tianheng-ui 0.1.43 → 0.1.45

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

@@ -21,9 +21,9 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 export default {
-  mixins: [itemsComponent]
+  mixins: [itemsComponent, eventMixin]
 };
 </script>
 

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

@@ -5,9 +5,9 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 export default {
-  mixins: [itemsComponent]
+  mixins: [itemsComponent, eventMixin]
 };
 </script>
 

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

@@ -11,11 +11,11 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 import { VueEditor } from "vue2-editor";
 export default {
   components: { VueEditor },
-  mixins: [itemsComponent]
+  mixins: [itemsComponent, eventMixin]
 };
 </script>
 

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

@@ -8,9 +8,9 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 export default {
-  mixins: [itemsComponent]
+  mixins: [itemsComponent, eventMixin]
 };
 </script>
 

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

@@ -41,13 +41,13 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 import Draggable from "vuedraggable";
 import WidgetFormItem from "../../WidgetFormItem.vue";
 
 export default {
   components: { Draggable, WidgetFormItem },
-  mixins: [itemsComponent],
+  mixins: [itemsComponent, eventMixin],
   data() {
     return {
       selectWidget: {}

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

@@ -13,9 +13,10 @@
         v-for="element in column.list"
         :key="element.key"
         :widget="element"
+        :model.sync="dataModel[element.model]"
         :models="models"
+        :pModel="getPModel"
         :config="config"
-        :prop="prop ? `${prop}.${element.model}` : element.model"
         :slotKeys="slotKeys"
         :componentsData="componentsData"
       >
@@ -28,15 +29,28 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 import GenerateFormItem from "../../GenerateFormItem.vue";
 export default {
   components: { GenerateFormItem },
-  mixins: [itemsComponent],
-  props: ["models", "prop", "slotKeys", "componentsData"],
+  mixins: [itemsComponent, eventMixin],
+  props: ["slotKeys", "componentsData"],
   data() {
     return {};
   },
+  computed: {
+    getPModel() {
+      let pModel = "";
+      if (this.widget.options.isEntity) {
+        pModel = this.pModel
+          ? `${this.pModel}.${this.widget.model}`
+          : `${this.widget.model}`;
+      } else {
+        pModel = this.pModel ? `${this.pModel}` : "";
+      }
+      return pModel;
+    }
+  },
   methods: {}
 };
 </script>

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

@@ -13,12 +13,12 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 import ThImage from "ui/Image/index.vue";
 
 export default {
   components: { ThImage },
-  mixins: [itemsComponent],
+  mixins: [itemsComponent, eventMixin],
   computed: {
     selfStyle() {
       const style = { display: "inline-block" };

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

@@ -27,9 +27,9 @@
 
 <script>
 import { inputTypeDict } from "../../util/index";
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 export default {
-  mixins: [itemsComponent],
+  mixins: [itemsComponent, eventMixin],
   methods: {
     inputTypeDict
   }

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

@@ -41,12 +41,12 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 import Draggable from "vuedraggable";
 import WidgetFormItem from "../../WidgetFormItem.vue";
 export default {
   components: { Draggable, WidgetFormItem },
-  mixins: [itemsComponent],
+  mixins: [itemsComponent, eventMixin],
   data() {
     return {
       selectWidget: {}

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

@@ -15,9 +15,9 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 export default {
-  mixins: [itemsComponent]
+  mixins: [itemsComponent, eventMixin]
 };
 </script>
 

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

@@ -45,9 +45,9 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 export default {
-  mixins: [itemsComponent]
+  mixins: [itemsComponent, eventMixin]
 };
 </script>
 

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

@@ -11,9 +11,9 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 export default {
-  mixins: [itemsComponent]
+  mixins: [itemsComponent, eventMixin]
 };
 </script>
 

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

@@ -29,9 +29,9 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 export default {
-  mixins: [itemsComponent]
+  mixins: [itemsComponent, eventMixin]
 };
 </script>
 

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

@@ -20,9 +20,9 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 export default {
-  mixins: [itemsComponent],
+  mixins: [itemsComponent, eventMixin],
   methods: {
     formatTooltip(val, num) {
       return val / num;

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

@@ -13,9 +13,9 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 export default {
-  mixins: [itemsComponent]
+  mixins: [itemsComponent, eventMixin]
 };
 </script>
 

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

@@ -43,12 +43,12 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 import Draggable from "vuedraggable";
 import WidgetFormItem from "../../WidgetFormItem.vue";
 export default {
   components: { Draggable, WidgetFormItem },
-  mixins: [itemsComponent],
+  mixins: [itemsComponent, eventMixin],
   data() {
     return {
       selectWidget: {}

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

@@ -12,14 +12,19 @@
       >
         <generate-form-item
           style="flex:1;"
-          :models.sync="column"
           :widget="element"
-          :config="config"
-          :prop="
-            element.type === 'grid'
-              ? `${prop}.${columnIndex}`
-              : `${prop}.${columnIndex}.${element.model}`
+          :model.sync="
+            element.type === 'grid' && !element.options.isEntity
+              ? column
+              : column[element.model]
+          "
+          :models="models"
+          :pModel="
+            pModel
+              ? `${pModel}.${columnIndex}`
+              : `${widget.model}.${columnIndex}`
           "
+          :config="config"
           :slotKeys="slotKeys"
           :componentsData="componentsData"
         >
@@ -56,31 +61,34 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 import GenerateFormItem from "../../GenerateFormItem.vue";
 export default {
   components: { GenerateFormItem },
-  mixins: [itemsComponent],
+  mixins: [itemsComponent, eventMixin],
   props: ["models", "prop", "slotKeys", "componentsData"],
   data() {
     return {};
   },
-
   methods: {
     handleTableAdd() {
       let dic = {};
-      this.widget.options.columns.map(item => {
-        if (item.type === "grid") {
-          for (let i = 0; i < item.options.columns.length; i++) {
-            const column = item.options.columns[i];
-            for (const element of column.list) {
-              dic[element.model] = element.options.defaultValue;
+      const initData = (list, data) => {
+        for (const item of list) {
+          if (item.type === "grid") {
+            if (item.options.isEntity) data[item.model] = {};
+            for (const column of item.options.columns) {
+              initData(
+                column.list,
+                item.options.isEntity ? data[item.model] : data
+              );
             }
+          } else {
+            data[item.model] = item.options.defaultValue;
           }
-        } else {
-          dic[item.model] = item.options.defaultValue;
         }
-      });
+      };
+      initData(this.widget.options.columns, dic);
       this.dataModel.push(dic);
     }
   }

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

@@ -30,12 +30,12 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 import Draggable from "vuedraggable";
 import WidgetFormItem from "../../WidgetFormItem.vue";
 export default {
   components: { Draggable, WidgetFormItem },
-  mixins: [itemsComponent],
+  mixins: [itemsComponent, eventMixin],
   data() {
     return {
       selectWidget: {}

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

@@ -24,10 +24,15 @@
     >
       <template slot-scope="scope">
         <generate-form-item
-          :models.sync="dataModel[scope.$index]"
           :widget="element"
+          :model.sync="dataModel[scope.$index][element.model]"
+          :models="models"
+          :pModel="
+            pModel
+              ? `${pModel}.${scope.$index}`
+              : `${widget.model}.${scope.$index}`
+          "
           :config="config"
-          :prop="`${prop}.${scope.$index}.${element.model}`"
           :slotKeys="slotKeys"
           :componentsData="componentsData"
         >
@@ -74,12 +79,12 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 import GenerateFormItem from "../../GenerateFormItem.vue";
 export default {
   components: { GenerateFormItem },
-  mixins: [itemsComponent],
-  props: ["models", "prop", "slotKeys", "componentsData"],
+  mixins: [itemsComponent, eventMixin],
+  props: ["slotKeys", "componentsData"],
   data() {
     return {};
   },

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

@@ -40,12 +40,12 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 import Draggable from "vuedraggable";
 import WidgetFormItem from "../../WidgetFormItem.vue";
 export default {
   components: { Draggable, WidgetFormItem },
-  mixins: [itemsComponent],
+  mixins: [itemsComponent, eventMixin],
   data() {
     return {
       selectWidget: {}

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

@@ -14,13 +14,18 @@
         v-for="element in column.list"
         :key="`tabs_${columnIndex}_${element.key}`"
         :widget="element"
-        :models.sync="dataModel[column.value]"
-        :config="config"
-        :prop="
-          element.type === 'grid'
-            ? `${prop}.${column.value}`
-            : `${prop}.${column.value}.${element.model}`
+        :model.sync="
+          element.type === 'grid' && !element.options.isEntity
+            ? dataModel[column.value]
+            : dataModel[column.value][element.model]
+        "
+        :models="models"
+        :pModel="
+          pModel
+            ? `${pModel}.${scope.$index}`
+            : `${widget.model}.${column.value}`
         "
+        :config="config"
         :slotKeys="slotKeys"
         :componentsData="componentsData"
       >
@@ -33,12 +38,12 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 import GenerateFormItem from "../../GenerateFormItem.vue";
 export default {
   components: { GenerateFormItem },
-  mixins: [itemsComponent],
-  props: ["models", "prop", "slotKeys", "componentsData"],
+  mixins: [itemsComponent, eventMixin],
+  props: ["slotKeys", "componentsData"],
   data() {
     return {};
   },

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

@@ -9,9 +9,9 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 export default {
-  mixins: [itemsComponent]
+  mixins: [itemsComponent, eventMixin]
 };
 </script>
 

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

@@ -19,9 +19,9 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 export default {
-  mixins: [itemsComponent]
+  mixins: [itemsComponent, eventMixin]
 };
 </script>
 

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

@@ -23,9 +23,9 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 export default {
-  mixins: [itemsComponent]
+  mixins: [itemsComponent, eventMixin]
 };
 </script>
 

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

@@ -55,9 +55,9 @@
 </template>
 
 <script>
-import { itemsComponent } from "../mixins/index";
+import { itemsComponent, eventMixin } from "../mixins/index";
 export default {
-  mixins: [itemsComponent],
+  mixins: [itemsComponent, eventMixin],
   data() {
     return {
       dialogVisible: false,

package/packages/FormMaking/custom/mixins/index.js

@@ -12,7 +12,7 @@ export const configComponent = {
         return {};
       }
     },
-    apiConfig: Object
+    apiOptions: Array
   },
   data() {
     return {};
@@ -28,24 +28,47 @@ export const configComponent = {
 };
 
 export const itemsComponent = {
-  props: ["value", "widget", "widgetArray", "models", "select", "config"],
+  props: [
+    "widget",
+    "model",
+    "pModel",
+    "widgetArray",
+    "models",
+    "select",
+    "config"
+  ],
   data() {
     return {
-      dataModel: this.value
+      dataModel: this.model
     };
   },
   watch: {
-    value(val) {
+    model(val) {
       this.dataModel = val;
     },
-    dataModel: {
-      handler(val) {
-        this.$emit("update:value", val);
-      },
-      deep: true
+    dataModel(val) {
+      this.$emit("update:model", val);
     }
   },
   methods: {
+    display(keys) {
+      console.log("请在 预览 模式下使用 display 方法");
+    },
+    hide(keys) {
+      console.log("请在 预览 模式下使用 hide 方法");
+    },
+    setData(obj) {
+      console.log("请在 预览 模式下使用 setData 方法");
+    },
+    getData(obj) {
+      console.log("请在 预览 模式下使用 getData 方法");
+    }
+  }
+};
+
+export const eventMixin = {
+  methods: {
+    // 支撑 JavaScript 动态编译
     handleEventAction(key) {
       const eventScript = this.config.eventScript;
       if (key) {
@@ -62,17 +85,50 @@ export const itemsComponent = {
         return;
       }
     },
+    // 显示组件
     display(keys) {
-      console.log("请在 预览 模式下使用 display 方法");
+      if (!keys || keys.length === 0) return;
+      for (let i = 0; i < keys.length; i++) {
+        const key = keys[i];
+        if (this.componentsData[key]) {
+          // this.componentsData[key].options.hidden = false;
+          this.$set(this.componentsData[key].options, "hidden", false);
+          console.log("display =>", keys, this.componentsData);
+        }
+      }
     },
+    // 隐藏组件
     hide(keys) {
-      console.log("请在 预览 模式下使用 hide 方法");
+      if (!keys || keys.length === 0) return;
+      for (let i = 0; i < keys.length; i++) {
+        const key = keys[i];
+        if (this.componentsData[key]) {
+          // this.componentsData[key].options.hidden = true;
+          this.$set(this.componentsData[key].options, "hidden", true);
+          console.log("hide =>", keys, this.componentsData);
+        }
+      }
     },
+    // 设置数据，仅支持修改当前组件节点下的数据
     setData(obj) {
-      console.log("请在 预览 模式下使用 setData 方法");
+      const keys = Object.keys(obj);
+      for (let i = 0; i < keys.length; i++) {
+        const arr = keys[i].split(".");
+        if (arr.length === 1) {
+          const key = keys[i];
+          const value = obj[key];
+          this.$set(this.models, key, value);
+        } else {
+          const key = arr.pop();
+          const value = obj[keys[i]];
+          const path = arr.join(".");
+          this.$set(eval(`this.models.${path}`), key, value);
+        }
+      }
     },
+    // 获取数据，仅支持获取当前组件节点下的数据
     getData(obj) {
-      console.log("请在 预览 模式下使用 getData 方法");
+      return this.models;
     }
   }
 };