tianheng-ui 0.0.60 → 0.0.62

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.0.60",
+  "version": "0.0.62",
   "author": "shu lang <403732931@qq.com>",
   "license": "MIT",
   "private": false,
@@ -25,7 +25,6 @@
     "mini-css-extract-plugin": "^2.6.1",
     "normalize.css": "^8.0.1",
     "nprogress": "^0.2.0",
-    "vant": "^2.12.50",
     "viewerjs": "^1.10.5",
     "vue": "^2.5.11",
     "vue-i18n": "^5.0.3",

package/packages/FormMaking/GenerateForm.vue

@@ -1,24 +1,24 @@
 <template>
-  <div>
+  <div v-if="formJson.config">
     <el-form
       class="generateForm"
-      :class="{ 'form-hideLabel': data.config.hideLabel }"
+      :class="{ 'form-hideLabel': formJson.config.hideLabel }"
       :style="{ width: formWidth }"
-      :label-suffix="data.config.labelSuffix"
-      :size="data.config.size"
+      :label-suffix="formJson.config.labelSuffix"
+      :size="formJson.config.size"
       :model="models"
-      :label-position="data.config.labelPosition"
-      :label-width="data.config.labelWidth + 'px'"
+      :label-position="formJson.config.labelPosition"
+      :label-width="formJson.config.labelWidth + 'px'"
       ref="generateForm"
     >
       <genetate-form-item
-        v-for="item in data.list"
+        v-for="item in formJson.list"
         :key="item.key"
         :models.sync="models"
         :widget="item"
         :slotKeys="slotKeys"
         :remote="remote"
-        :config="data.config"
+        :config="formJson.config"
         :prop="item.type === 'grid' ? '' : item.model"
         :componentsData="componentsData"
         @input-change="onInputChange"
@@ -31,21 +31,21 @@
     <!-- <van-form
       v-else
       class="generateForm"
-      :class="{ 'form-hideLabel': data.config.hideLabel }"
+      :class="{ 'form-hideLabel': formJson.config.hideLabel }"
       :style="{ width: formWidth }"
       style="margin: 0 auto;"
-      :label-align="data.config.labelPosition"
-      :label-width="data.config.labelWidth + 'px'"
+      :label-align="formJson.config.labelPosition"
+      :label-width="formJson.config.labelWidth + 'px'"
       ref="generateForm"
     >
       <genetate-form-item-h5
-        v-for="item in data.list"
+        v-for="item in formJson.list"
         :key="item.key"
         :models.sync="models"
         :widget="item"
         :slotKeys="slotKeys"
         :remote="remote"
-        :config="data.config"
+        :config="formJson.config"
         :prop="item.type === 'grid' ? '' : item.model"
         :componentsData="componentsData"
         @input-change="onInputChange"
@@ -60,35 +60,80 @@
 
 <script>
 import GenetateFormItem from "./GenerateFormItem";
-import GenetateFormItemH5 from "./GenerateFormItemH5";
-import Vue from "vue";
-import { Form } from "vant";
-Vue.use(Form);
+// import GenetateFormItemH5 from "./GenerateFormItemH5";
+// import Vue from "vue";
+// import { Form } from "vant";
+// Vue.use(Form);
 
 export default {
   name: "th-generate-form",
-  components: { GenetateFormItem, GenetateFormItemH5 },
-  props: ["data", "remote", "value", "insite", "slotKeys", "client"],
+  components: { GenetateFormItem },
+  props: {
+    data: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    remote: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    value: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    slotKeys: {
+      type: Array,
+      default: () => {
+        return [];
+      }
+    },
+    client: String
+  },
   data() {
     return {
+      formJson: this.data,
       models: {},
       componentsData: []
     };
   },
   computed: {
     formWidth() {
-      if (this.data.config.width) return this.data.config.width;
+      if (this.formJson.config.width) return this.formJson.config.width;
       if (this.client === "mobile") return "375px";
 
       return "";
     }
   },
+  watch: {
+    data(val) {
+      this.formJson = val;
+    },
+    formJson: {
+      handler(val) {
+        this.$emit("update:data", val);
+      },
+      deep: true
+    },
+    value: {
+      deep: true,
+      handler(val) {
+        this.models = { ...this.models, ...val };
+      }
+    }
+  },
   created() {
-    this.generateModle(this.data.list);
+    this.generateModle(this.formJson.list);
   },
   mounted() {},
   methods: {
     generateModle(genList, modelObj) {
+      if (!genList) return;
       genList.map(item => {
         if (item.type === "grid") {
           item.columns.forEach(item => {
@@ -185,20 +230,9 @@ export default {
     onInputChange(value, field) {
       this.$emit("on-change", field, value, this.models);
     },
-    refresh() {}
-  },
-  watch: {
-    data: {
-      deep: true,
-      handler(val) {
-        // this.generateModle(val.list);
-      }
-    },
-    value: {
-      deep: true,
-      handler(val) {
-        this.models = { ...this.models, ...val };
-      }
+    setJSON(json) {
+      this.formJson = json;
+      this.generateModle(this.formJson.list);
     }
   }
 };

package/packages/FormMaking/custom/items/button.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-button
+  <th-button
     :style="{
       width: widget.options.width,
       height: widget.options.height
@@ -14,7 +14,7 @@
     :icon="widget.options.buttonIcon"
   >
     {{ widget.options.defaultValue }}
-  </el-button>
+  </th-button>
 </template>
 
 <script>

package/packages/FormMaking/custom/items/input.vue

@@ -25,9 +25,6 @@
 
 <script>
 import { itemsComponent } from "../mixins/index";
-import Vue from "vue";
-import { Field } from "vant";
-Vue.use(Field);
 export default {
   mixins: [itemsComponent]
 };