bri-components 1.4.23 → 1.4.25

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.4.23",
+    "version": "1.4.25",
     "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;
                     }
                 });

package/src/components/list/mixins/DshCascaderTableMixin.js

@@ -46,6 +46,13 @@ export default {
             return this.transformRows(this.allTreeData, this.treeColumns);
         },
 
+        showContentColumns () {
+            return this.contentColumns.filter(colItem =>
+                this.hideStatus === true
+                    ? !this.hideColKeys.includes(colItem._key)
+                    : true
+            );
+        },
         showColumns () {
             return this.mergeColumns(this.treeColumns);
         },

package/src/components/list/mixins/DshFlatTableMixin.js

@@ -61,7 +61,7 @@ export default {
                 ? []
                 : this.useSummary && this.allListData.length
                     ? [
-                        this.filterColumns.reduce((obj, column) => {
+                        this.useFormColumns.reduce((obj, column) => {
                             return {
                                 ...obj,
                                 [column._key]: column._type === "number" && column._summaryType

package/src/components/list/mixins/DshTreeTableMixin.js

@@ -23,7 +23,7 @@ export default {
                 ? []
                 : this.useSummary && this.allListData.length
                     ? [
-                        this.filterColumns.reduce((obj, column) => {
+                        this.useFormColumns.reduce((obj, column) => {
                             return {
                                 ...obj,
                                 [column._key]: column._type === "number" && column._summaryType

package/src/components/list/mixins/tableBaseMixin.js

@@ -210,7 +210,7 @@ export default {
         controlKey () {
             return this.propsObj._key;
         },
-        // 是否在设置默认值下
+        // 是否在字段默认值设置里使用
         isDftSet () {
             return this.controlKey === "_default";
         },
@@ -265,6 +265,8 @@ export default {
                     conditions: []
                 }, // 筛选默认值（cascaderTable和flatTable组件里默认值情使用时，以及modSetForm里，会重置_tableAdvSearch）
 
+                _showOrHideColKeys: [], // 联动隐藏字段的keys
+                _showByNumFieldKey: "", // 控制联动隐藏字段的外层字段
                 _hideColKeys: [], // 隐藏／查看列字段的keys
                 _isQuote: false, // 引用
                 _quoteDisabledColKeys: [], // 引用数据行不可编辑咧
@@ -356,7 +358,6 @@ export default {
         disabledDeleteOldRow () {
             return this.isDftSet ? false : this.selfPropsObj._disabledDeleteOldRow;
         },
-
         dftReadonly () {
             return this.isDftSet ? false : this.selfPropsObj._dftReadonly;
         },
@@ -370,6 +371,7 @@ export default {
             return this.isDftSet ? [] : this.selfPropsObj._oldReadonlyColKeys || []; // 配置端有问题，高级依赖时值成undefined了
         },
 
+        /* --- 筛选 --- */
         searchLabelWidth () {
             return this.selfPropsObj._searchLabelWidth;
         },
@@ -392,7 +394,7 @@ export default {
         tableAdvSearch () {
             return this.$transformAdvSearch(this.selfPropsObj._tableAdvSearch, this.allFormList, this.parentObj);
         },
-        // 配置的默认筛选值里 隐藏的看不到的筛选条件
+        // 默认筛选配置里-隐藏的筛选条件
         hideAdvSearch () {
             return {
                 logic: ["and", "or"].includes(this.tableAdvSearch.logic) ? this.tableAdvSearch.logic : "and",
@@ -411,9 +413,11 @@ export default {
                 ]
             };
         },
+        // 是否搜索状态
         isSearching () {
             return this.$isAdvSearching(this.finalTableAdvSearch);
         },
+        // 当前行数
         rowsNum () {
             return this.isSearching
                 ? this.showListData.length
@@ -423,7 +427,7 @@ export default {
             return `当前${this.isSearching ? "筛选" : "全部"}数据, 共 ${this.rowsNum} ${this.showMode === "form" ? "条" : "行"};`;
         },
 
-        /* 数据 */
+        /* --- 数据 --- */
         defaultListData () {
             const loop = (tree = [], list = []) => {
                 return tree.reduce((newList, rowItem) => {
@@ -486,15 +490,22 @@ export default {
             return !!this.compareListData.length;
         },
 
-        /* 列 */
+        /* --- 列字段 --- */
+        // columns => selfColumns => useFormColumns => contentColumns => showContentColumns => showColumns
         selfColumns () {
             return this.columns;
         },
-        filterColumns () {
-            return this.selfColumns.filter(colItem => this.$isAdvRelyShow(colItem, this.allListData, this.parentObj, true));
+        useFormColumns () {
+            const list = this.selfColumns.filter(colItem =>
+                this.showOrHideColKeys.includes(colItem._key)
+                    ? this.showColKeys.includes(colItem._key)
+                    : true
+            );
+
+            return list.filter(colItem => this.$isAdvRelyShow(colItem, this.allListData, this.parentObj, true));
         },
         contentColumns () {
-            return this.filterColumns.map(colItem => ({
+            return this.useFormColumns.map(colItem => ({
                 filter: undefined,
                 sortBy: undefined,
                 renderHeaderCell: ({ column }, h) => {
@@ -506,13 +517,7 @@ export default {
                 ...colItem
             }));
         },
-        showContentColumns () {
-            return this.contentColumns.filter(colItem =>
-                this.hideStatus === true
-                    ? !this.hideColKeys.includes(colItem._key)
-                    : true
-            );
-        },
+
         selectionColumn () {
             return {
                 _key: "__selection__",
@@ -572,9 +577,30 @@ export default {
             };
         },
 
+        // 联动隐藏
+        showColKeys () {
+            return this.showByNumFieldVal >= 0
+                ? this.showOrHideColKeys.slice(0, this.showByNumFieldVal)
+                : this.showOrHideColKeys;
+        },
+        showOrHideColKeys () {
+            return this.selfPropsObj._showOrHideColKeys || [];
+        },
+        showByNumFieldKey () {
+            // 控制联动隐藏的数字类型字段
+            return this.selfPropsObj._showByNumFieldKey;
+        },
+        showByNumFieldVal () {
+            // 控制联动隐藏的数字类型字段的值
+            return this.showByNumFieldKey
+                ? this.parentObj[this.showByNumFieldKey]
+                : undefined;
+        },
+        // 显示／隐藏
         hideColKeys () {
             return this.selfPropsObj._hideColKeys;
         },
+        // 引用
         isQuote () {
             return this.selfPropsObj._isQuote;
         },
@@ -608,6 +634,7 @@ export default {
                 }
             };
         },
+        // 导入
         isImport () {
             return this.selfPropsObj._isImport;
         },
@@ -618,6 +645,7 @@ export default {
                 importType: this.inTableType
             };
         },
+        // 导出
         isExport () {
             return this.selfPropsObj._isExport;
         },
@@ -629,6 +657,7 @@ export default {
                 advSearch: this.finalTableAdvSearch
             };
         },
+        // 全屏
         useEnlarge () {
             return this.selfPropsObj._useEnlarge;
         },
@@ -639,6 +668,7 @@ export default {
             };
         },
 
+        /* --- 功能按钮 --- */
         baseOperationBtns () {
             return Object.keys(this.baseOperationMap);
         },
@@ -1326,7 +1356,7 @@ export default {
         /* ----------- 方法 ---------- */
         // 整行校验结果
         getRowRuleResult (row, rowIndex) {
-            return this.filterColumns.every(column => this.getColRuleResult({ row, rowIndex, column }).bool);
+            return this.useFormColumns.every(column => this.getColRuleResult({ row, rowIndex, column }).bool);
         },
         getRowFormList (row, rowIndex) {
             return this.selfColumns.map(column => {