bri-components 1.4.23 → 1.4.24

package/package.json

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

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

@@ -260,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);
@@ -313,7 +313,7 @@
                     callback: data => {
                         this.loadinged = true;
 
-                        this.dataList = data.list;
+                        this.departList = data.list;
                     }
                 });
             }

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

@@ -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,37 +311,55 @@
                 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,
-                            ...loop(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 : []),
                     {
                         name: "全部",
                         _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
                             ? [
@@ -355,18 +374,30 @@
                     )
                 ];
             },
+            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.highUserList
                     : this.curDepart._key === "_resign"
-                        ? this.dataList
+                        ? this.userList
                         : !this.curDepart._key
                             ? list
                             : list.filter(item => item.departmentKey === this.curDepart._key);
@@ -447,7 +478,7 @@
                     callback: data => {
                         this.loadinged = true;
 
-                        this.dataList = data.list;
+                        this.userList = data.list;
                         this.total = data.total;
                     }
                 });