bri-components 1.4.26 → 1.4.27

package/package.json

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

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

@@ -82,7 +82,7 @@
                     canSave: {
                         name: "完成",
                         type: "canSave",
-                        btnType: "primary",
+                        btnType: "primaryLine",
                         size: "default",
                         event: "clickSave"
                     }

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

@@ -311,6 +311,7 @@
                 return (JSON.parse(sessionStorage.getItem("userData")) || {}).isCompAdmin || this.selfPropsObj._isCompAdmin;
             },
 
+            // 展示的部门
             departShowList () {
                 const loop = (arr = [], filterVals = [], cascaderVals = [], reverseFilter = false) => {
                     arr = cascaderVals.length
@@ -374,7 +375,7 @@
                     )
                 ];
             },
-            allSelectDepartKeys () {
+            allDepartShowKeys () {
                 const loop = (list = []) => {
                     return list.reduce((arr, item) => {
                         return [
@@ -387,13 +388,15 @@
                 return loop(this.departShowList).map(item => item._key);
             },
             userShowList () {
-                let list = this.allSelectDepartKeys.length
+                // 有部门过滤就只显示对应的部门，无过滤就涌全部用户（包含无部门用户）
+                let list = this.filterVals.length || this.cascaderVals.length
                     ? this.userList.filter(item =>
                         this.reverseFilter
-                            ? !this.allSelectDepartKeys.includes(item.departmentKey)
-                            : this.allSelectDepartKeys.includes(item.departmentKey)
+                            ? !this.allDepartShowKeys.includes(item.departmentKey)
+                            : this.allDepartShowKeys.includes(item.departmentKey)
                     )
                     : this.userList;
+
                 list = this.curDepart._key === "_highSearch"
                     ? this.highUserList
                     : this.curDepart._key === "_resign"

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

@@ -46,13 +46,6 @@ 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

@@ -85,7 +85,7 @@ export default {
             return [
                 ...(this.useSelection === true ? [this.selectionColumn] : []),
                 ...(this.useIndex === true ? [this.indexColumn] : []),
-                ...this.$transformToColumns(this.contentColumns),
+                ...this.$transformToColumns(this.showContentColumns),
                 ...(!this.isSearching && this.rowOperationList.length ? [this.operationColumn] : [])
             ];
         },

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

@@ -51,7 +51,7 @@ export default {
                 ...(this.useSelection === true ? [this.selectionColumn] : []),
                 this.expandColumn,
                 ...(this.useIndex === true ? [this.indexColumn] : []),
-                ...this.$transformToColumns(this.contentColumns),
+                ...this.$transformToColumns(this.showContentColumns),
                 ...(!this.isSearching && this.rowOperationList.length ? [this.operationColumn] : [])
             ];
         },

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

@@ -517,6 +517,13 @@ export default {
                 ...colItem
             }));
         },
+        showContentColumns () {
+            return this.contentColumns.filter(colItem =>
+                this.hideStatus === true
+                    ? !this.hideColKeys.includes(colItem._key)
+                    : true
+            );
+        },
 
         selectionColumn () {
             return {
@@ -557,7 +564,7 @@ export default {
                 maxHeight: this.contentHeight,
                 // 通过实例方法 hideColumnsByKeys(keys)将列隐藏，通过实例方法 showColumnsByKeys(keys)将隐藏的列显示
                 columnHiddenOption: {
-                    defaultHiddenColumnKeys: [...this.hideColKeys] // 必须这么写，不解构，切换一次隐藏／显示后，hideColKeys会变成空数组
+                    // defaultHiddenColumnKeys: [...this.hideColKeys] // 必须这么写，不解构，切换一次隐藏／显示后，hideColKeys会变成空数组
                 },
                 cellStyleOption: {
                     bodyCellClass: this.bodyCellClass
@@ -579,7 +586,7 @@ export default {
 
         // 联动隐藏
         showColKeys () {
-            return this.showByNumFieldVal >= 0
+            return this.showByNumFieldVal != null && this.showByNumFieldVal >= 0
                 ? this.showOrHideColKeys.slice(0, this.showByNumFieldVal)
                 : this.showOrHideColKeys;
         },
@@ -816,13 +823,13 @@ export default {
 
         /* ----------- 隐藏／显示字段 ---------- */
         toggleHideOrShow () {
-            if (this.$refs.briTable) {
-                if (this.hideStatus === true) {
-                    this.$refs.briTable.showColumnsByKeys(this.hideColKeys);
-                } else {
-                    this.$refs.briTable.hideColumnsByKeys(this.hideColKeys);
-                }
-            }
+            // if (this.$refs.briTable) {
+            //     if (this.hideStatus === true) {
+            //         this.$refs.briTable.showColumnsByKeys(this.hideColKeys);
+            //     } else {
+            //         this.$refs.briTable.hideColumnsByKeys(this.hideColKeys);
+            //     }
+            // }
 
             this.hideStatus = !this.hideStatus;
         },