tianheng-ui 0.1.25 → 0.1.27

package/package.json

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

package/packages/FormMaking/FormConfig.vue

@@ -5,10 +5,12 @@
       label-position="left"
       label-width="80px"
       size="small"
+      :rules="formRules"
+      ref="formRef"
     >
       <el-collapse v-model="collapseValue">
         <el-collapse-item title="表单配置" name="group-form">
-          <el-form-item required>
+          <el-form-item prop="fieldsType" required>
             <el-tooltip
               slot="label"
               effect="dark"
@@ -22,7 +24,11 @@
               <el-radio-button label="fieldsApi">接口导入</el-radio-button>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="config.fieldsType === 'fieldsApi'" required>
+          <el-form-item
+            v-if="config.fieldsType === 'fieldsApi'"
+            prop="fieldsApi"
+            required
+          >
             <el-tooltip
               slot="label"
               effect="dark"
@@ -48,7 +54,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="表单标题" required>
+          <el-form-item label="表单标题" prop="title" required>
             <el-input
               v-model="config.title"
               placeholder="请输入"
@@ -129,7 +135,18 @@ export default {
         "group-resultData",
         "group-label",
         "group-attributes"
-      ]
+      ],
+      formRules: {
+        fieldsType: [
+          { required: true, message: "请选择字段类型", trigger: "change" }
+        ],
+        fieldsApi: [
+          { required: true, message: "请选择字段类型", trigger: "change" }
+        ],
+        title: [
+          { required: true, message: "请选择字段类型", trigger: "change" }
+        ]
+      }
     };
   },
   methods: {
@@ -149,6 +166,13 @@ export default {
         });
         this.$emit("fieldsChange", fields);
       } else this.$emit("fieldsChange", []);
+    },
+    formValidate() {
+      return new Promise((resolve, reject) => {
+        this.$refs.formRef.validate(valid => {
+          resolve(valid);
+        });
+      });
     }
   }
 };

package/packages/FormMaking/WidgetForm.vue

@@ -3,7 +3,7 @@
     <th-empty
       class="form-empty"
       v-if="data.list.length == 0"
-      :image="require('@/assets/images/notData.png')"
+      :image="require('../../lib/theme-chalk/images/notData.png')"
       description="从左侧拖拽来添加字段"
     ></th-empty>
     <el-form

package/packages/FormMaking/index.vue

@@ -159,6 +159,7 @@
                   v-if="configTab == 'form'"
                   :config="formConfig.config"
                   @fieldsChange="handleFieldsChange"
+                  ref="formConfigRef"
                 ></form-config>
               </el-main>
             </el-container>
@@ -390,8 +391,36 @@ export default {
     clear() {
       this.handleClear();
     },
-    getJSON() {
-      return this.formConfig;
+    getConfig() {
+      if (this.$refs.formConfigRef) {
+        return new Promise((resolve, reject) =>
+          this.$refs.formConfigRef.formValidate().then(res => {
+            if (res) {
+              const data = deepClone(this.formConfig);
+              resolve(data);
+            } else {
+              reject();
+            }
+          })
+        );
+      } else {
+        return new Promise((resolve, reject) => {
+          if (!this.formConfig.config.fieldsType) {
+            this.$message.warning("请选择字段类型");
+            return reject();
+          }
+          if (!this.formConfig.config.fieldsApi) {
+            this.$message.warning("请选择字段接口");
+            return reject();
+          }
+          if (!this.formConfig.config.title) {
+            this.$message.warning("请填写表单标题");
+            return reject();
+          }
+          const data = deepClone(this.formConfig);
+          resolve(data);
+        });
+      }
     },
     getHtml() {
       return generateCode(JSON.stringify(this.formConfig));

package/packages/TableMaking/index.vue

@@ -39,7 +39,7 @@ export default {
     config: {
       type: Object,
       default: () => {
-        return deepClone(baseConfig);
+        return {};
       }
     },
 
@@ -86,6 +86,7 @@ export default {
     }
   },
   data() {
+    this.baseConfig = deepClone(baseConfig);
     return {
       tableConfig: this.config,
       client: "monitor"
@@ -99,14 +100,16 @@ export default {
       }
     },
     config(val) {
-      this.tableConfig = val;
+      this.tableConfig = Object.assign(this.baseConfig, val);
       this.handleNetwork();
     },
     apiOptions(val) {
       this.handleNetwork();
     }
   },
-  mounted() {},
+  mounted() {
+    this.tableConfig = Object.assign(this.baseConfig, this.tableConfig);
+  },
   methods: {
     handleNetwork() {
       const network = {};
@@ -129,10 +132,10 @@ export default {
           break;
       }
     },
-    getJson() {
+    getConfig() {
       return new Promise((resolve, reject) =>
         this.$refs.configRef
-          .handleFormValidate()
+          .formValidate()
           .then(res => {
             if (res) {
               const data = deepClone(this.tableConfig);

package/packages/TableMaking/widgetConfig.vue

@@ -609,7 +609,7 @@ export default {
         this.fields = fields;
       } else this.fields = [];
     },
-    handleFormValidate() {
+    formValidate() {
       return new Promise((resolve, reject) => {
         if (this.$refs.formRef) {
           this.$refs.formRef.validate(valid => {