tianheng-ui 0.0.81 → 0.0.83

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.0.81",
+  "version": "0.0.83",
   "author": "shu lang <403732931@qq.com>",
   "license": "MIT",
   "private": false,

package/packages/FormMaking/index.vue

@@ -396,6 +396,7 @@ export default {
     GenerateForm
   },
   props: {
+    formName: String,
     data: {
       type: Object,
       default: () => {
@@ -539,7 +540,10 @@ export default {
       this.widgetFormSelect = this.data.list[0];
     }
     if (this.data && this.data.config) {
-      this.widgetFormData.config = this.data.config;
+      this.widgetFormData.config = Object.assign(
+        this.widgetFormData.config,
+        this.data.config
+      );
     }
   },
   methods: {

package/packages/TableMaking/index.vue

@@ -56,6 +56,12 @@ export default {
       default: () => {
         return [];
       }
+    },
+    config: {
+      type: Object,
+      default: () => {
+        return {};
+      }
     }
   },
   data() {
@@ -65,8 +71,58 @@ export default {
       client: "monitor"
     };
   },
-  mounted() {},
+  watch: {
+    fields: {
+      handler(val, oldVal) {
+        if (oldVal.length === 0) {
+          this.initConfig();
+        }
+      },
+      deep: true
+    },
+    config(val) {
+      this.initConfig();
+    }
+  },
+  mounted() {
+    this.initConfig();
+  },
   methods: {
+    initConfig() {
+      const searchFields = [];
+      const searchFieldsIndexs = [];
+      if (this.config.search) {
+        const searchOptions = this.config.search.options;
+        for (const item of searchOptions) {
+          for (let i = 0; i < this.fields.length; i++) {
+            const element = this.fields[i];
+            if (element.prop === item.prop) {
+              searchFields.push(item);
+              searchFieldsIndexs.push(i);
+            }
+          }
+        }
+      }
+      this.searchFields = searchFields;
+      this.$refs.configRef.search.fields = searchFieldsIndexs;
+
+      const tableFields = [];
+      const tableFieldsIndexs = [];
+      if (this.config.table) {
+        const tableOptions = this.config.table.options;
+        for (const item of tableOptions) {
+          for (let i = 0; i < this.fields.length; i++) {
+            const element = this.fields[i];
+            if (element.prop === item.prop) {
+              tableFields.push(item);
+              tableFieldsIndexs.push(i);
+            }
+          }
+        }
+      }
+      this.tableFields = tableFields;
+      this.$refs.configRef.table.fields = tableFieldsIndexs;
+    },
     handleFieldsChange(val) {
       const type = val.type;
       const data = val.data;
@@ -113,7 +169,7 @@ export default {
       const tableConfig = this.$refs.configRef.getJson();
       tableConfig.search.options = this.searchFields;
       tableConfig.table.options = this.tableFields;
-      return tableConfig
+      return tableConfig;
     }
   }
 };

package/packages/TableMaking/util/index.js

@@ -317,7 +317,8 @@ const tableConfig = {
       delete: { show: true, name: "删除", position: 2 },
       batchDelete: { show: true, name: "批量删除", position: 1 },
       export: { show: true, name: "导出", position: 1 },
-      import: { show: true, name: "导入", position: 1 }
+      import: { show: true, name: "导入", position: 1 },
+      key_123456:{}
     },
     network: {
       mounted: {

package/packages/TableMaking/widgetConfig.vue

@@ -50,7 +50,7 @@
         label-width="80px"
         size="mini"
       >
-        <el-collapse v-model="tableCollapse" @change="handleChange">
+        <el-collapse v-model="tableCollapse">
           <el-collapse-item title="表格配置" name="1">
             <el-form-item label="高级查询">
               <el-switch v-model="tableConfig.search.show"> </el-switch>