meixioacomponent 0.3.72 → 0.3.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "0.3.72",
+  "version": "0.3.73",
   "private": false,
   "author": "YuRi",
   "main": "lib/meixioacomponent.umd.min.js",

package/packages/components/proForm/dialogForm/baseDialogForm.vue

@@ -27,7 +27,9 @@
             :form="true"
             :size="size"
             :footer="false"
+            ref="proFormVue"
             :formConfig="item"
+            :isDialogForm="true"
             :disables="disables"
             :rowNumber="rowNumber"
             :labelWidth="labelWidth"
@@ -35,7 +37,6 @@
             :rules="returnRules(item.key)"
             :labelPosition="setLabelPosition(item.formType)"
             :formType="item.formType ? item.formType : 'default'"
-            ref="proFormVue"
             @disableWatcherResult="disableWatcherResult"
           >
             <template v-for="slotItem in slotList">
@@ -59,20 +60,20 @@
 </template>
 
 <script>
-import pro_formVue from "../proForm/pro_form.vue";
-import baseButtonHandleVue from "../../base/baseButtonHandle/baseButtonHandle.vue";
+import pro_formVue from '../proForm/pro_form.vue'
+import baseButtonHandleVue from '../../base/baseButtonHandle/baseButtonHandle.vue'
 export default {
-  name: "baseDialogForm",
+  name: 'baseDialogForm',
   data() {
     return {
       slotList: [],
-    };
+    }
   },
   created() {
-    this.createSlots();
+    this.createSlots()
   },
   beforeDestroy() {
-    this.$parent.$destroy();
+    this.$parent.$destroy()
   },
   mounted() {},
   props: {
@@ -83,7 +84,7 @@ export default {
     top: {
       type: Number,
       default: () => {
-        return document.documentElement.clientHeight * 0.15;
+        return document.documentElement.clientHeight * 0.15
       },
     },
     // 是否开启拖拽
@@ -108,7 +109,7 @@ export default {
     // 每一个itemlabel的宽度
     labelWidth: {
       type: String,
-      default: "100px",
+      default: '100px',
     },
     // 弹框尾部
     footerHandleConfig: {
@@ -121,7 +122,7 @@ export default {
     },
     size: {
       type: String,
-      default: "small",
+      default: 'small',
     },
     rowNumber: {
       type: Number,
@@ -130,12 +131,12 @@ export default {
 
     footerButtonSize: {
       type: String,
-      default: "small",
+      default: 'small',
     },
 
     contentHeight: {
       type: String,
-      default: "50vh",
+      default: '50vh',
     },
     labelPosition: {
       type: String,
@@ -149,102 +150,102 @@ export default {
   computed: {
     module: {
       set(val) {
-        this.$emit("input", val);
+        this.$emit('input', val)
       },
       get() {
-        return this.$props.value;
+        return this.$props.value
       },
     },
   },
   methods: {
     createSlots() {
       for (let i = 0; i < this.module.length; i++) {
-        let item = this.module[i];
+        let item = this.module[i]
         for (let j = 0; j < item.formList.length; j++) {
-          let citem = item.formList[j];
-          if (citem.type == "template") {
-            this.slotList.push(citem.key);
+          let citem = item.formList[j]
+          if (citem.type == 'template') {
+            this.slotList.push(citem.key)
           }
         }
       }
     },
     disableWatcherResult(params) {
-      const { result, type, key } = params;
-      let index = 0;
-      let cindex = -1;
+      const { result, type, key } = params
+      let index = 0
+      let cindex = -1
 
       for (let i = 0; i < this.module.length; i++) {
-        let item = this.module[i];
+        let item = this.module[i]
         for (let j = 0; j < item.formList.length; j++) {
-          let citem = item.formList[j];
+          let citem = item.formList[j]
           if (citem.key == key) {
-            index = i;
-            cindex = j;
-            break;
+            index = i
+            cindex = j
+            break
           }
         }
       }
 
       if (cindex > -1) {
-        let formItem = this.module[index].formList[cindex];
-        if (type == "hide") {
-          this.$set(formItem, "renderHide", result);
-        } else if (type == "disable") {
-          this.$set(formItem, "disabled", result);
+        let formItem = this.module[index].formList[cindex]
+        if (type == 'hide') {
+          this.$set(formItem, 'renderHide', result)
+        } else if (type == 'disable') {
+          this.$set(formItem, 'disabled', result)
         }
       }
     },
     setLabelPosition(type) {
       if (!type) {
-        return this.$props.labelPosition;
-      } else if (type == "upload") {
-        return "top";
+        return this.$props.labelPosition
+      } else if (type == 'upload') {
+        return 'top'
       }
     },
     returnRules(key) {
-      let rulesList = this.$props.rulesList;
-      if (!rulesList) return null;
-      let listItem = rulesList[`${key}`] ? rulesList[`${key}`] : null;
+      let rulesList = this.$props.rulesList
+      if (!rulesList) return null
+      let listItem = rulesList[`${key}`] ? rulesList[`${key}`] : null
       if (listItem) {
-        return listItem;
+        return listItem
       }
-      return null;
+      return null
     },
     showDialog() {
-      this.$refs.dialog.showDialog();
+      this.$refs.dialog.showDialog()
     },
     closeDialog() {
-      this.$refs.dialog.closeDialog();
+      this.$refs.dialog.closeDialog()
     },
 
     getFormValue() {
-      let obj = {};
+      let obj = {}
       for (let i = 0; i < this.module.length; i++) {
-        let result = this.$refs.proFormVue[i].returnFormValue();
+        let result = this.$refs.proFormVue[i].returnFormValue()
         // obj[`${this.module[i].key}`] = result;
-        obj = { ...obj, ...result };
+        obj = { ...obj, ...result }
       }
-      return obj;
+      return obj
     },
     async checkValidate() {
-      let refs = this.$refs.proFormVue;
-      let validateResult = true;
+      let refs = this.$refs.proFormVue
+      let validateResult = true
       for (let i = 0; i < refs.length; i++) {
-        let validate = await refs[i].checkValidate();
-        validateResult = validate.result;
+        let validate = await refs[i].checkValidate()
+        validateResult = validate.result
         //console.log(result);
         if (!validateResult) {
-          return validateResult;
+          return validateResult
         }
       }
-      return validateResult;
+      return validateResult
     },
     destroyForDialog() {
-      this.$destroy();
+      this.$destroy()
     },
   },
   watch: {},
-};
+}
 </script>
 
 <style lang="less" scoped>
@@ -265,7 +266,7 @@ export default {
       justify-content: flex-start;
       margin-bottom: var(--margin-4);
       &::before {
-        content: "";
+        content: '';
         top: 0px;
         width: 4px;
         height: 100%;

package/packages/components/proForm/proForm/pro_form.vue

@@ -173,6 +173,11 @@ export default {
       default: 'small',
     },
 
+    isDialogForm: {
+      type: Boolean,
+      default: false,
+    },
+
     footButtonText: { type: Array, default: () => ['取消', '确定'] },
   },
   components: {
@@ -370,8 +375,8 @@ export default {
     },
 
     disableWatcherResult(params) {
-      const isBaseDialogForm = this.$parent.$options.name == 'baseDialogForm'
-      if (isBaseDialogForm) {
+      const { isDialogForm } = this.$props
+      if (isDialogForm) {
         this.$emit('disableWatcherResult', params)
       } else {
         const { result, type, key } = params