bri-components 1.3.63 → 1.3.65

package/package.json

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

package/src/components/list/BriTable.vue

@@ -186,6 +186,15 @@
             }
         },
         mounted () {},
-        methods: {}
+        methods: {
+            // hidden columns
+            hideColumnsByKeys (keys = []) {
+                this.$refs["briTable"].hideColumnsByKeys(keys);
+            },
+            // show cloumns
+            showColumnsByKeys (keys = []) {
+                this.$refs["briTable"].showColumnsByKeys(keys);
+            }
+        }
     };
 </script>

package/src/components/list/DshFlatTable.vue

@@ -11,6 +11,7 @@
 
         <!-- 表格 -->
         <bri-table
+            ref="briTable"
             class="DshFlatTable-main"
             :columns="showColumns"
             :data="renderedListData"

package/src/components/list/DshTreeTable.vue

@@ -11,6 +11,7 @@
 
         <!-- 表格 -->
         <bri-table
+            ref="briTable"
             class="DshTreeTable-main"
             :columns="showColumns"
             :data="renderedListData"

package/src/components/list/common/quoteListModal.vue

@@ -138,12 +138,12 @@
                 this.$https({
                     url: {
                         module: "sheet",
-                        name: "index"
+                        name: "customFilter"
                     },
                     params: this.listParams,
                     loadingName: "listPropsObj.isLoading",
                     callback: data => {
-                        this.listData = data.list;
+                        this.listData = data.list.slice(0, 50);
                         this.curDataItem = this.listData[0];
                     }
                 });

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

@@ -13,13 +13,14 @@ export default {
 
                 if (this.initFlag) {
                     item.__old__ = true; // 标记老数据（initFlag不用在data中声明）
-                    item.__isRendered__ = true;
-                    item.__isShow__ = true;
-                    item.__isTmpShow__ = true;
-                    item.__isSearchShow__ = false;
                 }
+                item.__isRendered__ = true;
+                item.__isShow__ = true;
+                item.__isTmpShow__ = true;
+                item.__isSearchShow__ = false;
             });
 
+            console.log(this.initFlag);
             this.initFlag = false;
             return this.data;
         },
@@ -48,32 +49,18 @@ export default {
                     : [];
         },
 
-        tablePropsObj () {
-            return {
-                maxHeight: this.contentHeight,
-                cellStyleOption: {
-                    bodyCellClass: ({ column, row, rowIndex }) => {
-                        return "bri-table-td" +
-                            `${this.getRowCanEdit(row)
-                                ? " bri-table-td-edit"
-                                : ""
-                            }` +
-                            `${this.isSearching
-                                ? !row.__isSearchShow__
-                                    ? " bri-table-td-hide"
-                                    : ""
-                                : ""
-                            }`;
-                    }
-                }
-            };
-        },
         showColumns () {
             return [
                 ...(this.useSelection === true ? [this.selectionColumn] : []),
                 ...(this.useIndex === true ? [this.indexColumn] : []),
                 ...this.$transformToColumns(this.contentColumns),
-                ...(this.$getOperationList(["canDelete"]).length ? [this.operationColumn] : [])
+                ...(
+                    this.isSearching
+                        ? []
+                        : this.$getOperationList(["canDelete"]).length
+                            ? [this.operationColumn]
+                            : []
+                )
             ];
         },
         indexColumn () {

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

@@ -8,7 +8,6 @@ export default {
             isExpandAction: false,
 
             searchMode: "flat" // "flat", "tree"
-
         };
     },
     computed: {
@@ -62,11 +61,10 @@ export default {
         tablePropsObj () {
             return {
                 maxHeight: this.contentHeight,
-                // rowStyleOption: {
-                //     hoverHighlight: true,
-                //     clickHighlight: true,
-                //     stripe: true // 斑马纹
-                // },
+                // 通过实例方法 hideColumnsByKeys(keys)将列隐藏，通过实例方法 showColumnsByKeys(keys)将隐藏的列显示
+                columnHiddenOption: {
+                    defaultHiddenColumnKeys: this.hideColKeys
+                },
                 cellStyleOption: {
                     bodyCellClass: ({ row, column, rowIndex }) => {
                         return "bri-table-td" +
@@ -91,10 +89,6 @@ export default {
                                     : ""
                             }`;
                     }
-                },
-                // 通过实例方法 hideColumnsByKeys(keys)将列隐藏，通过实例方法 showColumnsByKeys(keys)将隐藏的列显示
-                columnHiddenOption: {
-                    defaultHiddenColumnKeys: []
                 }
             };
         },
@@ -104,11 +98,13 @@ export default {
                 this.expandColumn,
                 ...(this.useIndex === true ? [this.indexColumn] : []),
                 ...this.$transformToColumns(this.contentColumns),
-                ...(this.isSearching
-                    ? []
-                    : this.$getOperationList(["canDelete"]).length
-                        ? [this.operationColumn]
-                        : [])
+                ...(
+                    this.isSearching
+                        ? []
+                        : this.$getOperationList(["canDelete"]).length
+                            ? [this.operationColumn]
+                            : []
+                )
             ];
         },
         expandColumn () {
@@ -215,11 +211,6 @@ export default {
             };
         },
 
-        // 筛选回调
-        searchCb (conditions) {
-            this.isExpandAction = false;
-            this.dftAdvSearch.conditions = conditions;
-        },
         // 展开／隐藏节点
         toggleExpand (row, bool = true) {
             this.isExpandAction = true;

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

@@ -67,6 +67,7 @@ export default {
             showRuleMessage: false, // 进行全体校验
             ruleRecordMap: {}, // 单元格是否发生校验的记录映射
 
+            hideStatus: true,
             dftAdvSearch: {
                 logic: "and",
                 conditions: []
@@ -90,6 +91,14 @@ export default {
             isEnlargeFlag: true, // 为重渲染膜态框内容而用
 
             topOperationMap: {
+                canHideOrShow: {
+                    name: "显示/隐藏字段",
+                    type: "canHideOrShow",
+                    // icon: "md-share-alt",
+                    size: "small",
+                    btnType: "text",
+                    event: "toggleHideOrShow"
+                },
                 canQuote: {
                     name: "引用",
                     type: "canQuote",
@@ -186,9 +195,17 @@ export default {
                 _disabledBtns: false, // 禁用增删按钮
                 _disabledCreateBtn: false, // 置灰新增按钮，目前只内部使用，comp_web数据表配置页那块
                 _disabledOldDataRow: false, // 置灰老数据行包含删除
+
+                _hideColKeys: [], // 隐藏／查看列字段的keys
+                _searchList: [], // 作为搜索的字段
+                _searchLabelWidth: 100, // 搜索的label宽度
+                _tableAdvSearch: {
+                    logic: "and",
+                    conditions: []
+                }, // 筛选默认值（cascaderTable和flatTable组件里默认值情使用时，以及modSetForm里，会重置_tableAdvSearch）
+
                 _isImport: false, // 导入
                 _isExport: false, // 导出
-
                 _isQuote: false, // 引用
                 _quoteDataCanEdit: false, // 引用的数据是否能编辑
                 _quoteListFields: [], // 引用列表的显示字段
@@ -196,13 +213,6 @@ export default {
                     logic: "and",
                     conditions: []
                 }, // 引用列表筛选条件
-
-                _searchList: [], // 作为搜索的字段
-                _searchLabelWidth: 100, // 搜索的label宽度
-                _tableAdvSearch: {
-                    logic: "and",
-                    conditions: []
-                }, // 筛选默认值（cascaderTable和flatTable组件里默认值情使用时，以及modSetForm里，会重置_tableAdvSearch）
                 ...this.propsObj,
 
                 _contentHeight: this.propsObj._contentHeight || 500 // 表格最大高度
@@ -249,6 +259,7 @@ export default {
         disabledOldDataRow () {
             return this.selfPropsObj._disabledOldDataRow;
         },
+
         isImport () {
             return this.selfPropsObj._isImport;
         },
@@ -268,6 +279,9 @@ export default {
             return this.$transformAdvSearch(this.selfPropsObj._quoteAdvSearch, this.allFormList, this.parentObj);
         },
 
+        hideColKeys () {
+            return this.selfPropsObj._hideColKeys || [];
+        },
         searchList () {
             return this.selfPropsObj._searchList || []; // 级联表切层级表时 值会undefined覆盖selfPropsObj默认的[]
         },
@@ -313,14 +327,16 @@ export default {
             return this.selfPropsObj._searchLabelWidth;
         },
         rowsNum () {
-            return this.showListData.length;
+            return this.isSearching
+                ? this.showListData.length
+                : this.allListData.length;
         },
         rowsNumStr () {
             return `当前“${this.isSearching ? "筛选" : "全部"}”范围, 共 ${this.rowsNum} 行`;
         },
 
-        showListData () {
-            console.log("showListData");
+        renderedListData () {
+            console.log("renderedListData");
             return this.allListData.filter(row => {
                 if (this.isSearching) {
                     const bool = this.$isAdvRelyAccord(this.finalTableAdvSearch, row);
@@ -331,21 +347,17 @@ export default {
                         row.__isRendered__ = true;
                         row.__isSearchShow__ = true;
                     }
-
-                    return bool;
-                } else {
-                    return true;
                 }
+
+                return row.__isRendered__;
             });
         },
-        renderedListData () {
-            console.log("renderedListData");
-            return this.allListData.filter(row =>
-                row.__isRendered__ || (
-                    this.isSearching
-                        ? this.$isAdvRelyAccord(this.finalTableAdvSearch, row)
-                        : false
-                )
+        showListData () {
+            console.log("showListData");
+            return this.renderedListData.filter(row =>
+                this.isSearching
+                    ? !!row.__isSearchShow__
+                    : !!row.__isShow__
             );
         },
         parentDataId () {
@@ -375,13 +387,28 @@ export default {
 
         tablePropsObj () {
             return {
+                // rowStyleOption: {
+                //     hoverHighlight: true,
+                //     clickHighlight: true,
+                //     stripe: true // 斑马纹
+                // },
                 maxHeight: this.contentHeight,
+                // 通过实例方法 hideColumnsByKeys(keys)将列隐藏，通过实例方法 showColumnsByKeys(keys)将隐藏的列显示
+                columnHiddenOption: {
+                    defaultHiddenColumnKeys: [...this.hideColKeys]
+                },
                 cellStyleOption: {
                     bodyCellClass: ({ column, row, rowIndex }) => {
                         return "bri-table-td" +
                             `${this.getRowCanEdit(row)
                                 ? " bri-table-td-edit"
                                 : ""
+                            }` +
+                            `${this.isSearching
+                                ? !row.__isSearchShow__
+                                    ? " bri-table-td-hide"
+                                    : ""
+                                : ""
                             }`;
                     }
                 }
@@ -426,6 +453,7 @@ export default {
             return this.columns.filter(col => this.$isAdvRelyShow(col, this.allListData, this.parentObj, true));
         },
         contentColumns () {
+            console.log("contentColumns");
             return this.filterColumns.map(colItem => ({
                 filter: undefined,
                 sortBy: undefined,
@@ -555,6 +583,10 @@ export default {
                 ...(this.topOperationMap || {}),
                 ...(this.baseOperationMap || {}),
 
+                canHideOrShow: {
+                    ...this.topOperationMap.canHideOrShow,
+                    name: this.hideStatus ? "显示字段" : "隐藏字段"
+                },
                 canCreate: {
                     ...this.baseOperationMap.canCreate,
                     disabled: !!this.disabledCreateBtn
@@ -568,6 +600,7 @@ export default {
                 undefined,
                 this.canEdit
                     ? [
+                        ...(this.hideColKeys.length ? ["canHideOrShow"] : []),
                         ...(this.isQuote ? ["canQuote"] : []),
                         ...(this.isImport ? ["canImport"] : []),
                         ...(this.isExport ? ["canExport"] : []),
@@ -575,6 +608,7 @@ export default {
                         ...(this.disabledBtns ? ["changeVal"] : this.baseOperationBtns)
                     ]
                     : [
+                        ...(this.hideColKeys.length ? ["canHideOrShow"] : []),
                         ...(this.isExport ? ["canExport"] : []),
                         "canEnlarge"
                     ]
@@ -634,6 +668,17 @@ export default {
             this.$emit("change", { list: this.allListData, rowDefault: this.rowDefault }, ...params);
         },
 
+        /* ----------- 隐藏／显示字段 ---------- */
+        toggleHideOrShow () {
+            if (this.hideStatus === true) {
+                this.$refs["briTable"].showColumnsByKeys(this.hideColKeys);
+            } else {
+                this.$refs["briTable"].hideColumnsByKeys(this.hideColKeys);
+            }
+
+            this.hideStatus = !this.hideStatus;
+        },
+
         /* ----------- 全屏 ---------- */
         // 打开全屏模态框
         clickEnlarge (operationItem) {