From 57e1a4231d420b9e00bdb4feea2a723e7548ddbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Sun, 9 May 2021 13:04:52 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix=20org=E5=AF=B9seed=E7=9A=84=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/assets/style/main.less         |   2 +
 Web/src/pages/system/app/addForm.vue   |  71 ----------------
 Web/src/pages/system/app/editForm.vue  |  74 ----------------
 Web/src/pages/system/menu/addForm.vue  |  84 ------------------
 Web/src/pages/system/menu/editForm.vue |  83 ------------------
 Web/src/pages/system/org/form.vue      |  67 +++++++--------
 Web/src/pages/system/org/index.vue     | 113 +++++++++++++------------
 7 files changed, 91 insertions(+), 403 deletions(-)
 delete mode 100644 Web/src/pages/system/app/addForm.vue
 delete mode 100644 Web/src/pages/system/app/editForm.vue
 delete mode 100644 Web/src/pages/system/menu/addForm.vue
 delete mode 100644 Web/src/pages/system/menu/editForm.vue

diff --git a/Web/src/assets/style/main.less b/Web/src/assets/style/main.less
index 3992476..849aa4d 100644
--- a/Web/src/assets/style/main.less
+++ b/Web/src/assets/style/main.less
@@ -95,6 +95,8 @@
           box-shadow: 0 0 0 2px @white;
         }
         &--name {
+          font-weight: bolder;
+
           position: absolute;
           left: 32px + @padding-sm * 2;
 
diff --git a/Web/src/pages/system/app/addForm.vue b/Web/src/pages/system/app/addForm.vue
deleted file mode 100644
index 2d1ce72..0000000
--- a/Web/src/pages/system/app/addForm.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-  <a-modal
-    :confirmLoading="confirmLoading"
-    :visible="visible"
-    @cancel="onCancel"
-    @ok="onOk"
-    class="yo-modal-form"
-    title="新增应用"
-  >
-    <FormBody ref="form-body" />
-  </a-modal>
-</template>
-<script>
-import FormBody from './form';
-
-export default {
-  components: {
-    FormBody,
-  },
-  data() {
-    return {
-      visible: false,
-
-      confirmLoading: false,
-    };
-  },
-
-  methods: {
-    /**
-     * 必要的方法
-     * 从外部调用打开本窗口
-     */
-    onOpen() {
-      this.visible = true;
-    },
-
-    /**
-     * 必要的方法
-     * 点击保存时的操作
-     */
-    onOk() {
-      this.$refs['form-body'].onValidate((valid) => {
-        if (valid) {
-          this.confirmLoading = true;
-          this.$api
-            .sysAppAdd(this.$refs['form-body'].form)
-            .then(({ success }) => {
-              if (success) {
-                this.$message.success('新增成功');
-                this.onCancel();
-                this.$emit('ok');
-              }
-            })
-            .finally(() => {
-              this.confirmLoading = false;
-            });
-        }
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 关闭窗口时的操作
-     */
-    onCancel() {
-      this.$refs['form-body'].onResetFields();
-      this.visible = false;
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/app/editForm.vue b/Web/src/pages/system/app/editForm.vue
deleted file mode 100644
index 76f613d..0000000
--- a/Web/src/pages/system/app/editForm.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-  <a-modal
-    :confirmLoading="confirmLoading"
-    :visible="visible"
-    @cancel="onCancel"
-    @ok="onOk"
-    class="yo-modal-form"
-    title="编辑应用"
-  >
-    <FormBody ref="form-body" />
-  </a-modal>
-</template>
-<script>
-import FormBody from './form';
-
-export default {
-  components: {
-    FormBody,
-  },
-  data() {
-    return {
-      visible: false,
-
-      confirmLoading: false,
-    };
-  },
-
-  methods: {
-    /**
-     * 必要的方法
-     * 从外部调用打开本窗口,并填充外部传入的数据
-     */
-    onOpen(record) {
-      this.visible = true;
-      this.$nextTick(() => {
-        this.$refs['form-body'].onFillData(record);
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 点击保存时的操作
-     */
-    onOk() {
-      this.$refs['form-body'].onValidate((valid) => {
-        if (valid) {
-          this.confirmLoading = true;
-          this.$api
-            .sysAppEdit(this.$refs['form-body'].form)
-            .then(({ success }) => {
-              if (success) {
-                this.$message.success('编辑成功');
-                this.onCancel();
-                this.$emit('ok');
-              }
-            })
-            .finally(() => {
-              this.confirmLoading = false;
-            });
-        }
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 关闭窗口时的操作
-     */
-    onCancel() {
-      this.$refs['form-body'].onResetFields();
-      this.visible = false;
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/menu/addForm.vue b/Web/src/pages/system/menu/addForm.vue
deleted file mode 100644
index d7ddebf..0000000
--- a/Web/src/pages/system/menu/addForm.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :confirmLoading="confirmLoading"
-    :visible="visible"
-    :width="800"
-    @close="onClose"
-    @ok="onOk"
-    class="yo-drawer-form"
-    title="新增菜单"
-  >
-    <FormBody ref="form-body" />
-    <div class="ant-drawer-footer">
-      <a-button @click="onClose">取消</a-button>
-      <a-button :loading="confirmLoading" @click="onOk" type="primary">确定</a-button>
-    </div>
-  </a-drawer>
-</template>
-<script>
-import FormBody from './form';
-
-export default {
-  components: {
-    FormBody,
-  },
-  data() {
-    return {
-      visible: false,
-
-      confirmLoading: false,
-    };
-  },
-
-  computed: {
-    formBody() {
-      return this.$refs['form-body'];
-    },
-  },
-
-  methods: {
-    /**
-     * 必要的方法
-     * 从外部调用打开本窗口
-     */
-    async onOpen(record) {
-      this.visible = true;
-
-      this.$nextTick(async () => {
-        await this.formBody.onInit(record, true);
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 点击保存时的操作
-     */
-    onOk() {
-      this.formBody.onGetData().then((data) => {
-        this.confirmLoading = true;
-        this.$api
-          .sysMenuAdd(data)
-          .then(({ success }) => {
-            if (success) {
-              this.$message.success('新增成功');
-              this.onClose();
-              this.$emit('ok');
-            }
-          })
-          .finally(() => {
-            this.confirmLoading = false;
-          });
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 关闭窗口时的操作
-     */
-    onClose() {
-      this.formBody.onResetFields();
-      this.visible = false;
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/menu/editForm.vue b/Web/src/pages/system/menu/editForm.vue
deleted file mode 100644
index e5867ab..0000000
--- a/Web/src/pages/system/menu/editForm.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-  <a-drawer
-    :confirmLoading="confirmLoading"
-    :visible="visible"
-    :width="800"
-    @close="onClose"
-    class="yo-drawer-form"
-    title="编辑应用"
-  >
-    <FormBody ref="form-body" />
-    <div class="ant-drawer-footer">
-      <a-button @click="onClose">取消</a-button>
-      <a-button :loading="confirmLoading" @click="onOk" type="primary">确定</a-button>
-    </div>
-  </a-drawer>
-</template>
-<script>
-import FormBody from './form';
-
-export default {
-  components: {
-    FormBody,
-  },
-  data() {
-    return {
-      visible: false,
-
-      confirmLoading: false,
-    };
-  },
-
-  computed: {
-    formBody() {
-      return this.$refs['form-body'];
-    },
-  },
-
-  methods: {
-    /**
-     * 必要的方法
-     * 从外部调用打开本窗口,并填充外部传入的数据
-     */
-    onOpen(record) {
-      this.visible = true;
-      this.$nextTick(async () => {
-        await this.formBody.onInit(record);
-        this.formBody.onFillData(record);
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 点击保存时的操作
-     */
-    onOk() {
-      this.formBody.onGetData().then((data) => {
-        this.confirmLoading = true;
-        this.$api
-          .sysMenuEdit(data)
-          .then(({ success }) => {
-            if (success) {
-              this.$message.success('编辑成功');
-              this.onClose();
-              this.$emit('ok');
-            }
-          })
-          .finally(() => {
-            this.confirmLoading = false;
-          });
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 关闭窗口时的操作
-     */
-    onClose() {
-      this.formBody.onResetFields();
-      this.visible = false;
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/org/form.vue b/Web/src/pages/system/org/form.vue
index ae1f515..b0b949d 100644
--- a/Web/src/pages/system/org/form.vue
+++ b/Web/src/pages/system/org/form.vue
@@ -11,7 +11,7 @@
       <div class="yo-form-group">
         <!-- 表单控件 -->
         <!-- ... -->
-                <a-form-model-item label="机构名称" prop="name">
+        <a-form-model-item label="机构名称" prop="name">
           <a-input placeholder="请输入机构名称" v-model="form.name" />
         </a-form-model-item>
         <a-form-model-item label="唯一编码" prop="code">
@@ -57,16 +57,15 @@ import { EMPTY_ID } from '@/util/global';
 /* 表单内容默认值 */
 const defaultForm = {
   /* ... */
+  pid: undefined,
+  sort: 100,
 };
 
 export default {
   data() {
     return {
       /** 表单数据 */
-      form: {
-        pid: undefined,
-        sort: 100,
-      },
+      form: {},
       /** 验证格式 */
       rules: {
         name: [{ required: true, message: '请输入机构名称' }],
@@ -90,45 +89,42 @@ export default {
      * 必要的方法
      * 在打开编辑页时允许填充数据
      */
-    onFillData(params,orgId) {
-      if(orgId){
-        this.form.pid = orgId;
-      }else if(params){
-        // 从字符串areaCode查找到整个层级
-        const areaCode = [];
-        const findCode = (data, level) => {
-          level = level || 0;
-          for (let i = 0; i < data.length; i++) {
-            const item = data[i];
-            areaCode[level] = item.code;
+    onFillData(params) {
+      // 从字符串areaCode查找到整个层级
+      const areaCode = [];
+      const findCode = (data, level) => {
+        level = level || 0;
+        for (let i = 0; i < data.length; i++) {
+          const item = data[i];
+          areaCode[level] = item.code;
 
-            if (item.code === params.areaCode) {
-              areaCode.length = level + 1;
+          if (item.code === params.record.areaCode) {
+            areaCode.length = level + 1;
+            return true;
+          }
+
+          if (item.children && item.children.length) {
+            const found = findCode(item.children, level + 1);
+            if (found) {
               return true;
             }
-
-            if (item.children && item.children.length) {
-              const found = findCode(item.children, level + 1);
-              if (found) {
-                return true;
-              }
-            }
           }
-        };
-
-        if (params.areaCode) {
-          findCode(this.areaData);
         }
-   
+      };
+
+      if (params.record && params.record.areaCode) {
+        findCode(this.areaData);
+      }
+
       /** 将默认数据覆盖到form */
       this.form = this.$_.cloneDeep({
         ...defaultForm,
-        ...params,
-        areaCode,
+        pid: params.orgId,
+        ...params.record,
         /** 在此处添加其他默认数据转换 */
         /* ... */
+        areaCode,
       });
-      }
     },
 
     /**
@@ -137,14 +133,13 @@ export default {
      */
     onGetData() {
       return new Promise((reslove, reject) => {
-        
         this.$refs.form.validate((valid) => {
           if (valid) {
             const record = this.$_.cloneDeep(this.form);
             record.areaCode = record.areaCode[record.areaCode.length - 1];
             /** 验证通过后可以对数据进行转换得到想要提交的格式 */
             /* ... */
-          
+
             reslove(record);
           } else {
             reject();
@@ -182,7 +177,7 @@ export default {
       this.loading = true;
       /** 可以在这里await获取一些异步数据 */
       await this.onLoadOrgData();
-      await this.onLoadAreaData();     
+      await this.onLoadAreaData();
       /* ... */
       this.loading = false;
     },
diff --git a/Web/src/pages/system/org/index.vue b/Web/src/pages/system/org/index.vue
index 190d6bc..17bf5c2 100644
--- a/Web/src/pages/system/org/index.vue
+++ b/Web/src/pages/system/org/index.vue
@@ -5,63 +5,68 @@
     2021-04-30
     Lufthafen
   -->
-   <yo-tree-layout
+  <yo-tree-layout
     :load-data="loadTreeData"
     @select="onSelect"
     default-expanded-keys
     ref="tree-layout"
   >
-  <container>
-    <br />
-    <a-card :bordered="false">
-      <yo-table
-        :columns="columns"
-        :load-data="loadData"
-        @query="onQuery"
-        @resetQuery="onResetQuery"
-        ref="table"
-      >
-        <Auth auth="sysOrg:page" slot="query">
-          <!-- 此处添加查询表单控件 -->
-          <!-- ... -->
-          <a-form-model-item label="机构名称">
-            <a-input allow-clear placeholder="请输入机构名称" v-model="query.name" />
-          </a-form-model-item>
-        </Auth>
-        <Auth auth="sysOrg:add" slot="operator">
-          <a-button @click="onOpen('add-form')" icon="plus">新增机构</a-button>
-        </Auth>
-        <!-- 格式化字段内容 -->
-        <!-- ... -->
-        <!-- 添加操作控件 -->
-        <span slot="action" slot-scope="text, record">
-          <yo-table-actions>
-            <Auth auth="sysOrg:edit">
-              <a @click="onOpen('edit-form', record)">编辑</a>
-            </Auth>
-            <Auth auth="sysOrg:delete">
-              <a-popconfirm @confirm="onDelete(record)" placement="topRight" title="是否确认删除">
-                <a>删除</a>
-              </a-popconfirm>
-            </Auth>
-            <!-- 可在此处添加其他操作控件 -->
+    <container>
+      <br />
+      <a-card :bordered="false">
+        <yo-table
+          :columns="columns"
+          :load-data="loadData"
+          @query="onQuery"
+          @resetQuery="onResetQuery"
+          ref="table"
+        >
+          <Auth auth="sysOrg:page" slot="query">
+            <!-- 此处添加查询表单控件 -->
             <!-- ... -->
-          </yo-table-actions>
-        </span>
-      </yo-table>
-    </a-card>
+            <a-form-model-item label="机构名称">
+              <a-input allow-clear placeholder="请输入机构名称" v-model="query.name" />
+            </a-form-model-item>
+          </Auth>
+          <Auth auth="sysOrg:add" slot="operator">
+            <a-button @click="onOpen('add-form')" icon="plus">新增机构</a-button>
+          </Auth>
+          <!-- 格式化字段内容 -->
+          <!-- ... -->
+          <!-- 添加操作控件 -->
+          <span slot="action" slot-scope="text, record">
+            <yo-table-actions>
+              <Auth auth="sysOrg:edit">
+                <a @click="onOpen('edit-form', record)">编辑</a>
+              </Auth>
+              <Auth auth="sysOrg:delete">
+                <a-popconfirm @confirm="onDelete(record)" placement="topRight" title="是否确认删除">
+                  <a>删除</a>
+                </a-popconfirm>
+              </Auth>
+              <!-- 可在此处添加其他操作控件 -->
+              <!-- ... -->
+            </yo-table-actions>
+          </span>
+        </yo-table>
+      </a-card>
 
-     <!-- 新增表单 -->
-    <yo-modal-form :action="$api[api.add]" :title="'新增' + name" @ok="onReloadData" ref="add-form">
-      <form-body />
-    </yo-modal-form>
+      <!-- 新增表单 -->
+      <yo-modal-form :action="$api[api.add]" :title="'新增' + name" @ok="onReloadData" ref="add-form">
+        <form-body />
+      </yo-modal-form>
 
-    <!-- 编辑表单 -->
-    <yo-modal-form :action="$api[api.edit]" :title="'编辑' + name" @ok="onReloadData" ref="edit-form">
-      <form-body />
-    </yo-modal-form>
-  </container>
-</yo-tree-layout>
+      <!-- 编辑表单 -->
+      <yo-modal-form
+        :action="$api[api.edit]"
+        :title="'编辑' + name"
+        @ok="onReloadData"
+        ref="edit-form"
+      >
+        <form-body />
+      </yo-modal-form>
+    </container>
+  </yo-tree-layout>
 </template>
 <script>
 import FormBody from './form';
@@ -167,7 +172,7 @@ export default {
      */
     onResetQuery() {
       /** 在这里重置查询条件时,可对特殊的字段做保留处理 */
-        Object.keys(this.query).forEach((p) => {
+      Object.keys(this.query).forEach((p) => {
         if (p !== 'pid') {
           this.query[p] = undefined;
         }
@@ -219,14 +224,12 @@ export default {
      * 从列表页调用窗口的打开方法
      */
     onOpen(formName, record) {
-      this.$refs[formName].onOpen(
-        
+      this.$refs[formName].onOpen({
         record,
         /* 按需添加其他参数 */
         /* ... */
-
-        this.query['pid']
-      );
+        orgId: this.query['pid'],
+      });
     },
     /**
      * 必要方法

From 76a74dd63f4fc79968c65bb7ea6a8a9b7ce63cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Sun, 9 May 2021 20:00:50 +0800
Subject: [PATCH 2/9] =?UTF-8?q?update=20=E5=AE=9E=E7=8E=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81.=20=E5=B9=B6=E5=AF=B9=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E7=94=A8=E6=88=B7=E5=A1=AB=E5=86=99=E7=9A=84=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E8=BF=9B=E8=A1=8C=E4=BA=86=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Ewide.Core/Ewide.Core.xml                 |  70 ++++++++-
 Api/Ewide.Core/Service/Auth/AuthService.cs    |  33 ++--
 Api/Ewide.Core/Service/User/Dto/UserInput.cs  |   8 +-
 Api/Ewide.Core/Service/User/SysUserService.cs |   4 +-
 Api/Ewide.Web.Core/core.settings.json         |   3 +-
 Web/src/assets/style/app.less                 |   2 +
 Web/src/assets/style/lib/button.less          |   5 +
 Web/src/assets/style/lib/form.less            |   8 -
 Web/src/assets/style/lib/list.less            |   4 +
 Web/src/assets/style/lib/text-color.less      |  32 ++++
 Web/src/common/api/index.js                   |  11 +-
 Web/src/components/yoModalForm/index.js       |   5 +-
 Web/src/pages/{ => system}/account/index.vue  |  25 ++-
 .../{ => system}/account/setting/info.vue     |   3 +-
 .../system/account/setting/safety/index.vue   | 143 ++++++++++++++++++
 .../account/setting/safety/password.vue       | 126 +++++++++++++++
 Web/src/pages/system/doc/index.vue            |   1 +
 Web/src/pages/system/user/form.vue            |  30 ++--
 Web/src/views/main/_layout/header/user.js     |   2 +-
 19 files changed, 462 insertions(+), 53 deletions(-)
 create mode 100644 Web/src/assets/style/lib/button.less
 create mode 100644 Web/src/assets/style/lib/text-color.less
 rename Web/src/pages/{ => system}/account/index.vue (60%)
 rename Web/src/pages/{ => system}/account/setting/info.vue (99%)
 create mode 100644 Web/src/pages/system/account/setting/safety/index.vue
 create mode 100644 Web/src/pages/system/account/setting/safety/password.vue

diff --git a/Api/Ewide.Core/Ewide.Core.xml b/Api/Ewide.Core/Ewide.Core.xml
index 3cbc0f1..7c48c82 100644
--- a/Api/Ewide.Core/Ewide.Core.xml
+++ b/Api/Ewide.Core/Ewide.Core.xml
@@ -2801,6 +2801,71 @@
             <param name="refreshToken"></param>
             <returns></returns>
         </member>
+        <member name="T:Ewide.Core.SysDictDataSeedData">
+            <summary>
+            系统字典值种子数据
+            </summary>
+        </member>
+        <member name="M:Ewide.Core.SysDictDataSeedData.HasData(Microsoft.EntityFrameworkCore.DbContext,System.Type)">
+            <summary>
+            种子数据
+            </summary>
+            <param name="dbContext"></param>
+            <param name="dbContextLocator"></param>
+            <returns></returns>
+        </member>
+        <member name="T:Ewide.Core.SysDictTypeSeedData">
+            <summary>
+            系统字典类型种子数据
+            </summary>
+        </member>
+        <member name="M:Ewide.Core.SysDictTypeSeedData.HasData(Microsoft.EntityFrameworkCore.DbContext,System.Type)">
+            <summary>
+            种子数据
+            </summary>
+            <param name="dbContext"></param>
+            <param name="dbContextLocator"></param>
+            <returns></returns>
+        </member>
+        <member name="T:Ewide.Core.SysMenuSeedData">
+            <summary>
+            系统菜单表种子数据
+            </summary>
+        </member>
+        <member name="M:Ewide.Core.SysMenuSeedData.HasData(Microsoft.EntityFrameworkCore.DbContext,System.Type)">
+            <summary>
+            种子数据
+            </summary>
+            <param name="dbContext"></param>
+            <param name="dbContextLocator"></param>
+            <returns></returns>
+        </member>
+        <member name="T:Ewide.Core.SysTimerSeedData">
+            <summary>
+            系统任务调度表种子数据
+            </summary>
+        </member>
+        <member name="M:Ewide.Core.SysTimerSeedData.HasData(Microsoft.EntityFrameworkCore.DbContext,System.Type)">
+            <summary>
+            种子数据
+            </summary>
+            <param name="dbContext"></param>
+            <param name="dbContextLocator"></param>
+            <returns></returns>
+        </member>
+        <member name="T:Ewide.Core.SysUserSeedData">
+            <summary>
+            系统用户表种子数据
+            </summary>
+        </member>
+        <member name="M:Ewide.Core.SysUserSeedData.HasData(Microsoft.EntityFrameworkCore.DbContext,System.Type)">
+            <summary>
+            种子数据
+            </summary>
+            <param name="dbContext"></param>
+            <param name="dbContextLocator"></param>
+            <returns></returns>
+        </member>
         <member name="T:Ewide.Core.Service.AppInput">
             <summary>
             系统应用参数
@@ -6604,11 +6669,6 @@
             用户Id
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.ChangePasswordUserInput.Id">
-            <summary>
-            用户Id
-            </summary>
-        </member>
         <member name="P:Ewide.Core.Service.ChangePasswordUserInput.Password">
             <summary>
             密码
diff --git a/Api/Ewide.Core/Service/Auth/AuthService.cs b/Api/Ewide.Core/Service/Auth/AuthService.cs
index beb77f9..0ff2a2c 100644
--- a/Api/Ewide.Core/Service/Auth/AuthService.cs
+++ b/Api/Ewide.Core/Service/Auth/AuthService.cs
@@ -115,6 +115,15 @@ namespace Ewide.Core.Service
             var httpContext = App.GetService<IHttpContextAccessor>().HttpContext;
             var loginOutput = user.Adapt<LoginOutput>();
 
+            // 隐藏手机号/邮箱中间几位
+            loginOutput.Phone = String.IsNullOrEmpty(loginOutput.Phone) ? loginOutput.Phone 
+                : loginOutput.Phone.Substring(0, 3) + "****" + loginOutput.Phone.Substring(7, 4);
+            loginOutput.Email = String.IsNullOrEmpty(loginOutput.Email) ? loginOutput.Email
+                : String.Join("@", loginOutput.Email.Split('@').Select((p, i) =>
+                {
+                    return i == 0 ? (p.Length > 3 ? p.Substring(0, 3).PadRight(p.Length, '*') : "".PadRight(3, '*')) : p;
+                }));
+
             loginOutput.LastLoginTime = user.LastLoginTime = DateTime.Now;
             var ip = httpContext.Request.Headers["X-Real-IP"].FirstOrDefault();
             loginOutput.LastLoginIp = user.LastLoginIp = string.IsNullOrEmpty(user.LastLoginIp) ? httpContext.GetRemoteIpAddressToIPv4() : ip;
@@ -153,18 +162,18 @@ namespace Ewide.Core.Service
             }
 
             // 增加登录日志
-            await new SysLogVis
-            {
-                Name = "登录",
-                Success = true,
-                Message = "登录成功",
-                Ip = loginOutput.LastLoginIp,
-                Browser = loginOutput.LastLoginBrowser,
-                Os = loginOutput.LastLoginOs,
-                VisType = 1,
-                VisTime = loginOutput.LastLoginTime,
-                Account = loginOutput.Account
-            }.InsertAsync();
+            //await new SysLogVis
+            //{
+            //    Name = "登录",
+            //    Success = true,
+            //    Message = "登录成功",
+            //    Ip = loginOutput.LastLoginIp,
+            //    Browser = loginOutput.LastLoginBrowser,
+            //    Os = loginOutput.LastLoginOs,
+            //    VisType = 1,
+            //    VisTime = loginOutput.LastLoginTime,
+            //    Account = loginOutput.Account
+            //}.InsertAsync();
 
             return loginOutput;
         }
diff --git a/Api/Ewide.Core/Service/User/Dto/UserInput.cs b/Api/Ewide.Core/Service/User/Dto/UserInput.cs
index 13b0740..c31572b 100644
--- a/Api/Ewide.Core/Service/User/Dto/UserInput.cs
+++ b/Api/Ewide.Core/Service/User/Dto/UserInput.cs
@@ -46,11 +46,13 @@ namespace Ewide.Core.Service
         /// <summary>
         /// 邮箱
         /// </summary>
+        [RegularExpression(@"^\w{3,}(\.\w+)*@[A-z0-9]+(\.[A-z]{2,5}){1,2}$", ErrorMessage = "邮箱格式不正确")]
         public virtual string Email { get; set; }
 
         /// <summary>
         /// 手机
         /// </summary>
+        [RegularExpression(@"^((13[0-9])|(14[5,7])|(15[^4,\\D])|(17[0,1,3,6-8])|(18[0-9])|(19[8,9])|(166))[0-9]{8}$", ErrorMessage = "手机号格式不正确")]
         public virtual string Phone { get; set; }
 
         /// <summary>
@@ -120,12 +122,6 @@ namespace Ewide.Core.Service
 
     public class ChangePasswordUserInput
     {
-        /// <summary>
-        /// 用户Id
-        /// </summary>
-        [Required(ErrorMessage = "用户Id不能为空")]
-        public string Id { get; set; }
-
         /// <summary>
         /// 密码
         /// </summary>
diff --git a/Api/Ewide.Core/Service/User/SysUserService.cs b/Api/Ewide.Core/Service/User/SysUserService.cs
index bc45545..5e2d321 100644
--- a/Api/Ewide.Core/Service/User/SysUserService.cs
+++ b/Api/Ewide.Core/Service/User/SysUserService.cs
@@ -239,7 +239,7 @@ namespace Ewide.Core.Service
                 nameof(SysUser.Password),
                 nameof(SysUser.AdminType),
                 nameof(SysUser.Status),
-                // 邮箱和手机号作为可能登录的方式,不能在此处直接进行修改
+                // 邮箱和手机号作为安全验证的方式,不能在此处直接进行修改
                 nameof(SysUser.Phone),
                 nameof(SysUser.Email)
             }, true);
@@ -253,7 +253,7 @@ namespace Ewide.Core.Service
         [HttpPost("/sysUser/updatePwd")]
         public async Task UpdateUserPwd(ChangePasswordUserInput input)
         {
-            var user = await _sysUserRep.FirstOrDefaultAsync(u => u.Id == input.Id);
+            var user = await _sysUserRep.FirstOrDefaultAsync(u => u.Id == _userManager.UserId);
             if (MD5Encryption.Encrypt(input.Password) != user.Password)
                 throw Oops.Oh(ErrorCode.D1004);
             if (MD5Encryption.Encrypt(input.NewPassword).Equals(user.Password))
diff --git a/Api/Ewide.Web.Core/core.settings.json b/Api/Ewide.Web.Core/core.settings.json
index 41b6a0c..035a2a2 100644
--- a/Api/Ewide.Web.Core/core.settings.json
+++ b/Api/Ewide.Web.Core/core.settings.json
@@ -6,7 +6,8 @@
       "sysFileInfo:upload",
       "sysFileInfo:download",
       "sysFileInfo:preview",
-      "sysUser:updateInfo"
+      "sysUser:updateInfo",
+      "sysUser:updatePwd"
     ]
   }
 }
\ No newline at end of file
diff --git a/Web/src/assets/style/app.less b/Web/src/assets/style/app.less
index 6ceea2a..6eafc94 100644
--- a/Web/src/assets/style/app.less
+++ b/Web/src/assets/style/app.less
@@ -3,6 +3,7 @@
 @import './lib/container.less';
 @import './lib/align.less';
 @import './lib/font-size.less';
+@import './lib/text-color.less';
 @import './lib/margin.less';
 @import './lib/width-height.less';
 @import './lib/scrollbar.less';
@@ -15,6 +16,7 @@
 .yo-nav-theme--light {
   .light();
 }
+@import './lib/button.less';
 @import './lib/card.less';
 @import './lib/table.less';
 @import './lib/list.less';
diff --git a/Web/src/assets/style/lib/button.less b/Web/src/assets/style/lib/button.less
new file mode 100644
index 0000000..fbc571b
--- /dev/null
+++ b/Web/src/assets/style/lib/button.less
@@ -0,0 +1,5 @@
+@import (reference) '~@/assets/style/extend.less';
+@btn-default-border: @border-color-split;
+.ant-btn {
+  box-shadow: none;
+}
diff --git a/Web/src/assets/style/lib/form.less b/Web/src/assets/style/lib/form.less
index a4508aa..9f53965 100644
--- a/Web/src/assets/style/lib/form.less
+++ b/Web/src/assets/style/lib/form.less
@@ -4,25 +4,17 @@
     width: 660px;
     margin: 0 auto;
   }
-  h1,
   .h1,
-  h2,
   .h2,
-  h3,
   .h3,
-  h4,
   .h4,
-  h5,
   .h5,
-  h6,
   .h6 {
     color: darken(@white, 40%);
   }
-  h3,
   .h3 {
     font-size: 16px;
   }
-  h4,
   .h4 {
     font-size: 15px;
   }
diff --git a/Web/src/assets/style/lib/list.less b/Web/src/assets/style/lib/list.less
index 3ab9fab..146034f 100644
--- a/Web/src/assets/style/lib/list.less
+++ b/Web/src/assets/style/lib/list.less
@@ -1,4 +1,8 @@
 @import (reference) '~@/assets/style/extend.less';
+.ant-list-bordered {
+  border-color: @border-color-split;
+  background-color: @white;
+}
 .yo-list {
   &-content--h {
     display: flex;
diff --git a/Web/src/assets/style/lib/text-color.less b/Web/src/assets/style/lib/text-color.less
new file mode 100644
index 0000000..b4e431f
--- /dev/null
+++ b/Web/src/assets/style/lib/text-color.less
@@ -0,0 +1,32 @@
+@import (reference) '~@/assets/style/extend.less';
+.text-primary {
+  color: @primary-color;
+}
+.text-info {
+  color: @info-color;
+}
+.text-success {
+  color: @success-color;
+}
+.text-processing {
+  color: @processing-color;
+}
+.text-error,
+.text-danger {
+  color: @error-color;
+}
+.text-highlight {
+  color: @highlight-color;
+}
+.text-warning {
+  color: @warning-color;
+}
+.text-normal {
+  color: @normal-color;
+}
+.text-white {
+  color: @white;
+}
+.text-black {
+  color: @black;
+}
diff --git a/Web/src/common/api/index.js b/Web/src/common/api/index.js
index 907d351..dbb9ed3 100644
--- a/Web/src/common/api/index.js
+++ b/Web/src/common/api/index.js
@@ -18,6 +18,7 @@ axios.defaults.baseURL = '/api'
  * api.getItemGroupType(parmas).then(...)
  */
 import urls from './requests'
+import { settings } from 'nprogress'
 
 const initInstance = (options) => {
     const instance = axios
@@ -45,10 +46,12 @@ const errorNotification = ({ code, message }) => {
     switch (message.constructor) {
         case Array:
             message.map(p => {
-                app.$notification.error({
-                    duration: 30,
-                    message: p.field,
-                    description: p.messages.join('/'),
+                setTimeout(() => {
+                    app.$notification.error({
+                        duration: 30,
+                        message: p.field,
+                        description: p.messages.join('/'),
+                    })
                 })
             })
             break
diff --git a/Web/src/components/yoModalForm/index.js b/Web/src/components/yoModalForm/index.js
index c5f4a6b..f1a6cc8 100644
--- a/Web/src/components/yoModalForm/index.js
+++ b/Web/src/components/yoModalForm/index.js
@@ -13,6 +13,9 @@ export default {
         },
         action: {
             type: Function
+        },
+        successMessage: {
+            type: String
         }
     },
 
@@ -124,7 +127,7 @@ export default {
                             && this.action(data)
                                 .then(({ success }) => {
                                     if (success) {
-                                        this.$message.success('保存成功');
+                                        this.$message.success(this.successMessage || '保存成功');
                                         this.onClose();
                                         this.$emit('ok');
                                     }
diff --git a/Web/src/pages/account/index.vue b/Web/src/pages/system/account/index.vue
similarity index 60%
rename from Web/src/pages/account/index.vue
rename to Web/src/pages/system/account/index.vue
index 3009fac..d8f1ecf 100644
--- a/Web/src/pages/account/index.vue
+++ b/Web/src/pages/system/account/index.vue
@@ -1,10 +1,10 @@
 <template>
   <container>
-    <br />
     <a-anchor
       :get-container="()=> $el.parentNode"
       :offset-top="16"
-      :wrapper-style="{ backgroundColor: 'transparent' }"
+      @click.prevent
+      class="yo-account--anchor"
     >
       <a-anchor-link
         :href="`#account-${key}`"
@@ -13,12 +13,27 @@
         v-for="(nav, key) in navs"
       />
     </a-anchor>
-
+    <br />
     <section :id="`account-${key}`" :key="key" v-for="(nav, key) in navs">
       <component :is="nav.component" v-if="nav.component" />
     </section>
   </container>
 </template>
+<style lang="less" scoped>
+@import (reference) '~@/assets/style/extend.less';
+.yo-account--anchor {
+  position: absolute;
+
+  width: 200px;
+  /deep/.ant-anchor-wrapper {
+    background-color: transparent;
+  }
+  /deep/.ant-anchor-ink {
+    display: none;
+  }
+}
+
+</style>
 <script>
 export default {
   data() {
@@ -28,6 +43,10 @@ export default {
           title: '我的信息',
           component: () => import('./setting/info'),
         },
+        1: {
+          title: '安全设置',
+          component: () => import('./setting/safety'),
+        },
       },
     };
   },
diff --git a/Web/src/pages/account/setting/info.vue b/Web/src/pages/system/account/setting/info.vue
similarity index 99%
rename from Web/src/pages/account/setting/info.vue
rename to Web/src/pages/system/account/setting/info.vue
index c06d462..619913d 100644
--- a/Web/src/pages/account/setting/info.vue
+++ b/Web/src/pages/system/account/setting/info.vue
@@ -1,7 +1,7 @@
 <template>
   <container mode="container-xxs">
     <a-form-model class="yo-form">
-      <h4>我的信息</h4>
+      <h4 class="h4">我的信息</h4>
       <div class="yo-avatar-info">
         <yo-image :id="form.avatar" :size="128" icon="user" type="avatar" />
         <div @click="avatar.cropper = true" class="yo-avatar-info--cover">
@@ -99,6 +99,7 @@
 
       <a-button :loading="saving" @click="onSaveInfo" block>更新个人信息</a-button>
     </a-form-model>
+    <br />
   </container>
 </template>
 <style lang="less" scoped>
diff --git a/Web/src/pages/system/account/setting/safety/index.vue b/Web/src/pages/system/account/setting/safety/index.vue
new file mode 100644
index 0000000..3fff7f8
--- /dev/null
+++ b/Web/src/pages/system/account/setting/safety/index.vue
@@ -0,0 +1,143 @@
+<template>
+  <container mode="container-xxs">
+    <div class="yo-form">
+      <h4 class="h4">安全设置</h4>
+      <a-progress
+        :percent="15"
+        :stroke-color="{
+            from: '#108ee9',
+            to: '#87d068',
+        }"
+        :stroke-width="15"
+        class="mb-md"
+        status="active"
+        stroke-linecap="square"
+      >
+        <span slot="format">
+          帐号安全级别:
+          <span v-html="safetyLevel"></span>
+        </span>
+      </a-progress>
+      <a-list :data-source="data" bordered item-layout="vertical">
+        <a-list-item slot="renderItem" slot-scope="item">
+          <template v-if="item.done">
+            <span class="text-success" slot="actions">
+              <a-icon class="mr-xxs" type="check-circle" />已设置
+            </span>
+            <a @click="item.action" slot="actions">修改</a>
+          </template>
+          <template v-else>
+            <span class="text-warning" slot="actions">
+              <a-icon class="mr-xxs" type="exclamation-circle" />未设置
+            </span>
+            <a @click="item.action" slot="actions">设置</a>
+          </template>
+          <a-list-item-meta :description="item.description" :title="item.title" />
+          <span>{{ item.content }}</span>
+        </a-list-item>
+      </a-list>
+    </div>
+    <br />
+
+    <yo-modal-form
+      :action="$api.sysUserUpdatePwd"
+      @ok="onSetPasswordSuccess"
+      ref="password-form"
+      success-message="密码修改成功"
+      title="修改密码"
+    >
+      <password />
+    </yo-modal-form>
+  </container>
+</template>
+<style lang="less" scoped>
+@import (reference) '~@/assets/style/app.less';
+.ant-progress {
+  width: 400px;
+  /deep/.ant-progress-inner {
+    border-radius: @border-radius-base;
+    background-color: @white;
+  }
+}
+
+</style>
+<script>
+import { doLogout } from '@/common/login';
+
+import Password from './password';
+
+export default {
+  components: {
+    Password,
+  },
+
+  data() {
+    return {
+      data: [],
+    };
+  },
+
+  computed: {
+    safetyLevel() {
+      // 计算帐号安全级别
+      return '<span class="text-error">弱</span>';
+    },
+  },
+
+  created() {
+    const info = this.$root.global.info;
+
+    // 登录密码
+    this.data.push({
+      title: '登录密码',
+      description:
+        '安全性高的密码可以使帐号更安全。建议您定期更换密码，设置一个包含字母，符号或数字中至少两项且长度超过6位的密码。',
+      content: '当前密码强度：弱(不保存密码明文,需要在数据库以字段形式存储)',
+      done: true,
+      action: () => {
+        this.$refs['password-form'].onOpen({});
+      },
+    });
+
+    // 手机绑定
+    this.data.push({
+      title: '手机绑定(发送验证码到手机,未实现)',
+      description: (
+        <div>
+          手机号可以直接用于登录、找回密码等。
+          {info.phone && (
+            <span>
+              您已绑定了手机<b>{info.phone}</b>
+            </span>
+          )}
+        </div>
+      ),
+      done: !!info.phone,
+      action: () => {},
+    });
+
+    // 邮箱绑定
+    this.data.push({
+      title: '安全邮箱(发送验证码到邮箱,未实现)',
+      description: (
+        <div>
+          安全邮箱可以直接用于登录、找回密码等。
+          {info.email && (
+            <span>
+              您已绑定了邮箱<b>{info.email}</b>
+            </span>
+          )}
+        </div>
+      ),
+      done: !!info.email,
+      action: () => {},
+    });
+  },
+
+  methods: {
+    onSetPasswordSuccess() {
+      doLogout();
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/account/setting/safety/password.vue b/Web/src/pages/system/account/setting/safety/password.vue
new file mode 100644
index 0000000..6e91b85
--- /dev/null
+++ b/Web/src/pages/system/account/setting/safety/password.vue
@@ -0,0 +1,126 @@
+<template>
+  <!-- 
+    普通编辑窗体
+    v 1.2
+    2021-04-30
+    Lufthafen
+  -->
+  <a-form-model :model="form" :rules="rules" class="yo-form" ref="form">
+    <a-spin :spinning="loading">
+      <a-icon slot="indicator" spin type="loading" />
+      <div class="yo-form-group">
+        <!-- 表单控件 -->
+        <!-- ... -->
+        <a-form-model-item label="旧密码" prop="password">
+          <a-input-password placeholder="请输入旧密码" v-model="form.password" />
+        </a-form-model-item>
+        <a-form-model-item label="新密码" prop="newPassword">
+          <a-input-password placeholder="请输入新密码" v-model="form.newPassword" />
+        </a-form-model-item>
+        <a-form-model-item label="确认新密码" prop="confirm">
+          <a-input-password placeholder="请确认新密码" v-model="form.confirm" />
+        </a-form-model-item>
+      </div>
+    </a-spin>
+  </a-form-model>
+</template>
+<script>
+/* 表单内容默认值 */
+const defaultForm = {
+  /* ... */
+};
+
+export default {
+  data() {
+    return {
+      /** 表单数据 */
+      form: {},
+      /** 验证格式 */
+      rules: {
+        /* ... */
+        password: [{ required: true, message: '请输入旧密码' }],
+        newPassword: [{ required: true, message: '请输入新密码' }],
+        confirm: [{ required: true, message: '请确认新密码' }],
+      },
+
+      /** 加载异步数据状态 */
+      loading: false,
+
+      /** 其他成员属性 */
+      /* ... */
+    };
+  },
+
+  methods: {
+    /**
+     * 必要的方法
+     * 在打开编辑页时允许填充数据
+     */
+    onFillData(params) {
+      /** 将默认数据覆盖到form */
+      this.form = this.$_.cloneDeep({
+        ...defaultForm,
+        ...params.record,
+        /** 在此处添加其他默认数据转换 */
+        /* ... */
+      });
+    },
+
+    /**
+     * 必要方法
+     * 验证表单并获取表单数据
+     */
+    onGetData() {
+      return new Promise((reslove, reject) => {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            const record = this.$_.cloneDeep(this.form);
+
+            /** 验证通过后可以对数据进行转换得到想要提交的格式 */
+            /* ... */
+
+            reslove(record);
+          } else {
+            reject();
+          }
+        });
+      });
+    },
+
+    /**
+     * 必要的方法
+     * 在外部窗口进行保存时调用表单验证
+     */
+    onValidate(callback) {
+      this.$refs.form.validate(callback);
+    },
+
+    /**
+     * 必要的方法
+     * 在外部窗口关闭或重置时对表单验证进行初始化
+     */
+    onResetFields() {
+      setTimeout(() => {
+        this.$refs.form.resetFields();
+
+        /** 在这里可以初始化当前组件中其他属性 */
+        /* ... */
+      }, 300);
+    },
+
+    /**
+     * 必要方法
+     * 加载当前表单中所需要的异步数据
+     */
+    async onInit(params) {
+      this.loading = true;
+      /** 可以在这里await获取一些异步数据 */
+      /* ... */
+      this.loading = false;
+    },
+
+    /** 当前组件的其他方法 */
+    /* ... */
+  },
+};
+</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/doc/index.vue b/Web/src/pages/system/doc/index.vue
index a3fda6d..674f4db 100644
--- a/Web/src/pages/system/doc/index.vue
+++ b/Web/src/pages/system/doc/index.vue
@@ -79,6 +79,7 @@
             :get-container="()=> $el.parentNode"
             :offset-top="24"
             :wrapper-style="{ backgroundColor: 'transparent' }"
+            @click.prevent
           >
             <a-anchor-link
               :href="`#doc-${index}`"
diff --git a/Web/src/pages/system/user/form.vue b/Web/src/pages/system/user/form.vue
index f6742fc..0929b91 100644
--- a/Web/src/pages/system/user/form.vue
+++ b/Web/src/pages/system/user/form.vue
@@ -4,7 +4,7 @@
       <a-icon slot="indicator" spin type="loading" />
       <a-row :gutter="16">
         <a-col :span="10">
-          <h3>基本信息</h3>
+          <h3 class="h3">基本信息</h3>
           <div class="yo-form-group">
             <a-form-model-item label="账号" prop="account">
               <a-input placeholder="请输入账号" v-model="form.account" />
@@ -53,7 +53,7 @@
           </div>
         </a-col>
         <a-col :span="14">
-          <h3>员工信息</h3>
+          <h3 class="h3">员工信息</h3>
           <div class="yo-form-group">
             <a-form-model-item label="所属组织机构" prop="sysEmpParam.orgId">
               <a-tree-select
@@ -77,7 +77,7 @@
               </a-select>
             </a-form-model-item>
           </div>
-          <h4>附加信息</h4>
+          <h4 class="h4">附加信息</h4>
           <a-table
             :columns="extColumns"
             :data-source="form.sysEmpParam.extIds"
@@ -136,15 +136,27 @@ export default {
         sysEmpParam: {},
       },
       rules: {
-        account: [{ required: true, min: 5, message: '请输入至少五个字符的账号' }],
-        name: [{ required: true, message: '请输入姓名' }],
+        account: [{ required: true, min: 5, message: '请输入至少五个字符的账号', trigger: 'blur' }],
+        name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
         password: [
-          { required: true, min: 5, message: '请输入至少五个字符的密码' },
-          { validator: validateToNextPassword },
+          { required: true, min: 5, message: '请输入至少五个字符的密码', trigger: 'blur' },
+          { validator: validateToNextPassword, trigger: 'blur' },
+        ],
+        confirm: [
+          { required: true, message: '请确认密码', trigger: 'blur' },
+          { validator: compareToFirstPassword, trigger: 'blur' },
         ],
-        confirm: [{ required: true, message: '请确认密码' }, { validator: compareToFirstPassword }],
         sex: [{ required: true, message: '请选择性别' }],
-        phone: [{ required: true, message: '请输入手机号' }],
+        phone: [
+          {
+            pattern: /^((13[0-9])|(14[5,7])|(15[^4,\\D])|(17[0,1,3,6-8])|(18[0-9])|(19[8,9])|(166))[0-9]{8}$/,
+            message: '手机号格式不正确',
+            trigger: 'blur',
+          },
+        ],
+        email: [
+          { pattern: /^\w{3,}(\.\w+)*@[A-z0-9]+(\.[A-z]{2,5}){1,2}$/, message: '邮箱格式不正确', trigger: 'blur' },
+        ],
         'sysEmpParam.orgId': [{ required: true, message: '请选择所属组织机构' }],
         'sysEmpParam.posIdList': [{ required: true, message: '请选择职位信息' }],
       },
diff --git a/Web/src/views/main/_layout/header/user.js b/Web/src/views/main/_layout/header/user.js
index 2677a78..14031b2 100644
--- a/Web/src/views/main/_layout/header/user.js
+++ b/Web/src/views/main/_layout/header/user.js
@@ -39,7 +39,7 @@ export default {
                 key: 'account-home',
                 title: '个人中心',
                 icon: 'user',
-                path: '/account'
+                path: '/system/account'
             })
         },
 

From eecc20e4e3642d97f499e1d05b46be135dd01ff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Sun, 9 May 2021 21:26:19 +0800
Subject: [PATCH 3/9] =?UTF-8?q?update=20=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BD=BF=E7=94=A8=E6=96=B0=E7=9A=84=E7=A7=8D=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/assets/style/lib/list.less            |   2 +-
 Web/src/pages/system/account/setting/info.vue |   6 +-
 Web/src/pages/system/user/addForm.vue         |  84 ------
 Web/src/pages/system/user/dataForm.vue        |   4 +-
 Web/src/pages/system/user/editForm.vue        |  75 ------
 Web/src/pages/system/user/form.vue            | 174 +++++++++----
 Web/src/pages/system/user/index.vue           | 242 +++++++++++++-----
 Web/src/pages/system/user/roleForm.vue        |   4 +-
 8 files changed, 309 insertions(+), 282 deletions(-)
 delete mode 100644 Web/src/pages/system/user/addForm.vue
 delete mode 100644 Web/src/pages/system/user/editForm.vue

diff --git a/Web/src/assets/style/lib/list.less b/Web/src/assets/style/lib/list.less
index 146034f..3343e02 100644
--- a/Web/src/assets/style/lib/list.less
+++ b/Web/src/assets/style/lib/list.less
@@ -8,7 +8,7 @@
     display: flex;
     align-items: center;
     &--item {
-      min-width: 100px;
+      min-width: 120px;
       margin-left: @padding-xl;
       >span {
         line-height: 20px;
diff --git a/Web/src/pages/system/account/setting/info.vue b/Web/src/pages/system/account/setting/info.vue
index 619913d..12f82ed 100644
--- a/Web/src/pages/system/account/setting/info.vue
+++ b/Web/src/pages/system/account/setting/info.vue
@@ -79,15 +79,15 @@
         <a-form-model-item label="性别" prop="sex">
           <a-radio-group v-model="form.sex">
             <a-radio-button :value="0">
-              <a-icon type="stop" />
+              <a-icon class="mr-xxs" type="stop" />
               <span>保密</span>
             </a-radio-button>
             <a-radio-button :value="1">
-              <a-icon :style="{ color: '#1890ff' }" type="man" />
+              <a-icon :style="{ color: '#1890ff' }" class="mr-xxs" type="man" />
               <span>男</span>
             </a-radio-button>
             <a-radio-button :value="2">
-              <a-icon :style="{ color: '#eb2f96' }" type="woman" />
+              <a-icon :style="{ color: '#eb2f96' }" class="mr-xxs" type="woman" />
               <span>女</span>
             </a-radio-button>
           </a-radio-group>
diff --git a/Web/src/pages/system/user/addForm.vue b/Web/src/pages/system/user/addForm.vue
deleted file mode 100644
index 58bde42..0000000
--- a/Web/src/pages/system/user/addForm.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-modal
-    :confirmLoading="confirmLoading"
-    :visible="visible"
-    :width="1024"
-    @cancel="onCancel"
-    @ok="onOk"
-    title="新增应用"
-  >
-    <FormBody mode="add" ref="form-body" />
-  </a-modal>
-</template>
-<script>
-import FormBody from './form';
-
-export default {
-  components: {
-    FormBody,
-  },
-
-  data() {
-    return {
-      visible: false,
-
-      confirmLoading: false,
-    };
-  },
-
-  computed: {
-    formBody() {
-      return this.$refs['form-body'];
-    },
-  },
-
-  methods: {
-    /**
-     * 必要的方法
-     * 从外部调用打开本窗口
-     */
-    onOpen(record, id) {
-      this.visible = true;
-      this.$nextTick(async () => {
-        await this.formBody.onInit();
-
-        // 获取外部选中的部门id
-        this.formBody.onFillData(record, id);
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 点击保存时的操作
-     */
-    onOk() {
-      this.formBody.onValidate((valid) => {
-        if (valid) {
-          this.confirmLoading = true;
-          this.$api
-            .sysUserAdd(this.formBody.form)
-            .then(({ success }) => {
-              if (success) {
-                this.$message.success('新增成功');
-                this.onCancel();
-                this.$emit('ok');
-              }
-            })
-            .finally(() => {
-              this.confirmLoading = false;
-            });
-        }
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 关闭窗口时的操作
-     */
-    onCancel() {
-      this.formBody.onResetFields();
-      this.visible = false;
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/user/dataForm.vue b/Web/src/pages/system/user/dataForm.vue
index 8407c31..91d05f0 100644
--- a/Web/src/pages/system/user/dataForm.vue
+++ b/Web/src/pages/system/user/dataForm.vue
@@ -65,9 +65,9 @@ export default {
      * 必要的方法
      * 从外部调用打开本窗口
      */
-    async onOpen(record) {
+    async onOpen(params) {
       this.visible = true;
-      this.id = record.id;
+      this.id = params.record.id;
       this.$nextTick(() => {
         this.onInit();
       });
diff --git a/Web/src/pages/system/user/editForm.vue b/Web/src/pages/system/user/editForm.vue
deleted file mode 100644
index c14d8cd..0000000
--- a/Web/src/pages/system/user/editForm.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <a-modal
-    :confirmLoading="confirmLoading"
-    :visible="visible"
-    :width="1024"
-    @cancel="onCancel"
-    @ok="onOk"
-    title="编辑用户"
-  >
-    <FormBody mode="eidt" ref="form-body" />
-  </a-modal>
-</template>
-<script>
-import FormBody from './form';
-
-export default {
-  components: {
-    FormBody,
-  },
-  data() {
-    return {
-      visible: false,
-
-      confirmLoading: false,
-    };
-  },
-
-  methods: {
-    /**
-     * 必要的方法
-     * 从外部调用打开本窗口,并填充外部传入的数据
-     */
-    onOpen(record) {
-      this.visible = true;
-      this.$nextTick(async () => {
-        await this.$refs['form-body'].onInit();
-        this.$refs['form-body'].onFillData(record);
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 点击保存时的操作
-     */
-    onOk() {
-      this.$refs['form-body'].onValidate((valid) => {
-        if (valid) {
-          this.confirmLoading = true;
-          this.$api
-            .sysUserEdit(this.$refs['form-body'].form)
-            .then(({ success }) => {
-              if (success) {
-                this.$message.success('编辑成功');
-                this.onCancel();
-                this.$emit('ok');
-              }
-            })
-            .finally(() => {
-              this.confirmLoading = false;
-            });
-        }
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 关闭窗口时的操作
-     */
-    onCancel() {
-      this.$refs['form-body'].onResetFields();
-      this.visible = false;
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/user/form.vue b/Web/src/pages/system/user/form.vue
index 0929b91..902c9c9 100644
--- a/Web/src/pages/system/user/form.vue
+++ b/Web/src/pages/system/user/form.vue
@@ -1,4 +1,10 @@
 <template>
+  <!-- 
+    普通编辑窗体
+    v 1.2
+    2021-04-30
+    Lufthafen
+  -->
   <a-form-model :model="form" :rules="rules" class="yo-form" ref="form">
     <a-spin :spinning="loading">
       <a-icon slot="indicator" spin type="loading" />
@@ -33,11 +39,17 @@
             </a-form-model-item>
             <a-form-model-item label="性别" prop="sex">
               <a-radio-group v-model="form.sex">
+                <a-radio-button :value="0">
+                  <a-icon class="mr-xxs" type="stop" />
+                  <span>保密</span>
+                </a-radio-button>
                 <a-radio-button :value="1">
-                  <a-icon :style="{ color: '#1890ff' }" type="man" />男
+                  <a-icon :style="{ color: '#1890ff' }" class="mr-xxs" type="man" />
+                  <span>男</span>
                 </a-radio-button>
                 <a-radio-button :value="2">
-                  <a-icon :style="{ color: '#eb2f96' }" type="woman" />女
+                  <a-icon :style="{ color: '#eb2f96' }" class="mr-xxs" type="woman" />
+                  <span>女</span>
                 </a-radio-button>
               </a-radio-group>
             </a-form-model-item>
@@ -52,7 +64,7 @@
             </a-form-model-item>
           </div>
         </a-col>
-        <a-col :span="14">
+        <a-col :span="14" v-if="form.sysEmpParam">
           <h3 class="h3">员工信息</h3>
           <div class="yo-form-group">
             <a-form-model-item label="所属组织机构" prop="sysEmpParam.orgId">
@@ -78,42 +90,44 @@
             </a-form-model-item>
           </div>
           <h4 class="h4">附加信息</h4>
-          <a-table
-            :columns="extColumns"
-            :data-source="form.sysEmpParam.extIds"
-            :pagination="false"
-            size="small"
-          >
-            <template slot="footer">
-              <a-button @click="onAddExtData" block icon="plus" type="dashed">新增一项</a-button>
-            </template>
-            <template slot="orgId" slot-scope="text, record">
-              <a-tree-select
-                :default-value="text"
-                :dropdown-style="{ maxHeight: '300px', overflow: 'auto' }"
-                :tree-data="orgData"
-                @change="value => onChangeExtData(value, record, 'orgId')"
-                placeholder="请选择附加组织机构"
-                tree-default-expand-all
-              />
-            </template>
-            <template slot="posId" slot-scope="text, record">
-              <a-select
-                :default-value="text"
-                @change="value => onChangeExtData(value, record, 'posId')"
-                placeholder="请选择附加职位信息"
-              >
-                <a-select-option
-                  :key="i"
-                  :value="item.id"
-                  v-for="(item, i) in posData"
-                >{{ item.name }}</a-select-option>
-              </a-select>
-            </template>
-            <template slot="action" slot-scope="text, record">
-              <a-button @click="onRemoveExtData(record)" size="small" type="danger">删除</a-button>
-            </template>
-          </a-table>
+          <div class="pl-md pr-md">
+            <a-table
+              :columns="extColumns"
+              :data-source="form.sysEmpParam.extIds"
+              :pagination="false"
+              size="small"
+            >
+              <template slot="footer">
+                <a-button @click="onAddExtData" block icon="plus" type="dashed">新增一项</a-button>
+              </template>
+              <template slot="orgId" slot-scope="text, record">
+                <a-tree-select
+                  :default-value="text"
+                  :dropdown-style="{ maxHeight: '300px', overflow: 'auto' }"
+                  :tree-data="orgData"
+                  @change="value => onChangeExtData(value, record, 'orgId')"
+                  placeholder="请选择附加组织机构"
+                  tree-default-expand-all
+                />
+              </template>
+              <template slot="posId" slot-scope="text, record">
+                <a-select
+                  :default-value="text"
+                  @change="value => onChangeExtData(value, record, 'posId')"
+                  placeholder="请选择附加职位信息"
+                >
+                  <a-select-option
+                    :key="i"
+                    :value="item.id"
+                    v-for="(item, i) in posData"
+                  >{{ item.name }}</a-select-option>
+                </a-select>
+              </template>
+              <template slot="action" slot-scope="text, record">
+                <a-button @click="onRemoveExtData(record)" size="small" type="danger">删除</a-button>
+              </template>
+            </a-table>
+          </div>
         </a-col>
       </a-row>
     </a-spin>
@@ -127,15 +141,28 @@ const compareToFirstPassword = (rule, value, callback) => {
   callback();
 };
 
+/* 表单内容默认值 */
+const defaultForm = {
+  /* ... */
+  sex: 0,
+  sysEmpParam: {},
+};
+
 export default {
-  props: ['mode'],
+  props: {
+    mode: {
+      type: String,
+      default: 'edit',
+    },
+  },
 
   data() {
     return {
-      form: {
-        sysEmpParam: {},
-      },
+      /** 表单数据 */
+      form: {},
+      /** 验证格式 */
       rules: {
+        /* ... */
         account: [{ required: true, min: 5, message: '请输入至少五个字符的账号', trigger: 'blur' }],
         name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
         password: [
@@ -146,7 +173,6 @@ export default {
           { required: true, message: '请确认密码', trigger: 'blur' },
           { validator: compareToFirstPassword, trigger: 'blur' },
         ],
-        sex: [{ required: true, message: '请选择性别' }],
         phone: [
           {
             pattern: /^((13[0-9])|(14[5,7])|(15[^4,\\D])|(17[0,1,3,6-8])|(18[0-9])|(19[8,9])|(166))[0-9]{8}$/,
@@ -161,8 +187,11 @@ export default {
         'sysEmpParam.posIdList': [{ required: true, message: '请选择职位信息' }],
       },
 
+      /** 加载异步数据状态 */
       loading: false,
 
+      /** 其他成员属性 */
+      /* ... */
       orgData: [],
       posData: [],
 
@@ -188,13 +217,14 @@ export default {
       ],
     };
   },
+
   methods: {
     /**
      * 必要的方法
      * 在打开编辑页时允许填充数据
      */
-    onFillData(record, orgId) {
-      const form = this.$_.cloneDeep(record || {});
+    onFillData(params) {
+      const form = this.$_.cloneDeep(params.record || {});
       // 日期特殊处理
       if (form.birthday) {
         form.birthday = this.$moment(form.birthday).format('YYYY-MM-DD');
@@ -223,10 +253,38 @@ export default {
         });
       }
 
-      if (orgId) {
+      if (params.orgId) {
         form.sysEmpParam.orgId = orgId;
       }
-      this.form = form;
+
+      /** 将默认数据覆盖到form */
+      this.form = this.$_.cloneDeep({
+        ...defaultForm,
+        ...form,
+        /** 在此处添加其他默认数据转换 */
+        /* ... */
+      });
+    },
+
+    /**
+     * 必要方法
+     * 验证表单并获取表单数据
+     */
+    onGetData() {
+      return new Promise((reslove, reject) => {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            const record = this.$_.cloneDeep(this.form);
+
+            /** 验证通过后可以对数据进行转换得到想要提交的格式 */
+            /* ... */
+
+            reslove(record);
+          } else {
+            reject();
+          }
+        });
+      });
     },
 
     /**
@@ -243,20 +301,32 @@ export default {
      */
     onResetFields() {
       setTimeout(() => {
-        this.form = {
-          sysEmpParam: {},
-        };
         this.$refs.form.resetFields();
+
+        /** 在这里可以初始化当前组件中其他属性 */
+        /* ... */
+        this.form = {
+          ...defaultForm,
+        };
       }, 300);
     },
 
-    async onInit() {
+    /**
+     * 必要方法
+     * 加载当前表单中所需要的异步数据
+     */
+    async onInit(params) {
       this.loading = true;
+      /** 可以在这里await获取一些异步数据 */
+      /* ... */
       this.orgData = await this.onLoadOrgData();
       this.posData = await this.onLoadPosData();
       this.loading = false;
     },
 
+    /** 当前组件的其他方法 */
+    /* ... */
+
     onLoadOrgData() {
       return this.$api.getOrgTree().then(({ data }) => {
         return data;
diff --git a/Web/src/pages/system/user/index.vue b/Web/src/pages/system/user/index.vue
index 48bafe8..2dcb3a0 100644
--- a/Web/src/pages/system/user/index.vue
+++ b/Web/src/pages/system/user/index.vue
@@ -1,28 +1,41 @@
 <template>
-  <yo-tree-layout :load-data="loadTreeData" @select="onSelect" default-expanded-keys>
+  <!-- 
+    普通树查询表格
+    v 1.2
+    2021-04-30
+    Lufthafen
+  -->
+  <yo-tree-layout
+    :load-data="loadTreeData"
+    @select="onSelect"
+    default-expanded-keys
+    ref="tree-layout"
+  >
     <container>
-      <a-alert closable type="error">
-        <template slot="message">
-          后端bug:生日不填写,在保存时会默认写入0001-01-01
-          <br />权限问题,在这里需要用到组织架构以及职位的数据接口,所以必须配置该两项的菜单
-        </template>
-      </a-alert>
-      <br />
       <a-card :bordered="false">
         <Auth auth="sysUser:page">
           <div class="yo-query-bar">
-            <a-form-model :model="query" layout="inline">
+            <a-form-model :model="query" @submit.native.prevent layout="inline">
               <a-form-model-item label="关键词">
                 <a-input allow-clear placeholder="请输入姓名、账号、手机号" v-model="query.searchValue" />
               </a-form-model-item>
               <a-form-model-item label="状态">
-                <a-select :style="{ width: '170px' }" allow-clear placeholder="请选择状态" v-model="query.searchStatus">
-                  <a-select-option :key="i" :value="item.code" v-for="(item, i) in codes.find((p) => p.code === 'common_status').values">{{ item.value }}</a-select-option>
+                <a-select
+                  :style="{ width: '170px' }"
+                  allow-clear
+                  placeholder="请选择状态"
+                  v-model="query.searchStatus"
+                >
+                  <a-select-option
+                    :key="i"
+                    :value="item.code"
+                    v-for="(item, i) in codes.common_status"
+                  >{{ item.value }}</a-select-option>
                 </a-select>
               </a-form-model-item>
               <a-form-model-item>
                 <a-button-group>
-                  <a-button @click="onQuery" type="primary">查询</a-button>
+                  <a-button @click="onQuery" html-type="submit" type="primary">查询</a-button>
                   <a-button @click="onReset">重置</a-button>
                 </a-button-group>
               </a-form-model-item>
@@ -66,7 +79,14 @@
             <a-list-item-meta>
               <div slot="title">{{ record.nickName || record.name }}</div>
               <div slot="description">{{ record.account }}</div>
-              <yo-image :id="record.avatar" :size="48" icon="user" shape="square" slot="avatar" type="avatar" />
+              <yo-image
+                :id="record.avatar"
+                :size="48"
+                icon="user"
+                shape="square"
+                slot="avatar"
+                type="avatar"
+              />
             </a-list-item-meta>
             <div class="yo-list-content--h">
               <div class="yo-list-content--h--item">
@@ -75,11 +95,21 @@
               </div>
               <div class="yo-list-content--h--item">
                 <span>手机</span>
-                <p>{{ record.phone }}</p>
+                <p>{{ record.phone || '未设置' }}</p>
+              </div>
+              <div class="yo-list-content--h--item">
+                <span>邮箱</span>
+                <p>{{ record.email || '未设置' }}</p>
               </div>
               <Auth auth="sysUser:changeStatus">
-                <div class="yo-list-content--h--item">
-                  <a-switch :checked="!record.status" :checked-children="bindCodeValue(0, 'common_status')" :loading="record.statusChanging" :un-checked-children="bindCodeValue(1, 'common_status')" @change="(checked) => onSetUserStatus(record, checked)" />
+                <div class="yo-list-content--h--item text-center">
+                  <a-switch
+                    :checked="!record.status"
+                    :checked-children="bindCodeValue(0, 'common_status')"
+                    :loading="record.statusChanging"
+                    :un-checked-children="bindCodeValue(1, 'common_status')"
+                    @change="(checked) => onSetUserStatus(record, checked)"
+                  />
                 </div>
               </Auth>
             </div>
@@ -87,49 +117,96 @@
         </yo-list>
       </a-card>
     </container>
-    <add-form @ok="onReloadData" ref="add-form" />
-    <edit-form @ok="onReloadData" ref="edit-form" />
+
+    <!-- 新增表单 -->
+    <yo-modal-form
+      :action="$api[api.add]"
+      :title="'新增' + name"
+      :width="1024"
+      @ok="onReloadData"
+      ref="add-form"
+    >
+      <form-body mode="add" />
+    </yo-modal-form>
+
+    <!-- 编辑表单 -->
+    <yo-modal-form
+      :action="$api[api.edit]"
+      :title="'编辑' + name"
+      :width="1024"
+      @ok="onReloadData"
+      ref="edit-form"
+    >
+      <form-body mode="edit" />
+    </yo-modal-form>
+
     <role-form @ok="onReloadData" ref="role-form" />
     <data-form @ok="onReloadData" ref="data-form" />
   </yo-tree-layout>
 </template>
 <script>
+/* 需要引用YoTreeLayout组件 */
 import YoTreeLayout from '@/components/yoTreeLayout';
 import YoList from '@/components/yoList';
+import FormBody from './form';
 
-import AddForm from './addForm';
-import EditForm from './editForm';
 import RoleForm from './roleForm';
 import DataForm from './dataForm';
 
+/* 在此管理整个页面需要的接口名称 */
+const api = {
+  tree: 'getOrgTree',
+  page: 'getUserPage',
+  add: 'sysUserAdd',
+  edit: 'sysUserEdit',
+  delete: 'sysUserDelete',
+  /* ... */
+};
+
 export default {
   components: {
     YoTreeLayout,
     YoList,
-    AddForm,
-    EditForm,
+    FormBody,
     RoleForm,
     DataForm,
   },
 
   data() {
     return {
+      api,
+
+      name: '用户',
+
+      /* 查询条件 */
       query: {},
-      codes: [
-        {
-          code: 'sex',
-          values: [],
-        },
-        {
-          code: 'common_status',
-          values: [],
-        },
-      ],
+
+      /* 表格字段 */
+      columns: [],
+
+      /* 字典编码储存格式 */
+      codes: {
+        sex: [],
+        common_status: [],
+      },
     };
   },
 
   created() {
     this.onLoadCodes();
+
+    /** 根据权限添加操作列 */
+    const flag = this.$auth({
+      sysUser: [['edit'], ['delete'], ['grantRole'], ['grantData']],
+    });
+    if (flag) {
+      this.columns.push({
+        title: '操作',
+        width: '150px',
+        dataIndex: 'action',
+        scopedSlots: { customRender: 'action' },
+      });
+    }
   },
 
   methods: {
@@ -138,12 +215,17 @@ export default {
      * 传给yo-table-layout以示意数据接口
      */
     loadTreeData() {
-      return this.$api.getOrgTree().then((res) => {
+      return this.$api[api.tree]().then((res) => {
         return res.data;
       });
     },
 
+    /**
+     * 树形选择界面必要的方法
+     * 选择树节点事件
+     */
     onSelect([id]) {
+      /** 在选择事件中可以对右侧表格添加父节点id的查询条件 */
       this.query = {
         'sysEmpParam.orgId': id,
       };
@@ -155,14 +237,12 @@ export default {
      * 传给yo-table以示意数据接口及其参数和返回的数据结构
      */
     loadData(params) {
-      return this.$api
-        .getUserPage({
-          ...params,
-          ...this.query,
-        })
-        .then((res) => {
-          return res.data;
-        });
+      return this.$api[api.page]({
+        ...params,
+        ...this.query,
+      }).then((res) => {
+        return res.data;
+      });
     },
 
     /**
@@ -173,9 +253,14 @@ export default {
       this.$refs.list.onReloadData(true);
     },
 
+    /**
+     * 必要方法
+     * 重新列表数据
+     */
     onReset() {
+      /* 与普通查询页不同的是,这里的父节点参数不应该在重置后被清空 */
       Object.keys(this.query).forEach((p) => {
-        if (p !== 'sysEmpParam.orgId') {
+        if (p !== 'pid') {
           this.query[p] = undefined;
         }
       });
@@ -188,19 +273,34 @@ export default {
      */
     onReloadData() {
       this.$refs.list.onReloadData();
+      this.$refs['tree-layout'].onReloadData();
     },
 
     /**
-     * 加载字典数据时的必要方法
+     * 必要方法
+     * 加载字典数据
+     * 如果不需要获取相应的字典数据,此方法内容可空
      */
     onLoadCodes() {
-      this.$api.$queue([this.$api.sysDictTypeDropDownAwait({ code: 'sex' }), this.$api.sysDictTypeDropDownAwait({ code: 'common_status' })]).then(([sex, commonStatus]) => {
-        this.codes.find((p) => p.code === 'sex').values = sex.data;
-        this.codes.find((p) => p.code === 'common_status').values = commonStatus.data;
-      });
+      this.$api
+        .$queue([
+          this.$api.sysDictTypeDropDownAwait({ code: 'sex' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'common_status' }),
+          /* ... */
+        ])
+        .then(([code1, code2]) => {
+          this.codes.sex = code1.data;
+          this.codes.common_status = code2.data;
+          /* ... */
+        });
     },
+
+    /**
+     * 必要方法
+     * 绑定数据字典值
+     */
     bindCodeValue(code, name) {
-      const c = this.codes.find((p) => p.code == name).values.find((p) => p.code == code);
+      const c = this.codes[name].find((p) => p.code == code);
       if (c) {
         return c.value;
       }
@@ -212,13 +312,40 @@ export default {
      * 从列表页调用窗口的打开方法
      */
     onOpen(formName, record) {
-      try {
-        this.$refs[formName].onOpen(record, this.query['sysEmpParam.orgId']);
-      } catch {
-        console.warn('component open method not found');
+      this.$refs[formName].onOpen({
+        record,
+        orgId: this.query['sysEmpParam.orgId'],
+        /* 按需添加其他参数 */
+        /* ... */
+      });
+    },
+
+    /**
+     * 必要方法
+     * 可以用做一系列操作的公共回调,此方法中会重新加载当前列表
+     */
+    onResult(success, successMessage) {
+      if (success) {
+        this.$message.success(successMessage);
+        this.onReloadData();
       }
     },
 
+    /**
+     * 必要方法
+     * 删除时调用
+     */
+    onDelete(record) {
+      this.$refs.list.onLoading();
+      this.$api[api.delete](record)
+        .then(({ success }) => {
+          this.onResult(success, '删除成功');
+        })
+        .finally(() => {
+          this.$refs.list.onLoaded();
+        });
+    },
+
     onSetUserStatus(record, checked) {
       this.$set(record, 'statusChanging', true);
       this.$api
@@ -252,17 +379,6 @@ export default {
           }
         });
     },
-
-    onDelete(record) {
-      this.$api.sysUserDelete(record).then(({ success, message }) => {
-        if (success) {
-          this.$message.success('删除成功');
-          this.onReloadData();
-        } else {
-          this.$message.error(message);
-        }
-      });
-    },
   },
 };
 </script>
\ No newline at end of file
diff --git a/Web/src/pages/system/user/roleForm.vue b/Web/src/pages/system/user/roleForm.vue
index 90f975b..f1fcaa8 100644
--- a/Web/src/pages/system/user/roleForm.vue
+++ b/Web/src/pages/system/user/roleForm.vue
@@ -45,9 +45,9 @@ export default {
      * 必要的方法
      * 从外部调用打开本窗口
      */
-    async onOpen(record) {
+    async onOpen(params) {
       this.visible = true;
-      this.id = record.id;
+      this.id = params.record.id;
       this.$nextTick(() => {
         this.onInit();
       });

From 9eba92a2fb8a807acc615a9bd6d3495a4f32524b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Mon, 10 May 2021 16:22:26 +0800
Subject: [PATCH 4/9] =?UTF-8?q?update=20=E7=9B=AE=E5=89=8D=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E9=A1=B5=E9=9D=A2=E4=BD=BF=E7=94=A81.2=E7=9A=84?=
 =?UTF-8?q?=E7=A7=8D=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/pages/system/config/form.vue   |  86 +++++-------
 Web/src/pages/system/config/index.vue  |  28 ++--
 Web/src/pages/system/pos/addForm.vue   |  74 ----------
 Web/src/pages/system/pos/editForm.vue  |  74 ----------
 Web/src/pages/system/pos/form.vue      | 125 +++++++++++++----
 Web/src/pages/system/pos/index.vue     | 175 +++++++++++++++++------
 Web/src/pages/system/role/addForm.vue  |  71 ----------
 Web/src/pages/system/role/dataForm.vue |   8 +-
 Web/src/pages/system/role/editForm.vue |  75 ----------
 Web/src/pages/system/role/form.vue     | 124 +++++++++++++----
 Web/src/pages/system/role/index.vue    | 185 +++++++++++++++++++------
 Web/src/pages/system/role/menuForm.vue |   4 +-
 12 files changed, 509 insertions(+), 520 deletions(-)
 delete mode 100644 Web/src/pages/system/pos/addForm.vue
 delete mode 100644 Web/src/pages/system/pos/editForm.vue
 delete mode 100644 Web/src/pages/system/role/addForm.vue
 delete mode 100644 Web/src/pages/system/role/editForm.vue

diff --git a/Web/src/pages/system/config/form.vue b/Web/src/pages/system/config/form.vue
index 93ec7d1..dacdc2a 100644
--- a/Web/src/pages/system/config/form.vue
+++ b/Web/src/pages/system/config/form.vue
@@ -11,38 +11,33 @@
       <div class="yo-form-group">
         <!-- 表单控件 -->
         <!-- ... -->
-              <a-form-model-item label="角色名" prop="name">
-        <a-input placeholder="请输入角色名" v-model="form.name" />
-      </a-form-model-item>
-      <a-form-model-item label="唯一编码" prop="code" :disabled="editDisabled">
-        <a-input placeholder="请输入唯一编码" v-model="form.code" />
-      </a-form-model-item>
-      <a-form-model-item label="系统参数" prop="sysFlag">
-        <a-radio-group v-model="form.sysFlag" :disabled="editDisabled">
-          <a-radio-button value="Y">
-            <a-icon :style="{ color: '#1890ff' }" />是
-          </a-radio-button>
-          <a-radio-button value="N">
-            <a-icon :style="{ color: '#eb2f96' }" />否
-          </a-radio-button>
-        </a-radio-group>
-      </a-form-model-item>
-      <a-form-model-item label="所属分类" prop="groupCode">
-        <a-select placeholder="请选择所属分类" v-model="form.groupCode" :disabled="editDisabled">
+        <a-form-model-item label="角色名" prop="name">
+          <a-input placeholder="请输入角色名" v-model="form.name" />
+        </a-form-model-item>
+        <a-form-model-item :disabled="editDisabled" label="唯一编码" prop="code">
+          <a-input placeholder="请输入唯一编码" v-model="form.code" />
+        </a-form-model-item>
+        <a-form-model-item label="系统参数" prop="sysFlag">
+          <a-radio-group :disabled="editDisabled" v-model="form.sysFlag">
+            <a-radio-button value="Y">是</a-radio-button>
+            <a-radio-button value="N">否</a-radio-button>
+          </a-radio-group>
+        </a-form-model-item>
+        <a-form-model-item label="所属分类" prop="groupCode">
+          <a-select :disabled="editDisabled" placeholder="请选择所属分类" v-model="form.groupCode">
             <a-select-option
-                  :key="i"
-                  :value="item.code"
-                  v-for="(item, i) in groupCode"
-                >{{ item.value }}</a-select-option>
-              </a-select>
-        </a-select>
-      </a-form-model-item>
-      <a-form-model-item label="参数值" prop="name">
-        <a-input placeholder="请输入参数值 " v-model="form.value" />
-      </a-form-model-item>
-      <a-form-model-item label="备注" prop="remark">
-        <a-input placeholder="请输入备注" v-model="form.remark" />
-      </a-form-model-item>
+              :key="i"
+              :value="item.code"
+              v-for="(item, i) in groupCode"
+            >{{ item.value }}</a-select-option>
+          </a-select>
+        </a-form-model-item>
+        <a-form-model-item label="参数值" prop="name">
+          <a-input placeholder="请输入参数值 " v-model="form.value" />
+        </a-form-model-item>
+        <a-form-model-item label="备注" prop="remark">
+          <a-input placeholder="请输入备注" v-model="form.remark" />
+        </a-form-model-item>
       </div>
     </a-spin>
   </a-form-model>
@@ -50,7 +45,6 @@
 <script>
 /* 表单内容默认值 */
 const defaultForm = {
-  // editDisabled:false,
   /* ... */
 };
 
@@ -61,18 +55,18 @@ export default {
       form: {},
       /** 验证格式 */
       rules: {
-        name: [{ required: true, message: "请输入应用名称" }],
-        code: [{ required: true, message: "请输入唯一编码" }],
-        sysFlag: [{ required: true, message: "请选择参数类型" }],
-        groupCode: [{ required: true, message: "请选择所属分类" }],
-        value: [{ required: true, message: "请输入参数值" }],
+        name: [{ required: true, message: '请输入应用名称' }],
+        code: [{ required: true, message: '请输入唯一编码' }],
+        sysFlag: [{ required: true, message: '请选择参数类型' }],
+        groupCode: [{ required: true, message: '请选择所属分类' }],
+        value: [{ required: true, message: '请输入参数值' }],
         /* ... */
       },
 
       /** 加载异步数据状态 */
       loading: false,
-      editDisabled:false,
-      groupCode:[],
+      editDisabled: false,
+      groupCode: [],
       /** 其他成员属性 */
       /* ... */
     };
@@ -91,14 +85,8 @@ export default {
         /** 在此处添加其他默认数据转换 */
         /* ... */
       });
-     
-        if(this.form.sysFlag == 'Y')
-      {
-          this.editDisabled = true
-      }else
-      {
-           this.editDisabled = false
-      }
+
+      this.editDisabled = this.form.sysFlag == 'Y';
     },
 
     /**
@@ -158,9 +146,9 @@ export default {
     /** 当前组件的其他方法 */
     /* ... */
     /**
-     * 
+     *
      * 获取所属分类字典表的内容
-     */ 
+     */
     onLoadgroupCodeData() {
       return this.$api.sysDictTypeDropDown({ code: 'consts_type' }).then(({ data }) => {
         return data;
diff --git a/Web/src/pages/system/config/index.vue b/Web/src/pages/system/config/index.vue
index c779929..6dd2bdf 100644
--- a/Web/src/pages/system/config/index.vue
+++ b/Web/src/pages/system/config/index.vue
@@ -114,18 +114,20 @@ export default {
       ],
 
       /* 字典编码储存格式 */
-      // codes: {
-      //   code1: [],
-      //   code2: [],
-      // },
+      codes: {
+        code1: [],
+        code2: [],
+      },
     };
   },
   created() {
     /** 按需加载字典编码 */
-    //this.onLoadCodes();
+    this.onLoadCodes();
 
     /** 根据权限添加操作列 */
-    const flag = this.$auth(/* ... */);
+    const flag = this.$auth({
+      sysConfig: [['edit'], ['delete']],
+    });
     if (flag) {
       this.columns.push({
         title: '操作',
@@ -180,19 +182,7 @@ export default {
      * 加载字典数据
      * 如果不需要获取相应的字典数据,此方法内容可空
      */
-    //onLoadCodes() {
-    //   this.$api
-    //     .$queue([
-    //       this.$api.sysDictTypeDropDownAwait({ code: 'code1' }),
-    //       this.$api.sysDictTypeDropDownAwait({ code: 'code2' }),
-    //       /* ... */
-    //     ])
-    //     .then(([code1, code2]) => {
-    //       this.codes.code1 = code1.data;
-    //       this.codes.code2 = code2.data;
-    //       /* ... */
-    //     });
-    // },
+    onLoadCodes() {},
 
     /**
      * 必要方法
diff --git a/Web/src/pages/system/pos/addForm.vue b/Web/src/pages/system/pos/addForm.vue
deleted file mode 100644
index 2d2dcae..0000000
--- a/Web/src/pages/system/pos/addForm.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-  <a-modal
-    :confirmLoading="confirmLoading"
-    :visible="visible"
-    @cancel="onCancel"
-    @ok="onOk"
-    class="yo-modal-form"
-    title="新增职位"
-  >
-    <FormBody ref="form-body" />
-  </a-modal>
-</template>
-<script>
-import FormBody from './form';
-
-export default {
-  components: {
-    FormBody,
-  },
-  data() {
-    return {
-      visible: false,
-      confirmLoading: false,
-    };
-  },
-
-  methods: {
-    /**
-     * 必要的方法
-     * 从外部调用打开本窗口,并填充外部传入的数据
-     */
-    onOpen() {
-      this.visible = true;
-    //   this.$nextTick(() => {
-    //     this.$refs['form-body'].onFillData(record);
-    //   });
-    },
-
-    /**
-     * 必要的方法
-     * 点击保存时的操作
-     */
-    onOk() {
-      this.$refs['form-body'].onValidate((valid) => {
-        if (valid) {
-          this.confirmLoading = true;
-          this.$api
-            .sysPosAdd(this.$refs['form-body'].form)
-            .then(({ success }) => {
-              this.confirmLoading = false;
-              if (success) {
-                this.$message.success('编辑成功');
-                this.onCancel();
-                this.$emit('ok');
-              }
-            })
-            .finally(() => {
-              this.confirmLoading = false;
-            });
-        }
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 关闭窗口时的操作
-     */
-    onCancel() {
-      this.$refs['form-body'].onResetFields();
-      this.visible = false;
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/pos/editForm.vue b/Web/src/pages/system/pos/editForm.vue
deleted file mode 100644
index 79196bc..0000000
--- a/Web/src/pages/system/pos/editForm.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-  <a-modal
-    :confirmLoading="confirmLoading"
-    :visible="visible"
-    @cancel="onCancel"
-    @ok="onOk"
-    class="yo-modal-form"
-    title="职位编辑"
-  >
-    <FormBody ref="form-body" />
-  </a-modal>
-</template>
-<script>
-import FormBody from './form';
-
-export default {
-  components: {
-    FormBody,
-  },
-  data() {
-    return {
-      visible: false,
-      confirmLoading: false,
-    };
-  },
-
-  methods: {
-    /**
-     * 必要的方法
-     * 从外部调用打开本窗口,并填充外部传入的数据
-     */
-    onOpen(record) {
-      this.visible = true;
-      this.$nextTick(() => {
-        this.$refs['form-body'].onFillData(record);
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 点击保存时的操作
-     */
-    onOk() {
-      this.$refs['form-body'].onValidate((valid) => {
-        if (valid) {
-          this.confirmLoading = true;
-          this.$api
-            .sysPosEdit(this.$refs['form-body'].form)
-            .then(({ success }) => {
-              this.confirmLoading = false;
-              if (success) {
-                this.$message.success('编辑成功');
-                this.onCancel();
-                this.$emit('ok');
-              }
-            })
-            .finally(() => {
-              this.confirmLoading = false;
-            });
-        }
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 关闭窗口时的操作
-     */
-    onCancel() {
-      this.$refs['form-body'].onResetFields();
-      this.visible = false;
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/pos/form.vue b/Web/src/pages/system/pos/form.vue
index e752d1b..48576b9 100644
--- a/Web/src/pages/system/pos/form.vue
+++ b/Web/src/pages/system/pos/form.vue
@@ -1,50 +1,99 @@
 <template>
+  <!-- 
+    普通编辑窗体
+    v 1.2
+    2021-04-30
+    Lufthafen
+  -->
   <a-form-model :model="form" :rules="rules" class="yo-form" ref="form">
-    <div class="yo-form-group">
-      <a-form-model-item label="职位名称" prop="name">
-        <a-input placeholder="请输入职位名称" v-model="form.name" />
-      </a-form-model-item>
-      <a-form-model-item label="唯一编码" prop="code">
-        <a-input placeholder="请输入唯一编码" v-model="form.code" />
-      </a-form-model-item>
-      <a-form-model-item label="排序" prop="sort">
-        <a-input-number
-          :max="1000"
-          :min="0"
-          class="w-100-p"
-          placeholder="请输入排序"
-          v-model="form.sort"
-        />
-      </a-form-model-item>
-        <a-form-model-item
-          label="备注"
-          prop="remark"
-        >
-          <a-textarea v-model="form.remark" :rows="4" placeholder="请输入备注"></a-textarea>
+    <a-spin :spinning="loading">
+      <a-icon slot="indicator" spin type="loading" />
+      <div class="yo-form-group">
+        <!-- 表单控件 -->
+        <!-- ... -->
+        <a-form-model-item label="职位名称" prop="name">
+          <a-input placeholder="请输入职位名称" v-model="form.name" />
         </a-form-model-item>
-    </div>
+        <a-form-model-item label="唯一编码" prop="code">
+          <a-input placeholder="请输入唯一编码" v-model="form.code" />
+        </a-form-model-item>
+        <a-form-model-item label="排序" prop="sort">
+          <a-input-number
+            :max="1000"
+            :min="0"
+            class="w-100-p"
+            placeholder="请输入排序"
+            v-model="form.sort"
+          />
+        </a-form-model-item>
+        <a-form-model-item label="备注" prop="remark">
+          <a-textarea :rows="4" placeholder="请输入备注" v-model="form.remark"></a-textarea>
+        </a-form-model-item>
+      </div>
+    </a-spin>
   </a-form-model>
 </template>
 <script>
+/* 表单内容默认值 */
+const defaultForm = {
+  /* ... */
+  sort: 100,
+};
+
 export default {
   data() {
     return {
-      form: {
-        active: 'N',
-      },
+      /** 表单数据 */
+      form: {},
+      /** 验证格式 */
       rules: {
-        name: [{ required: true, message: '请输入应用名称' }],
-        code: [{ required: true, message: '请输入唯一编码' }],
+        /* ... */
+        name: [{ required: true, message: '请输入应用名称', trigger: 'blur' }],
+        code: [{ required: true, message: '请输入唯一编码', trigger: 'blur' }],
       },
+
+      /** 加载异步数据状态 */
+      loading: false,
+
+      /** 其他成员属性 */
+      /* ... */
     };
   },
+
   methods: {
     /**
      * 必要的方法
      * 在打开编辑页时允许填充数据
      */
-    onFillData(record) {
-      this.form = this.$_.cloneDeep(record);
+    onFillData(params) {
+      /** 将默认数据覆盖到form */
+      this.form = this.$_.cloneDeep({
+        ...defaultForm,
+        ...params.record,
+        /** 在此处添加其他默认数据转换 */
+        /* ... */
+      });
+    },
+
+    /**
+     * 必要方法
+     * 验证表单并获取表单数据
+     */
+    onGetData() {
+      return new Promise((reslove, reject) => {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            const record = this.$_.cloneDeep(this.form);
+
+            /** 验证通过后可以对数据进行转换得到想要提交的格式 */
+            /* ... */
+
+            reslove(record);
+          } else {
+            reject();
+          }
+        });
+      });
     },
 
     /**
@@ -61,10 +110,26 @@ export default {
      */
     onResetFields() {
       setTimeout(() => {
-        this.form = {};
         this.$refs.form.resetFields();
+
+        /** 在这里可以初始化当前组件中其他属性 */
+        /* ... */
       }, 300);
     },
+
+    /**
+     * 必要方法
+     * 加载当前表单中所需要的异步数据
+     */
+    async onInit(params) {
+      this.loading = true;
+      /** 可以在这里await获取一些异步数据 */
+      /* ... */
+      this.loading = false;
+    },
+
+    /** 当前组件的其他方法 */
+    /* ... */
   },
 };
 </script>
\ No newline at end of file
diff --git a/Web/src/pages/system/pos/index.vue b/Web/src/pages/system/pos/index.vue
index 6453768..df21a4d 100644
--- a/Web/src/pages/system/pos/index.vue
+++ b/Web/src/pages/system/pos/index.vue
@@ -1,30 +1,36 @@
 <template>
+  <!-- 
+    普通查询表格
+    v 1.2
+    2021-04-30
+    Lufthafen
+  -->
   <container>
     <br />
     <a-card :bordered="false">
-      <Auth auth="sysPos:page">
-        <div class="yo-query-bar">
-          <a-form-model :model="query" layout="inline">
-            <a-form-model-item label="职位名称">
-              <a-input placeholder="请输入职位名称" v-model="query.name" />
-            </a-form-model-item>
-            <a-form-model-item label="唯一编码">
-              <a-input placeholder="请输入唯一编码" v-model="query.code" />
-            </a-form-model-item>
-            <a-form-model-item>
-              <a-button-group>
-                <a-button @click="onQuery" type="primary">查询</a-button>
-                <a-button @click="() => {(query = {}), onQuery();}">重置</a-button>
-              </a-button-group>
-            </a-form-model-item>
-          </a-form-model>
-        </div>
-      </Auth>
-      <yo-table :columns="columns" :load-data="loadData" ref="table">
+      <yo-table
+        :columns="columns"
+        :load-data="loadData"
+        @query="onQuery"
+        @resetQuery="onResetQuery"
+        ref="table"
+      >
+        <Auth auth="sysPos:page" slot="query">
+          <!-- 此处添加查询表单控件 -->
+          <!-- ... -->
+          <a-form-model-item label="职位名称">
+            <a-input placeholder="请输入职位名称" v-model="query.name" />
+          </a-form-model-item>
+          <a-form-model-item label="唯一编码">
+            <a-input placeholder="请输入唯一编码" v-model="query.code" />
+          </a-form-model-item>
+        </Auth>
         <Auth auth="sysPos:add" slot="operator">
           <a-button @click="onOpen('add-form')" icon="plus">新增职位</a-button>
         </Auth>
-
+        <!-- 格式化字段内容 -->
+        <!-- ... -->
+        <!-- 添加操作控件 -->
         <span slot="action" slot-scope="text, record">
           <yo-table-actions>
             <Auth auth="sysPos:edit">
@@ -35,26 +41,50 @@
                 <a>删除</a>
               </a-popconfirm>
             </Auth>
+            <!-- 可在此处添加其他操作控件 -->
+            <!-- ... -->
           </yo-table-actions>
         </span>
       </yo-table>
     </a-card>
-    <br />
-    <edit-form @ok="onReloadData" ref="edit-form" />
-    <add-form @ok="onReloadData" ref="add-form" />
+
+    <!-- 新增表单 -->
+    <yo-modal-form :action="$api[api.add]" :title="'新增' + name" @ok="onReloadData" ref="add-form">
+      <form-body />
+    </yo-modal-form>
+
+    <!-- 编辑表单 -->
+    <yo-modal-form :action="$api[api.edit]" :title="'编辑' + name" @ok="onReloadData" ref="edit-form">
+      <form-body />
+    </yo-modal-form>
   </container>
 </template>
 <script>
-import AddForm from './addForm';
-import editForm from './editForm';
+import FormBody from './form';
+
+/* 在此管理整个页面需要的接口名称 */
+const api = {
+  page: 'sysPosPage',
+  add: 'sysPosAdd',
+  edit: 'sysPosEdit',
+  delete: 'sysPosDelete',
+  /* ... */
+};
+
 export default {
   components: {
-    AddForm,
-    editForm,
+    FormBody,
   },
   data() {
     return {
+      api,
+
+      name: '职位',
+
+      /* 查询条件 */
       query: {},
+
+      /* 表格字段 */
       columns: [
         {
           title: '职位名称',
@@ -77,17 +107,28 @@ export default {
           sorter: true,
         },
       ],
+
+      /* 字典编码储存格式 */
+      codes: {
+        code1: [],
+        code2: [],
+      },
     };
   },
   created() {
-    if (this.$auth({ sysPos: [['edit'], ['delete']] })) {
+    /** 按需加载字典编码 */
+    this.onLoadCodes();
+
+    /** 根据权限添加操作列 */
+    const flag = this.$auth({
+      sysPos: [['edit'], ['delete']],
+    });
+    if (flag) {
       this.columns.push({
         title: '操作',
-        width: '200px',
+        width: '150px',
         dataIndex: 'action',
-        scopedSlots: {
-          customRender: 'action',
-        },
+        scopedSlots: { customRender: 'action' },
       });
     }
   },
@@ -97,14 +138,12 @@ export default {
      * 传给yo-table以示意数据接口及其参数和返回的数据结构
      */
     loadData(params) {
-      return this.$api
-        .sysPosPage({
-          ...params,
-          ...this.query,
-        })
-        .then((res) => {
-          return res.data;
-        });
+      return this.$api[api.page]({
+        ...params,
+        ...this.query,
+      }).then((res) => {
+        return res.data;
+      });
     },
 
     /**
@@ -115,6 +154,16 @@ export default {
       this.$refs.table.onReloadData(true);
     },
 
+    /**
+     * 有查询功能时的必要方法
+     * 重置查询条件
+     */
+    onResetQuery() {
+      /** 在这里重置查询条件时,可对特殊的字段做保留处理 */
+      this.query = {};
+      this.onQuery();
+    },
+
     /**
      * 必要方法
      * 重新列表数据
@@ -124,26 +173,60 @@ export default {
     },
 
     /**
-     * 有编辑新增功能的必要方法
+     * 必要方法
+     * 加载字典数据
+     * 如果不需要获取相应的字典数据,此方法内容可空
+     */
+    onLoadCodes() {},
+
+    /**
+     * 必要方法
+     * 绑定数据字典值
+     */
+    bindCodeValue(code, name) {
+      const c = this.codes[name].find((p) => p.code == code);
+      if (c) {
+        return c.value;
+      }
+      return null;
+    },
+
+    /**
+     * 必要方法
      * 从列表页调用窗口的打开方法
      */
     onOpen(formName, record) {
-      this.$refs[formName].onOpen(record);
+      this.$refs[formName].onOpen({
+        record,
+        /* 按需添加其他参数 */
+        /* ... */
+      });
     },
 
+    /**
+     * 必要方法
+     * 可以用做一系列操作的公共回调,此方法中会重新加载当前列表
+     */
     onResult(success, successMessage) {
       if (success) {
         this.$message.success(successMessage);
         this.onReloadData();
       }
-      this.$refs.table.onLoaded();
     },
 
+    /**
+     * 必要方法
+     * 删除时调用
+     */
     onDelete(record) {
       this.$refs.table.onLoading();
-      this.$api.sysPosDelete(record).then(({ success, message }) => {
-        this.onResult(success, '删除成功');
-      });
+      this.$api[api.delete](record)
+        .then(({ success }) => {
+          this.onResult(success, '删除成功');
+        })
+        .finally(() => {
+          this.$refs.table.onLoaded();
+        });
     },
   },
 };
diff --git a/Web/src/pages/system/role/addForm.vue b/Web/src/pages/system/role/addForm.vue
deleted file mode 100644
index 712b517..0000000
--- a/Web/src/pages/system/role/addForm.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-  <a-modal
-    :confirmLoading="confirmLoading"
-    :visible="visible"
-    @cancel="onCancel"
-    @ok="onOk"
-    class="yo-modal-form"
-    title="新增角色"
-  >
-    <FormBody ref="form-body" />
-  </a-modal>
-</template>
-<script>
-import FormBody from './form';
-
-export default {
-  components: {
-    FormBody,
-  },
-  data() {
-    return {
-      visible: false,
-      confirmLoading: false,
-    };
-  },
-
-  methods: {
-    /**
-     * 必要的方法
-     * 从外部调用打开本窗口
-     */
-    onOpen() {
-      this.visible = true;
-    },
-
-    /**
-     * 必要的方法
-     * 点击保存时的操作
-     */
-    onOk() {
-      this.$refs['form-body'].onValidate((valid) => {
-        if (valid) {
-          this.confirmLoading = true;
-          this.$api
-            .sysRoleAdd(this.$refs['form-body'].form)
-            .then(({ success }) => {
-              this.confirmLoading = false;
-              if (success) {
-                this.$message.success('编辑成功');
-                this.onCancel();
-                this.$emit('ok');
-              }
-            })
-            .finally(() => {
-              this.confirmLoading = false;
-            });
-        }
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 关闭窗口时的操作
-     */
-    onCancel() {
-      this.$refs['form-body'].onResetFields();
-      this.visible = false;
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/role/dataForm.vue b/Web/src/pages/system/role/dataForm.vue
index e24cca7..984928e 100644
--- a/Web/src/pages/system/role/dataForm.vue
+++ b/Web/src/pages/system/role/dataForm.vue
@@ -83,16 +83,16 @@ export default {
   },
 
   methods: {
-    async onOpen(record) {
+    async onOpen(params) {
       this.visible = true;
-      this.record = record;
+      this.record = params.record;
 
       this.loading = true;
 
       await this.onLoadCodes();
-      this.form.dataScopeType = record.dataScopeType.toString();
+      this.form.dataScopeType = this.record.dataScopeType.toString();
 
-      await this.onChange(record.dataScopeType);
+      await this.onChange(this.record.dataScopeType);
 
       this.loading = false;
     },
diff --git a/Web/src/pages/system/role/editForm.vue b/Web/src/pages/system/role/editForm.vue
deleted file mode 100644
index 1998175..0000000
--- a/Web/src/pages/system/role/editForm.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <a-modal
-    :confirmLoading="confirmLoading"
-    :visible="visible"
-    @cancel="onCancel"
-    @ok="onOk"
-    class="yo-modal-form"
-    title="编辑角色"
-  >
-    <FormBody ref="form-body" />
-  </a-modal>
-</template>
-<script>
-import FormBody from './form';
-
-export default {
-  components: {
-    FormBody,
-  },
-  data() {
-    return {
-      visible: false,
-
-      confirmLoading: false,
-    };
-  },
-
-  methods: {
-    /**
-     * 必要的方法
-     * 从外部调用打开本窗口,并填充外部传入的数据
-     */
-    onOpen(record) {
-      this.visible = true;
-      this.$nextTick(() => {
-        this.$refs['form-body'].onFillData(record);
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 点击保存时的操作
-     */
-    onOk() {
-      this.$refs['form-body'].onValidate((valid) => {
-        if (valid) {
-          this.confirmLoading = true;
-          this.$api
-            .sysRoleEdit(this.$refs['form-body'].form)
-            .then(({ success }) => {
-              this.confirmLoading = false;
-              if (success) {
-                this.$message.success('编辑成功');
-                this.onCancel();
-                this.$emit('ok');
-              }
-            })
-            .finally(() => {
-              this.confirmLoading = false;
-            });
-        }
-      });
-    },
-
-    /**
-     * 必要的方法
-     * 关闭窗口时的操作
-     */
-    onCancel() {
-      this.$refs['form-body'].onResetFields();
-      this.visible = false;
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/role/form.vue b/Web/src/pages/system/role/form.vue
index a1de03e..2d2606c 100644
--- a/Web/src/pages/system/role/form.vue
+++ b/Web/src/pages/system/role/form.vue
@@ -1,50 +1,98 @@
 <template>
+  <!-- 
+    普通编辑窗体
+    v 1.2
+    2021-04-30
+    Lufthafen
+  -->
   <a-form-model :model="form" :rules="rules" class="yo-form" ref="form">
-    <div class="yo-form-group">
-      <a-form-model-item label="角色名" prop="name">
-        <a-input placeholder="请输入角色名" v-model="form.name" />
-      </a-form-model-item>
-      <a-form-model-item label="唯一编码" prop="code">
-        <a-input placeholder="请输入唯一编码" v-model="form.code" />
-      </a-form-model-item>
-      <a-form-model-item label="排序" prop="sort">
-        <a-input-number
-          :max="1000"
-          :min="0"
-          class="w-100-p"
-          placeholder="请输入排序"
-          v-model="form.sort"
-        />
-      </a-form-model-item>
-        <a-form-model-item
-          label="备注"
-          prop="remark"
-        >
-          <a-textarea v-model="form.remark" :rows="4" placeholder="请输入备注"></a-textarea>
+    <a-spin :spinning="loading">
+      <a-icon slot="indicator" spin type="loading" />
+      <div class="yo-form-group">
+        <!-- 表单控件 -->
+        <!-- ... -->
+        <a-form-model-item label="角色名" prop="name">
+          <a-input placeholder="请输入角色名" v-model="form.name" />
         </a-form-model-item>
-    </div>
+        <a-form-model-item label="唯一编码" prop="code">
+          <a-input placeholder="请输入唯一编码" v-model="form.code" />
+        </a-form-model-item>
+        <a-form-model-item label="排序" prop="sort">
+          <a-input-number
+            :max="1000"
+            :min="0"
+            class="w-100-p"
+            placeholder="请输入排序"
+            v-model="form.sort"
+          />
+        </a-form-model-item>
+        <a-form-model-item label="备注" prop="remark">
+          <a-textarea :rows="4" placeholder="请输入备注" v-model="form.remark"></a-textarea>
+        </a-form-model-item>
+      </div>
+    </a-spin>
   </a-form-model>
 </template>
 <script>
+/* 表单内容默认值 */
+const defaultForm = {
+  /* ... */
+};
+
 export default {
   data() {
     return {
-      form: {
-        active: 'N',
-      },
+      /** 表单数据 */
+      form: {},
+      /** 验证格式 */
       rules: {
-        name: [{ required: true, message: '请输入应用名称' }],
-        code: [{ required: true, message: '请输入唯一编码' }],
+        /* ... */
+        name: [{ required: true, message: '请输入应用名称', trigger: 'blur' }],
+        code: [{ required: true, message: '请输入唯一编码', trigger: 'blur' }],
       },
+
+      /** 加载异步数据状态 */
+      loading: false,
+
+      /** 其他成员属性 */
+      /* ... */
     };
   },
+
   methods: {
     /**
      * 必要的方法
      * 在打开编辑页时允许填充数据
      */
-    onFillData(record) {
-      this.form = this.$_.cloneDeep(record);
+    onFillData(params) {
+      /** 将默认数据覆盖到form */
+      this.form = this.$_.cloneDeep({
+        ...defaultForm,
+        ...params.record,
+        /** 在此处添加其他默认数据转换 */
+        /* ... */
+      });
+    },
+
+    /**
+     * 必要方法
+     * 验证表单并获取表单数据
+     */
+    onGetData() {
+      return new Promise((reslove, reject) => {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            const record = this.$_.cloneDeep(this.form);
+
+            /** 验证通过后可以对数据进行转换得到想要提交的格式 */
+            /* ... */
+
+            reslove(record);
+          } else {
+            reject();
+          }
+        });
+      });
     },
 
     /**
@@ -61,10 +109,26 @@ export default {
      */
     onResetFields() {
       setTimeout(() => {
-        this.form = {};
         this.$refs.form.resetFields();
+
+        /** 在这里可以初始化当前组件中其他属性 */
+        /* ... */
       }, 300);
     },
+
+    /**
+     * 必要方法
+     * 加载当前表单中所需要的异步数据
+     */
+    async onInit(params) {
+      this.loading = true;
+      /** 可以在这里await获取一些异步数据 */
+      /* ... */
+      this.loading = false;
+    },
+
+    /** 当前组件的其他方法 */
+    /* ... */
   },
 };
 </script>
\ No newline at end of file
diff --git a/Web/src/pages/system/role/index.vue b/Web/src/pages/system/role/index.vue
index 2057f1a..49e66c4 100644
--- a/Web/src/pages/system/role/index.vue
+++ b/Web/src/pages/system/role/index.vue
@@ -1,31 +1,36 @@
 <template>
+  <!-- 
+    普通查询表格
+    v 1.2
+    2021-04-30
+    Lufthafen
+  -->
   <container>
     <br />
     <a-card :bordered="false">
-      <Auth auth="sysRole:page">
-        <div class="yo-query-bar">
-          <a-form-model :model="query" layout="inline">
-            <a-form-model-item label="角色名称">
-              <a-input placeholder="请输入角色名称" v-model="query.name" />
-            </a-form-model-item>
-            <a-form-model-item label="唯一编号">
-              <a-input placeholder="请输入唯一编码" v-model="query.code" />
-            </a-form-model-item>
-            <a-form-model-item>
-              <a-button-group>
-                <a-button @click="onQuery" type="primary">查询</a-button>
-                <a-button @click="() => {(query = {}), onQuery();}">重置</a-button>
-              </a-button-group>
-            </a-form-model-item>
-          </a-form-model>
-        </div>
-      </Auth>
-
-      <yo-table :columns="columns" :load-data="loadData" ref="table">
-        <Auth auth="sysRole:add" slot="operator">
-          <a-button @click="onOpen('add-form')" icon="plus">新建角色</a-button>
+      <yo-table
+        :columns="columns"
+        :load-data="loadData"
+        @query="onQuery"
+        @resetQuery="onResetQuery"
+        ref="table"
+      >
+        <Auth auth="sysRole:page" slot="query">
+          <!-- 此处添加查询表单控件 -->
+          <!-- ... -->
+          <a-form-model-item label="角色名称">
+            <a-input placeholder="请输入角色名称" v-model="query.name" />
+          </a-form-model-item>
+          <a-form-model-item label="唯一编号">
+            <a-input placeholder="请输入唯一编码" v-model="query.code" />
+          </a-form-model-item>
         </Auth>
-
+        <Auth auth="sysRole:add" slot="operator">
+          <a-button @click="onOpen('add-form')" icon="plus">新增角色</a-button>
+        </Auth>
+        <!-- 格式化字段内容 -->
+        <!-- ... -->
+        <!-- 添加操作控件 -->
         <span slot="action" slot-scope="text, record">
           <yo-table-actions>
             <Auth auth="sysRole:edit">
@@ -36,6 +41,8 @@
                 <a>删除</a>
               </a-popconfirm>
             </Auth>
+            <!-- 可在此处添加其他操作控件 -->
+            <!-- ... -->
             <Auth :auth="{ sysRole: [['grantMenu'], ['grantData']] }">
               <a-dropdown placement="bottomRight">
                 <a class="ant-dropdown-link">
@@ -60,28 +67,51 @@
         </span>
       </yo-table>
     </a-card>
-    <br />
-    <add-form @ok="onReloadData" ref="add-form" />
-    <edit-form @ok="onReloadData" ref="edit-form" />
+
+    <!-- 新增表单 -->
+    <yo-modal-form :action="$api[api.add]" :title="'新增' + name" @ok="onReloadData" ref="add-form">
+      <form-body />
+    </yo-modal-form>
+
+    <!-- 编辑表单 -->
+    <yo-modal-form :action="$api[api.edit]" :title="'编辑' + name" @ok="onReloadData" ref="edit-form">
+      <form-body />
+    </yo-modal-form>
+
     <menu-form @ok="onReloadData" ref="menu-form" />
     <data-form @ok="onReloadData" ref="data-form" />
   </container>
 </template>
 <script>
-import AddForm from './addForm';
-import EditForm from './editForm';
+import FormBody from './form';
 import MenuForm from './menuForm';
 import DataForm from './dataForm';
+
+/* 在此管理整个页面需要的接口名称 */
+const api = {
+  page: 'getRolePage',
+  add: 'sysRoleAdd',
+  edit: 'sysRoleEdit',
+  delete: 'sysRoleDelete',
+  /* ... */
+};
+
 export default {
   components: {
-    AddForm,
-    EditForm,
+    FormBody,
     MenuForm,
     DataForm,
   },
   data() {
     return {
+      api,
+
+      name: '角色',
+
+      /* 查询条件 */
       query: {},
+
+      /* 表格字段 */
       columns: [
         {
           title: '角色名',
@@ -99,17 +129,26 @@ export default {
           sorter: true,
         },
       ],
+
+      /* 字典编码储存格式 */
+      codes: {
+        code1: [],
+        code2: [],
+      },
     };
   },
   created() {
+    /** 按需加载字典编码 */
+    this.onLoadCodes();
+
+    /** 根据权限添加操作列 */
     const flag = this.$auth({
       sysRole: [['edit'], ['delete'], ['grantMenu'], ['grantData']],
     });
-
     if (flag) {
       this.columns.push({
         title: '操作',
-        width: '200px',
+        width: '150px',
         dataIndex: 'action',
         scopedSlots: { customRender: 'action' },
       });
@@ -121,14 +160,12 @@ export default {
      * 传给yo-table以示意数据接口及其参数和返回的数据结构
      */
     loadData(params) {
-      return this.$api
-        .getRolePage({
-          ...params,
-          ...this.query,
-        })
-        .then((res) => {
-          return res.data;
-        });
+      return this.$api[api.page]({
+        ...params,
+        ...this.query,
+      }).then((res) => {
+        return res.data;
+      });
     },
 
     /**
@@ -139,6 +176,16 @@ export default {
       this.$refs.table.onReloadData(true);
     },
 
+    /**
+     * 有查询功能时的必要方法
+     * 重置查询条件
+     */
+    onResetQuery() {
+      /** 在这里重置查询条件时,可对特殊的字段做保留处理 */
+      this.query = {};
+      this.onQuery();
+    },
+
     /**
      * 必要方法
      * 重新列表数据
@@ -148,26 +195,72 @@ export default {
     },
 
     /**
-     * 有编辑新增功能的必要方法
+     * 必要方法
+     * 加载字典数据
+     * 如果不需要获取相应的字典数据,此方法内容可空
+     */
+    onLoadCodes() {
+      this.$api
+        .$queue([
+          this.$api.sysDictTypeDropDownAwait({ code: 'code1' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'code2' }),
+          /* ... */
+        ])
+        .then(([code1, code2]) => {
+          this.codes.code1 = code1.data;
+          this.codes.code2 = code2.data;
+          /* ... */
+        });
+    },
+
+    /**
+     * 必要方法
+     * 绑定数据字典值
+     */
+    bindCodeValue(code, name) {
+      const c = this.codes[name].find((p) => p.code == code);
+      if (c) {
+        return c.value;
+      }
+      return null;
+    },
+
+    /**
+     * 必要方法
      * 从列表页调用窗口的打开方法
      */
     onOpen(formName, record) {
-      this.$refs[formName].onOpen(record);
+      this.$refs[formName].onOpen({
+        record,
+        /* 按需添加其他参数 */
+        /* ... */
+      });
     },
 
+    /**
+     * 必要方法
+     * 可以用做一系列操作的公共回调,此方法中会重新加载当前列表
+     */
     onResult(success, successMessage) {
       if (success) {
         this.$message.success(successMessage);
         this.onReloadData();
       }
-      this.$refs.table.onLoaded();
     },
 
+    /**
+     * 必要方法
+     * 删除时调用
+     */
     onDelete(record) {
       this.$refs.table.onLoading();
-      this.$api.sysRoleDel(record).then(({ success }) => {
-        this.onResult(success, '删除成功');
-      });
+      this.$api[api.delete](record)
+        .then(({ success }) => {
+          this.onResult(success, '删除成功');
+        })
+        .finally(() => {
+          this.$refs.table.onLoaded();
+        });
     },
   },
 };
diff --git a/Web/src/pages/system/role/menuForm.vue b/Web/src/pages/system/role/menuForm.vue
index 4a4523c..f45de34 100644
--- a/Web/src/pages/system/role/menuForm.vue
+++ b/Web/src/pages/system/role/menuForm.vue
@@ -41,9 +41,9 @@ export default {
      * 必要的方法
      * 从外部调用打开本窗口
      */
-    onOpen(record) {
+    onOpen(params) {
       this.visible = true;
-      this.record = record;
+      this.record = params.record;
 
       this.$nextTick(async () => {
         const view = this.$refs['authority-view'];

From cd23663b5290736240c159fd00453a80710dde6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Mon, 10 May 2021 17:59:47 +0800
Subject: [PATCH 5/9] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=88=90=E5=8A=9F/=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=90=8E=E6=97=A0=E6=B3=95=E6=B8=85=E7=A9=BA=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/pages/system/account/setting/info.vue | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/Web/src/pages/system/account/setting/info.vue b/Web/src/pages/system/account/setting/info.vue
index 12f82ed..6650fc6 100644
--- a/Web/src/pages/system/account/setting/info.vue
+++ b/Web/src/pages/system/account/setting/info.vue
@@ -4,16 +4,12 @@
       <h4 class="h4">我的信息</h4>
       <div class="yo-avatar-info">
         <yo-image :id="form.avatar" :size="128" icon="user" type="avatar" />
-        <div @click="avatar.cropper = true" class="yo-avatar-info--cover">
+        <div @click="onAvatarStart" class="yo-avatar-info--cover">
           <a-icon type="cloud-upload-o" />
         </div>
       </div>
       <br />
-      <a-card :key="avatar.key" v-if="avatar.cropper">
-        <a-alert type="error">
-          <template slot="message">上传完成时无法被销毁</template>
-        </a-alert>
-        <br />
+      <a-card v-if="avatar.cropper">
         <a-row :gutter="16" align="middle" type="flex">
           <a-col :span="12">
             <div class="yo-avatar-cropper">
@@ -56,7 +52,7 @@
               icon="check"
               type="primary"
             >确认</a-button>
-            <a-button @click="avatar.cropper = false" icon="close">取消</a-button>
+            <a-button @click="onAvatarCancel" icon="close">取消</a-button>
           </a-col>
         </a-row>
       </a-card>
@@ -172,7 +168,6 @@ export default {
       form: {},
 
       avatar: {
-        key: Date.now(),
         cropper: false,
         img: '',
         autoWidth: 200,
@@ -223,6 +218,10 @@ export default {
       return false;
     },
 
+    onAvatarStart() {
+      this.avatar.cropper = true;
+    },
+
     onAvatarOk() {
       this.avatar.uploading = true;
       this.$refs.cropper.getCropBlob(async (data) => {
@@ -233,17 +232,35 @@ export default {
           const { data: fileId } = await this.$api.sysFileInfoUpload(fd);
           this.form.avatar = fileId;
 
-          this.avatar.cropper = false;
+          this.onAvatarCancel();
         } finally {
           this.avatar.uploading = false;
         }
       });
     },
 
+    onAvatarCancel() {
+      this.avatar = {
+        ...this.avatar,
+        ...{
+          cropper: false,
+          img: '',
+          preview: {},
+          file: null,
+        },
+      };
+    },
+
     async onSaveInfo() {
       this.saving = true;
       try {
-        await this.$api.sysUserUpdateInfo(this.form);
+        await this.$api.sysUserUpdateInfo({
+          avatar: this.form.avatar,
+          nickName: this.form.nickName,
+          birthday: this.form.birthday,
+          sex: this.form.sex,
+          tel: this.form.tel,
+        });
         await this.onRefreshInfo();
         this.$message.success('更新个人信息成功');
       } finally {

From 86a398c237e9c75b7e16616750dcfc99e3aed726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Mon, 10 May 2021 18:01:13 +0800
Subject: [PATCH 6/9] =?UTF-8?q?update=20=E5=AE=9E=E7=8E=B0=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=BC=BA=E5=BA=A6=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Ewide.Core/Entity/SysUser.cs              |   7 +
 Api/Ewide.Core/Ewide.Core.xml                 |  79 ++------
 Api/Ewide.Core/SeedData/SysAreaCodeData.cs    |  23 ---
 .../SeedData/SysDictDataSeedData.cs           | 130 ------------
 .../SeedData/SysDictTypeSeedData.cs           |  49 -----
 Api/Ewide.Core/SeedData/SysMenuSeedData.cs    | 185 ------------------
 Api/Ewide.Core/SeedData/SysTimerSeedData.cs   |  28 ---
 Api/Ewide.Core/SeedData/SysUserSeedData.cs    |  29 ---
 Api/Ewide.Core/SeedDataXml/SysUser.xml        |   3 +
 .../Service/Auth/Dto/LoginOutput.cs           |   5 +
 .../Service/User/ISysUserService.cs           |   4 +-
 Api/Ewide.Core/Service/User/SysUserService.cs |   8 +-
 Api/Ewide.Web.Core/core.settings.json         |   3 +-
 .../system/account/setting/safety/index.vue   |  50 +++--
 14 files changed, 75 insertions(+), 528 deletions(-)
 delete mode 100644 Api/Ewide.Core/SeedData/SysAreaCodeData.cs
 delete mode 100644 Api/Ewide.Core/SeedData/SysDictDataSeedData.cs
 delete mode 100644 Api/Ewide.Core/SeedData/SysDictTypeSeedData.cs
 delete mode 100644 Api/Ewide.Core/SeedData/SysMenuSeedData.cs
 delete mode 100644 Api/Ewide.Core/SeedData/SysTimerSeedData.cs
 delete mode 100644 Api/Ewide.Core/SeedData/SysUserSeedData.cs

diff --git a/Api/Ewide.Core/Entity/SysUser.cs b/Api/Ewide.Core/Entity/SysUser.cs
index b668ef1..8c292c8 100644
--- a/Api/Ewide.Core/Entity/SysUser.cs
+++ b/Api/Ewide.Core/Entity/SysUser.cs
@@ -30,6 +30,13 @@ namespace Ewide.Core
         [Required]
         public string Password { get; set; }
 
+        /// <summary>
+        /// 密码安全级别，在注册和修改密码时生成
+        /// </summary>
+        [Comment("密码安全级别")]
+        [Required]
+        public int SecurityLevel { get; set; }
+
         /// <summary>
         /// 昵称
         /// </summary>
diff --git a/Api/Ewide.Core/Ewide.Core.xml b/Api/Ewide.Core/Ewide.Core.xml
index 7c48c82..ee9bdb5 100644
--- a/Api/Ewide.Core/Ewide.Core.xml
+++ b/Api/Ewide.Core/Ewide.Core.xml
@@ -1679,6 +1679,11 @@
             密码（采用MD5加密）
             </summary>
         </member>
+        <member name="P:Ewide.Core.SysUser.SecurityLevel">
+            <summary>
+            密码安全级别，在注册和修改密码时生成
+            </summary>
+        </member>
         <member name="P:Ewide.Core.SysUser.NickName">
             <summary>
             昵称
@@ -2801,71 +2806,6 @@
             <param name="refreshToken"></param>
             <returns></returns>
         </member>
-        <member name="T:Ewide.Core.SysDictDataSeedData">
-            <summary>
-            系统字典值种子数据
-            </summary>
-        </member>
-        <member name="M:Ewide.Core.SysDictDataSeedData.HasData(Microsoft.EntityFrameworkCore.DbContext,System.Type)">
-            <summary>
-            种子数据
-            </summary>
-            <param name="dbContext"></param>
-            <param name="dbContextLocator"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Ewide.Core.SysDictTypeSeedData">
-            <summary>
-            系统字典类型种子数据
-            </summary>
-        </member>
-        <member name="M:Ewide.Core.SysDictTypeSeedData.HasData(Microsoft.EntityFrameworkCore.DbContext,System.Type)">
-            <summary>
-            种子数据
-            </summary>
-            <param name="dbContext"></param>
-            <param name="dbContextLocator"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Ewide.Core.SysMenuSeedData">
-            <summary>
-            系统菜单表种子数据
-            </summary>
-        </member>
-        <member name="M:Ewide.Core.SysMenuSeedData.HasData(Microsoft.EntityFrameworkCore.DbContext,System.Type)">
-            <summary>
-            种子数据
-            </summary>
-            <param name="dbContext"></param>
-            <param name="dbContextLocator"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Ewide.Core.SysTimerSeedData">
-            <summary>
-            系统任务调度表种子数据
-            </summary>
-        </member>
-        <member name="M:Ewide.Core.SysTimerSeedData.HasData(Microsoft.EntityFrameworkCore.DbContext,System.Type)">
-            <summary>
-            种子数据
-            </summary>
-            <param name="dbContext"></param>
-            <param name="dbContextLocator"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Ewide.Core.SysUserSeedData">
-            <summary>
-            系统用户表种子数据
-            </summary>
-        </member>
-        <member name="M:Ewide.Core.SysUserSeedData.HasData(Microsoft.EntityFrameworkCore.DbContext,System.Type)">
-            <summary>
-            种子数据
-            </summary>
-            <param name="dbContext"></param>
-            <param name="dbContextLocator"></param>
-            <returns></returns>
-        </member>
         <member name="T:Ewide.Core.Service.AppInput">
             <summary>
             系统应用参数
@@ -3145,6 +3085,11 @@
             账号
             </summary>
         </member>
+        <member name="P:Ewide.Core.Service.LoginOutput.SecurityLevel">
+            <summary>
+            密码安全级别
+            </summary>
+        </member>
         <member name="P:Ewide.Core.Service.LoginOutput.NickName">
             <summary>
             昵称
@@ -6884,7 +6829,7 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Ewide.Core.Service.SysUserService.UpdateUserInfo(Ewide.Core.Service.UpdateUserInput)">
+        <member name="M:Ewide.Core.Service.SysUserService.UpdateUserInfo(Ewide.Core.Service.UserInput)">
             <summary>
             更新用户信息
             </summary>
@@ -6919,7 +6864,7 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Ewide.Core.Service.SysUserService.UpdateAvatar(Ewide.Core.Service.UpdateUserInput)">
+        <member name="M:Ewide.Core.Service.SysUserService.UpdateAvatar(Ewide.Core.Service.UserInput)">
             <summary>
             修改用户头像(未实现)
             </summary>
diff --git a/Api/Ewide.Core/SeedData/SysAreaCodeData.cs b/Api/Ewide.Core/SeedData/SysAreaCodeData.cs
deleted file mode 100644
index 4ff61d7..0000000
--- a/Api/Ewide.Core/SeedData/SysAreaCodeData.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Furion.DatabaseAccessor;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Ewide.Core
-{
-    public class SysAreaCodeData : IEntitySeedData<SysAreaCode>
-    {
-        public IEnumerable<SysAreaCode> HasData(DbContext dbContext, Type dbContextLocator)
-        {
-            return new[]
-            {
-                new SysAreaCode{Code="3302",AdCode="3302",Name="XX市",Note="XX市",LevelType=1,Sort=0 },
-                new SysAreaCode{Code="330266",AdCode="330266",Name="测试区",Note="测试区",LevelType=2,Sort=100 },
-                new SysAreaCode{Code="330266001",AdCode="330266001",Name="测试街道",Note="测试街道",LevelType=3,Sort=0},
-            };
-        }
-    }
-}
diff --git a/Api/Ewide.Core/SeedData/SysDictDataSeedData.cs b/Api/Ewide.Core/SeedData/SysDictDataSeedData.cs
deleted file mode 100644
index 9d51631..0000000
--- a/Api/Ewide.Core/SeedData/SysDictDataSeedData.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-using Furion.DatabaseAccessor;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-
-namespace Ewide.Core
-{
-    /// <summary>
-    /// 系统字典值种子数据
-    /// </summary>
-    public class SysDictDataSeedData : IEntitySeedData<SysDictData>
-    {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <param name="dbContext"></param>
-        /// <param name="dbContextLocator"></param>
-        /// <returns></returns>
-        public IEnumerable<SysDictData> HasData(DbContext dbContext, Type dbContextLocator)
-        {
-            return new[]
-            {
-                new SysDictData{Id="99b965d3-1f2b-4f5b-a62a-6763b8d64a64", TypeId="d5b311fd-4b60-4b51-9156-b0e6d6cfa4d1", Value="通知", Code="1", Sort=100, Remark="通知", Status=0 },
-                new SysDictData{Id="2616e6c2-a504-4fc6-993e-72701b48e79a", TypeId="d5b311fd-4b60-4b51-9156-b0e6d6cfa4d1", Value="公告", Code="2", Sort=100, Remark="公告", Status=0 },
-                new SysDictData{Id="40d336cd-918a-4e90-8836-cba7c1bf6cdf", TypeId="b30937e6-03cd-4d98-a413-10b06d605e5a", Value="草稿", Code="0", Sort=100, Remark="草稿", Status=0 },
-                new SysDictData{Id="f5b49fa9-31a1-44c2-9df0-b28bf5daeee0", TypeId="b30937e6-03cd-4d98-a413-10b06d605e5a", Value="发布", Code="1", Sort=100, Remark="发布", Status=0 },
-                new SysDictData{Id="d2f73bb4-05a1-4aa5-9273-e9f3c393996d", TypeId="b30937e6-03cd-4d98-a413-10b06d605e5a", Value="撤回", Code="2", Sort=100, Remark="撤回", Status=0 },
-                new SysDictData{Id="6385916f-6ead-470e-889b-cfb9d2da6256", TypeId="b30937e6-03cd-4d98-a413-10b06d605e5a", Value="删除", Code="3", Sort=100, Remark="删除", Status=0 },
-                new SysDictData{Id="1f432e9d-f031-4787-a527-f37bb20ebe3a", TypeId="80aea9e7-ad1b-4f57-b4db-9d15813707bd", Value="是", Code="true", Sort=100, Remark="是", Status=0 },
-                new SysDictData{Id="0724636d-e870-46c6-8e1e-67f1ea5f58e5", TypeId="80aea9e7-ad1b-4f57-b4db-9d15813707bd", Value="否", Code="false", Sort=100, Remark="否", Status=0 },
-                new SysDictData{Id="881ebcf2-94a6-4938-81a4-55b81736f3b3", TypeId="430d0538-054a-4b37-a459-1095d0ccf4ae", Value="下载压缩包", Code="1", Sort=100, Remark="下载压缩包", Status=0 },
-                new SysDictData{Id="5bc8662d-b795-48f1-a88e-2f4be5279d37", TypeId="430d0538-054a-4b37-a459-1095d0ccf4ae", Value="生成到本项目", Code="2", Sort=100, Remark="生成到本项目", Status=0 },
-                new SysDictData{Id="b2a00b40-23e1-40e1-8995-60ab420eafe1", TypeId="bc0dc25b-b85e-4dd1-8368-e014fe1bf30b", Value="GET", Code="1", Sort=100, Remark="GET", Status=0 },
-                new SysDictData{Id="10070836-0c89-4b89-96e3-c65c7e33a86c", TypeId="bc0dc25b-b85e-4dd1-8368-e014fe1bf30b", Value="POST", Code="2", Sort=100, Remark="POST", Status=0 },
-                new SysDictData{Id="69a34c0b-85ce-4e53-9ad4-a592057dddd4", TypeId="bc0dc25b-b85e-4dd1-8368-e014fe1bf30b", Value="PUT", Code="3", Sort=100, Remark="PUT", Status=0 },
-                new SysDictData{Id="0e4dc1f1-8654-401b-800a-22b31f62ced1", TypeId="bc0dc25b-b85e-4dd1-8368-e014fe1bf30b", Value="DELETE", Code="4", Sort=100, Remark="DELETE", Status=0 },
-                new SysDictData{Id="443f965e-96b4-4fd2-93e9-07fe00a47205", TypeId="5bdf9b7a-a483-4b61-8e22-e2b25b255b91", Value="输入框", Code="input", Sort=100, Remark="输入框", Status=0 },
-                new SysDictData{Id="bf7be9a2-53fb-4250-87fe-49d7f741d159", TypeId="5bdf9b7a-a483-4b61-8e22-e2b25b255b91", Value="时间选择", Code="datepicker", Sort=100, Remark="时间选择", Status=0 },
-                new SysDictData{Id="cea10919-47e2-43ab-a19b-9d41fe648310", TypeId="5bdf9b7a-a483-4b61-8e22-e2b25b255b91", Value="下拉框", Code="select", Sort=100, Remark="下拉框", Status=0 },
-                new SysDictData{Id="7d534f44-cf66-472e-b0d3-20a4cc2ad432", TypeId="5bdf9b7a-a483-4b61-8e22-e2b25b255b91", Value="单选框", Code="radio", Sort=100, Remark="单选框", Status=0 },
-                new SysDictData{Id="d63b06d4-be11-4ab7-9905-87f6f2ca056f", TypeId="5bdf9b7a-a483-4b61-8e22-e2b25b255b91", Value="开关", Code="switch", Sort=100, Remark="开关", Status=0 },
-                new SysDictData{Id="46967f62-bac9-47fd-9278-b29c047b0c38", TypeId="5bdf9b7a-a483-4b61-8e22-e2b25b255b91", Value="多选框", Code="checkbox", Sort=100, Remark="多选框", Status=0 },
-                new SysDictData{Id="a8ac5009-93d3-4405-a6b9-81ed3e2811f2", TypeId="5bdf9b7a-a483-4b61-8e22-e2b25b255b91", Value="数字输入框", Code="inputnumber", Sort=100, Remark="数字输入框", Status=0 },
-                new SysDictData{Id="d00b3efa-2f9d-464c-8134-aa7013ef52bb", TypeId="5bdf9b7a-a483-4b61-8e22-e2b25b255b91", Value="文本域", Code="textarea", Sort=100, Remark="文本域", Status=0 },
-                new SysDictData{Id="ad759239-e34e-4fdf-a0d0-6b39eb41f880", TypeId="41bc31f6-cef5-400d-b03a-bf51d27b2432", Value="等于", Code="==", Sort=1, Remark="等于", Status=0 },
-                new SysDictData{Id="2c8e1240-f3ef-4df1-bd68-3047109ad5b4", TypeId="41bc31f6-cef5-400d-b03a-bf51d27b2432", Value="模糊", Code="like", Sort=2, Remark="模糊", Status=0 },
-                new SysDictData{Id="efc18513-c17b-4fc1-8e0e-2e79fb9b0107", TypeId="41bc31f6-cef5-400d-b03a-bf51d27b2432", Value="大于", Code=">", Sort=3, Remark="大于", Status=0 },
-                new SysDictData{Id="a6812d98-7785-4db2-b2f8-d476a459c5ed", TypeId="41bc31f6-cef5-400d-b03a-bf51d27b2432", Value="小于", Code="<", Sort=4, Remark="小于", Status=0 },
-                new SysDictData{Id="218b5bac-343e-4594-a9da-30e391c7735c", TypeId="41bc31f6-cef5-400d-b03a-bf51d27b2432", Value="不等于", Code="!=", Sort=5, Remark="不等于", Status=0 },
-                new SysDictData{Id="4825f15d-077b-4c16-8ee7-0205d653e14d", TypeId="41bc31f6-cef5-400d-b03a-bf51d27b2432", Value="大于等于", Code=">=", Sort=6, Remark="大于等于", Status=0 },
-                new SysDictData{Id="7c9e8270-db5a-45b7-acd7-f95c8ee31547", TypeId="41bc31f6-cef5-400d-b03a-bf51d27b2432", Value="小于等于", Code="<=", Sort=7, Remark="小于等于", Status=0 },
-                new SysDictData{Id="759ea7de-a18f-4ed7-9032-bbd1a4dadc9e", TypeId="41bc31f6-cef5-400d-b03a-bf51d27b2432", Value="不为空", Code="isNotNull", Sort=8, Remark="不为空", Status=0 },
-                new SysDictData{Id="a5cdf75e-6361-490d-a043-f5929ccf65a9", TypeId="28f653d4-e573-4f54-8e5c-4e308780145a", Value="int", Code="int", Sort=100, Remark="int", Status=0 },
-                new SysDictData{Id="cffdd4b5-d4e0-4196-81b9-02045de8b189", TypeId="28f653d4-e573-4f54-8e5c-4e308780145a", Value="long", Code="long", Sort=100, Remark="long", Status=0 },
-                new SysDictData{Id="25be90ea-b439-4e9d-993c-48a5ce3b9358", TypeId="28f653d4-e573-4f54-8e5c-4e308780145a", Value="string", Code="string", Sort=100, Remark="string", Status=0 },
-                new SysDictData{Id="496eef62-3849-4263-b274-a3e6090942e3", TypeId="28f653d4-e573-4f54-8e5c-4e308780145a", Value="bool", Code="bool", Sort=100, Remark="bool", Status=0 },
-                new SysDictData{Id="681c02ea-7570-4a97-85a7-957a77314df6", TypeId="28f653d4-e573-4f54-8e5c-4e308780145a", Value="double", Code="double", Sort=100, Remark="double", Status=0 },
-                new SysDictData{Id="259698cf-b25d-427a-8d22-33b9c1899eea", TypeId="28f653d4-e573-4f54-8e5c-4e308780145a", Value="DateTime", Code="DateTime", Sort=100, Remark="DateTime", Status=0 },
-                new SysDictData{Id="a30c682e-744a-468d-a74f-827928c96c01", TypeId="28f653d4-e573-4f54-8e5c-4e308780145a", Value="float", Code="float", Sort=100, Remark="float", Status=0 },
-                new SysDictData{Id="4b68cb83-f173-4864-bd10-a7a7d5248102", TypeId="28f653d4-e573-4f54-8e5c-4e308780145a", Value="decimal", Code="decimal", Sort=100, Remark="decimal", Status=0 },
-                new SysDictData{Id="134d4173-8d93-4c19-bf6b-a640d35da097", TypeId="28f653d4-e573-4f54-8e5c-4e308780145a", Value="Guid", Code="Guid", Sort=100, Remark="Guid", Status=0 },
-                new SysDictData{Id="c597306f-5fd0-4f75-9a46-12de340cd199", TypeId="28f653d4-e573-4f54-8e5c-4e308780145a", Value="DateTimeOffset", Code="DateTimeOffset", Sort=100, Remark="DateTimeOffset", Status=0 },
-                new SysDictData{Id="9b44b297-f6f0-4c31-b680-83baabf4c5b7", TypeId="301ed120-dfc5-4d7c-af59-b56a519581c9", Value="男", Code="1", Sort=100, Remark="男性", Status=0 },
-                new SysDictData{Id="46ba4c21-cbde-4561-8e57-19ed0f752c17", TypeId="301ed120-dfc5-4d7c-af59-b56a519581c9", Value="女", Code="2", Sort=100, Remark="女性", Status=0 },
-                new SysDictData{Id="150e04a6-3bf5-4604-98d5-14fbd1608bc5", TypeId="301ed120-dfc5-4d7c-af59-b56a519581c9", Value="未知", Code="3", Sort=100, Remark="未知性别", Status=0 },
-                new SysDictData{Id="b6ad194b-ccfb-4ee7-b402-7b78e8bb8680", TypeId="64afb5e7-9f00-4c4f-9ba6-6b41221bd862", Value="默认常量", Code="DEFAULT", Sort=100, Remark="默认常量，都以XIAONUO_开头的", Status=0 },
-                new SysDictData{Id="e2271e0a-17a3-41f3-81fa-dbe895ce0466", TypeId="64afb5e7-9f00-4c4f-9ba6-6b41221bd862", Value="阿里云短信", Code="ALIYUN_SMS", Sort=100, Remark="阿里云短信配置", Status=0 },
-                new SysDictData{Id="5e61f455-1975-438b-bd17-85a1f89abe84", TypeId="64afb5e7-9f00-4c4f-9ba6-6b41221bd862", Value="腾讯云短信", Code="TENCENT_SMS", Sort=100, Remark="腾讯云短信", Status=0 },
-                new SysDictData{Id="9cba05e7-495a-43fb-b86b-fa459da5b04d", TypeId="64afb5e7-9f00-4c4f-9ba6-6b41221bd862", Value="邮件配置", Code="EMAIL", Sort=100, Remark="邮件配置", Status=0 },
-                new SysDictData{Id="81d87a9c-a4ee-46dc-be69-71dcccb14d9d", TypeId="64afb5e7-9f00-4c4f-9ba6-6b41221bd862", Value="文件上传路径", Code="FILE_PATH", Sort=100, Remark="文件上传路径", Status=0 },
-                new SysDictData{Id="fdf38fa8-3d1e-4a43-84bc-785c0a394160", TypeId="64afb5e7-9f00-4c4f-9ba6-6b41221bd862", Value="Oauth配置", Code="OAUTH", Sort=100, Remark="Oauth配置", Status=0 },
-                new SysDictData{Id="e3c9ebce-bdae-45a3-92b1-fc2e35a23242", TypeId="b0cfa91c-1189-4f39-bc5a-f035885d0604", Value="正常", Code="0", Sort=100, Remark="正常", Status=0 },
-                new SysDictData{Id="22492650-a92b-43f0-9954-3d3891ec6e45", TypeId="b0cfa91c-1189-4f39-bc5a-f035885d0604", Value="停用", Code="1", Sort=100, Remark="停用", Status=0 },
-                new SysDictData{Id="297030a2-88d9-4646-b7c1-a17c9a8c0b98", TypeId="b0cfa91c-1189-4f39-bc5a-f035885d0604", Value="删除", Code="2", Sort=100, Remark="删除", Status=0 },
-                new SysDictData{Id="1159fc34-ef51-4e0f-b55b-0220d2445a1e", TypeId="f2f0e8bf-04da-4a2f-9fb8-1d6549227302", Value="否", Code="N", Sort=100, Remark="否", Status=0 },
-                new SysDictData{Id="7d3115a8-938a-4d09-a2c9-21ad65b8b65a", TypeId="f2f0e8bf-04da-4a2f-9fb8-1d6549227302", Value="是", Code="Y", Sort=100, Remark="是", Status=0 },
-                new SysDictData{Id="8204daac-b2ea-41f6-ab52-ef299a05fd94", TypeId="2cecf329-cf95-44eb-a8d7-3fb77b13e093", Value="登录", Code="1", Sort=100, Remark="登录", Status=0 },
-                new SysDictData{Id="934099f4-c1a6-4f63-8cff-a42356369dd9", TypeId="2cecf329-cf95-44eb-a8d7-3fb77b13e093", Value="登出", Code="2", Sort=100, Remark="登出", Status=0 },
-                new SysDictData{Id="a8cd8263-4397-4d68-91db-d92330c67632", TypeId="e973d383-c28e-42e0-9e23-5f2bd592fef5", Value="目录", Code="0", Sort=100, Remark="目录", Status=0 },
-                new SysDictData{Id="bb082602-57ea-4941-b68b-64460e7f63b6", TypeId="e973d383-c28e-42e0-9e23-5f2bd592fef5", Value="菜单", Code="1", Sort=100, Remark="菜单", Status=0 },
-                new SysDictData{Id="a4cba529-769a-4309-add6-b15b25ebf05a", TypeId="e973d383-c28e-42e0-9e23-5f2bd592fef5", Value="按钮", Code="2", Sort=100, Remark="按钮", Status=0 },
-                new SysDictData{Id="7ec98dee-8dc9-47fe-9276-f3312ed5dd24", TypeId="058db370-3718-42c3-8ba7-095341b1fe13", Value="未发送", Code="0", Sort=100, Remark="未发送", Status=0 },
-                new SysDictData{Id="83cf4407-dbe1-4da2-883d-a3e16a780f37", TypeId="058db370-3718-42c3-8ba7-095341b1fe13", Value="发送成功", Code="1", Sort=100, Remark="发送成功", Status=0 },
-                new SysDictData{Id="e1e71562-015e-466b-b98b-29f4b8966bce", TypeId="058db370-3718-42c3-8ba7-095341b1fe13", Value="发送失败", Code="2", Sort=100, Remark="发送失败", Status=0 },
-                new SysDictData{Id="13e71f10-539b-4016-9acf-e3541c0f04db", TypeId="058db370-3718-42c3-8ba7-095341b1fe13", Value="失效", Code="3", Sort=100, Remark="失效", Status=0 },
-                new SysDictData{Id="f965b257-b2ff-4a18-9084-6e805547e9e6", TypeId="ff6202cb-25ce-4ab9-9c39-910c418b1d2d", Value="无", Code="0", Sort=100, Remark="无", Status=0 },
-                new SysDictData{Id="75c40b12-07d1-4828-9b6c-132f4bca194c", TypeId="ff6202cb-25ce-4ab9-9c39-910c418b1d2d", Value="组件", Code="1", Sort=100, Remark="组件", Status=0 },
-                new SysDictData{Id="be3197fd-2fba-4e79-b252-793f05e51a21", TypeId="ff6202cb-25ce-4ab9-9c39-910c418b1d2d", Value="内链", Code="2", Sort=100, Remark="内链", Status=0 },
-                new SysDictData{Id="2a10adc6-b286-4fad-9719-7e7321c7a93e", TypeId="ff6202cb-25ce-4ab9-9c39-910c418b1d2d", Value="外链", Code="3", Sort=100, Remark="外链", Status=0 },
-                new SysDictData{Id="d3984ed0-29d5-416e-87c6-75364010677b", TypeId="b3235678-f7fe-442b-8fba-e792a89b78f2", Value="系统权重", Code="1", Sort=100, Remark="系统权重", Status=0 },
-                new SysDictData{Id="f4771570-e4a5-416f-b82f-1e3082c35ee8", TypeId="b3235678-f7fe-442b-8fba-e792a89b78f2", Value="业务权重", Code="2", Sort=100, Remark="业务权重", Status=0 },
-                new SysDictData{Id="a2d6bdfe-ee61-4425-94c9-7ece3de080fa", TypeId="a2068ed1-62a6-463c-b720-06111d994079", Value="全部数据", Code="1", Sort=100, Remark="全部数据", Status=0 },
-                new SysDictData{Id="d0b25877-165e-41b8-9034-7a8fea7e5776", TypeId="a2068ed1-62a6-463c-b720-06111d994079", Value="本部门及以下数据", Code="2", Sort=100, Remark="本部门及以下数据", Status=0 },
-                new SysDictData{Id="375362c8-d694-40d9-8c55-07669e472460", TypeId="a2068ed1-62a6-463c-b720-06111d994079", Value="本部门数据", Code="3", Sort=100, Remark="本部门数据", Status=0 },
-                new SysDictData{Id="70afe4c1-3495-483a-bdd0-3d4ea45136b3", TypeId="a2068ed1-62a6-463c-b720-06111d994079", Value="仅本人数据", Code="4", Sort=100, Remark="仅本人数据", Status=0 },
-                new SysDictData{Id="6f395e69-8add-40ae-a378-0881d64a4413", TypeId="a2068ed1-62a6-463c-b720-06111d994079", Value="自定义数据", Code="5", Sort=100, Remark="自定义数据", Status=0 },
-                new SysDictData{Id="2285a101-70b3-4492-a5d7-2605448d99b3", TypeId="a2068ed1-62a6-463c-b720-06111d994079", Value="本部门所在区域及以下区域", Code="6", Sort=100, Remark="本部门所在区域及以下区域", Status=0 },
-                new SysDictData{Id="0b471624-f9a2-4f0a-9ff5-9cb12414fec0", TypeId="a2068ed1-62a6-463c-b720-06111d994079", Value="仅本部门所在区域数据", Code="7", Sort=100, Remark="仅本部门所在区域数据", Status=0 },
-                new SysDictData{Id="a819d549-6107-43a2-99d2-377cf0a5681a", TypeId="688f9a69-ec95-46f4-87bb-e19e3cc5c7fc", Value="app", Code="1", Sort=100, Remark="app", Status=0 },
-                new SysDictData{Id="b1e821b3-4e7b-4e60-a67f-a40d327ab6d6", TypeId="688f9a69-ec95-46f4-87bb-e19e3cc5c7fc", Value="pc", Code="2", Sort=100, Remark="pc", Status=0 },
-                new SysDictData{Id="2bce5da0-b386-4412-935d-d081b7cf4391", TypeId="688f9a69-ec95-46f4-87bb-e19e3cc5c7fc", Value="其他", Code="3", Sort=100, Remark="其他", Status=0 },
-                new SysDictData{Id="35aac71b-9939-4b2e-8533-d087618c1dca", TypeId="8461bd1d-311b-487e-b579-d6049c6fb191", Value="其它", Code="0", Sort=100, Remark="其它", Status=0 },
-                new SysDictData{Id="e7585292-d6c6-475f-bf87-8ad473ce6be4", TypeId="8461bd1d-311b-487e-b579-d6049c6fb191", Value="增加", Code="1", Sort=100, Remark="增加", Status=0 },
-                new SysDictData{Id="387d403c-6af3-4bda-af05-d60472823480", TypeId="8461bd1d-311b-487e-b579-d6049c6fb191", Value="删除", Code="2", Sort=100, Remark="删除", Status=0 },
-                new SysDictData{Id="4656bf7b-df6a-4c71-b963-18d8af3f93a7", TypeId="8461bd1d-311b-487e-b579-d6049c6fb191", Value="编辑", Code="3", Sort=100, Remark="编辑", Status=0 },
-                new SysDictData{Id="9edba767-7008-4623-8dbf-75417f1a0c82", TypeId="8461bd1d-311b-487e-b579-d6049c6fb191", Value="更新", Code="4", Sort=100, Remark="更新", Status=0 },
-                new SysDictData{Id="d1334517-ddfa-47f3-b053-88ea999babc7", TypeId="8461bd1d-311b-487e-b579-d6049c6fb191", Value="查询", Code="5", Sort=100, Remark="查询", Status=0 },
-                new SysDictData{Id="fe6e46ee-208b-446f-8aaa-05bd5eaa459b", TypeId="8461bd1d-311b-487e-b579-d6049c6fb191", Value="详情", Code="6", Sort=100, Remark="详情", Status=0 },
-                new SysDictData{Id="bf8f818f-060b-4815-8fe9-11bb356cb2e6", TypeId="8461bd1d-311b-487e-b579-d6049c6fb191", Value="树", Code="7", Sort=100, Remark="树", Status=0 },
-                new SysDictData{Id="2b9cf0b8-74ba-4b36-8504-275a2387729a", TypeId="8461bd1d-311b-487e-b579-d6049c6fb191", Value="导入", Code="8", Sort=100, Remark="导入", Status=0 },
-                new SysDictData{Id="db13458a-22b4-4f5e-b6f9-c3c9e1400909", TypeId="8461bd1d-311b-487e-b579-d6049c6fb191", Value="导出", Code="9", Sort=100, Remark="导出", Status=0 },
-                new SysDictData{Id="e02d9274-aa68-4e2c-9211-b226f1e6423e", TypeId="8461bd1d-311b-487e-b579-d6049c6fb191", Value="授权", Code="10", Sort=100, Remark="授权", Status=0 },
-                new SysDictData{Id="023244cd-eb32-4a19-bb3c-97301be1e769", TypeId="8461bd1d-311b-487e-b579-d6049c6fb191", Value="强退", Code="11", Sort=100, Remark="强退", Status=0 },
-                new SysDictData{Id="beb773cd-a22a-44e2-ac4b-5ab6f21aa3c4", TypeId="8461bd1d-311b-487e-b579-d6049c6fb191", Value="清空", Code="12", Sort=100, Remark="清空", Status=0 },
-                new SysDictData{Id="b6f55ff4-6b6a-452a-b372-32ac2f1f2b30", TypeId="8461bd1d-311b-487e-b579-d6049c6fb191", Value="修改状态", Code="13", Sort=100, Remark="修改状态", Status=0 },
-                new SysDictData{Id="f86e19a0-8ba8-4588-91f6-be2af525f490", TypeId="b924e0c1-3f23-4e37-9f27-90e945381304", Value="阿里云", Code="1", Sort=100, Remark="阿里云", Status=0 },
-                new SysDictData{Id="91c522b5-4f6f-48a5-ba79-962d56821bdc", TypeId="b924e0c1-3f23-4e37-9f27-90e945381304", Value="腾讯云", Code="2", Sort=100, Remark="腾讯云", Status=0 },
-                new SysDictData{Id="cc64be62-3213-4442-a98a-c508bc35104b", TypeId="b924e0c1-3f23-4e37-9f27-90e945381304", Value="minio", Code="3", Sort=100, Remark="minio", Status=0 },
-                new SysDictData{Id="cdc4a9ee-7436-4807-87cd-4350a72745b0", TypeId="b924e0c1-3f23-4e37-9f27-90e945381304", Value="本地", Code="4", Sort=100, Remark="本地", Status=0 },
-                new SysDictData{Id="76e885e8-1b40-45b6-bb0f-5519c6839df2", TypeId="0f1b8660-d932-4a53-a681-a38bebae91e0", Value="运行", Code="1", Sort=100, Remark="运行", Status=0 },
-                new SysDictData{Id="6e3591ec-2902-4bf3-b5a2-7ebc94ebc08f", TypeId="0f1b8660-d932-4a53-a681-a38bebae91e0", Value="停止", Code="2", Sort=100, Remark="停止", Status=0 },
-
-                new SysDictData{Id="6a01e89a-6bbb-4822-b862-8e566b6dde74", TypeId="2815b28b-e51d-4dfb-b549-2eaa27d8c23d", Value="市级编号", Code="1", Sort=1, Remark="市级编号", Status=0 },
-                new SysDictData{Id="fc843478-1e98-47e8-aaf3-12442fd4cbfc", TypeId="2815b28b-e51d-4dfb-b549-2eaa27d8c23d", Value="区县编号", Code="2", Sort=2, Remark="区县编号", Status=0 },
-                new SysDictData{Id="dad01f31-bb7f-4696-9e53-ad6d58b366a7", TypeId="2815b28b-e51d-4dfb-b549-2eaa27d8c23d", Value="乡镇街道编号", Code="3", Sort=3, Remark="乡镇街道编号", Status=0 },
-                new SysDictData{Id="514dbb46-ae79-4c07-96fa-496983765609", TypeId="2815b28b-e51d-4dfb-b549-2eaa27d8c23d", Value="社区/村委会编号", Code="4", Sort=4, Remark="社区/村委会编号", Status=0 },
-            };
-        }
-    }
-}
diff --git a/Api/Ewide.Core/SeedData/SysDictTypeSeedData.cs b/Api/Ewide.Core/SeedData/SysDictTypeSeedData.cs
deleted file mode 100644
index 9cfda91..0000000
--- a/Api/Ewide.Core/SeedData/SysDictTypeSeedData.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Furion.DatabaseAccessor;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-
-namespace Ewide.Core
-{
-    /// <summary>
-    /// 系统字典类型种子数据
-    /// </summary>
-    public class SysDictTypeSeedData : IEntitySeedData<SysDictType>
-    {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <param name="dbContext"></param>
-        /// <param name="dbContextLocator"></param>
-        /// <returns></returns>
-        public IEnumerable<SysDictType> HasData(DbContext dbContext, Type dbContextLocator)
-        {
-            return new[]
-            {
-                new SysDictType{Id="2815b28b-e51d-4dfb-b549-2eaa27d8c23d", Name="区域编码类型", Code="dic_areacode_type", Sort=0, Remark="区域编码类型", Status=0 },
-                new SysDictType{Id="b0cfa91c-1189-4f39-bc5a-f035885d0604", Name="通用状态", Code="common_status", Sort=100, Remark="通用状态", Status=0 },
-                new SysDictType{Id="301ed120-dfc5-4d7c-af59-b56a519581c9", Name="性别", Code="sex", Sort=100, Remark="性别字典", Status=0 },
-                new SysDictType{Id="64afb5e7-9f00-4c4f-9ba6-6b41221bd862", Name="常量的分类", Code="consts_type", Sort=100, Remark="常量的分类，用于区别一组配置", Status=0 },
-                new SysDictType{Id="f2f0e8bf-04da-4a2f-9fb8-1d6549227302", Name="是否", Code="yes_or_no", Sort=100, Remark="是否", Status=0 },
-                new SysDictType{Id="2cecf329-cf95-44eb-a8d7-3fb77b13e093", Name="访问类型", Code="vis_type", Sort=100, Remark="访问类型", Status=0 },
-                new SysDictType{Id="e973d383-c28e-42e0-9e23-5f2bd592fef5", Name="菜单类型", Code="menu_type", Sort=100, Remark="菜单类型", Status=0 },
-                new SysDictType{Id="058db370-3718-42c3-8ba7-095341b1fe13", Name="发送类型", Code="send_type", Sort=100, Remark="发送类型", Status=0 },
-                new SysDictType{Id="ff6202cb-25ce-4ab9-9c39-910c418b1d2d", Name="打开方式", Code="open_type", Sort=100, Remark="打开方式", Status=0 },
-                new SysDictType{Id="b3235678-f7fe-442b-8fba-e792a89b78f2", Name="菜单权重", Code="menu_weight", Sort=100, Remark="菜单权重", Status=0 },
-                new SysDictType{Id="a2068ed1-62a6-463c-b720-06111d994079", Name="数据范围类型", Code="data_scope_type", Sort=100, Remark="数据范围类型", Status=0 },
-                new SysDictType{Id="688f9a69-ec95-46f4-87bb-e19e3cc5c7fc", Name="短信发送来源", Code="sms_send_source", Sort=100, Remark="短信发送来源", Status=0 },
-                new SysDictType{Id="8461bd1d-311b-487e-b579-d6049c6fb191", Name="操作类型", Code="op_type", Sort=100, Remark="操作类型", Status=0 },
-                new SysDictType{Id="b924e0c1-3f23-4e37-9f27-90e945381304", Name="文件存储位置", Code="file_storage_location", Sort=100, Remark="文件存储位置", Status=0 },
-                new SysDictType{Id="0f1b8660-d932-4a53-a681-a38bebae91e0", Name="运行状态", Code="run_status", Sort=100, Remark="定时任务运行状态", Status=0 },
-                new SysDictType{Id="d5b311fd-4b60-4b51-9156-b0e6d6cfa4d1", Name="通知公告类型", Code="notice_type", Sort=100, Remark="通知公告类型", Status=0 },
-                new SysDictType{Id="b30937e6-03cd-4d98-a413-10b06d605e5a", Name="通知公告状态", Code="notice_status", Sort=100, Remark="通知公告状态", Status=0 },
-                new SysDictType{Id="80aea9e7-ad1b-4f57-b4db-9d15813707bd", Name="是否boolean", Code="yes_true_false", Sort=100, Remark="是否boolean", Status=0 },
-                new SysDictType{Id="430d0538-054a-4b37-a459-1095d0ccf4ae", Name="代码生成方式", Code="code_gen_create_type", Sort=100, Remark="代码生成方式", Status=0 },
-                new SysDictType{Id="bc0dc25b-b85e-4dd1-8368-e014fe1bf30b", Name="请求方式", Code="request_type", Sort=100, Remark="请求方式", Status=0 },
-                new SysDictType{Id="5bdf9b7a-a483-4b61-8e22-e2b25b255b91", Name="代码生成作用类型", Code="code_gen_effect_type", Sort=100, Remark="代码生成作用类型", Status=0 },
-                new SysDictType{Id="41bc31f6-cef5-400d-b03a-bf51d27b2432", Name="代码生成查询类型", Code="code_gen_query_type", Sort=100, Remark="代码生成查询类型", Status=0 },
-                new SysDictType{Id="28f653d4-e573-4f54-8e5c-4e308780145a", Name="代码生成.NET类型", Code="code_gen_net_type", Sort=100, Remark="代码生成.NET类型", Status=0 },
-            };
-        }
-    }
-}
diff --git a/Api/Ewide.Core/SeedData/SysMenuSeedData.cs b/Api/Ewide.Core/SeedData/SysMenuSeedData.cs
deleted file mode 100644
index 43801f6..0000000
--- a/Api/Ewide.Core/SeedData/SysMenuSeedData.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using Furion.DatabaseAccessor;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-
-namespace Ewide.Core
-{
-    /// <summary>
-    /// 系统菜单表种子数据
-    /// </summary>
-    public class SysMenuSeedData : IEntitySeedData<SysMenu>
-    {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <param name="dbContext"></param>
-        /// <param name="dbContextLocator"></param>
-        /// <returns></returns>
-        public IEnumerable<SysMenu> HasData(DbContext dbContext, Type dbContextLocator)
-        {
-            return new[]
-            {
-                 new SysMenu{Id="83ce02c9-b37f-4885-96e3-9b34371edb2e", Pid="00000000-0000-0000-0000-000000000000", Pids="[00000000-0000-0000-0000-000000000000],", Name="主控面板", Code="system_index", Type=0, Icon="home", Router="/", Component="RouteView", Application="system", OpenType=0, Visible=true, Redirect="/analysis", Weight=1, Sort=1, Status=0 },
-new SysMenu{Id="914a520d-9e4f-465b-ae05-7248b37d4be1", Pid="83ce02c9-b37f-4885-96e3-9b34371edb2e", Pids="[00000000-0000-0000-0000-000000000000],[83ce02c9-b37f-4885-96e3-9b34371edb2e],", Name="分析页", Code="system_index_dashboard", Type=1, Router="analysis", Component="system/dashboard/Analysis", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="72981ad9-9036-4aa7-b8f4-dc407eda50b4", Pid="83ce02c9-b37f-4885-96e3-9b34371edb2e", Pids="[00000000-0000-0000-0000-000000000000],[83ce02c9-b37f-4885-96e3-9b34371edb2e],", Name="工作台", Code="system_index_workplace", Type=1, Router="workplace", Component="system/dashboard/Workplace", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="f7d60a3f-2de3-4dca-a1d6-385cee9638bc", Pid="00000000-0000-0000-0000-000000000000", Pids="[00000000-0000-0000-0000-000000000000],", Name="组织架构", Code="sys_mgr", Type=0, Icon="team", Router="/sys", Component="PageView", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pid="f7d60a3f-2de3-4dca-a1d6-385cee9638bc", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],", Name="用户管理", Code="sys_user_mgr", Type=1, Router="/mgr_user", Component="system/user/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="bff7e542-6463-4f82-a03d-b1022e60d4b6", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户查询", Code="sys_user_mgr_page", Type=2, Permission="sysUser:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="936440c7-93ef-4d2f-adff-6151f4317355", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户编辑", Code="sys_user_mgr_edit", Type=2, Permission="sysUser:edit", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="281888e3-d183-4711-ba27-298ef6e64659", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户增加", Code="sys_user_mgr_add", Type=2, Permission="sysUser:add", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="e4aff800-d34a-416b-bd6e-dcebaa1dd436", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户删除", Code="sys_user_mgr_delete", Type=2, Permission="sysUser:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="7a266494-e17b-480d-8f50-cc234e6fe424", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户详情", Code="sys_user_mgr_detail", Type=2, Permission="sysUser:detail", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="0d93f763-20d3-4c95-add3-3d94770b110e", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户导出", Code="sys_user_mgr_export", Type=2, Permission="sysUser:export", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="17d047c3-6e95-4f7d-93db-97817d886fa2", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户选择器", Code="sys_user_mgr_selector", Type=2, Permission="sysUser:selector", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="5fc44256-2e56-4805-9382-b5504ca5b6cb", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户授权角色", Code="sys_user_mgr_grant_role", Type=2, Permission="sysUser:grantRole", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="ceff7899-6779-4708-b9ed-a2d5b488cff2", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户拥有角色", Code="sys_user_mgr_own_role", Type=2, Permission="sysUser:ownRole", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="38ba9ccc-eb96-4a60-a5ab-f6ea013f8291", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户授权数据", Code="sys_user_mgr_grant_data", Type=2, Permission="sysUser:grantData", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="cf2f8faf-b280-456c-8865-64115e04019f", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户拥有数据", Code="sys_user_mgr_own_data", Type=2, Permission="sysUser:ownData", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="711563e5-fed6-44d6-bcf3-138c73cfbfca", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户更新信息", Code="sys_user_mgr_update_info", Type=2, Permission="sysUser:updateInfo", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="306fe9bf-3132-4011-9f3f-1a2f4ead7734", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户修改密码", Code="sys_user_mgr_update_pwd", Type=2, Permission="sysUser:updatePwd", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="791b0d88-7e25-490f-a94f-a2e32bb3b6e6", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户修改状态", Code="sys_user_mgr_change_status", Type=2, Permission="sysUser:changeStatus", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="9d681aac-528a-46b0-9718-ffc4abe9c29e", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户修改头像", Code="sys_user_mgr_update_avatar", Type=2, Permission="sysUser:updateAvatar", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="471b5259-5f55-4643-841c-f07089cfafdf", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户重置密码", Code="sys_user_mgr_reset_pwd", Type=2, Permission="sysUser:resetPwd", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="471d3098-90a4-47e1-bd07-5d3ed8d21fb0", Pid="9f1f6051-15e6-474f-ab40-ab98a8713f7b", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9f1f6051-15e6-474f-ab40-ab98a8713f7b],", Name="用户登录信息", Code="sys_user_mgr_login", Type=2, Permission="getLoginUser", Application="system", OpenType=0, Visible=false, Weight=1, Sort=100, Status=CommonStatus.DISABLE },
-new SysMenu{Id="9c1b34f3-2412-496a-a42e-e4f6ae407ae1", Pid="f7d60a3f-2de3-4dca-a1d6-385cee9638bc", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],", Name="机构管理", Code="sys_org_mgr", Type=1, Router="/org", Component="system/org/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="b7c34c9b-933e-4c48-b1d0-af15a1f7da1f", Pid="9c1b34f3-2412-496a-a42e-e4f6ae407ae1", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9c1b34f3-2412-496a-a42e-e4f6ae407ae1],", Name="机构查询", Code="sys_org_mgr_page", Type=2, Permission="sysOrg:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="917064b2-c715-4fa4-9b2d-20a11b784ed1", Pid="9c1b34f3-2412-496a-a42e-e4f6ae407ae1", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9c1b34f3-2412-496a-a42e-e4f6ae407ae1],", Name="机构列表", Code="sys_org_mgr_list", Type=2, Permission="sysOrg:list", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="d7c18d60-f28f-4a57-90b3-26fc95249ae0", Pid="9c1b34f3-2412-496a-a42e-e4f6ae407ae1", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9c1b34f3-2412-496a-a42e-e4f6ae407ae1],", Name="机构增加", Code="sys_org_mgr_add", Type=2, Permission="sysOrg:add", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="e65eb1e3-cc9e-4309-8c7a-9ac41765b239", Pid="9c1b34f3-2412-496a-a42e-e4f6ae407ae1", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9c1b34f3-2412-496a-a42e-e4f6ae407ae1],", Name="机构编辑", Code="sys_org_mgr_edit", Type=2, Permission="sysOrg:edit", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="c2450c4c-89c6-46e8-8f89-11331790cbe3", Pid="9c1b34f3-2412-496a-a42e-e4f6ae407ae1", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9c1b34f3-2412-496a-a42e-e4f6ae407ae1],", Name="机构删除", Code="sys_org_mgr_delete", Type=2, Permission="sysOrg:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="695a6018-82c3-466e-a2a1-dab16039bfdb", Pid="9c1b34f3-2412-496a-a42e-e4f6ae407ae1", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9c1b34f3-2412-496a-a42e-e4f6ae407ae1],", Name="机构详情", Code="sys_org_mgr_detail", Type=2, Permission="sysOrg:detail", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="2d153046-279b-43be-8f57-46875118fd2c", Pid="9c1b34f3-2412-496a-a42e-e4f6ae407ae1", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[9c1b34f3-2412-496a-a42e-e4f6ae407ae1],", Name="机构树", Code="sys_org_mgr_tree", Type=2, Permission="sysOrg:tree", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="0f60d129-9d3b-42b5-9eb2-99bc066be6aa", Pid="f7d60a3f-2de3-4dca-a1d6-385cee9638bc", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],", Name="职位管理", Code="sys_pos_mgr", Type=1, Router="/pos", Component="system/pos/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="d2436601-bc48-4610-ba67-5b666f8ce33a", Pid="0f60d129-9d3b-42b5-9eb2-99bc066be6aa", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[0f60d129-9d3b-42b5-9eb2-99bc066be6aa],", Name="职位查询", Code="sys_pos_mgr_page", Type=2, Permission="sysPos:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="1305efaa-b81a-475f-9dde-8f6549ca7743", Pid="0f60d129-9d3b-42b5-9eb2-99bc066be6aa", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[0f60d129-9d3b-42b5-9eb2-99bc066be6aa],", Name="职位列表", Code="sys_pos_mgr_list", Type=2, Permission="sysPos:list", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="c227e732-f231-4488-89b0-d1c9dad78950", Pid="0f60d129-9d3b-42b5-9eb2-99bc066be6aa", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[0f60d129-9d3b-42b5-9eb2-99bc066be6aa],", Name="职位增加", Code="sys_pos_mgr_add", Type=2, Permission="sysPos:add", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="9dafbe04-83c9-482c-9c83-81f4da045da5", Pid="0f60d129-9d3b-42b5-9eb2-99bc066be6aa", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[0f60d129-9d3b-42b5-9eb2-99bc066be6aa],", Name="职位编辑", Code="sys_pos_mgr_edit", Type=2, Permission="sysPos:edit", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="031df05e-b7c6-4ecd-aff2-f189c994e86d", Pid="0f60d129-9d3b-42b5-9eb2-99bc066be6aa", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[0f60d129-9d3b-42b5-9eb2-99bc066be6aa],", Name="职位删除", Code="sys_pos_mgr_delete", Type=2, Permission="sysPos:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="fe5ee8a1-2145-43c6-bdeb-518f3a9c127d", Pid="0f60d129-9d3b-42b5-9eb2-99bc066be6aa", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[0f60d129-9d3b-42b5-9eb2-99bc066be6aa],", Name="职位详情", Code="sys_pos_mgr_detail", Type=2, Permission="sysPos:detail", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="235d9a5f-2469-4f17-a98c-45824513d5ae", Pid="f7d60a3f-2de3-4dca-a1d6-385cee9638bc", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],", Name="区域管理", Code="org_areaManage", Type=1, Router="/area", Component="system/area/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=0, Status=0},
-new SysMenu{Id="d5130f78-5d8d-4c8d-b433-f8e6796f0d12", Pid="235d9a5f-2469-4f17-a98c-45824513d5ae", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[235d9a5f-2469-4f17-a98c-45824513d5ae],", Name="区域增加", Code="org_area_add", Type=2, Permission="sysArea:add", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="4f44d697-5421-487e-9d31-3161aee4b7cc", Pid="235d9a5f-2469-4f17-a98c-45824513d5ae", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[235d9a5f-2469-4f17-a98c-45824513d5ae],", Name="区域编辑", Code="org_area_edit", Type=2, Permission="sysArea:edit", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="142803a5-63de-48be-afa9-3bde8640d580", Pid="235d9a5f-2469-4f17-a98c-45824513d5ae", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[235d9a5f-2469-4f17-a98c-45824513d5ae],", Name="区域删除", Code="org_area_delete", Type=2, Permission="sysArea:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="e7f28efd-2ac4-45c6-a73b-57ef7c5b8c8b", Pid="235d9a5f-2469-4f17-a98c-45824513d5ae", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[235d9a5f-2469-4f17-a98c-45824513d5ae],", Name="区域查询", Code="org_area_page", Type=2, Permission="sysArea:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="8645a374-6939-4dd8-a827-c6a39771f33d", Pid="235d9a5f-2469-4f17-a98c-45824513d5ae", Pids="[00000000-0000-0000-0000-000000000000],[f7d60a3f-2de3-4dca-a1d6-385cee9638bc],[235d9a5f-2469-4f17-a98c-45824513d5ae],", Name="区域树", Code="org_area_tree", Type=2, Permission="sysArea:tree", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="4c00d8c1-e871-4231-8b46-a3e3f3fd400c", Pid="00000000-0000-0000-0000-000000000000", Pids="[00000000-0000-0000-0000-000000000000],", Name="权限管理", Code="auth_manager", Type=0, Icon="safety-certificate", Router="/auth", Component="PageView", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="05175bfd-6e5f-4c3b-8daf-0f79df4e9694", Pid="4c00d8c1-e871-4231-8b46-a3e3f3fd400c", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],", Name="应用管理", Code="sys_app_mgr", Type=1, Router="/app", Component="system/app/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="dbaa7a6d-234f-4cc9-977f-4544b8bb45b8", Pid="05175bfd-6e5f-4c3b-8daf-0f79df4e9694", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[05175bfd-6e5f-4c3b-8daf-0f79df4e9694],", Name="应用查询", Code="sys_app_mgr_page", Type=2, Permission="sysApp:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="ab7b2b41-b0bc-4b9c-9017-f5c6918e393e", Pid="05175bfd-6e5f-4c3b-8daf-0f79df4e9694", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[05175bfd-6e5f-4c3b-8daf-0f79df4e9694],", Name="应用列表", Code="sys_app_mgr_list", Type=2, Permission="sysApp:list", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="f4e1d63b-5d92-46eb-82aa-267335a5a3f3", Pid="05175bfd-6e5f-4c3b-8daf-0f79df4e9694", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[05175bfd-6e5f-4c3b-8daf-0f79df4e9694],", Name="应用增加", Code="sys_app_mgr_add", Type=2, Permission="sysApp:add", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="f33a3791-1c01-4d30-bcc3-d9fdf5246376", Pid="05175bfd-6e5f-4c3b-8daf-0f79df4e9694", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[05175bfd-6e5f-4c3b-8daf-0f79df4e9694],", Name="应用编辑", Code="sys_app_mgr_edit", Type=2, Permission="sysApp:edit", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="e0a6cf90-0a8b-44e4-a32f-5f43ef996b82", Pid="05175bfd-6e5f-4c3b-8daf-0f79df4e9694", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[05175bfd-6e5f-4c3b-8daf-0f79df4e9694],", Name="应用删除", Code="sys_app_mgr_delete", Type=2, Permission="sysApp:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="a0abe974-5ae9-440b-9d16-2412eab52d70", Pid="05175bfd-6e5f-4c3b-8daf-0f79df4e9694", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[05175bfd-6e5f-4c3b-8daf-0f79df4e9694],", Name="应用详情", Code="sys_app_mgr_detail", Type=2, Permission="sysApp:detail", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="f640e243-b439-4109-8aea-c66205ef6b12", Pid="05175bfd-6e5f-4c3b-8daf-0f79df4e9694", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[05175bfd-6e5f-4c3b-8daf-0f79df4e9694],", Name="设为默认应用", Code="sys_app_mgr_set_as_default", Type=2, Permission="sysApp:setAsDefault", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="babff4e1-dd00-4e6b-909a-3aac76bb52cd", Pid="4c00d8c1-e871-4231-8b46-a3e3f3fd400c", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],", Name="菜单管理", Code="sys_menu_mgr", Type=1, Router="/menu", Component="system/menu/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="e9982e73-1833-4674-9403-ee3dee2efdf7", Pid="babff4e1-dd00-4e6b-909a-3aac76bb52cd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[babff4e1-dd00-4e6b-909a-3aac76bb52cd],", Name="菜单列表", Code="sys_menu_mgr_list", Type=2, Permission="sysMenu:list", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="758e15e6-75a6-4b72-8f94-5da379e53354", Pid="babff4e1-dd00-4e6b-909a-3aac76bb52cd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[babff4e1-dd00-4e6b-909a-3aac76bb52cd],", Name="菜单增加", Code="sys_menu_mgr_add", Type=2, Permission="sysMenu:add", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="07139c19-6b39-49f5-9e22-c4dc7e9d947b", Pid="babff4e1-dd00-4e6b-909a-3aac76bb52cd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[babff4e1-dd00-4e6b-909a-3aac76bb52cd],", Name="菜单编辑", Code="sys_menu_mgr_edit", Type=2, Permission="sysMenu:edit", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="857fb581-78ff-4884-a6fb-8dfb4951fef9", Pid="babff4e1-dd00-4e6b-909a-3aac76bb52cd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[babff4e1-dd00-4e6b-909a-3aac76bb52cd],", Name="菜单删除", Code="sys_menu_mgr_delete", Type=2, Permission="sysMenu:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="cd43a8ee-9f98-4355-bf81-ba40f388b23f", Pid="babff4e1-dd00-4e6b-909a-3aac76bb52cd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[babff4e1-dd00-4e6b-909a-3aac76bb52cd],", Name="菜单详情", Code="sys_menu_mgr_detail", Type=2, Permission="sysMenu:detail", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="ec318997-596d-403a-91be-f303b234b02d", Pid="babff4e1-dd00-4e6b-909a-3aac76bb52cd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[babff4e1-dd00-4e6b-909a-3aac76bb52cd],", Name="菜单授权树", Code="sys_menu_mgr_grant_tree", Type=2, Permission="sysMenu:treeForGrant", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="3892ef5d-39b2-4a4d-8047-cb96542fb54f", Pid="babff4e1-dd00-4e6b-909a-3aac76bb52cd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[babff4e1-dd00-4e6b-909a-3aac76bb52cd],", Name="菜单树", Code="sys_menu_mgr_tree", Type=2, Permission="sysMenu:tree", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="00831a3b-d080-411f-afb9-9f415334b192", Pid="babff4e1-dd00-4e6b-909a-3aac76bb52cd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[babff4e1-dd00-4e6b-909a-3aac76bb52cd],", Name="菜单切换", Code="sys_menu_mgr_change", Type=2, Permission="sysMenu:change", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="ee63be7b-5d06-4c15-81f3-875e2eb164dd", Pid="4c00d8c1-e871-4231-8b46-a3e3f3fd400c", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],", Name="角色管理", Code="sys_role_mgr", Type=1, Router="/role", Component="system/role/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="4241f4a0-89ab-4a6a-80bb-2830f855d3be", Pid="ee63be7b-5d06-4c15-81f3-875e2eb164dd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[ee63be7b-5d06-4c15-81f3-875e2eb164dd],", Name="角色查询", Code="sys_role_mgr_page", Type=2, Permission="sysRole:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="6a48beb1-c828-43d6-af3d-3e18ef163070", Pid="ee63be7b-5d06-4c15-81f3-875e2eb164dd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[ee63be7b-5d06-4c15-81f3-875e2eb164dd],", Name="角色增加", Code="sys_role_mgr_add", Type=2, Permission="sysRole:add", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="1198a602-a23d-4a06-aa9a-76aaf5f065a7", Pid="ee63be7b-5d06-4c15-81f3-875e2eb164dd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[ee63be7b-5d06-4c15-81f3-875e2eb164dd],", Name="角色编辑", Code="sys_role_mgr_edit", Type=2, Permission="sysRole:edit", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="e7708eeb-2c87-4c3d-bc71-c395e5d708db", Pid="ee63be7b-5d06-4c15-81f3-875e2eb164dd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[ee63be7b-5d06-4c15-81f3-875e2eb164dd],", Name="角色删除", Code="sys_role_mgr_delete", Type=2, Permission="sysRole:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="63ab477f-88fb-4f4b-9dcd-0cb83ac767f6", Pid="ee63be7b-5d06-4c15-81f3-875e2eb164dd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[ee63be7b-5d06-4c15-81f3-875e2eb164dd],", Name="角色详情", Code="sys_role_mgr_detail", Type=2, Permission="sysRole:detail", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="2622348c-dd8f-4ade-a350-de0a8f01e1f6", Pid="ee63be7b-5d06-4c15-81f3-875e2eb164dd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[ee63be7b-5d06-4c15-81f3-875e2eb164dd],", Name="角色下拉", Code="sys_role_mgr_drop_down", Type=2, Permission="sysRole:dropDown", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="73d84863-b381-40be-84bc-ec8381fa6c0a", Pid="ee63be7b-5d06-4c15-81f3-875e2eb164dd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[ee63be7b-5d06-4c15-81f3-875e2eb164dd],", Name="角色授权菜单", Code="sys_role_mgr_grant_menu", Type=2, Permission="sysRole:grantMenu", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="bbc5e792-3d72-4d0d-8ddb-25cf2c4e1374", Pid="ee63be7b-5d06-4c15-81f3-875e2eb164dd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[ee63be7b-5d06-4c15-81f3-875e2eb164dd],", Name="角色拥有菜单", Code="sys_role_mgr_own_menu", Type=2, Permission="sysRole:ownMenu", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="19234814-6007-484c-818c-88a664a2a339", Pid="ee63be7b-5d06-4c15-81f3-875e2eb164dd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[ee63be7b-5d06-4c15-81f3-875e2eb164dd],", Name="角色授权数据", Code="sys_role_mgr_grant_data", Type=2, Permission="sysRole:grantData", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="19e5c5f6-b598-4c42-8eed-3d46fb11b465", Pid="ee63be7b-5d06-4c15-81f3-875e2eb164dd", Pids="[00000000-0000-0000-0000-000000000000],[4c00d8c1-e871-4231-8b46-a3e3f3fd400c],[ee63be7b-5d06-4c15-81f3-875e2eb164dd],", Name="角色拥有数据", Code="sys_role_mgr_own_data", Type=2, Permission="sysRole:ownData", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="ac0ee878-f713-4a77-9c8f-6e1ee1f4484e", Pid="00000000-0000-0000-0000-000000000000", Pids="[00000000-0000-0000-0000-000000000000],", Name="开发管理", Code="system_tools", Type=0, Icon="euro", Router="/tools", Component="PageView", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="abf3e33d-3d6a-4bbd-8743-179df5a95d48", Pid="ac0ee878-f713-4a77-9c8f-6e1ee1f4484e", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],", Name="系统配置", Code="system_tools_config", Type=1, Router="/config", Component="system/config/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="c14c82bd-632d-4cc9-9236-37aa64b15ecf", Pid="abf3e33d-3d6a-4bbd-8743-179df5a95d48", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[abf3e33d-3d6a-4bbd-8743-179df5a95d48],", Name="配置查询", Code="system_tools_config_page", Type=2, Permission="sysConfig:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="78d31d68-9c9b-4e02-94c9-8a74eea4c1fb", Pid="abf3e33d-3d6a-4bbd-8743-179df5a95d48", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[abf3e33d-3d6a-4bbd-8743-179df5a95d48],", Name="配置列表", Code="system_tools_config_list", Type=2, Permission="sysConfig:list", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="fc91afb5-2b9e-428b-b5ff-b0ef35dd5336", Pid="abf3e33d-3d6a-4bbd-8743-179df5a95d48", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[abf3e33d-3d6a-4bbd-8743-179df5a95d48],", Name="配置增加", Code="system_tools_config_add", Type=2, Permission="sysConfig:add", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="1efb72e8-3449-490a-92e0-308b124c338f", Pid="abf3e33d-3d6a-4bbd-8743-179df5a95d48", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[abf3e33d-3d6a-4bbd-8743-179df5a95d48],", Name="配置编辑", Code="system_tools_config_edit", Type=2, Permission="sysConfig:edit", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="5760230f-e6fc-4c3d-ba38-1c8a5a923eb3", Pid="abf3e33d-3d6a-4bbd-8743-179df5a95d48", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[abf3e33d-3d6a-4bbd-8743-179df5a95d48],", Name="配置删除", Code="system_tools_config_delete", Type=2, Permission="sysConfig:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="6bfc0c53-5d6c-437c-9757-bc79e664d0f5", Pid="abf3e33d-3d6a-4bbd-8743-179df5a95d48", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[abf3e33d-3d6a-4bbd-8743-179df5a95d48],", Name="配置详情", Code="system_tools_config_detail", Type=2, Permission="sysConfig:detail", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="f7fe47a3-86b2-4660-9920-0c9836755666", Pid="abf3e33d-3d6a-4bbd-8743-179df5a95d48", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[abf3e33d-3d6a-4bbd-8743-179df5a95d48],", Name="设为默认应用", Code="sys_app_mgr_set_as_default", Type=2, Permission="sysApp:setAsDefault", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="cde43456-baae-4e9b-b6f9-b0ea9ab49adb", Pid="ac0ee878-f713-4a77-9c8f-6e1ee1f4484e", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],", Name="邮件发送", Code="sys_email_mgr", Type=1, Router="/email", Component="system/email/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="4d4cf5b3-bd4c-4f17-9fb2-47b28b00681f", Pid="cde43456-baae-4e9b-b6f9-b0ea9ab49adb", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[cde43456-baae-4e9b-b6f9-b0ea9ab49adb],", Name="发送文本邮件", Code="sys_email_mgr_send_email", Type=2, Permission="email:sendEmail", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="51e45073-1461-4b3b-ae06-d0d3dcf222e0", Pid="cde43456-baae-4e9b-b6f9-b0ea9ab49adb", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[cde43456-baae-4e9b-b6f9-b0ea9ab49adb],", Name="发送html邮件", Code="sys_email_mgr_send_email_html", Type=2, Permission="email:sendEmailHtml", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="e571a1c9-8b43-459f-9dc6-1dcf967627b7", Pid="ac0ee878-f713-4a77-9c8f-6e1ee1f4484e", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],", Name="短信管理", Code="sys_sms_mgr", Type=1, Router="/sms", Component="system/sms/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="2afa4925-b927-457e-88a1-d215b7d75fb6", Pid="e571a1c9-8b43-459f-9dc6-1dcf967627b7", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[e571a1c9-8b43-459f-9dc6-1dcf967627b7],", Name="短信发送查询", Code="sys_sms_mgr_page", Type=2, Permission="sms:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="97c1b073-5e19-4542-89e2-d8da44d0f1df", Pid="e571a1c9-8b43-459f-9dc6-1dcf967627b7", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[e571a1c9-8b43-459f-9dc6-1dcf967627b7],", Name="发送验证码短信", Code="sys_sms_mgr_send_login_message", Type=2, Permission="sms:sendLoginMessage", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="d2454bd2-f300-4b28-95c0-12432c28cbdf", Pid="e571a1c9-8b43-459f-9dc6-1dcf967627b7", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[e571a1c9-8b43-459f-9dc6-1dcf967627b7],", Name="验证短信验证码", Code="sys_sms_mgr_validate_message", Type=2, Permission="sms:validateMessage", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pid="ac0ee878-f713-4a77-9c8f-6e1ee1f4484e", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],", Name="字典管理", Code="sys_dict_mgr", Type=1, Router="/dict", Component="system/dict/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="70c5e8c5-6104-4e53-99c0-4743e557456b", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典类型查询", Code="sys_dict_mgr_dict_type_page", Type=2, Permission="sysDictType:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="1bd1d982-e05a-4bdc-a4e0-752d94f3196c", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典类型列表", Code="sys_dict_mgr_dict_type_list", Type=2, Permission="sysDictType:list", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="bd09b023-0884-4f31-8cf7-f66f789fa3db", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典类型增加", Code="sys_dict_mgr_dict_type_add", Type=2, Permission="sysDictType:add", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="1f7a41ff-5a46-449c-81f3-1618dfdcb4cd", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典类型删除", Code="sys_dict_mgr_dict_type_delete", Type=2, Permission="sysDictType:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="2381cde4-2174-47e7-a1e5-e58da70e7a11", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典类型编辑", Code="sys_dict_mgr_dict_type_edit", Type=2, Permission="sysDictType:edit", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="8f7d3c74-8800-4922-9662-ac6af378c882", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典类型详情", Code="sys_dict_mgr_dict_type_detail", Type=2, Permission="sysDictType:detail", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="4f87b6de-be62-4398-b680-1f8611f2cd70", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典类型下拉", Code="sys_dict_mgr_dict_type_drop_down", Type=2, Permission="sysDictType:dropDown", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="07c799b2-e8e9-4955-83da-97560f161d87", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典类型修改状态", Code="sys_dict_mgr_dict_type_change_status", Type=2, Permission="sysDictType:changeStatus", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="29be8e3c-c2bb-4162-b282-fdf58c218b9d", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典值查询", Code="sys_dict_mgr_dict_page", Type=2, Permission="sysDictData:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="b8cbc4e1-ac10-4cda-b1e4-f816a2632d02", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典值列表", Code="sys_dict_mgr_dict_list", Type=2, Permission="sysDictData:list", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="54e97bde-94d6-42df-89e3-4c3ace153b22", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典值增加", Code="sys_dict_mgr_dict_add", Type=2, Permission="sysDictData:add", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="be98da08-a3b0-463c-8208-05d843620258", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典值删除", Code="sys_dict_mgr_dict_delete", Type=2, Permission="sysDictData:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="38809fc3-163f-4fe9-a488-c9bb5bce752a", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典值编辑", Code="sys_dict_mgr_dict_edit", Type=2, Permission="sysDictData:edit", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="fc511b42-f0a1-489b-8418-7ef94b0fb374", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典值详情", Code="sys_role_mgr_grant_data", Type=2, Permission="sysDictData:detail", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="200428b3-1605-4c70-b840-e691e302ae69", Pid="477739a3-53d8-4f9b-ba32-f6dda79ec8a8", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],[477739a3-53d8-4f9b-ba32-f6dda79ec8a8],", Name="字典值修改状态", Code="sys_dict_mgr_dict_change_status", Type=2, Permission="sysDictData:changeStatus", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="d40f424d-d5fc-4b86-a2bd-3a5a76076bc1", Pid="ac0ee878-f713-4a77-9c8f-6e1ee1f4484e", Pids="[00000000-0000-0000-0000-000000000000],[ac0ee878-f713-4a77-9c8f-6e1ee1f4484e],", Name="接口文档", Code="sys_swagger_mgr", Type=1, Router="/swagger", Component="Iframe", Application="system", OpenType=2, Visible=true, Link="http://127.0.0.1:5566/", Weight=1, Sort=100, Status=0},
-new SysMenu{Id="eec4563e-9307-4ccd-ac3a-93598badb195", Pid="00000000-0000-0000-0000-000000000000", Pids="[00000000-0000-0000-0000-000000000000],", Name="日志管理", Code="sys_log_mgr", Type=0, Icon="read", Router="/log", Component="PageView", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="322b2cb6-df29-483b-b011-54dce1532fae", Pid="eec4563e-9307-4ccd-ac3a-93598badb195", Pids="[00000000-0000-0000-0000-000000000000],[eec4563e-9307-4ccd-ac3a-93598badb195],", Name="访问日志", Code="sys_log_mgr_vis_log", Type=1, Router="/vislog", Component="system/log/vislog/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="122641c1-ab6d-4f91-9527-16fc8fea9708", Pid="322b2cb6-df29-483b-b011-54dce1532fae", Pids="[00000000-0000-0000-0000-000000000000],[eec4563e-9307-4ccd-ac3a-93598badb195],[322b2cb6-df29-483b-b011-54dce1532fae],", Name="访问日志查询", Code="sys_log_mgr_vis_log_page", Type=2, Permission="sysVisLog:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="f2367804-6382-4e72-8282-e4f6f988ecd1", Pid="322b2cb6-df29-483b-b011-54dce1532fae", Pids="[00000000-0000-0000-0000-000000000000],[eec4563e-9307-4ccd-ac3a-93598badb195],[322b2cb6-df29-483b-b011-54dce1532fae],", Name="访问日志清空", Code="sys_log_mgr_vis_log_delete", Type=2, Permission="sysVisLog:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="1a1a13cb-f9a9-4ffe-924d-d523db79f7bf", Pid="eec4563e-9307-4ccd-ac3a-93598badb195", Pids="[00000000-0000-0000-0000-000000000000],[eec4563e-9307-4ccd-ac3a-93598badb195],", Name="操作日志", Code="sys_log_mgr_op_log", Type=1, Router="/oplog", Component="system/log/oplog/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="7f44f49e-6458-4149-bbcd-9a937f552cec", Pid="1a1a13cb-f9a9-4ffe-924d-d523db79f7bf", Pids="[00000000-0000-0000-0000-000000000000],[eec4563e-9307-4ccd-ac3a-93598badb195],[1a1a13cb-f9a9-4ffe-924d-d523db79f7bf],", Name="操作日志查询", Code="sys_log_mgr_op_log_page", Type=2, Permission="sysOpLog:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="263e0c00-2796-411c-9f50-0aa361f7781c", Pid="1a1a13cb-f9a9-4ffe-924d-d523db79f7bf", Pids="[00000000-0000-0000-0000-000000000000],[eec4563e-9307-4ccd-ac3a-93598badb195],[1a1a13cb-f9a9-4ffe-924d-d523db79f7bf],", Name="操作日志清空", Code="sys_log_mgr_op_log_delete", Type=2, Permission="sysOpLog:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="cf72e37b-3d3b-4dba-bcd0-3fb4bd54757c", Pid="00000000-0000-0000-0000-000000000000", Pids="[00000000-0000-0000-0000-000000000000],", Name="系统监控", Code="sys_monitor_mgr", Type=0, Icon="deployment-unit", Router="/monitor", Component="PageView", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="c1e70042-fe3f-4efc-a6cc-86de8507f948", Pid="cf72e37b-3d3b-4dba-bcd0-3fb4bd54757c", Pids="[00000000-0000-0000-0000-000000000000],[cf72e37b-3d3b-4dba-bcd0-3fb4bd54757c],", Name="服务监控", Code="sys_monitor_mgr_machine_monitor", Type=1, Router="/machine", Component="system/machine/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="444f3658-defe-47a7-880e-bf0af8b66591", Pid="c1e70042-fe3f-4efc-a6cc-86de8507f948", Pids="[00000000-0000-0000-0000-000000000000],[cf72e37b-3d3b-4dba-bcd0-3fb4bd54757c],[c1e70042-fe3f-4efc-a6cc-86de8507f948],", Name="服务监控查询", Code="sys_monitor_mgr_machine_monitor_query", Type=2, Permission="sysMachine:query", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="49a8b476-327b-4f33-87b8-2d9bc50dc390", Pid="cf72e37b-3d3b-4dba-bcd0-3fb4bd54757c", Pids="[00000000-0000-0000-0000-000000000000],[cf72e37b-3d3b-4dba-bcd0-3fb4bd54757c],", Name="在线用户", Code="sys_monitor_mgr_online_user", Type=1, Router="/onlineUser", Component="system/onlineUser/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="4785eb5a-678a-4f9c-b07c-3b92acdd6de0", Pid="49a8b476-327b-4f33-87b8-2d9bc50dc390", Pids="[00000000-0000-0000-0000-000000000000],[cf72e37b-3d3b-4dba-bcd0-3fb4bd54757c],[49a8b476-327b-4f33-87b8-2d9bc50dc390],", Name="在线用户列表", Code="sys_monitor_mgr_online_user_list", Type=2, Permission="sysOnlineUser:list", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="4dbf6765-ac79-4708-a9d5-16a4d4b09164", Pid="49a8b476-327b-4f33-87b8-2d9bc50dc390", Pids="[00000000-0000-0000-0000-000000000000],[cf72e37b-3d3b-4dba-bcd0-3fb4bd54757c],[49a8b476-327b-4f33-87b8-2d9bc50dc390],", Name="在线用户强退", Code="sys_monitor_mgr_online_user_force_exist", Type=2, Permission="sysOnlineUser:forceExist", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="31c2af01-b856-4a1d-a131-cdf8e847b1a4", Pid="cf72e37b-3d3b-4dba-bcd0-3fb4bd54757c", Pids="[00000000-0000-0000-0000-000000000000],[cf72e37b-3d3b-4dba-bcd0-3fb4bd54757c],", Name="数据监控", Code="sys_monitor_mgr_druid", Type=1, Router="/druid", Component="Iframe", Application="system", OpenType=2, Visible=false, Link="http://localhost:82/druid/login.html", Weight=1, Sort=100, Status=0},
-new SysMenu{Id="d4cac841-99e5-4014-af17-2986c9340306", Pid="00000000-0000-0000-0000-000000000000", Pids="[00000000-0000-0000-0000-000000000000],", Name="通知公告", Code="sys_notice", Type=0, Icon="sound", Router="/notice", Component="PageView", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="e8ca3968-e404-4ea6-a71a-d06d06b51bd5", Pid="d4cac841-99e5-4014-af17-2986c9340306", Pids="[00000000-0000-0000-0000-000000000000],[d4cac841-99e5-4014-af17-2986c9340306],", Name="公告管理", Code="sys_notice_mgr", Type=1, Router="/notice", Component="system/notice/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="54584ab7-25d1-45b7-b3d4-76ba21511f97", Pid="e8ca3968-e404-4ea6-a71a-d06d06b51bd5", Pids="[00000000-0000-0000-0000-000000000000],[d4cac841-99e5-4014-af17-2986c9340306],[e8ca3968-e404-4ea6-a71a-d06d06b51bd5],", Name="公告查询", Code="sys_notice_mgr_page", Type=2, Permission="sysNotice:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="f27c8431-7da5-4ffe-a8f3-b511cf44c0c8", Pid="e8ca3968-e404-4ea6-a71a-d06d06b51bd5", Pids="[00000000-0000-0000-0000-000000000000],[d4cac841-99e5-4014-af17-2986c9340306],[e8ca3968-e404-4ea6-a71a-d06d06b51bd5],", Name="公告增加", Code="sys_notice_mgr_add", Type=2, Permission="sysNotice:add", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="f84c1f3a-3a51-4be2-97c9-7543b044e457", Pid="e8ca3968-e404-4ea6-a71a-d06d06b51bd5", Pids="[00000000-0000-0000-0000-000000000000],[d4cac841-99e5-4014-af17-2986c9340306],[e8ca3968-e404-4ea6-a71a-d06d06b51bd5],", Name="公告编辑", Code="sys_notice_mgr_edit", Type=2, Permission="sysNotice:edit", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="a8abcb85-ad3b-47b9-8c9b-e7d1876b90cf", Pid="e8ca3968-e404-4ea6-a71a-d06d06b51bd5", Pids="[00000000-0000-0000-0000-000000000000],[d4cac841-99e5-4014-af17-2986c9340306],[e8ca3968-e404-4ea6-a71a-d06d06b51bd5],", Name="公告删除", Code="sys_notice_mgr_delete", Type=2, Permission="sysNotice:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="fe9cbb41-7b05-4f32-b960-87a1ef146166", Pid="e8ca3968-e404-4ea6-a71a-d06d06b51bd5", Pids="[00000000-0000-0000-0000-000000000000],[d4cac841-99e5-4014-af17-2986c9340306],[e8ca3968-e404-4ea6-a71a-d06d06b51bd5],", Name="公告查看", Code="sys_notice_mgr_detail", Type=2, Permission="sysNotice:detail", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="3e547bb0-4cf5-4cf0-8386-48d2f3c12dcb", Pid="e8ca3968-e404-4ea6-a71a-d06d06b51bd5", Pids="[00000000-0000-0000-0000-000000000000],[d4cac841-99e5-4014-af17-2986c9340306],[e8ca3968-e404-4ea6-a71a-d06d06b51bd5],", Name="公告修改状态", Code="sys_notice_mgr_changeStatus", Type=2, Permission="sysNotice:changeStatus", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="ac3065ff-d239-4e0e-86e5-d72cc658224c", Pid="d4cac841-99e5-4014-af17-2986c9340306", Pids="[00000000-0000-0000-0000-000000000000],[d4cac841-99e5-4014-af17-2986c9340306],", Name="已收公告", Code="sys_notice_mgr_received", Type=1, Router="/noticeReceived", Component="system/noticeReceived/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0},
-new SysMenu{Id="e2d4b13b-eb3e-4ead-8fb8-4c61a3004726", Pid="ac3065ff-d239-4e0e-86e5-d72cc658224c", Pids="[00000000-0000-0000-0000-000000000000],[d4cac841-99e5-4014-af17-2986c9340306],[ac3065ff-d239-4e0e-86e5-d72cc658224c],", Name="已收公告查询", Code="sys_notice_mgr_received_page", Type=2, Permission="sysNotice:received", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="05326e62-f496-4950-8a29-40e8a479424f", Pid="00000000-0000-0000-0000-000000000000", Pids="[00000000-0000-0000-0000-000000000000],", Name="文件管理", Code="sys_file_mgr", Type=0, Icon="file", Router="/file", Component="PageView", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="0af2a460-bbb0-472c-b027-8532970425df", Pid="05326e62-f496-4950-8a29-40e8a479424f", Pids="[00000000-0000-0000-0000-000000000000],[05326e62-f496-4950-8a29-40e8a479424f],", Name="系统文件", Code="sys_file_mgr_sys_file", Type=1, Router="/file", Component="system/file/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="c7bac800-b922-4173-bd8d-9888b4eab1d4", Pid="0af2a460-bbb0-472c-b027-8532970425df", Pids="[00000000-0000-0000-0000-000000000000],[05326e62-f496-4950-8a29-40e8a479424f],[0af2a460-bbb0-472c-b027-8532970425df],", Name="文件查询", Code="sys_file_mgr_sys_file_page", Type=2, Permission="sysFileInfo:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="f47e1fa7-6329-4d67-8fe6-36ca06aad54b", Pid="0af2a460-bbb0-472c-b027-8532970425df", Pids="[00000000-0000-0000-0000-000000000000],[05326e62-f496-4950-8a29-40e8a479424f],[0af2a460-bbb0-472c-b027-8532970425df],", Name="文件列表", Code="sys_file_mgr_sys_file_list", Type=2, Permission="sysFileInfo:list", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="cca0a2ee-cfb9-4996-affb-dc8d8168ac10", Pid="0af2a460-bbb0-472c-b027-8532970425df", Pids="[00000000-0000-0000-0000-000000000000],[05326e62-f496-4950-8a29-40e8a479424f],[0af2a460-bbb0-472c-b027-8532970425df],", Name="文件删除", Code="sys_file_mgr_sys_file_delete", Type=2, Permission="sysFileInfo:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="eb738eaa-5eed-466d-b422-4eb6f4662dd9", Pid="0af2a460-bbb0-472c-b027-8532970425df", Pids="[00000000-0000-0000-0000-000000000000],[05326e62-f496-4950-8a29-40e8a479424f],[0af2a460-bbb0-472c-b027-8532970425df],", Name="文件详情", Code="sys_file_mgr_sys_file_detail", Type=2, Permission="sysFileInfo:detail", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="69b97ace-d849-4e52-8fc2-9da7d93e325f", Pid="0af2a460-bbb0-472c-b027-8532970425df", Pids="[00000000-0000-0000-0000-000000000000],[05326e62-f496-4950-8a29-40e8a479424f],[0af2a460-bbb0-472c-b027-8532970425df],", Name="文件上传", Code="sys_file_mgr_sys_file_upload", Type=2, Permission="sysFileInfo:upload", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="e286d53d-bf3c-4711-b0a3-15cfad0a7521", Pid="0af2a460-bbb0-472c-b027-8532970425df", Pids="[00000000-0000-0000-0000-000000000000],[05326e62-f496-4950-8a29-40e8a479424f],[0af2a460-bbb0-472c-b027-8532970425df],", Name="文件下载", Code="sys_file_mgr_sys_file_download", Type=2, Permission="sysFileInfo:download", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="1975891b-7940-44a8-a513-9f2e8b05dda1", Pid="0af2a460-bbb0-472c-b027-8532970425df", Pids="[00000000-0000-0000-0000-000000000000],[05326e62-f496-4950-8a29-40e8a479424f],[0af2a460-bbb0-472c-b027-8532970425df],", Name="图片预览", Code="sys_file_mgr_sys_file_preview", Type=2, Permission="sysFileInfo:preview", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="ba03cfd5-5d72-465f-87b6-71134da68fab", Pid="00000000-0000-0000-0000-000000000000", Pids="[00000000-0000-0000-0000-000000000000],", Name="定时任务", Code="sys_timers", Type=0, Icon="dashboard", Router="/timers", Component="PageView", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="8d4643d7-ec15-48ba-b896-816f8dab1b31", Pid="ba03cfd5-5d72-465f-87b6-71134da68fab", Pids="[00000000-0000-0000-0000-000000000000],[ba03cfd5-5d72-465f-87b6-71134da68fab],", Name="任务管理", Code="sys_timers_mgr", Type=1, Router="/timers", Component="system/timers/index", Application="system", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="db62154a-470e-43c8-8959-a686b954fe7d", Pid="8d4643d7-ec15-48ba-b896-816f8dab1b31", Pids="[00000000-0000-0000-0000-000000000000],[ba03cfd5-5d72-465f-87b6-71134da68fab],[8d4643d7-ec15-48ba-b896-816f8dab1b31],", Name="定时任务查询", Code="sys_timers_mgr_page", Type=2, Permission="sysTimers:page", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="dc07cd9f-4a53-40d9-988e-70290a146eff", Pid="8d4643d7-ec15-48ba-b896-816f8dab1b31", Pids="[00000000-0000-0000-0000-000000000000],[ba03cfd5-5d72-465f-87b6-71134da68fab],[8d4643d7-ec15-48ba-b896-816f8dab1b31],", Name="定时任务列表", Code="sys_timers_mgr_list", Type=2, Permission="sysTimers:list", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="1e562d31-c2f8-4af8-be4b-47e3b251d9a3", Pid="8d4643d7-ec15-48ba-b896-816f8dab1b31", Pids="[00000000-0000-0000-0000-000000000000],[ba03cfd5-5d72-465f-87b6-71134da68fab],[8d4643d7-ec15-48ba-b896-816f8dab1b31],", Name="定时任务详情", Code="sys_timers_mgr_detail", Type=2, Permission="sysTimers:detail", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="f27ba442-7d6f-499f-8053-a737adc3492a", Pid="8d4643d7-ec15-48ba-b896-816f8dab1b31", Pids="[00000000-0000-0000-0000-000000000000],[ba03cfd5-5d72-465f-87b6-71134da68fab],[8d4643d7-ec15-48ba-b896-816f8dab1b31],", Name="定时任务增加", Code="sys_timers_mgr_add", Type=2, Permission="sysTimers:add", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="99129601-0be5-43ee-842b-a428603f013b", Pid="8d4643d7-ec15-48ba-b896-816f8dab1b31", Pids="[00000000-0000-0000-0000-000000000000],[ba03cfd5-5d72-465f-87b6-71134da68fab],[8d4643d7-ec15-48ba-b896-816f8dab1b31],", Name="定时任务删除", Code="sys_timers_mgr_delete", Type=2, Permission="sysTimers:delete", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="5e118fc0-f580-4d06-a89d-f321a84e5654", Pid="8d4643d7-ec15-48ba-b896-816f8dab1b31", Pids="[00000000-0000-0000-0000-000000000000],[ba03cfd5-5d72-465f-87b6-71134da68fab],[8d4643d7-ec15-48ba-b896-816f8dab1b31],", Name="定时任务编辑", Code="sys_timers_mgr_edit", Type=2, Permission="sysTimers:edit", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="4272f2e4-4a8b-45bb-b688-2b9471c35e83", Pid="8d4643d7-ec15-48ba-b896-816f8dab1b31", Pids="[00000000-0000-0000-0000-000000000000],[ba03cfd5-5d72-465f-87b6-71134da68fab],[8d4643d7-ec15-48ba-b896-816f8dab1b31],", Name="定时任务可执行列表", Code="sys_timers_mgr_get_action_classes", Type=2, Permission="sysTimers:getActionClasses", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="54094687-f661-4cba-bdfc-e76f22db8d76", Pid="8d4643d7-ec15-48ba-b896-816f8dab1b31", Pids="[00000000-0000-0000-0000-000000000000],[ba03cfd5-5d72-465f-87b6-71134da68fab],[8d4643d7-ec15-48ba-b896-816f8dab1b31],", Name="定时任务启动", Code="sys_timers_mgr_start", Type=2, Permission="sysTimers:start", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="6b82d407-d1ea-440e-9245-128ad03dffc0", Pid="8d4643d7-ec15-48ba-b896-816f8dab1b31", Pids="[00000000-0000-0000-0000-000000000000],[ba03cfd5-5d72-465f-87b6-71134da68fab],[8d4643d7-ec15-48ba-b896-816f8dab1b31],", Name="定时任务关闭", Code="sys_timers_mgr_stop", Type=2, Permission="sysTimers:stop", Application="system", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="5172265d-eda3-4b8a-a542-d582467a51a1", Pid="00000000-0000-0000-0000-000000000000", Pids="[00000000-0000-0000-0000-000000000000],", Name="代码生成", Code="code_gen", Type=1, Icon="thunderbolt", Router="/codeGenerate/index", Component="gen/codeGenerate/index", Application="system_tool", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="cf51df0a-8e0b-4252-ba06-9646cad648d1", Pid="00000000-0000-0000-0000-000000000000", Pids="[00000000-0000-0000-0000-000000000000],", Name="表单设计", Code="form_design", Type=1, Icon="robot", Router="/formDesign/index", Component="system/formDesign/index", Application="system_tool", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="f4cf2a3d-0714-4ca4-a691-0b363c172f82", Pid="00000000-0000-0000-0000-000000000000", Pids="[00000000-0000-0000-0000-000000000000],", Name="SaaS租户", Code="sys_tenant", Type=1, Icon="switcher", Router="/tenant", Component="PageView", Application="advanced", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="a6e5cd91-e3de-401d-bc8c-86bd464ab32e", Pid="f4cf2a3d-0714-4ca4-a691-0b363c172f82", Pids="[00000000-0000-0000-0000-000000000000],[f4cf2a3d-0714-4ca4-a691-0b363c172f82],", Name="租户管理", Code="sys_tenant_mgr", Type=1, Router="/tenant", Component="system/tenant/index", Application="advanced", OpenType=1, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="8985ec0a-5060-4812-bf47-4f3102948066", Pid="a6e5cd91-e3de-401d-bc8c-86bd464ab32e", Pids="[00000000-0000-0000-0000-000000000000],[f4cf2a3d-0714-4ca4-a691-0b363c172f82],[a6e5cd91-e3de-401d-bc8c-86bd464ab32e],", Name="租户查询", Code="sys_tenant_mgr_page", Type=2, Permission="sysTenant:page", Application="advanced", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="d9584afb-18de-4f7e-b992-c21ad77b1aae", Pid="a6e5cd91-e3de-401d-bc8c-86bd464ab32e", Pids="[00000000-0000-0000-0000-000000000000],[f4cf2a3d-0714-4ca4-a691-0b363c172f82],[a6e5cd91-e3de-401d-bc8c-86bd464ab32e],", Name="租户详情", Code="sys_tenant_mgr_detail", Type=2, Permission="sysTenant:detail", Application="advanced", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="01ae6b95-9c1e-4882-a9ac-ebb9f1868c54", Pid="a6e5cd91-e3de-401d-bc8c-86bd464ab32e", Pids="[00000000-0000-0000-0000-000000000000],[f4cf2a3d-0714-4ca4-a691-0b363c172f82],[a6e5cd91-e3de-401d-bc8c-86bd464ab32e],", Name="租户增加", Code="sys_tenant_mgr_add", Type=2, Permission="sysTenant:add", Application="advanced", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="59e9f6da-151a-4201-bea1-00ef06fe5842", Pid="a6e5cd91-e3de-401d-bc8c-86bd464ab32e", Pids="[00000000-0000-0000-0000-000000000000],[f4cf2a3d-0714-4ca4-a691-0b363c172f82],[a6e5cd91-e3de-401d-bc8c-86bd464ab32e],", Name="租户删除", Code="sys_tenant_mgr_delete", Type=2, Permission="sysTenant:delete", Application="advanced", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-new SysMenu{Id="220b6a86-e65d-469b-8aa0-46c4f5e77ab8", Pid="a6e5cd91-e3de-401d-bc8c-86bd464ab32e", Pids="[00000000-0000-0000-0000-000000000000],[f4cf2a3d-0714-4ca4-a691-0b363c172f82],[a6e5cd91-e3de-401d-bc8c-86bd464ab32e],", Name="租户编辑", Code="sys_tenant_mgr_edit", Type=2, Permission="sysTenant:edit", Application="advanced", OpenType=0, Visible=true, Weight=1, Sort=100, Status=0 },
-
-            };
-        }
-    }
-}
diff --git a/Api/Ewide.Core/SeedData/SysTimerSeedData.cs b/Api/Ewide.Core/SeedData/SysTimerSeedData.cs
deleted file mode 100644
index 69d496e..0000000
--- a/Api/Ewide.Core/SeedData/SysTimerSeedData.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Ewide.Core.Service;
-using Furion.DatabaseAccessor;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-
-namespace Ewide.Core
-{
-    /// <summary>
-    /// 系统任务调度表种子数据
-    /// </summary>
-    public class SysTimerSeedData : IEntitySeedData<SysTimer>
-    {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <param name="dbContext"></param>
-        /// <param name="dbContextLocator"></param>
-        /// <returns></returns>
-        public IEnumerable<SysTimer> HasData(DbContext dbContext, Type dbContextLocator)
-        {
-            return new[]
-            {
-                new SysTimer{Id="971bc338-0c03-46d4-8113-c7738d54ea18", JobName="百度api", JobGroup="默认分组", BeginTime=DateTime.Parse("2021-03-21 00:00:00+08:00"), Interval=30, TriggerType=TriggerTypeEnum.Simple, RequestUrl="https://www.baidu.com", RequestType=RequestTypeEnum.Post, IsDeleted=false }, // 142307070910556
-            };
-        }
-    }
-}
diff --git a/Api/Ewide.Core/SeedData/SysUserSeedData.cs b/Api/Ewide.Core/SeedData/SysUserSeedData.cs
deleted file mode 100644
index 214393b..0000000
--- a/Api/Ewide.Core/SeedData/SysUserSeedData.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Furion.DatabaseAccessor;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-
-namespace Ewide.Core
-{
-    /// <summary>
-    /// 系统用户表种子数据
-    /// </summary>
-    public class SysUserSeedData : IEntitySeedData<SysUser>
-    {
-        /// <summary>
-        /// 种子数据
-        /// </summary>
-        /// <param name="dbContext"></param>
-        /// <param name="dbContextLocator"></param>
-        /// <returns></returns>
-        public IEnumerable<SysUser> HasData(DbContext dbContext, Type dbContextLocator)
-        {
-            return new[]
-            {
-                new SysUser{Id="d0ead3dc-5096-4e15-bc6d-f640be5301ec", Account="superAdmin", Name="superAdmin", Password="e10adc3949ba59abbe56e057f20f883e", AdminType=AdminType.SuperAdmin, Birthday=DateTime.Parse("1986-07-26 00:00:00"), Phone="18020030720", Sex=1, IsDeleted=false }, // 142307070910551
-                new SysUser{Id="5398fb9a-2209-4ce7-a2c1-b6a983e502b5", Account="admin", Name="admin", Password="e10adc3949ba59abbe56e057f20f883e", AdminType=AdminType.SuperAdmin, Birthday=DateTime.Parse("1986-07-26 00:00:00"), Phone="18020030720", Sex=2, IsDeleted=false }, // 142307070910552
-                new SysUser{Id="16a74726-e156-499f-9942-0e0e24ad0c3f", Account="zuohuaijun", Name="zuohuaijun", Password="e10adc3949ba59abbe56e057f20f883e", AdminType=AdminType.None, Birthday=DateTime.Parse("1986-07-26 00:00:00"), Phone="18020030720", Sex=1, IsDeleted=false } // 142307070910553
-            };
-        }
-    }
-}
diff --git a/Api/Ewide.Core/SeedDataXml/SysUser.xml b/Api/Ewide.Core/SeedDataXml/SysUser.xml
index b79be0c..5601d21 100644
--- a/Api/Ewide.Core/SeedDataXml/SysUser.xml
+++ b/Api/Ewide.Core/SeedDataXml/SysUser.xml
@@ -7,6 +7,7 @@
     <IsDeleted>false</IsDeleted>
     <Account>superAdmin</Account>
     <Password>e10adc3949ba59abbe56e057f20f883e</Password>
+    <SecurityLevel>1</SecurityLevel>
     <Name>superAdmin</Name>
     <Birthday>1986-07-26T00:00:00</Birthday>
     <Sex>1</Sex>
@@ -22,6 +23,7 @@
     <IsDeleted>false</IsDeleted>
     <Account>admin</Account>
     <Password>e10adc3949ba59abbe56e057f20f883e</Password>
+    <SecurityLevel>1</SecurityLevel>
     <Name>admin</Name>
     <Birthday>1986-07-26T00:00:00</Birthday>
     <Sex>2</Sex>
@@ -37,6 +39,7 @@
     <IsDeleted>false</IsDeleted>
     <Account>zuohuaijun</Account>
     <Password>e10adc3949ba59abbe56e057f20f883e</Password>
+    <SecurityLevel>1</SecurityLevel>
     <Name>zuohuaijun</Name>
     <Birthday>1986-07-26T00:00:00</Birthday>
     <Sex>1</Sex>
diff --git a/Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs b/Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs
index 4dfea66..e066ed6 100644
--- a/Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs
+++ b/Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs
@@ -20,6 +20,11 @@ namespace Ewide.Core.Service
         /// </summary>
         public string Account { get; set; }
 
+        /// <summary>
+        /// 密码安全级别
+        /// </summary>
+        public int SecurityLevel { get; set; }
+
         /// <summary>
         /// 昵称
         /// </summary>
diff --git a/Api/Ewide.Core/Service/User/ISysUserService.cs b/Api/Ewide.Core/Service/User/ISysUserService.cs
index e0f5f1a..f712b30 100644
--- a/Api/Ewide.Core/Service/User/ISysUserService.cs
+++ b/Api/Ewide.Core/Service/User/ISysUserService.cs
@@ -22,9 +22,9 @@ namespace Ewide.Core.Service
         Task<dynamic> QueryUserPageList([FromQuery] UserInput input);
         Task ResetUserPwd(QueryUserInput input);
         Task SaveAuthUserToUser(AuthUserInput authUser, UserInput sysUser);
-        Task UpdateAvatar(UpdateUserInput input);
+        Task UpdateAvatar(UserInput input);
         Task UpdateUser(UpdateUserInput input);
-        Task UpdateUserInfo(UpdateUserInput input);
+        Task UpdateUserInfo(UserInput input);
         Task UpdateUserPwd(ChangePasswordUserInput input);
     }
 }
\ No newline at end of file
diff --git a/Api/Ewide.Core/Service/User/SysUserService.cs b/Api/Ewide.Core/Service/User/SysUserService.cs
index 5e2d321..880b61e 100644
--- a/Api/Ewide.Core/Service/User/SysUserService.cs
+++ b/Api/Ewide.Core/Service/User/SysUserService.cs
@@ -230,11 +230,13 @@ namespace Ewide.Core.Service
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost("/sysUser/updateInfo")]
-        public async Task UpdateUserInfo(UpdateUserInput input)
+        public async Task UpdateUserInfo(UserInput input)
         {
             var user = input.Adapt<SysUser>();
+            user.Id = _userManager.UserId;
             await user.UpdateExcludeAsync(new string[] {
                 nameof(SysUser.Account),
+                nameof(SysUser.SecurityLevel),
                 nameof(SysUser.Name),
                 nameof(SysUser.Password),
                 nameof(SysUser.AdminType),
@@ -301,9 +303,9 @@ namespace Ewide.Core.Service
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost("/sysUser/updateAvatar")]
-        public async Task UpdateAvatar(UpdateUserInput input)
+        public async Task UpdateAvatar(UserInput input)
         {
-            var user = await _sysUserRep.FirstOrDefaultAsync(u => u.Id == input.Id);
+            var user = await _sysUserRep.FirstOrDefaultAsync(u => u.Id == _userManager.UserId);
             // 调用文件上传
             //sysFileInfoService.assertFile(input.Avatar);
             user.Avatar = input.Avatar;
diff --git a/Api/Ewide.Web.Core/core.settings.json b/Api/Ewide.Web.Core/core.settings.json
index 035a2a2..d6ee02a 100644
--- a/Api/Ewide.Web.Core/core.settings.json
+++ b/Api/Ewide.Web.Core/core.settings.json
@@ -7,7 +7,8 @@
       "sysFileInfo:download",
       "sysFileInfo:preview",
       "sysUser:updateInfo",
-      "sysUser:updatePwd"
+      "sysUser:updatePwd",
+      "sysUser:updateAvatar"
     ]
   }
 }
\ No newline at end of file
diff --git a/Web/src/pages/system/account/setting/safety/index.vue b/Web/src/pages/system/account/setting/safety/index.vue
index 3fff7f8..7777377 100644
--- a/Web/src/pages/system/account/setting/safety/index.vue
+++ b/Web/src/pages/system/account/setting/safety/index.vue
@@ -3,11 +3,8 @@
     <div class="yo-form">
       <h4 class="h4">安全设置</h4>
       <a-progress
-        :percent="15"
-        :stroke-color="{
-            from: '#108ee9',
-            to: '#87d068',
-        }"
+        :percent="[33.33, 66.67, 100][popSecurityLevel - 1]"
+        :stroke-color="strokeColor"
         :stroke-width="15"
         class="mb-md"
         status="active"
@@ -15,11 +12,13 @@
       >
         <span slot="format">
           帐号安全级别:
-          <span v-html="safetyLevel"></span>
+          <span class="text-success" v-if="popSecurityLevel === 3">强</span>
+          <span class="text-warning" v-else-if="popSecurityLevel === 2">中</span>
+          <span class="text-error" v-else>弱</span>
         </span>
       </a-progress>
       <a-list :data-source="data" bordered item-layout="vertical">
-        <a-list-item slot="renderItem" slot-scope="item">
+        <a-list-item :extra="item.extra" slot="renderItem" slot-scope="item">
           <template v-if="item.done">
             <span class="text-success" slot="actions">
               <a-icon class="mr-xxs" type="check-circle" />已设置
@@ -33,7 +32,6 @@
             <a @click="item.action" slot="actions">设置</a>
           </template>
           <a-list-item-meta :description="item.description" :title="item.title" />
-          <span>{{ item.content }}</span>
         </a-list-item>
       </a-list>
     </div>
@@ -78,9 +76,28 @@ export default {
   },
 
   computed: {
-    safetyLevel() {
+    popSecurityLevel() {
       // 计算帐号安全级别
-      return '<span class="text-error">弱</span>';
+      return (
+        Math.floor(((this.data.filter((p) => p.done).length - 1) * 3 + this.$root.global.info.securityLevel * 3) / 5) ||
+        1
+      );
+    },
+    strokeColor() {
+      return [
+        {
+          from: '#e280bf',
+          to: '#e91010',
+        },
+        {
+          from: '#e9ce10',
+          to: '#ff974d',
+        },
+        {
+          from: '#108ee9',
+          to: '#87d068',
+        },
+      ][this.popSecurityLevel - 1];
     },
   },
 
@@ -92,7 +109,18 @@ export default {
       title: '登录密码',
       description:
         '安全性高的密码可以使帐号更安全。建议您定期更换密码，设置一个包含字母，符号或数字中至少两项且长度超过6位的密码。',
-      content: '当前密码强度：弱(不保存密码明文,需要在数据库以字段形式存储)',
+      extra: (
+        <div>
+          当前密码强度：
+          {
+            [
+              <span class="text-error">弱</span>,
+              <span class="text-warning">中</span>,
+              <span class="text-success">强</span>,
+            ][info.securityLevel - 1]
+          }
+        </div>
+      ),
       done: true,
       action: () => {
         this.$refs['password-form'].onOpen({});

From 89bed3e0eebce01b8055666f63a09e29751f076a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Tue, 11 May 2021 10:04:45 +0800
Subject: [PATCH 7/9] =?UTF-8?q?update=20=E9=99=8D=E4=BD=8E=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=80=9F=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/views/main/_layout/header/search.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Web/src/views/main/_layout/header/search.js b/Web/src/views/main/_layout/header/search.js
index cae9bd6..043f2f8 100644
--- a/Web/src/views/main/_layout/header/search.js
+++ b/Web/src/views/main/_layout/header/search.js
@@ -10,6 +10,8 @@ export default {
         return {
             searchText: '',
             searchResult: [],
+
+            timer: null
         };
     },
 
@@ -44,6 +46,14 @@ export default {
 
 
         onSearch(value) {
+            clearTimeout(this.timer)
+
+            this.timer = setTimeout(() => {
+                this.doSearch(value)
+            }, 300)
+        },
+
+        doSearch(value) {
             this.searchText = value
 
             const menus = this.$_.concat.apply(this, this.$_.cloneDeep(this.menus.map(p => p.menu)))

From 452c0291aafc7bc26d9f05a2ecb7e96b3a7c4d72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Tue, 11 May 2021 13:27:16 +0800
Subject: [PATCH 8/9] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E6=88=BF?=
 =?UTF-8?q?=E5=B1=8B=E7=BC=96=E7=A0=81(=E6=9C=AA=E5=AE=9E=E7=8E=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/business/house/houseCode/form.vue   | 129 +++++++++++
 .../pages/business/house/houseCode/index.vue  | 206 ++++++++++++++++++
 2 files changed, 335 insertions(+)
 create mode 100644 Web/src/pages/business/house/houseCode/form.vue
 create mode 100644 Web/src/pages/business/house/houseCode/index.vue

diff --git a/Web/src/pages/business/house/houseCode/form.vue b/Web/src/pages/business/house/houseCode/form.vue
new file mode 100644
index 0000000..cb8f26d
--- /dev/null
+++ b/Web/src/pages/business/house/houseCode/form.vue
@@ -0,0 +1,129 @@
+<template>
+  <!-- 
+    普通编辑窗体
+    v 1.2
+    2021-04-30
+    Lufthafen
+  -->
+  <container>
+    <br />
+    <a-card>
+      <a-form-model
+        :label-col="labelCol"
+        :model="form"
+        :rules="rules"
+        :wrapper-col="wrapperCol"
+        ref="form"
+      >
+        <a-spin :spinning="loading">
+          <a-icon slot="indicator" spin type="loading" />
+          <a-form-model-item class="ant-row-flex" label="房屋性质">
+            <a-input />
+          </a-form-model-item>
+        </a-spin>
+      </a-form-model>
+    </a-card>
+  </container>
+</template>
+<script>
+/* 表单内容默认值 */
+const defaultForm = {
+  /* ... */
+};
+
+export default {
+  props: ['param'],
+
+  data() {
+    return {
+      labelCol: { flex: '150px' },
+      wrapperCol: { flex: 'auto' },
+
+      /** 表单数据 */
+      form: {},
+      /** 验证格式 */
+      rules: {
+        /* ... */
+      },
+
+      /** 加载异步数据状态 */
+      loading: false,
+
+      /** 其他成员属性 */
+      /* ... */
+    };
+  },
+
+  methods: {
+    /**
+     * 必要的方法
+     * 在打开编辑页时允许填充数据
+     */
+    onFillData(params) {
+      /** 将默认数据覆盖到form */
+      this.form = this.$_.cloneDeep({
+        ...defaultForm,
+        ...params.record,
+        /** 在此处添加其他默认数据转换 */
+        /* ... */
+      });
+    },
+
+    /**
+     * 必要方法
+     * 验证表单并获取表单数据
+     */
+    onGetData() {
+      return new Promise((reslove, reject) => {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            const record = this.$_.cloneDeep(this.form);
+
+            /** 验证通过后可以对数据进行转换得到想要提交的格式 */
+            /* ... */
+
+            reslove(record);
+          } else {
+            reject();
+          }
+        });
+      });
+    },
+
+    /**
+     * 必要的方法
+     * 在外部窗口进行保存时调用表单验证
+     */
+    onValidate(callback) {
+      this.$refs.form.validate(callback);
+    },
+
+    /**
+     * 必要的方法
+     * 在外部窗口关闭或重置时对表单验证进行初始化
+     */
+    onResetFields() {
+      setTimeout(() => {
+        this.$refs.form.resetFields();
+
+        /** 在这里可以初始化当前组件中其他属性 */
+        /* ... */
+      }, 300);
+    },
+
+    /**
+     * 必要方法
+     * 加载当前表单中所需要的异步数据
+     */
+    async onInit(params) {
+      this.loading = true;
+      /** 可以在这里await获取一些异步数据 */
+      /* ... */
+      this.loading = false;
+    },
+
+    /** 当前组件的其他方法 */
+    /* ... */
+  },
+};
+</script>
\ No newline at end of file
diff --git a/Web/src/pages/business/house/houseCode/index.vue b/Web/src/pages/business/house/houseCode/index.vue
new file mode 100644
index 0000000..a10161b
--- /dev/null
+++ b/Web/src/pages/business/house/houseCode/index.vue
@@ -0,0 +1,206 @@
+<template>
+  <!-- 
+    普通查询表格
+    v 1.2
+    2021-04-30
+    Lufthafen
+  -->
+  <container>
+    <div ref="test"></div>
+    <br />
+    <a-card :bordered="false">
+      <yo-table
+        :columns="columns"
+        :load-data="loadData"
+        @query="onQuery"
+        @resetQuery="onResetQuery"
+        ref="table"
+      >
+        <Auth auth="authCode:page" slot="query">
+          <!-- 此处添加查询表单控件 -->
+          <!-- ... -->
+        </Auth>
+        <Auth auth="authCode:add" slot="operator">
+          <a-button @click="onOpen('add-form')" icon="plus">新增房屋编码</a-button>
+        </Auth>
+        <!-- 格式化字段内容 -->
+        <!-- ... -->
+        <!-- 添加操作控件 -->
+        <span slot="action" slot-scope="text, record">
+          <yo-table-actions>
+            <Auth auth="authCode:edit">
+              <a @click="onOpen('edit-form', record)">编辑</a>
+            </Auth>
+            <Auth auth="authCode:delete">
+              <a-popconfirm @confirm="onDelete(record)" placement="topRight" title="是否确认删除">
+                <a>删除</a>
+              </a-popconfirm>
+            </Auth>
+            <!-- 可在此处添加其他操作控件 -->
+            <!-- ... -->
+          </yo-table-actions>
+        </span>
+      </yo-table>
+    </a-card>
+  </container>
+</template>
+<script>
+/* 在此管理整个页面需要的接口名称 */
+const api = {
+  page: 'testPageApi...',
+  add: 'testAddApi',
+  edit: 'testEditApi',
+  delete: 'testDeleteApi...',
+  /* ... */
+};
+
+export default {
+  props: ['paneKey'],
+  data() {
+    return {
+      api,
+
+      name: '...',
+
+      /* 查询条件 */
+      query: {},
+
+      /* 表格字段 */
+      columns: [],
+
+      /* 字典编码储存格式 */
+      codes: {
+        code1: [],
+        code2: [],
+      },
+    };
+  },
+  created() {
+    /** 按需加载字典编码 */
+    this.onLoadCodes();
+
+    /** 根据权限添加操作列 */
+    const flag = this.$auth(/* ... */);
+    if (flag) {
+      this.columns.push({
+        title: '操作',
+        width: '150px',
+        dataIndex: 'action',
+        scopedSlots: { customRender: 'action' },
+      });
+    }
+  },
+  methods: {
+    /**
+     * 必要的方法
+     * 传给yo-table以示意数据接口及其参数和返回的数据结构
+     */
+    loadData(params) {
+      return this.$api[api.page]({
+        ...params,
+        ...this.query,
+      }).then((res) => {
+        return res.data;
+      });
+    },
+
+    /**
+     * 有查询功能时的必要方法
+     * 加载数据时初始化分页信息
+     */
+    onQuery() {
+      this.$refs.table.onReloadData(true);
+    },
+
+    /**
+     * 有查询功能时的必要方法
+     * 重置查询条件
+     */
+    onResetQuery() {
+      /** 在这里重置查询条件时,可对特殊的字段做保留处理 */
+      this.query = {};
+      this.onQuery();
+    },
+
+    /**
+     * 必要方法
+     * 重新列表数据
+     */
+    onReloadData() {
+      this.$refs.table.onReloadData();
+    },
+
+    /**
+     * 必要方法
+     * 加载字典数据
+     * 如果不需要获取相应的字典数据,此方法内容可空
+     */
+    onLoadCodes() {
+      this.$api
+        .$queue([
+          this.$api.sysDictTypeDropDownAwait({ code: 'code1' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'code2' }),
+          /* ... */
+        ])
+        .then(([code1, code2]) => {
+          this.codes.code1 = code1.data;
+          this.codes.code2 = code2.data;
+          /* ... */
+        });
+    },
+
+    /**
+     * 必要方法
+     * 绑定数据字典值
+     */
+    bindCodeValue(code, name) {
+      const c = this.codes[name].find((p) => p.code == code);
+      if (c) {
+        return c.value;
+      }
+      return null;
+    },
+
+    /**
+     * 必要方法
+     * 从列表页调用窗口的打开方法
+     */
+    onOpen(formName, record) {
+      this.openContentWindow({
+        title: '新建房屋编码',
+        path: 'business/house/houseCode/form',
+        param: {
+          parent: this,
+          record,
+        },
+      });
+    },
+
+    /**
+     * 必要方法
+     * 可以用做一系列操作的公共回调,此方法中会重新加载当前列表
+     */
+    onResult(success, successMessage) {
+      if (success) {
+        this.$message.success(successMessage);
+        this.onReloadData();
+      }
+    },
+
+    /**
+     * 必要方法
+     * 删除时调用
+     */
+    onDelete(record) {
+      this.$refs.table.onLoading();
+      this.$api[api.delete](record)
+        .then(({ success }) => {
+          this.onResult(success, '删除成功');
+        })
+        .finally(() => {
+          this.$refs.table.onLoaded();
+        });
+    },
+  },
+};
+</script>
\ No newline at end of file

From 82e7ac70bd5307877ede8914f8fe9185bb8730ca Mon Sep 17 00:00:00 2001
From: ky_yusj <2655568377@qq.com>
Date: Tue, 11 May 2021 13:30:38 +0800
Subject: [PATCH 9/9] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entity/BsHouseProjectInfo.cs                 |  2 +-
 .../Dto/HouseProjectInfoInput.cs                 |  2 +-
 .../HouseProjectInfo/Dto/HouseProjectOutput.cs   |  2 +-
 .../HouseProjectInfo/HouseProjectInfoService.cs  | 10 +++++-----
 .../{houseprojectinfo => house/project}/form.vue | 16 ++++++++++------
 .../project}/index.vue                           |  0
 6 files changed, 18 insertions(+), 14 deletions(-)
 rename Web/src/pages/business/{houseprojectinfo => house/project}/form.vue (90%)
 rename Web/src/pages/business/{houseprojectinfo => house/project}/index.vue (100%)

diff --git a/Api/Ewide.Application/Entity/BsHouseProjectInfo.cs b/Api/Ewide.Application/Entity/BsHouseProjectInfo.cs
index b456dea..1f294e2 100644
--- a/Api/Ewide.Application/Entity/BsHouseProjectInfo.cs
+++ b/Api/Ewide.Application/Entity/BsHouseProjectInfo.cs
@@ -29,7 +29,7 @@ namespace Ewide.Application.Entity
         [Comment("区域ID")]
         [MaxLength(36)]
         [Required]
-        public string AreaId { get; set; }
+        public string AreaCode { get; set; }
 
         [Comment("类型")]
         [Required]
diff --git a/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectInfoInput.cs b/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectInfoInput.cs
index 3867919..636af34 100644
--- a/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectInfoInput.cs
+++ b/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectInfoInput.cs
@@ -13,7 +13,7 @@ namespace Ewide.Application.Service.HouseProjectInfo.Dto
         public string Name { get; set; }
         public string Note { get; set; }
         public int Sort { get; set; }
-        public string AreaId { get; set; }
+        public string AreaCode { get; set; }
         public int Type { get; set; }
     }
     public class AddProjectInput : HouseProjectInfoInput
diff --git a/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectOutput.cs b/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectOutput.cs
index 9558ace..307b548 100644
--- a/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectOutput.cs
+++ b/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectOutput.cs
@@ -12,7 +12,7 @@ namespace Ewide.Application.Service.HouseProjectInfo.Dto
         public string Name { get; set; }
         public string Note { get; set; }
         public int Sort { get; set; }
-        public string AreaId { get; set; }
+        public string AreaCode { get; set; }
         public string AreaName { get; set; }
         public int Type { get; set; }
     }
diff --git a/Api/Ewide.Application/Service/HouseProjectInfo/HouseProjectInfoService.cs b/Api/Ewide.Application/Service/HouseProjectInfo/HouseProjectInfoService.cs
index f2e6e0c..dbe658a 100644
--- a/Api/Ewide.Application/Service/HouseProjectInfo/HouseProjectInfoService.cs
+++ b/Api/Ewide.Application/Service/HouseProjectInfo/HouseProjectInfoService.cs
@@ -63,7 +63,7 @@ namespace Ewide.Application.Service.HouseProjectInfo
         public async Task UpdateProject(UpdateProjectInput input)
         {
             var project = input.Adapt<BsHouseProjectInfo>();
-            await project.UpdateExcludeAsync(new[] { nameof(BsHouseProjectInfo.AreaId)}, true);
+            await project.UpdateExcludeAsync(new[] { nameof(BsHouseProjectInfo.AreaCode) }, true);
         }
 
         /// <summary>
@@ -85,12 +85,12 @@ namespace Ewide.Application.Service.HouseProjectInfo
         [HttpPost("/houseProjectInfo/page")]
         public async Task<dynamic> QueryProjectPageList([FromBody] HouseProjectInfoInput input)
         {
-            var areaID = !string.IsNullOrEmpty(input.AreaId);
+            var areaID = !string.IsNullOrEmpty(input.AreaCode);
             var areaCodeRep = Db.GetRepository<SysAreaCode>();
             var projects = await _houseProjectInfoRep.DetachedEntities
-                .Join(areaCodeRep.DetachedEntities, p => p.AreaId, a => a.Code, (p, a) => new { p, AreaName = a.Name })
-                .Where(areaID, x => x.p.AreaId == input.AreaId)
-                .Select(x => new { x.p.Id, x.p.Name, x.p.Note, x.p.Sort, x.p.AreaId, x.AreaName, x.p.Type }.Adapt<HouseProjectOutput>()).ToPagedListAsync(input.PageNo, input.PageSize);
+                .Join(areaCodeRep.DetachedEntities, p => p.AreaCode, a => a.Code, (p, a) => new { p, AreaName = a.Name })
+                .Where(areaID, x => x.p.AreaCode == input.AreaCode)
+                .Select(x => new { x.p.Id, x.p.Name, x.p.Note, x.p.Sort, x.p.AreaCode, x.AreaName, x.p.Type }.Adapt<HouseProjectOutput>()).ToPagedListAsync(input.PageNo, input.PageSize);
             return XnPageResult<HouseProjectOutput>.PageResult(projects);
         }
 
diff --git a/Web/src/pages/business/houseprojectinfo/form.vue b/Web/src/pages/business/house/project/form.vue
similarity index 90%
rename from Web/src/pages/business/houseprojectinfo/form.vue
rename to Web/src/pages/business/house/project/form.vue
index 67f82aa..b65d1a6 100644
--- a/Web/src/pages/business/houseprojectinfo/form.vue
+++ b/Web/src/pages/business/house/project/form.vue
@@ -12,7 +12,7 @@
         <!-- 表单控件 -->
         <a-form-model-item label="所属区域" prop="areaCode">
           <!-- <a-tree-select :dropdown-style="{ maxHeight: '300px', overflow: 'auto' }" :tree-data="areaData" :replace-fields="{ value: 'code', title: 'name', children: 'children' }" placeholder="请选择所属区域" tree-default-expand-all v-model="form.areaId" /> -->
-          <a-cascader :field-names="{ label: 'name', value: 'code', children: 'children' }" :options="areaData" expand-trigger="hover" placeholder="请选择所属区域" v-model="areaCode" />
+          <a-cascader :field-names="{ label: 'name', value: 'code', children: 'children' }" :options="areaData" expand-trigger="hover" placeholder="请选择所属区域" v-model="form.areaCode" :display-render="displayRender" />
         </a-form-model-item>
         <a-form-model-item label="项目名称" prop="name">
           <a-input placeholder="请输入项目名称" v-model="form.name" />
@@ -43,16 +43,18 @@ export default {
   data() {
     return {
       /** 表单数据 */
-      form: { areaId: '' },
+      form: {},
       /** 验证格式 */
       rules: {
         /* ... */
         note: [{ required: true, message: '请输入备注' }],
+        name: [{ required: true, message: '请输入项目名称' }],
+        sort: [{ required: true, message: '请输入排序' }],
+        areaCode: [{ required: true, message: '请选择所属区域' }],
       },
 
       /** 加载异步数据状态 */
       loading: false,
-
       /** 其他成员属性 */
       areaData: [],
       /* ... */
@@ -96,10 +98,9 @@ export default {
         ...defaultForm,
         ...params.record,
         /** 在此处添加其他默认数据转换 */
-        areaId: areaCode[3],
+        areaCode,
         /* ... */
       });
-      this.areaCode = areaCode;
     },
 
     /**
@@ -111,7 +112,7 @@ export default {
         this.$refs.form.validate((valid) => {
           if (valid) {
             const record = this.$_.cloneDeep(this.form);
-
+            record.areaCode = record.areaCode[record.areaCode.length - 1];
             /** 验证通过后可以对数据进行转换得到想要提交的格式 */
             /* ... */
 
@@ -162,6 +163,9 @@ export default {
         return res.data;
       });
     },
+    displayRender({ labels }) {
+      return labels[labels.length - 1];
+    },
     /* ... */
   },
 };
diff --git a/Web/src/pages/business/houseprojectinfo/index.vue b/Web/src/pages/business/house/project/index.vue
similarity index 100%
rename from Web/src/pages/business/houseprojectinfo/index.vue
rename to Web/src/pages/business/house/project/index.vue