tianheng-ui 0.1.18 → 0.1.20

package/package.json

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

package/packages/FormMaking/GenerateForm.vue

@@ -121,7 +121,7 @@ export default {
     },
     formJson: {
       handler(val) {
-        this.$emit("update:data", val);
+        this.$emit("update:config", val);
       },
       deep: true
     },

package/packages/FormMaking/index.vue

@@ -292,8 +292,8 @@ export default {
     widgetFormData: {
       deep: true,
       handler: function(val) {
-        this.$emit("update:data", val);
-        this.$emit("on-change", val);
+        this.$emit("update:config", val);
+        // this.$emit("on-change", val);
       }
     },
     config(val) {

package/packages/TableMaking/index.vue

@@ -2,7 +2,7 @@
   <div class="th-table-making th-flex_box">
     <div class="th-fiex_content">
       <widget-tools
-        :config="config"
+        :config="tableConfig"
         :client="client"
         :permissions="permissions"
         @click="handleToolsClick"
@@ -11,12 +11,12 @@
       </widget-tools>
       <widget-table
         style="height:calc(100% - 45px)"
-        :config="config"
+        :config="tableConfig"
       ></widget-table>
     </div>
     <div class="th-flex_aside th-is_border_left" style="width:300px">
       <widget-config
-        :config="config"
+        :config="tableConfig"
         :fields.sync="fields"
         :formOptions="formOptions"
         :apiOptions="apiOptions"
@@ -31,7 +31,7 @@ import WidgetTools from "./WidgetTools.vue";
 import WidgetTable from "./widgetTable.vue";
 import WidgetConfig from "./widgetConfig.vue";
 import { deepClone, deepMerge } from "./util/index";
-import { tableConfig } from "./custom/config";
+import { baseConfig } from "./custom/config";
 export default {
   name: "ThTableMaking",
   components: { WidgetTools, WidgetTable, WidgetConfig },
@@ -39,7 +39,7 @@ export default {
     config: {
       type: Object,
       default: () => {
-        return deepClone(tableConfig);
+        return deepClone(baseConfig);
       }
     },
     fields: Array,
@@ -88,19 +88,19 @@ export default {
   },
   data() {
     return {
-      config: this.data,
+      tableConfig: this.config,
       client: "monitor"
     };
   },
   watch: {
-    config: {
+    tableConfig: {
       deep: true,
       handler: function(val) {
-        this.$emit("update:data", val);
+        this.$emit("update:config", val);
       }
     },
-    data(val) {
-      this.config = val;
+    config(val) {
+      this.tableConfig = val;
       this.handleNetwork();
     },
     apiOptions(val) {
@@ -114,12 +114,12 @@ export default {
       this.apiOptions.map(item => {
         network[item.id] = item;
       });
-      this.config.network = network;
+      this.tableConfig.network = network;
     },
     handleToolsClick(action, data) {
       switch (action) {
         case "import-json":
-          this.config = data;
+          this.tableConfig = data;
           break;
 
         default:
@@ -132,22 +132,22 @@ export default {
           .handleFormValidate()
           .then(res => {
             if (res) {
-              const data = deepClone(this.config);
+              const data = deepClone(this.tableConfig);
               resolve(data);
             } else {
               reject();
             }
           })
           .catch(err => {
-            if (!this.config.table.title) {
+            if (!this.tableConfig.table.title) {
               this.$message.warning("请选择列表名称");
               return reject();
             }
-            if (!this.config.table.mounted.api) {
+            if (!this.tableConfig.table.mounted.api) {
               this.$message.warning("请选择列表接口");
               return reject();
             }
-            const data = deepClone(this.config);
+            const data = deepClone(this.tableConfig);
             resolve(data);
           })
       );