tianheng-ui 0.1.10 → 0.1.12

package/package.json

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

package/packages/FormMaking/GenerateForm.vue

@@ -2,7 +2,7 @@
   <div v-if="formJson.config">
     <el-form
       class="generateForm"
-      :class="{ 'form-hideLabel': formJson.config.hideLabel }"
+      :class="{ isHideLabel: formJson.config.hideLabel }"
       :style="{ width: formWidth }"
       :label-suffix="formJson.config.labelSuffix"
       :size="formJson.config.size"
@@ -22,6 +22,7 @@
         :prop="item.type === 'grid' ? '' : item.model"
         :componentsData="componentsData"
         @input-change="onInputChange"
+        @button-submit="handleButtonSubmit"
       >
         <template v-for="name in slotKeys" :slot="name">
           <slot :name="name" />
@@ -132,6 +133,7 @@ export default {
     }
   },
   created() {
+    localStorage.setItem("_TH_OauthConfig", JSON.stringify(this.oauthConfig));
     this.axios = Axios.init(this.oauthConfig);
     this.generateModle(this.formJson.list);
   },
@@ -141,19 +143,19 @@ export default {
       if (!genList) return;
       genList.map(item => {
         if (item.type === "grid") {
-          item.columns.forEach(item => {
+          item.options.columns.forEach(item => {
             this.generateModle(item.list, modelObj);
           });
         } else if (item.type === "tabs") {
           if (modelObj) {
             this.$set(modelObj, item.model, {});
-            item.tabs.forEach(item2 => {
+            item.options.columns.forEach(item2 => {
               this.$set(modelObj[item.model], item2.value, {});
               this.generateModle(item2.list, modelObj[item.model][item2.value]);
             });
           } else {
             this.$set(this.models, item.model, {});
-            item.tabs.forEach(item2 => {
+            item.options.columns.forEach(item2 => {
               this.$set(this.models[item.model], item2.value, {});
               this.generateModle(
                 item2.list,
@@ -161,21 +163,21 @@ export default {
               );
             });
           }
-        } else if (item.type === "table" || item.type === "table_h5") {
+        } else if (item.type === "table" || item.type === "tableH5") {
           if (modelObj) {
             this.$set(
               modelObj,
               item.model,
               JSON.parse(item.options.defaultValue || "[]")
             );
-            this.generateModle(item.list, modelObj[item.model]);
+            this.generateModle(item.options.columns, modelObj[item.model]);
           } else {
             this.$set(
               this.models,
               item.model,
               JSON.parse(item.options.defaultValue || "[]")
             );
-            this.generateModle(item.list, this.models[item.model]);
+            this.generateModle(item.options.columns, this.models[item.model]);
           }
         } else if (modelObj) {
           if (!modelObj[item.model]) {
@@ -213,8 +215,8 @@ export default {
     generateRules(item) {
       if (!item.rules) item.rules = [];
       item.rules.forEach(rule => {
-        if (rule.pattern) {
-          rule.pattern = new RegExp(rule.pattern);
+        if (rule.patternStr) {
+          rule.pattern = new RegExp(rule.patternStr);
         }
       });
       this.hendleRemoteData(item);
@@ -225,7 +227,7 @@ export default {
 
       const remoteFunc = item.options.remoteFunc;
       this.axios({
-        url: remoteFunc.api,
+        url: remoteFunc.url,
         method: remoteFunc.method,
         headers: remoteFunc.headers,
         data: { ...remoteFunc.params }
@@ -240,6 +242,9 @@ export default {
         });
       });
     },
+    handleButtonSubmit(val){
+      this.$emit("button-submit", val);
+    },
     getData() {
       return new Promise((resolve, reject) => {
         this.$refs.generateForm.validate(valid => {
@@ -277,7 +282,7 @@ export default {
     }
   }
 
-  .form-hideLabel {
+  .isHideLabel {
     .el-form-item__label {
       display: none;
     }