tianheng-ui 0.1.46 → 0.1.48

package/packages/TableMaking/widgetConfig.vue

@@ -12,15 +12,17 @@
       </div>
     </div>
     <div v-if="activeTab.value === 'field'" class="configItem fieldsView">
-      <template v-if="fieldsTree.search.length || fieldsTree.table.length">
+      <template
+        v-if="fieldsData.inParams.length || fieldsData.outParams.length"
+      >
         <el-collapse v-model="collapseValue">
           <el-collapse-item title="查询字段" name="group-fields_search">
             <el-tree
               ref="fieldsSearchTreeRef"
-              :data="fieldsTree.search"
+              :data="fieldsData.inParams"
               :default-checked-keys="searchActiveFields"
               show-checkbox
-              node-key="key"
+              node-key="id"
               :default-expand-all="true"
               :check-strictly="true"
               :props="{ label: 'label', value: 'alias' }"
@@ -31,10 +33,10 @@
           <el-collapse-item title="列表字段" name="group-fields_table">
             <el-tree
               ref="fieldsTableTreeRef"
-              :data="fieldsTree.table"
+              :data="fieldsData.outParams"
               :default-checked-keys="tableActiveFields"
               show-checkbox
-              node-key="key"
+              node-key="id"
               :default-expand-all="true"
               :check-strictly="true"
               :props="{ label: 'label', value: 'alias' }"
@@ -100,7 +102,7 @@
                 placeholder="请选择"
                 no-data-text="暂无接口，请前往【接口模块】创建"
                 filterable
-                @change="handleFieldsApiChange"
+                @change="handleResetTableFields"
               >
                 <el-option
                   v-for="item in apiOptions"
@@ -248,8 +250,8 @@
               </div>
             </template>
             <div
-              v-for="(item, index) in Object.values(config.tools)"
-              :key="index"
+              v-for="item in Object.values(config.tools)"
+              :key="item.type"
               class="tools-item"
             >
               <el-checkbox v-model="item.show">{{ item.name }}</el-checkbox>
@@ -511,12 +513,12 @@
             > -->
           </div>
           <div
-            v-for="(item, index) in Object.values(config.tools || [])"
+            v-for="item in Object.values(config.tools || [])"
             class="list-item th-is_hover"
             :class="{
               'th-is_active': dialog.data && dialog.data.name === item.name
             }"
-            :key="item.key"
+            :key="item.type"
             @click="dialog.data = item"
           >
             <div class="list-item-value">{{ item.name }}</div>
@@ -707,10 +709,7 @@ export default {
           { required: true, message: "请选择列表名称", trigger: "change" }
         ]
       },
-      fieldsTree: {
-        search: [],
-        table: []
-      },
+      fieldsData: { inParams: [], outParams: [] },
       dialog: { show: false, data: null },
       cssDemo: `
 {<br>
@@ -722,43 +721,86 @@ export default {
     };
   },
   watch: {
-    config(val) {
-      this.handleInitFields(val.table.mounted.api);
+    "config.table.mounted.api"(val) {
+      this.handleFieldsApiChange(val, true);
+    },
+    "config.tools.add.show"(bool) {
+      if (bool) this.handleFieldsApiChange(this.config.tools.add.api);
+    },
+    "config.tools.edit.show"(bool) {
+      if (bool) this.handleFieldsApiChange(this.config.tools.edit.api);
+    },
+    "config.tools.look.show"(bool) {
+      if (bool) this.handleFieldsApiChange(this.config.tools.look.api);
+    },
+    "config.tools.delete.show"(bool) {
+      if (bool) this.handleFieldsApiChange(this.config.tools.delete.api);
+    },
+    "config.tools.batchDelete.show"(bool) {
+      if (bool) this.handleFieldsApiChange(this.config.tools.batchDelete.api);
+    },
+    "config.tools.export.show"(bool) {
+      if (bool) this.handleFieldsApiChange(this.config.tools.export.api);
+    },
+    "config.tools.import.show"(bool) {
+      if (bool) this.handleFieldsApiChange(this.config.tools.import.api);
+    },
+    "config.tools.add.api"(val) {
+      if (this.config.tools.add.show) this.handleFieldsApiChange(val);
+    },
+    "config.tools.edit.api"(val) {
+      if (this.config.tools.edit.show) this.handleFieldsApiChange(val);
+    },
+    "config.tools.look.api"(val) {
+      if (this.config.tools.look.show) this.handleFieldsApiChange(val);
+    },
+    "config.tools.delete.api"(val) {
+      if (this.config.tools.delete.show) this.handleFieldsApiChange(val);
+    },
+    "config.tools.batchDelete.api"(val) {
+      if (this.config.tools.batchDelete.show) this.handleFieldsApiChange(val);
     },
-    apiOptions() {
-      this.handleInitFields(this.config.table.mounted.api);
+    "config.tools.export.api"(val) {
+      if (this.config.tools.export.show) this.handleFieldsApiChange(val);
+    },
+    "config.tools.import.api"(val) {
+      if (this.config.tools.import.show) this.handleFieldsApiChange(val);
     }
   },
   computed: {
     searchActiveFields() {
       const data = this.config.search.options.map(item => {
-        return item.key;
+        return item.id;
       });
       return data;
     },
     tableActiveFields() {
       const data = this.config.table.options.map(item => {
-        return item.key;
+        return item.id;
       });
       return data;
     }
   },
   mounted() {},
   methods: {
-    handleActionConfig(data) {
-      this.dialog = { show: true, data };
-    },
-    handleFieldsApiChange(val) {
-      this.fieldsTree = { search: [], table: [] };
+    handleResetTableFields() {
       this.config.search.options = [];
       this.config.table.options = [];
-      this.handleInitFields(val);
     },
-    handleInitFields(apiId) {
+    handleActionConfig(data) {
+      this.dialog = { show: true, data };
+    },
+    handleFieldsApiChange(apiId, isFields) {
+      if (isFields) this.fieldsData = { inParams: [], outParams: [] };
+      if (!this.apiOptions.length || !apiId) return;
+
       const api = this.apiOptions.filter(item => {
         return item.id === apiId;
       })[0];
-      if (!api) return;
+      if (!api) {
+        this.$message.warning("未知的接口，请检查配置信息");
+        return;
+      }
 
       const initParams = (paramsList, pAlias) => {
         paramsList.forEach(item => {
@@ -770,31 +812,38 @@ export default {
           }
         });
       };
+
       if (this.config.table.fields.remote) {
         const callback = res => {
           api.inParams = res.inParams;
           api.outParams = res.outParams;
-          this.fieldsTree.search = deepClone(res.inParams) || [];
-          initParams(this.fieldsTree.search);
-          this.fieldsTree.table = deepClone(res.outParams) || [];
-          initParams(this.fieldsTree.table);
+          if (isFields) {
+            this.fieldsData.inParams = deepClone(res.inParams || []);
+            initParams(this.fieldsData.inParams);
+            this.fieldsData.outParams = deepClone(res.outParams || []);
+            initParams(this.fieldsData.outParams);
+          }
         };
         this.$emit("remote-params", apiId, callback);
-      } else {
-        this.fieldsTree.search = deepClone(api.inParams) || [];
-        initParams(this.fieldsTree.search);
-        this.fieldsTree.table = deepClone(api.outParams) || [];
-        initParams(this.fieldsTree.table);
+        return;
+      }
+
+      if (isFields) {
+        this.fieldsData.inParams = deepClone(api.inParams || []);
+        initParams(this.fieldsData.inParams);
+        this.fieldsData.outParams = deepClone(api.outParams || []);
+        initParams(this.fieldsData.outParams);
+        return;
       }
     },
     handleTreeCheckChange(action) {
       if (action === "search") {
         const keys = this.config.search.options.map(item => {
-          return item.key;
+          return item.id;
         });
         let nodes = deepClone(this.$refs.fieldsSearchTreeRef.getCheckedNodes());
         nodes.map(item => {
-          const index = keys.indexOf(item.key);
+          const index = keys.indexOf(item.id);
           if (index > -1) {
             return this.config.search.options[index];
           } else {
@@ -804,12 +853,12 @@ export default {
         this.config.search.options = nodes;
       } else {
         const keys = this.config.table.options.map(item => {
-          return item.key;
+          return item.id;
         });
 
         let nodes = deepClone(this.$refs.fieldsTableTreeRef.getCheckedNodes());
         nodes = nodes.map(item => {
-          const index = keys.indexOf(item.key);
+          const index = keys.indexOf(item.id);
           if (index > -1) {
             return this.config.table.options[index];
           } else {

package/packages/TableMaking/widgetTable.vue

@@ -47,7 +47,7 @@
       >
         <div
           v-for="item in config.search.options"
-          :key="item.pAlias"
+          :key="item.id"
           class="table-item"
         >
           <div class="table-item-custom drag">
@@ -135,7 +135,7 @@
       >
         <div
           v-for="item in config.table.options"
-          :key="item.pAlias"
+          :key="item.id"
           class="table-item"
         >
           <div class="table-item-custom drag">