bri-components 1.2.34 → 1.2.36

package/src/components/form/DshForm.vue

@@ -5,6 +5,7 @@
         :model="formData"
         :rules="showRules ? rules : {}"
         @submit.native.prevent
+        @on-validate="validateCb"
     >
         <Row>
             <template v-if="displayFormList.length">
@@ -21,7 +22,7 @@
                             @click.native="clickControl(formItem)"
                         >
                             <dsh-form-unit
-                                ref="dshFormItem"
+                                ref="dshFormUnit"
                                 :canEdit="canEdit"
                                 :formData="formData"
                                 :formItem="formItem"
@@ -99,11 +100,11 @@
             DshFormUnit
         },
         props: {
-            // 启用该参数后，查看状态时，空值字段不显示
-            notShowEmpty: {
-                type: Boolean,
-                default: false
-            },
+            // // 启用该参数后，查看状态时，空值字段不显示
+            // notShowEmpty: {
+            //     type: Boolean,
+            //     default: false
+            // },
             canEdit: {
                 type: Boolean,
                 default: true
@@ -158,6 +159,10 @@
         data () {
             return {
                 rules: {},
+                errorObj: {
+                    errors: []
+                },
+
                 forceValidateTypes: [
                     "select", "cascader", "regions", "cascaders", "file", "coordinates", "editor",
                     "users", "departments", "labels", "flatTable", "reference", "referenceBy"
@@ -204,13 +209,57 @@
             getFormVDom () {
                 return this.$refs.form;
             },
-            // 控件校验
-            validate (callback) {
+            submit () {
+                this.errorObj = {
+                    errors: []
+                };
+
+                this.$refs.form.validate(valid => {
+                    // 此函数有时早于某些字段的validateCb，不稳定，所以加setTimeout目的确保最后执行
+                    setTimeout(() => {
+                        // if (!valid) {
+                        //     this.displayFormList.forEach(formItem => {
+                        //         const resultObj = this.$getFieldRuleResult(formItem, this.formData);
+                        //         if (resultObj.bool === false) {
+                        //             this.errorObj.errors.push(resultObj);
+                        //         }
+                        //     });
+                        // }
+                        const selfValid = this.selfValidate((valid, errorFormList) => {
+                            if (valid === false) {
+                                errorFormList.forEach(formItem => {
+                                    this.errorObj.errors.push({
+                                        bool: false,
+                                        message: `${formItem._name} 内部校验不正确！`
+                                    });
+                                });
+                            }
+                        });
+
+                        if (valid && selfValid) {
+                            this.rulesSuccess({});
+                        } else {
+                            this.rulesFailed(this.errorObj);
+                        }
+                    }, 0);
+                });
+            },
+            // iview的校验回调
+            validateCb (prop, status, error) {
+                if (status === false) {
+                    this.errorObj.errors.push({
+                        bool: false,
+                        message: error
+                    });
+                }
+            },
+            // 控件自己的校验
+            selfValidate (callback) {
                 let bool = true;
                 let errorRefs = [];
 
-                if (this.$refs.dshFormItem) {
-                    errorRefs = this.$refs.dshFormItem.filter(refItem => !refItem.validate());
+                if (this.$refs.dshFormUnit) {
+                    errorRefs = this.$refs.dshFormUnit.filter(refItem => !refItem.validate());
                     bool = !errorRefs.length;
                 } else {
                     bool = true;
@@ -219,6 +268,14 @@
 
                 return bool;
             },
+            // 校验成功
+            rulesSuccess (obj) {
+                this.$emit("rulesSuccess", obj);
+            },
+            // 校验失败
+            rulesFailed (errorObj) {
+                this.$emit("rulesFailed", errorObj);
+            },
 
             // 点击控件
             clickControl (formItem) {
@@ -260,7 +317,7 @@
                 // 格式校验 （不依赖必填）
                 if (ruleConfig.regs.length) {
                     rules.push({
-                        message: formItem._regMessage || `${formItem._name}格式不正确`,
+                        message: formItem._regMessage || `${formItem._name} 格式不正确！`,
                         trigger: "blur",
                         transform: (val) => {
                             if (this.$isEmptyData(val)) {
@@ -280,7 +337,7 @@
                             fields: {
                                 lnglat: {
                                     required: true,
-                                    message: `${formItem._name}为必填项`,
+                                    message: `${formItem._name} 为必填项！`,
                                     type: "array"
                                 }
                             }
@@ -289,7 +346,7 @@
                             fields: {
                                 list: {
                                     required: true,
-                                    message: `${formItem._name}不能为空行！`,
+                                    message: `${formItem._name} 不能为空行！`,
                                     type: "array"
                                 }
                             }
@@ -297,7 +354,7 @@
                         referenceBy: {
                             fields: {
                                 count: {
-                                    message: `${formItem._name}必须关联数据！`,
+                                    message: `${formItem._name} 必须关联数据！`,
                                     type: "number",
                                     transform: (val) => {
                                         if (val && val > 0) {
@@ -313,7 +370,7 @@
 
                     rules.push({
                         required: true,
-                        message: `${formItem._name}为必填项！`,
+                        message: `${formItem._name} 为必填项！`,
                         trigger: "blur, change",
                         type: "string",
                         ...(subFieldsMap[formItem._type] || {}),

package/src/components/list/BriFlatTable.vue

@@ -423,22 +423,7 @@
             // 是否显示 单元格校验提示文字
             getRuleResult (col, row, showRuleMessage = this.showRuleMessage) {
                 if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || showRuleMessage) {
-                    const val = row[col._key];
-                    const ruleConfig = this.$getFieldRuleConfig(col);
-                    // 为空 校验必填；不为空 格式校验 （不是必填也要校验格式）
-                    return this.$isEmptyData(val)
-                        ? {
-                            bool: !col._required,
-                            message: `${col._name}为必填项`
-                        }
-                        : ruleConfig.regs && ruleConfig.regs.length
-                            ? {
-                                bool: ruleConfig.regs.every(regItem => regItem.test(val)),
-                                message: col._regMessage || `${col._name}格式不正确`
-                            }
-                            : {
-                                bool: true
-                    };
+                    return this.$getFieldRuleResult(col, row);
                 } else {
                     return {
                         bool: true

package/src/components/small/DshButtons.vue

@@ -11,7 +11,7 @@
             <div class="DshButtons-flex-left">
                 <bri-button
                     v-for="(operationItem, index) in leftFlatList"
-                    :key="operationItem.type"
+                    :key="operationItem._key || operationItem.type"
                     :style="operationItem.style"
                     :class="[
                         index ? 'dsh-margin-left8' : undefined,
@@ -56,7 +56,7 @@
 
                 <bri-button
                     v-for="(operationItem, index) in rightList"
-                    :key="operationItem.type"
+                    :key="operationItem._key || operationItem.type"
                     :style="operationItem.style"
                     :class="[
                         index ? 'dsh-margin-left8' : undefined,
@@ -79,7 +79,7 @@
         <template v-else>
             <bri-button
                 v-for="(operationItem, index) in flatList"
-                :key="operationItem.type"
+                :key="operationItem._key || operationItem.type"
                 :style="operationItem.style"
                 :class="[
                     index ? 'dsh-margin-left8' : undefined,