tianheng-ui 0.0.87 → 0.0.89

package/package.json

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

package/packages/FormMaking/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="fm-container">
-    <el-container class="container-box">
+    <el-container v-if="widgetFormData.config" class="container-box">
       <el-main>
         <el-container>
           <!-- 左侧字段区 -->
@@ -458,11 +458,9 @@ export default {
     this.basicComponents = basicComponents;
     this.layoutComponents = layoutComponents;
     this.advanceComponents = advanceComponents;
+    this.baseConfig = JSON.parse(JSON.stringify(baseConfig));
     return {
-      widgetFormData: {
-        list: [],
-        config: JSON.parse(JSON.stringify(baseConfig))
-      },
+      widgetFormData: this.data,
       widgetFormSelect: {},
       widgetValue: {},
       configTab: "widget",
@@ -531,23 +529,28 @@ export default {
     },
     data(val) {
       if (val && val.config) {
-        val.config = Object.assign(this.widgetFormData.config, val.config);
+        val.config = Object.assign(this.baseConfig, val.config);
       }
       this.setJSON(val);
     }
   },
-  mounted() {
-    if (this.data && this.data.list) {
-      this.widgetFormData.list = this.data.list;
-      this.widgetFormSelect = this.data.list[0];
-    }
-    if (this.data && this.data.config) {
-      this.widgetFormData.config = Object.assign(
-        this.widgetFormData.config,
-        this.data.config
-      );
+  created() {
+    this.widgetFormData.config = Object.assign(
+      this.baseConfig,
+      this.widgetFormData.config
+    );
+    if (this.widgetFormData && this.widgetFormData.list.length) {
+      this.widgetFormSelect = this.widgetFormData.list[0];
     }
   },
+  mounted() {
+    // if (this.data && this.data.config) {
+    //   this.widgetFormData.config = Object.assign(
+    //     this.widgetFormData.config,
+    //     this.data.config
+    //   );
+    // }
+  },
   methods: {
     // 读取excel file
     readExcelFile(file) {
@@ -590,29 +593,7 @@ export default {
 
         let config = {
           list: [],
-          config: {
-            ui: "element",
-            title: "",
-            width: "",
-            labelWidth: 100,
-            labelPosition: "right",
-            labelSuffix: ":",
-            size: "small",
-            disabled: false,
-            hideLabel: false,
-            eventScript: [
-              {
-                key: "mounted",
-                name: "mounted",
-                func: ""
-              },
-              {
-                key: "refresh",
-                name: "refresh",
-                func: ""
-              }
-            ]
-          }
+          config: this.baseConfig
         };
 
         for (const row of rowsDom) {
@@ -768,7 +749,7 @@ export default {
     handleClear() {
       this.widgetFormData = {
         list: [],
-        config: baseConfig
+        config: this.baseConfig
       };
 
       this.widgetFormSelect = {};