bri-components 1.3.65 → 1.3.67

package/package.json

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

package/src/components/list/DshCascaderTable.vue

@@ -686,7 +686,11 @@
                         );
                     }, [])
                     .concat(
-                        subForm.map(subFormItem => (
+                        subForm.filter(subFormItem =>
+                            this.hideStatus === true
+                                ? !this.hideColKeys.includes(subFormItem._key)
+                                : true
+                        ).map(subFormItem => (
                             {
                                 ...subFormItem,
                                 nodeKey: treeForm[treeForm.length - 1]._key,

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

@@ -63,7 +63,7 @@ export default {
                 maxHeight: this.contentHeight,
                 // 通过实例方法 hideColumnsByKeys(keys)将列隐藏，通过实例方法 showColumnsByKeys(keys)将隐藏的列显示
                 columnHiddenOption: {
-                    defaultHiddenColumnKeys: this.hideColKeys
+                    defaultHiddenColumnKeys: [...this.hideColKeys] // 必须这么写，不解构，切换一次隐藏／显示后，hideColKeys会变成空数组
                 },
                 cellStyleOption: {
                     bodyCellClass: ({ row, column, rowIndex }) => {
@@ -73,10 +73,10 @@ export default {
                                 : ""
                             }` +
                             `${this.isSearching
-                                ? !row.__isSearchShow__
+                                ? row.__isSearchShow__ === false
                                     ? " bri-table-td-hide"
                                     : ""
-                                : !row.__isShow__
+                                : row.__isShow__ === false
                                     ? " bri-table-td-hide"
                                     : this.isExpandAction
                                         ? " bri-table-td-visible"

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

@@ -395,7 +395,7 @@ export default {
                 maxHeight: this.contentHeight,
                 // 通过实例方法 hideColumnsByKeys(keys)将列隐藏，通过实例方法 showColumnsByKeys(keys)将隐藏的列显示
                 columnHiddenOption: {
-                    defaultHiddenColumnKeys: [...this.hideColKeys]
+                    defaultHiddenColumnKeys: [...this.hideColKeys] // 必须这么写，不解构，切换一次隐藏／显示后，hideColKeys会变成空数组
                 },
                 cellStyleOption: {
                     bodyCellClass: ({ column, row, rowIndex }) => {
@@ -405,7 +405,7 @@ export default {
                                 : ""
                             }` +
                             `${this.isSearching
-                                ? !row.__isSearchShow__
+                                ? row.__isSearchShow__ === false
                                     ? " bri-table-td-hide"
                                     : ""
                                 : ""
@@ -670,10 +670,12 @@ export default {
 
         /* ----------- 隐藏／显示字段 ---------- */
         toggleHideOrShow () {
-            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;