fix org对seed的错误应用

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;
 

Web/src/pages/system/app/addForm.vue

@@ -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>

Web/src/pages/system/app/editForm.vue

@@ -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>

Web/src/pages/system/menu/addForm.vue

@@ -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>

Web/src/pages/system/menu/editForm.vue

@@ -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>

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;
     },

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'],
+      });
     },
     /**
      * 必要方法