tianheng-ui 0.1.56 → 0.1.58

package/package.json

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

package/packages/FormMaking/GenerateForm.vue

@@ -98,7 +98,7 @@ export default {
   data() {
     return {
       formConfig: this.config,
-      models: {},
+      models: this.value,
       query: {},
       componentsData: [],
       axios: null,
@@ -108,7 +108,6 @@ export default {
   computed: {
     formWidth() {
       if (this.formConfig.config.width) return this.formConfig.config.width;
-
       return "";
     }
   },
@@ -116,17 +115,8 @@ export default {
     config(val) {
       this.setConfig(val);
     },
-    formConfig: {
-      handler(val) {
-        this.$emit("update:config", val);
-      },
-      deep: true
-    },
-    value: {
-      deep: true,
-      handler(val) {
-        this.models = { ...this.models, ...val };
-      }
+    value(val) {
+      if (val) this.models = val;
     }
   },
   created() {
@@ -136,11 +126,11 @@ export default {
   },
   mounted() {
     this.generateModle(this.formConfig.list, this.models);
-    this.showForm = true;
     this.handleMountedRemotData();
+    this.showForm = true;
   },
   methods: {
-    generateModle(genList, modelObj) {
+    generateModle(genList, modelObj, pModel) {
       if (!genList) return;
       genList.map(item => {
         if (item.type === "grid") {
@@ -149,7 +139,7 @@ export default {
             modelObj[item.model] = dic;
 
             item.options.columns.forEach(item => {
-              this.generateModle(item.list, dic);
+              this.generateModle(item.list, dic, item.model);
             });
           } else {
             item.options.columns.forEach(item => {
@@ -172,14 +162,7 @@ export default {
           modelObj[item.model] = arr || [dic];
 
           this.generateModle(item.options.columns, dic);
-        }
-        // else if (modelObj) {
-        //   if (!modelObj[item.model]) {
-        //     this.$set(modelObj, item.model, item.options.defaultValue);
-        //   }
-        //   this.generateRules(item);
-        // }
-        else if (item.type === "blank") {
+        } else if (item.type === "blank") {
           const value = eval(`this.value.${item.model}`);
           const defaultValue = { String: "", Object: {}, Array: [] }[
             item.options.defaultType
@@ -283,8 +266,10 @@ export default {
       };
       const params = {};
       for (let e of api.inParams) {
-        const value = getProperty(this.query, e.alias) || null;
-        setProperty(params, e.alias, value);
+        const value =
+          getProperty(this.models, e.pAlias) ||
+          getProperty(this.query, e.pAlias);
+        setProperty(params, e.pAlias, value);
       }
       if (api.needPage) {
         params.pageNum = params.pageNum || 1;

package/packages/FormMaking/WidgetTools.vue

@@ -166,6 +166,7 @@
           v-if="dialog.show"
           :config="formData"
           :oauthConfig="oauthConfig"
+          :value="{ user: { name: '123' }, name: '111' }"
           :slotKeys="slotKeys"
           @change="handleDataChange"
           @button-submit="handleButtonSubmit"