meixioacomponent 1.1.53 → 1.1.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "1.1.53",
+  "version": "1.1.55",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/packages/components/base/{area/baseArea → baseArea}/baseArea.vue

@@ -92,7 +92,7 @@
 
 <script>
 import {json} from 'body-parser'
-import baseButtonHandleVue from '../../baseButtonHandle/baseButtonHandle.vue'
+import baseButtonHandleVue from '../baseButtonHandle/baseButtonHandle.vue'
 //
 import areaJson from './area'
 import areaConfig from './areaConfig'

package/packages/components/base/{area/baseArea → baseArea}/baseAreaV2.vue

@@ -16,7 +16,7 @@
 
 <script>
 import areaConfig from "./areaConfig";
-import {mixinsByArea} from "../mixins/mixinsByArea";
+import {mixinsByArea} from "../../mixins/mixinsByArea";
 //
 
 export default {

package/packages/components/base/{area/baseAreaByMultiple → baseAreaByMultiple}/baseAreaByMultiple.vue

@@ -23,7 +23,7 @@
  * 该组件不支持回显数据
  */
 import {defineComponent} from 'vue'
-import {mixinsByArea} from "../mixins/mixinsByArea";
+import {mixinsByArea} from "../../mixins/mixinsByArea";
 import areaConfig from "../baseArea/areaConfig";
 
 export default defineComponent({
@@ -55,6 +55,7 @@ export default defineComponent({
         }
         if (!this.tempItem[`idList`]) {
           this.tempItem[`idList`] = [];
+          this.tempItem[`idList`].length = level;
         }
         this.tempItem[`${areaConfig[level - 1].value}`] = label;
         this.tempItem[`idList`][level - 1] = data.code;

package/packages/components/index.js

@@ -2,8 +2,8 @@
 exports.__esModule = true;
 var baseAnchor_1 = require("./base/baseAnchor");
 var baseAppendix_1 = require("./base/baseAppendix");
-var baseArea_1 = require("./base/area/baseArea");
-var baseAreaByMultiple_1 = require("./base/area/baseAreaByMultiple");
+var baseArea_1 = require("./base/baseArea");
+var baseAreaByMultiple_1 = require("./base/baseAreaByMultiple");
 var baseAvatar_1 = require("./base/baseAvatar");
 var baseButtonHandle_1 = require("./base/baseButtonHandle");
 var baseDefaultSvg_1 = require("./base/baseDefaultSvg");

package/packages/components/index.ts

@@ -1,7 +1,7 @@
 import baseAnchor from "./base/baseAnchor";
 import baseAppendix from "./base/baseAppendix";
-import baseArea from "./base/area/baseArea";
-import baseAreaByMultiple from "./base/area/baseAreaByMultiple"
+import baseArea from "./base/baseArea";
+import baseAreaByMultiple from "./base/baseAreaByMultiple"
 import baseAvatar from "./base/baseAvatar";
 import baseButtonHandle from "./base/baseButtonHandle";
 import baseDefaultSvg from "./base/baseDefaultSvg";

package/packages/components/{base/area/mixins → mixins}/mixinsByArea.js

@@ -1,4 +1,4 @@
-import {GetAreaTree} from "../baseArea/api";
+import {GetAreaTree} from "../base/baseArea/api";
 
 export const mixinsByArea = {
 

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

@@ -125,14 +125,14 @@
 
 <script>
 import pro_form_itemVue from './proFormItem/pro_form_item.vue'
-import baseAreaV2 from "../../base/area/baseArea/baseAreaV2.vue";
+import baseAreaV2 from "../../base/baseArea/baseAreaV2.vue";
 import baseUploadVue from '../../base/baseUpload/baseUpload.vue'
 import pro_formItem_skeletonVue from './pro_form-item_skeleton.vue'
 import baseButtonHandleVue from '../../base/baseButtonHandle/baseButtonHandle.vue'
 //
 import {ArrayChunk} from '../../../utils/utils'
 import BaseNumberInput from '../../base/baseNumberInput/index.vue'
-import BaseArea from "../../base/area/baseArea/baseArea.vue";
+import BaseArea from "../../base/baseArea/baseArea.vue";
 
 export default {
   name: 'baseForm',
@@ -320,42 +320,47 @@ export default {
       this.chunkLength = 3
     },
 
-    formItemConfirm(params) {
+    async formItemConfirm(params) {
       if (params.config.type === 'area') {
-        this.formAreaConfirm(params)
+        this.$nextTick(() => {
+          this.formAreaConfirm(params)
+        })
         return
       }
-      let result = this.submitVerifiData(params)
+      let result = await this.submitVerifiData(params)
       if (result) {
         params.this.handleConfirm()
         this.$emit('formItemConfirm', params.config)
       }
     },
-    formAreaConfirm(params) {
-      let result = this.submitVerifiData(params)
+    async formAreaConfirm(params) {
+      let result = await this.submitVerifiData(params)
       if (result) {
-        this.$refs[`area-${params.config.key}`][0].doClose()
         this.$emit('formItemConfirm', params.config)
       } else {
         this.$message.error('请重新选择')
       }
     },
     submitVerifiData(params) {
-      if (this.$props.rules) {
-        // element 验证单条表单修改
-        let confrim = true
-        const rulesItem = this.$props.rules[params.config.key]
-        if (rulesItem) {
-          this.$refs.form.validateField(`${params.config.key}`, (errorMsg) => {
-            if (errorMsg) {
-              confrim = false
-            }
-          })
+
+      return new Promise((resolve, reject) => {
+        if (this.$props.rules) {
+          // element 验证单条表单修改
+          let confirm = true
+          const rulesItem = this.$props.rules[params.config.key]
+          if (rulesItem) {
+            this.$refs.form.validateField(`${params.config.key}`, (errorMsg) => {
+              if (errorMsg) {
+                confirm = false
+              }
+              resolve(confirm);
+            })
+          }
+        } else {
+          resolve(true);
         }
-        return confrim
-      } else {
-        return true
-      }
+      })
+
     },
 
     // 返回form表单值