tianheng-ui 0.1.16 → 0.1.18

package/package.json

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

package/packages/FormMaking/GenerateForm.vue

@@ -73,7 +73,7 @@ export default {
         return {};
       }
     },
-    data: {
+    config: {
       type: Object,
       default: () => {
         return {};
@@ -101,7 +101,7 @@ export default {
   },
   data() {
     return {
-      formJson: this.data,
+      formJson: this.config,
       models: {},
       componentsData: [],
       axios: null
@@ -116,7 +116,7 @@ export default {
     }
   },
   watch: {
-    data(val) {
+    config(val) {
       this.setJSON(val);
     },
     formJson: {

package/packages/FormMaking/custom/configs/image.vue

@@ -118,9 +118,7 @@ export default {
   },
   props: {},
   mixins: [configComponent],
-  mounted() {
-    console.log(this.widget);
-  },
+  mounted() {},
   methods: {
     handleAddImage() {
       const obj = {

package/packages/FormMaking/index.vue

@@ -194,7 +194,7 @@ export default {
     GenerateForm
   },
   props: {
-    data: {
+    config: {
       type: Object,
       default: () => {
         return { config: {}, list: [] };
@@ -261,7 +261,7 @@ export default {
     this.layoutComponents = layoutComponents;
     this.baseConfig = deepClone(baseConfig);
     return {
-      widgetFormData: this.data,
+      widgetFormData: this.config,
       widgetFormSelect: {},
       widgetValue: {},
       configTab: "widget",
@@ -296,7 +296,7 @@ export default {
         this.$emit("on-change", val);
       }
     },
-    data(val) {
+    config(val) {
       if (val && val.config) {
         val.config = Object.assign(this.baseConfig, val.config);
       }

package/packages/TableMaking/index.vue

@@ -36,7 +36,7 @@ export default {
   name: "ThTableMaking",
   components: { WidgetTools, WidgetTable, WidgetConfig },
   props: {
-    data: {
+    config: {
       type: Object,
       default: () => {
         return deepClone(tableConfig);
@@ -139,13 +139,16 @@ export default {
             }
           })
           .catch(err => {
+            if (!this.config.table.title) {
+              this.$message.warning("请选择列表名称");
+              return reject();
+            }
             if (!this.config.table.mounted.api) {
               this.$message.warning("请选择列表接口");
-              reject();
-            } else {
-              const data = deepClone(this.config);
-              resolve(data);
+              return reject();
             }
+            const data = deepClone(this.config);
+            resolve(data);
           })
       );
     }

package/packages/TableMaking/widgetConfig.vue

@@ -54,6 +54,12 @@
       >
         <el-collapse v-model="tableCollapse">
           <el-collapse-item title="表格配置" name="group-table">
+            <el-form-item label="列表名称" required prop="table.title">
+              <el-input
+                v-model="config.table.title"
+                placeholder="请输入"
+              ></el-input>
+            </el-form-item>
             <el-form-item label="列表接口" required prop="table.mounted.api">
               <el-select
                 v-model="config.table.mounted.api"
@@ -427,7 +433,7 @@ export default {
         { title: "列表字段", value: 1 },
         { title: "列表属性", value: 2 }
       ],
-      activeTab: { title: "查询字段", value: 0 },
+      activeTab: { title: "列表属性", value: 2 },
       searchField: {
         isCheckAll: false,
         isIndeterminate: false
@@ -448,9 +454,12 @@ export default {
         "group-button"
       ],
       formRules: {
+        "table.title": [
+          { required: true, message: "请选择列表名称", trigger: "change" }
+        ],
         "table.mounted.api": [
           { required: true, message: "请选择列表接口", trigger: "change" }
-        ]
+        ],
       },
       dialog: { show: false, data: null }
     };