bri-components 1.4.22 → 1.4.24

package/package.json

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

package/src/components/controls/base/DshNumber/BriInputNumber/BriInputNumber.vue

@@ -309,12 +309,16 @@
                 } else if (type === "down") {
                     val = addNum(val, -step);
                 }
+
                 this.setValue(val, "step");
             },
             setValue (val, setType) {
                 // 如果 step 是小数，且没有设置 precision，是有问题的
-                if (val && !isNaN(this.precision)) val = Number(Number(val).toFixed(this.precision));
+                if (val && !isNaN(this.precision)) {
+                    val = Number(Number(val).toFixed(this.precision));
+                }
 
+                // 处理最大值最小值
                 const {min, max} = this;
                 if (val !== null) {
                     if (val > max) {
@@ -324,20 +328,13 @@
                     }
                 }
 
+                // emit事件
                 this.$nextTick(() => {
                     this.transferValue = val;
                     if (setType && setType === "step") {
                         this.$emit("input", val);
                         this.$emit("on-change", val);
                         this.dispatch("FormItem", "on-form-change", val);
-                    } else {
-                        clearTimeout(this.timer);
-                        this.timer = setTimeout(() => {
-                            this.currentValue = val;
-                            this.$emit("input", val);
-                            this.$emit("on-change", val);
-                            this.dispatch("FormItem", "on-form-change", val);
-                        }, 600);
                     }
                 });
             },
@@ -348,6 +345,10 @@
             blur () {
                 this.focused = false;
                 if (this.transferValue !== this.currentValue) {
+                    this.currentValue = this.transferValue;
+                    this.$emit("input", this.transferValue);
+                    this.$emit("on-change", this.transferValue);
+                    this.dispatch("FormItem", "on-form-change", this.transferValue);
                     this.focused = false;
                     this.$emit("on-blur");
                     if (!findComponentUpward(this, ["DatePicker", "TimePicker", "Cascader", "Search"])) {
@@ -365,31 +366,35 @@
                 }
             },
             change (event) {
-                if (event.type == "change" && this.activeChange) return;
-
-                if (event.type == "input" && !this.activeChange) return;
+                if (event.type == "change" && this.activeChange) {
 
-                let val = event.target.value.trim();
-                if (this.parser) {
-                    val = this.parser(val);
-                }
+                } else if (event.type == "input" && !this.activeChange) {
 
-                const isEmptyString = val.length === 0;
-                if (isEmptyString) {
-                    this.setValue(null);
-                    return;
-                }
-                if (event.type == "input" && val.match(/^-?\.?$|\.$/)) return; // prevent fire early if decimal. If no more input the change event will fire later
+                } else {
+                    let val = event.target.value.trim();
+                    if (this.parser) {
+                        val = this.parser(val);
+                    }
 
-                // eslint认为\为无用的转义符(-不需要转义)
-                // if (event.type == "input" && val.match(/^\-?\.?$|\.$/)) return; // prevent fire early if decimal. If no more input the change event will fire later
-                val = Number(val);
+                    const isEmptyString = val.length === 0;
+                    if (isEmptyString) {
+                        this.setValue(null);
+                    } else {
+                        if (event.type == "input" && val.match(/^-?\.?$|\.$/)) {
+                            // prevent fire early if decimal. If no more input the change event will fire later
+                        } else {
+                            // eslint认为\为无用的转义符(-不需要转义)
+                            // if (event.type == "input" && val.match(/^\-?\.?$|\.$/)) return; // prevent fire early if decimal. If no more input the change event will fire later
+                            val = Number(val);
 
-                if (!isNaN(val)) {
-                    // this.currentValue = val;
-                    this.setValue(val);
-                } else {
-                    event.target.value = this.currentValue;
+                            if (!isNaN(val)) {
+                                // this.currentValue = val;
+                                this.setValue(val);
+                            } else {
+                                event.target.value = this.currentValue;
+                            }
+                        }
+                    }
                 }
             },
             changeVal (val) {

package/src/components/controls/base/DshNumber/DshNumber.vue

@@ -15,7 +15,6 @@
                 :max="maxNum"
                 :min="minNum"
                 :precision="digit"
-                @on-change="change"
             >
                 <div
                     v-if="unitStr"

package/src/components/controls/mixins/cascaderPickerMixin.js

@@ -170,8 +170,6 @@ export default {
         clickInput (e) {
             if (!this.disabled) {
                 this.showModal = true;
-            } else {
-                e.stopPropagation();
             }
         },
         clickCancel () {

package/src/components/controls/mixins/userAndDepartMixin.js

@@ -18,7 +18,7 @@ export default {
 
             loading: false,
             loadinged: false,
-            dataList: [],
+            departList: [],
             tmpValList: [],
 
             // 筛选

package/src/components/controls/senior/selectDepartments.vue

@@ -10,7 +10,7 @@
             maxWidth="200"
             :transfer="true"
         >
-            <div @click.stop="clickInput">
+            <div @click="clickInput">
                 <slot>
                     <!-- 编辑 -->
                     <dsh-control-input
@@ -120,51 +120,35 @@
     >
         <!-- 有值 -->
         <template v-if="!$isEmptyData(curShowValList)">
-            <!-- 单元格查看 -->
+            <!-- 表单查看 -->
+            <!-- 高度自由时 -->
+            <dsh-tags
+                v-if="isHeightAuto"
+                :class="{
+                    ...commonClass,
+                    'selectDepartments-show-auto': true
+                }"
+                itemClass="selectDepartments-show-auto-tag"
+                :list="curShowValList"
+            ></dsh-tags>
+
+            <!-- 高度不自由（不换行） -->
             <bri-tooltip
-                v-if="isUnitShow"
+                v-else
                 :content="showVal"
                 placement="top"
                 maxWidth="200"
                 :transfer="true"
             >
                 <dsh-tags
-                    class="text"
-                    :list="curShowValList"
-                ></dsh-tags>
-            </bri-tooltip>
-
-            <!-- 表单查看 -->
-            <template v-else>
-                <!-- 高度自由时 -->
-                <dsh-tags
-                    v-if="isHeightAuto"
                     :class="{
                         ...commonClass,
-                        'selectDepartments-show-auto': true
+                        'selectDepartments-show-ellipsis': true
                     }"
-                    itemClass="selectDepartments-show-auto-tag"
+                    itemClass="selectDepartments-show-ellipsis-tag"
                     :list="curShowValList"
                 ></dsh-tags>
-
-                <!-- 高度不自由（不换行） -->
-                <bri-tooltip
-                    v-else
-                    :content="showVal"
-                    placement="top"
-                    maxWidth="200"
-                    :transfer="true"
-                >
-                    <dsh-tags
-                        :class="{
-                            ...commonClass,
-                            'selectDepartments-show-ellipsis': true
-                        }"
-                        itemClass="selectDepartments-show-ellipsis-tag"
-                        :list="curShowValList"
-                    ></dsh-tags>
-                </bri-tooltip>
-            </template>
+            </bri-tooltip>
         </template>
 
         <!-- 无值 -->
@@ -276,7 +260,7 @@
 
                 const departList = [
                     ...(this.highSearch ? this.highList : []),
-                    ...loop(this.dataList, this.filterVals, this.cascaderVals, this.reverseFilter)
+                    ...loop(this.departList, this.filterVals, this.cascaderVals, this.reverseFilter)
                 ];
 
                 return this.transformDepartList(departList, this.tmpValKeys);
@@ -329,7 +313,7 @@
                     callback: data => {
                         this.loadinged = true;
 
-                        this.dataList = data.list;
+                        this.departList = data.list;
                     }
                 });
             }
@@ -349,23 +333,6 @@
             &-ellipsis {
                 margin: 5px 0px;
             }
-
-            &-unit {
-                .dsh-ellipsis();
-                padding-left: 5px;
-
-                &-img {
-                    width: 18px;
-                    height: 18px;
-                    vertical-align: middle;
-                    margin-left: -5px;
-                    border-radius: 50%;
-                }
-
-                &-text {
-                    vertical-align: middle;
-                }
-            }
         }
     }
 </style>

package/src/components/controls/senior/selectUsers/selectUsers.vue

@@ -10,7 +10,7 @@
             maxWidth="200"
             :transfer="true"
         >
-            <div @click.stop="clickInput">
+            <div @click="clickInput">
                 <slot>
                     <dsh-control-input
                         :class="commonClass"
@@ -271,13 +271,21 @@
                     _search: true,
                     _clearable: false
                 },
-                highList: [
+
+                curDepart: {
+                    _key: "",
+                    name: "全部",
+                    is_leaf: true,
+                    level: 1
+                },
+                highUserList: [
                     {
                         _key: "dyn_myself",
                         realname: "当前用户"
                     }
                 ],
-                highDepartList: [
+                userList: [],
+                highList: [
                     {
                         _key: "_highSearch",
                         name: "高级选项",
@@ -285,13 +293,6 @@
                         is_leaf: true
                     }
                 ],
-                curDepart: {
-                    _key: "",
-                    name: "全部",
-                    is_leaf: true,
-                    level: 1
-                },
-                departList: [],
 
                 imageResizeConfig: {
                     m: "fixed",
@@ -310,64 +311,96 @@
                 return (JSON.parse(sessionStorage.getItem("userData")) || {}).isCompAdmin || this.selfPropsObj._isCompAdmin;
             },
 
-            allFilterDepartKeys () {
-                const loop = (list = []) => {
-                    return list.reduce((arr, item) => {
+            departShowList () {
+                const loop = (arr = [], filterVals = [], cascaderVals = [], reverseFilter = false) => {
+                    arr = cascaderVals.length
+                        ? arr.filter(item => {
+                            return reverseFilter
+                                ? !cascaderVals.some(cascaderItem =>
+                                    item.code && cascaderItem.code
+                                        ? item.code.length < cascaderItem.code.length
+                                            ? false
+                                            : item.code.startsWith(cascaderItem.code)
+                                        : false
+                                )
+                                : cascaderVals.some(cascaderItem =>
+                                    item.code && cascaderItem.code
+                                        ? item.code.length < cascaderItem.code.length
+                                            ? cascaderItem.code.startsWith(item.code)
+                                            : item.code.startsWith(cascaderItem.code)
+                                        : false
+                            );
+                        })
+                        : filterVals.length
+                            ? arr.filter(item =>
+                                reverseFilter
+                                    ? !filterVals.includes(item._key)
+                                    : filterVals.includes(item._key)
+                            )
+                            : arr;
+
+                    return arr.reduce((newArr, item) => {
+                        if (item.children && item.children.length) {
+                            item.children = loop(item.children, [], cascaderVals, reverseFilter);
+                        }
+
                         return [
-                            ...arr,
-                            ...this.getAllListFilterVals(item.children)
+                            ...newArr,
+                            item
                         ];
-                    }, list);
+                    }, []);
                 };
 
-                const departList = this.departList.filter(item => this.filterVals.includes(item._key));
-                return loop(departList).map(item => item._key);
-            },
-            departShowList () {
                 return [
-                    ...(this.highSearch ? this.highDepartList : []),
+                    ...(this.highSearch ? this.highList : []),
                     {
-                        _key: "",
                         name: "全部",
-                        is_leaf: true,
-                        level: 1
+                        _key: "",
+                        level: 1,
+                        is_leaf: true
                     },
-                    ...(
-                        this.allFilterDepartKeys.length
-                            ? this.departList.filter(item =>
-                                this.reverseFilter
-                                    ? !this.allFilterDepartKeys.includes(item._key)
-                                    : this.allFilterDepartKeys.includes(item._key)
-                            )
-                            : this.departList
-                    ),
+                    ...loop(this.departList, this.filterVals, this.cascaderVals, this.reverseFilter),
                     ...(
                         this.isCompAdmin
                             ? [
                                 {
-                                    is_leaf: true,
-                                    level: 1,
                                     name: "离职人员",
-                                    _key: "_resign"
+                                    _key: "_resign",
+                                    level: 1,
+                                    is_leaf: true
                                 }
                             ]
                             : []
                     )
                 ];
             },
+            allSelectDepartKeys () {
+                const loop = (list = []) => {
+                    return list.reduce((arr, item) => {
+                        return [
+                            ...arr,
+                            ...loop(item.children)
+                        ];
+                    }, list);
+                };
+
+                return loop(this.departShowList).map(item => item._key);
+            },
             userShowList () {
-                let list = this.allFilterDepartKeys.length
-                    ? this.dataList.filter(item =>
+                let list = this.allSelectDepartKeys.length
+                    ? this.userList.filter(item =>
                         this.reverseFilter
-                            ? !this.allFilterDepartKeys.includes(item.departmentKey)
-                            : this.allFilterDepartKeys.includes(item.departmentKey)
+                            ? !this.allSelectDepartKeys.includes(item.departmentKey)
+                            : this.allSelectDepartKeys.includes(item.departmentKey)
                     )
-                    : this.dataList;
+                    : this.userList;
                 list = this.curDepart._key === "_highSearch"
-                    ? this.highList
-                    : !this.curDepart._key
-                        ? list
-                        : list.filter(item => item.departmentKey === this.curDepart._key);
+                    ? this.highUserList
+                    : this.curDepart._key === "_resign"
+                        ? this.userList
+                        : !this.curDepart._key
+                            ? list
+                            : list.filter(item => item.departmentKey === this.curDepart._key);
 
                 return this.transformDepartList(list, this.tmpValKeys);
             },
@@ -438,14 +471,14 @@
                                 }
                                 : undefined
                         },
-                        department: this.curDepart._key === "_resign" ? "_resign" : undefined,
+                        // department: this.curDepart._key,
                         pagination: this.pagePropsObj
                     },
                     loadingName: "loading",
                     callback: data => {
                         this.loadinged = true;
 
-                        this.dataList = data.list;
+                        this.userList = data.list;
                         this.total = data.total;
                     }
                 });
@@ -537,7 +570,7 @@
         &-modal {
             .ivu-modal {
                 width: 40%!important;
-                min-width: 800px!important;
+                min-width: 900px!important;
                 height: 60%;
                 min-height: 600px;
             }
@@ -570,13 +603,13 @@
                             border-top: 1px solid #E5E5E5;
 
                             &-menu {
-                                flex: 3;
+                                flex: 4;
                                 height: 100%;
                                 overflow: auto;
                             }
 
                             &-users {
-                                flex: 2;
+                                flex: 3;
                                 border-left: 1px solid #E5E5E5;
                                 position: relative;