bri-components 1.2.38 → 1.2.40

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.2.38",
+    "version": "1.2.40",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

package/src/components/form/DshForm.vue

@@ -209,52 +209,41 @@
             getFormVDom () {
                 return this.$refs.form;
             },
+            // 校验
             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} 内部校验不正确！`
-                                    });
-                                });
-                            }
-                        });
+                const bool = this.getValid();
+                if (bool) {
+                    this.validateSuccess({});
+                } else {
+                    this.validateFailed(this.errorObj);
+                }
 
-                        if (valid && selfValid) {
-                            this.rulesSuccess({});
-                        } else {
-                            this.rulesFailed(this.errorObj);
-                        }
-                    }, 0);
-                });
+                return bool;
             },
-            // iview的校验回调
-            validateCb (prop, status, error) {
-                if (status === false) {
-                    this.errorObj.errors.push({
-                        bool: false,
-                        message: error
+            // 获取校验结果
+            getValid () {
+                let bool = true;
+
+                this.getFormVDom().validate(valid => {
+                    bool = bool && valid;
+                });
+                this.selfValidate((valid, errorFormList) => {
+                    bool = bool && valid;
+
+                    errorFormList.forEach(formItem => {
+                        this.validateCb(formItem._key, false, `${formItem._name} 内部校验不正确！`);
                     });
-                }
+                });
+
+                return bool;
             },
+
             // 控件自己的校验
-            selfValidate (callback) {
+            selfValidate (cb) {
                 let bool = true;
                 let errorRefs = [];
 
@@ -264,17 +253,26 @@
                 } else {
                     bool = true;
                 }
-                callback && callback(bool, errorRefs.map(errorRefItem => errorRefItem.formItem));
+                cb && cb(bool, errorRefs.map(errorRefItem => errorRefItem.formItem));
 
                 return bool;
             },
+            // iview的校验回调
+            validateCb (prop, valid, error) {
+                if (valid === false) {
+                    this.errorObj.errors.push({
+                        bool: false,
+                        message: error
+                    });
+                }
+            },
             // 校验成功
-            rulesSuccess (obj) {
-                this.$emit("rulesSuccess", obj);
+            validateSuccess (obj) {
+                this.$emit("validateSuccess", obj);
             },
             // 校验失败
-            rulesFailed (errorObj) {
-                this.$emit("rulesFailed", errorObj);
+            validateFailed (errorObj) {
+                this.$emit("validateFailed", errorObj);
             },
 
             // 点击控件

package/src/components/small/DshSteps.vue

@@ -7,11 +7,11 @@
             :size="selfPropsObj._size"
         >
             <Step
-                class="DshSteps-item"
                 v-for="(stepItem, stepIndex) in list"
-                :key="stepItem.type || stepItem._id || stepItem._key || stepIndex"
+                :key="stepItem._key || stepItem._id || tepItem.type || stepIndex"
+                class="DshSteps-item"
                 :status="stepItem.status"
-                :title="stepItem.name"
+                :title="stepItem.name || stepItem._name"
                 :content="stepItem.description"
                 :icon="stepItem.icon"
                 @click.native="clickStepItem(stepItem, stepIndex)"

package/src/components/small/DshTabs.vue

@@ -14,19 +14,21 @@
             <slot
                 v-if="renderStatusMap[tabItem._key]"
                 :tabItem="tabItem"
-            ></slot>
+            >
+                <span></span>
+            </slot>
         </TabPane>
 
         <div
             slot="extra"
-            class="DshTabs-extra"
+            class="extra"
         >
             <span
                 v-for="tabItem in rightTabList"
                 :key="tabItem._key"
                 :class="{
-                    'DshTabs-extra-item': true,
-                    'DshTabs-extra-item-active': tabItem._key === curTabKey
+                    'extra-item': true,
+                    'extra-item-active': tabItem._key === curTabKey
                 }"
                 @click="curTabKey = tabItem._key"
             >
@@ -119,7 +121,7 @@
             padding-top: 20px;
         }
 
-        &-extra {
+        .extra {
             height: 100%;
 
             &-item {
@@ -132,16 +134,16 @@
                     color: @themeColor;
                     position: relative;
 
-                    &::after {
-                        content: "";
-                        width: 100%;
-                        height: 2px;
-                        position: absolute;
-                        bottom: 0px;
-                        left: 0;
-                        z-index: 1;
-                        background-color: @themeColor;
-                    }
+                    // &::after {
+                    //     content: "";
+                    //     width: 100%;
+                    //     height: 2px;
+                    //     position: absolute;
+                    //     bottom: 0px;
+                    //     left: 0;
+                    //     z-index: 1;
+                    //     background-color: @themeColor;
+                    // }
                 }
             }
         }
@@ -163,7 +165,6 @@
 
                     .ivu-tabs-nav-container {
                         height: 100%;
-                        overflow: visible;
 
                         .ivu-tabs-nav-wrap {
 
@@ -231,6 +232,7 @@
                     }
 
                     .ivu-tabs-nav-container {
+                        overflow: visible;
 
                         .ivu-tabs-nav-wrap {
 
@@ -274,6 +276,23 @@
 
         // 页面编辑版
         &-page {
+            .extra {
+                &-item {
+                    &-active {
+                        &::after {
+                            content: "";
+                            width: 100%;
+                            height: 2px;
+                            position: absolute;
+                            bottom: 0px;
+                            left: 0;
+                            z-index: 1;
+                            background-color: @themeColor;
+                        }
+                    }
+                }
+            }
+
             .ivu-tabs {
 
                 &-bar {

package/src/styles/components/controls/base/DshSwitch.less

@@ -1,7 +1,7 @@
 .DshSwitch {
     width: 100%;
-
-    &-show {
+    
+    .DshSwitch-show {
         .bri-unit-show();
     }
 }