bri-components 1.4.84 → 1.4.86

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

@@ -20,25 +20,22 @@ export default {
         };
     },
     computed: {
-        rowspanMap () {
-            return this.tableDataObj.rowspanMap || {};
-        },
         selfBasePropsObj () {
             return {
                 _isUseDescSort: false, // 是否使用使用倒序
                 _mergeRowColKeys: [] // 合并行的列
             };
         },
+        // 是不是合并行表格
+        isMergeRowTable () {
+            return !!this.mergeRowColKeys.length;
+        },
         mergeRowColKeys () {
             const mergeRowColKeys = this.selfPropsObj._mergeRowColKeys || []; // 配置端有问题，高级依赖时值成undefined了
             return this.selfColumns
                 .filter(colItem => mergeRowColKeys.includes(colItem._key))
                 .map(colItem => colItem._key);
         },
-        // 是不是合并行表格
-        isMergeRowTable () {
-            return !!this.mergeRowColKeys.length;
-        },
         // 一级合并列keys（一级合并列：左侧第一合并列和右侧和并列）
         firstMergeRowColKeys () {
             if (this.isMergeRowTable) {
@@ -60,14 +57,47 @@ export default {
         notFirstMergeRowColKeys () {
             return this.mergeRowColKeys.filter(colKey => !this.firstMergeRowColKeys.includes(colKey));
         },
-        // 顶替tableBaseMixin里的
+        // 替换tableBaseMixin里的
         searchTitle () {
             return `${this.isSearching ? "筛选" : "全部"}数据${this.isMergeRowTable ? `，共 ${this.selfTotal}条；` : "；"}`;
         },
 
+        /* --- 列字段 --- */
+        showColumns () {
+            return [
+                ...(this.useSelection === true ? [this.selectionColumn] : []),
+                ...(this.useIndex === true ? [this.indexColumn] : []),
+                ...this.$transformToColumns(this.showContentColumns),
+                ...(!this.isSearching && this.rowOperationList.length ? [this.operationColumn] : [])
+            ];
+        },
+        indexColumn () {
+            return {
+                title: "序号",
+                _key: "__index__",
+                key: "__index__",
+                field: "__index__",
+                width: 76,
+                align: "center",
+                fixed: "left",
+                renderBodyCell: ({ row, rowIndex, column }, h) => {
+                    return [
+                        h("div", this.isMergeRowTable ? rowIndex + 1 : row.__index__),
+
+                        // 添加符
+                        ...this.operationIconRender(h, { row, rowIndex, column })
+                    ];
+                }
+            };
+        },
+
+        /* --- 数据 --- */
+        rowspanMap () {
+            return this.tableDataObj.rowspanMap || {};
+        },
         allListData () {
-            this.data.forEach(rowItem => {
-                this.fixRowItem(rowItem);
+            this.data.forEach(row => {
+                this.fixRowData(row);
             });
             this.initFlag = false;
 
@@ -77,41 +107,30 @@ export default {
                     ? [...this.data].reverse()
                     : this.data;
         },
-        allListMap () {
-            return this.$arrToMap(this.allListData, "_id");
+        // 全部数据（或筛选出的数据）
+        showListData () {
+            return this.allListData
+                .filter(row =>
+                    this.isSearching
+                        ? this.$isAdvRelyAccord(this.finalTableAdvSearch, row)
+                        : true
+                )
+                .map((row, rowIndex) => {
+                    row.__index__ = rowIndex + 1;
+                    return row;
+            });
         },
         selfShowListData () {
             return this.isMergeRowTable
                 ? this.showListData
                 : this.curPageShowListData;
         },
-        //  全部数据 或 筛选时符合条件的数据 -当前页的
-        curPageShowListData () {
-            return this.pagePropsObj.page >= 1
-                ? (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize >= this.showListData.length
-                    ? this.showListData.slice(-(
-                        this.showListData.length % this.pagePropsObj.pagesize === 0
-                            ? this.pagePropsObj.pagesize
-                            : this.showListData.length % this.pagePropsObj.pagesize
-                    ))
-                    : this.showListData.slice(
-                        (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize,
-                        this.pagePropsObj.page * this.pagePropsObj.pagesize
-                    )
-                : [];
-        },
-        // 全部数据 或 筛选时符合条件的数据 -共多少分页
-        PageNum () {
-            return this.selfTotal % this.pagePropsObj.pagesize > 0
-                ? Math.ceil(this.selfTotal / this.pagePropsObj.pagesize)
-                : Math.floor(this.selfTotal / this.pagePropsObj.pagesize);
-        },
         footerData () {
             return this.isSearching
                 ? []
                 : this.useSummary && this.allListData.length
                     ? [
-                        this.useFormColumns.reduce((obj, column) => {
+                        this.contentColumns.reduce((obj, column) => {
                             return {
                                 ...obj,
                                 [column._key]: column._type === "number" && column._summaryType
@@ -131,42 +150,53 @@ export default {
                     : [];
         },
 
-        showColumns () {
-            return [
-                ...(this.useSelection === true ? [this.selectionColumn] : []),
-                ...(this.useIndex === true ? [this.indexColumn] : []),
-                ...this.$transformToColumns(this.showContentColumns),
-                ...(!this.isSearching && this.rowOperationList.length ? [this.operationColumn] : [])
-            ];
+        allListMap () {
+            return this.$arrToMap(this.allListData, "_id");
         },
-        indexColumn () {
-            return {
-                title: "序号",
-                _key: "__index__",
-                key: "__index__",
-                field: "__index__",
-                width: 76,
-                align: "center",
-                fixed: "left",
-                renderBodyCell: ({ row, rowIndex, column }, h) => {
-                    return [
-                        h("div", this.isMergeRowTable ? rowIndex + 1 : row.__index__),
-
-                        // 添加符
-                        ...this.operationIconRender(h, { row, rowIndex, column })
-                    ];
-                }
-            };
+        //  全部数据 或 筛选时符合条件的数据 -当前页的
+        curPageShowListData () {
+            return this.pagePropsObj.page >= 1
+                ? (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize >= this.showListData.length
+                    ? this.showListData.slice(-(
+                        this.showListData.length % this.pagePropsObj.pagesize === 0
+                            ? this.pagePropsObj.pagesize
+                            : this.showListData.length % this.pagePropsObj.pagesize
+                    ))
+                    : this.showListData.slice(
+                        (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize,
+                        this.pagePropsObj.page * this.pagePropsObj.pagesize
+                    )
+                : [];
+        },
+        // 全部数据 或 筛选时符合条件的数据 -共多少分页
+        PageNum () {
+            return this.selfTotal % this.pagePropsObj.pagesize > 0
+                ? Math.ceil(this.selfTotal / this.pagePropsObj.pagesize)
+                : Math.floor(this.selfTotal / this.pagePropsObj.pagesize);
         }
     },
     created () {
-        this.isUseDescSort = this.selfPropsObj._isUseDescSort;
-        this.initRowspan();
+        this.selfInit();
     },
     methods: {
+        selfInit () {
+            this.isUseDescSort = this.selfPropsObj._isUseDescSort;
+            this.initRowspan();
+        },
         // 本身的初始化
         selfReset () {
-            this.initRowspan();
+            this.selfInit();
+        },
+        fixSelfRowData (row) {
+            if (this.initFlag) {
+                // 每条数据都补充全所有字段值（赋一个默认的空值）
+                this.selfColumns.forEach((colItem) => {
+                    // 不用row[colItem._key] === undefined判断，是因为后端给的空值不可靠，多选的有时候都能给null
+                    if (!Object.prototype.hasOwnProperty.call(row, colItem._key) && this.$isEmptyData(row[colItem._key])) {
+                        this.$set(row, colItem._key, this.$deepCopy(this.dftInitValMap[colItem._type]));
+                    }
+                });
+            }
         },
 
         // 切换正倒序
@@ -350,6 +380,25 @@ export default {
             }
         },
 
+        bodyCellSpan ({ row, rowIndex, column }) {
+            return {
+                rowspan: this.mergeRowColKeys.includes(column._key)
+                    ? this.isSearching
+                        ? this.getRowspan({ row, rowIndex, column })
+                        : this.getRealRowspan({ row, rowIndex, column })
+                    : 1,
+                colspan: 1
+            };
+        },
+        // 加工单元格对应的配置
+        getSelfResetCol ({ row, rowIndex, column }) {
+            return this.mergeRowColKeys.includes(column._key)
+                ? {
+                    _heightAuto: true
+                }
+                : {};
+        },
+
         /* ----------- 方法 ---------- */
         // 初始化合并单元格的rowspan
         initRowspan () {
@@ -391,24 +440,6 @@ export default {
                 });
             }
         },
-        // 加工单元格对应的配置
-        getSelfResetCol ({ row, rowIndex, column }) {
-            return this.mergeRowColKeys.includes(column._key)
-                ? {
-                    _heightAuto: true
-                }
-                : {};
-        },
-        bodyCellSpan ({ row, rowIndex, column }) {
-            return {
-                rowspan: this.mergeRowColKeys.includes(column._key)
-                    ? this.isSearching
-                        ? this.getRowspan({ row, rowIndex, column })
-                        : this.getRealRowspan({ row, rowIndex, column })
-                    : 1,
-                colspan: 1
-            };
-        },
         // 获取合并单元格真实的rowspan
         getRealRowspan ({ row, rowIndex, column }) {
             return ![undefined, null].includes(this.rowspanMap[this.getMixKey(row, column)])
@@ -438,12 +469,6 @@ export default {
 
             return rowspan;
         },
-        // // 是都满足使用quickChange
-        // isUseQuickChange ({ row, rowIndex, column }) {
-        //     return ["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type) &&
-        //         this.mergeRowColKeys.includes(column._key) &&
-        //         this.rowspanMap[this.getMixKey(row, column)] > 1;
-        // },
         // 合并单元格的行，某列的值全部跟着修改
         dealSameRowsVal ({ row, rowIndex, column }, list = this.allListData) {
             if (this.mergeRowColKeys.includes(column._key) && this.rowspanMap[this.getMixKey(row, column)] > 1) {

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

@@ -12,40 +12,7 @@ export default {
             };
         },
 
-        allTreeData () {
-            return this.getCalcuedTree(this.data, this.selfColumns);
-        },
-        allListData () {
-            return this.$getTreeFlatArr(this.allTreeData);
-        },
-        footerData () {
-            return this.isSearching
-                ? []
-                : this.useSummary && this.allListData.length
-                    ? [
-                        this.useFormColumns.reduce((obj, column) => {
-                            return {
-                                ...obj,
-                                [column._key]: column._type === "number" && column._summaryType
-                                    ? this.$calNumList(
-                                        this.allListData
-                                            .filter(rowItem => rowItem.level === 1)
-                                            .map(rowItem => rowItem[column._key]),
-                                        column._summaryType,
-                                        { ...column, _defaultDigit: 2 }
-                                    )
-                                    : (obj[column._key] || "--")
-                            };
-                        }, {
-                            _id: this.$ObjectID().str,
-                            __treeIndex__: "汇总",
-                            __isExpand__: "-",
-                            __operation__: "——"
-                        })
-                    ]
-                    : [];
-        },
-
+        /* --- 列字段 --- */
         showColumns () {
             return [
                 this.expandColumn,
@@ -112,11 +79,53 @@ export default {
                     ];
                 }
             };
+        },
+
+        /* --- 数据 --- */
+        allTreeData () {
+            return this.getCalcuedTree(this.data, this.selfColumns);
+        },
+        allListData () {
+            return this.$getTreeFlatArr(this.allTreeData);
+        },
+        // 全部数据（或筛选出的数据）
+        showListData () {
+            return this.allListData.filter(row =>
+                this.isSearching
+                    ? this.$isAdvRelyAccord(this.finalTableAdvSearch, row)
+                    : row.__isShow__
+            );
+        },
+        footerData () {
+            return this.isSearching
+                ? []
+                : this.useSummary && this.allListData.length
+                    ? [
+                        this.contentColumns.reduce((obj, column) => {
+                            return {
+                                ...obj,
+                                [column._key]: column._type === "number" && column._summaryType
+                                    ? this.$calNumList(
+                                        this.allListData
+                                            .filter(row => row.level === 1)
+                                            .map(row => row[column._key]),
+                                        column._summaryType,
+                                        { ...column, _defaultDigit: 2 }
+                                    )
+                                    : (obj[column._key] || "--")
+                            };
+                        }, {
+                            _id: this.$ObjectID().str,
+                            __treeIndex__: "汇总",
+                            __isExpand__: "-",
+                            __operation__: "——"
+                        })
+                    ]
+                    : [];
         }
     },
     created () { },
     methods: {
-        /* ------ 工具方法 ------- */
         // 加工树形数据
         getCalcuedTree (treeData = [], cols = []) {
             const loop = (list = [], parentRow, levelNum = 1) =>
@@ -130,7 +139,7 @@ export default {
                             else if (["upToDown"].includes(column._writeSort) && column._noLimitWrite !== true) {
                                 // 有父级且值为空的 值置空
                                 const val = parentRow && this.$isEmptyData(parentRow[column._key])
-                                    ? this.$deepCopy(this.initDftValMap[column._type])
+                                    ? this.$deepCopy(this.dftInitValMap[column._type])
                                     : newRow[column._key];
 
                                 this.$set(newRow, column._key, val);
@@ -166,7 +175,7 @@ export default {
                                 else if (["downToUp"].includes(column._writeSort) && column._noLimitWrite !== true) {
                                     // 子行有空值的 值置空
                                     const val = newRow.children.some(sonRow => this.$isEmptyData(sonRow[column._key]))
-                                        ? this.$deepCopy(this.initDftValMap[column._type])
+                                        ? this.$deepCopy(this.dftInitValMap[column._type])
                                         : newRow[column._key];
 
                                     this.$set(newRow, column._key, val);
@@ -193,12 +202,70 @@ export default {
                         }, rowItem);
                     }
 
-                    this.fixRowItem(rowItem, levelNum);
+                    this.fixRowData(rowItem, levelNum);
                 });
             loop(treeData);
 
             this.initFlag = false;
             return treeData;
+        },
+        fixSelfRowData (row, levelNum) {
+            if (this.initFlag) {
+                // 每条数据都补充全所有字段值（赋一个默认的空值）
+                this.selfColumns.forEach((colItem) => {
+                    // 不用row[colItem._key] === undefined判断，是因为后端给的空值不可靠，多选的有时候都能给null
+                    if (!Object.prototype.hasOwnProperty.call(row, colItem._key) && this.$isEmptyData(row[colItem._key])) {
+                        this.$set(row, colItem._key, this.$deepCopy(this.dftInitValMap[colItem._type]));
+                    }
+                });
+
+                row.level = row.level || levelNum; // TODO：修正数据level属性，后期可以删除
+                // 第一级的需要显示出来
+                if (row.level == 1) {
+                    row.__isShow__ = true;
+                }
+            }
+            // 计算或其它重新传进来值时
+            else {
+                // 第一级的需要显示出来
+                if (row.level == 1) {
+                    row.__isShow__ = Object.prototype.hasOwnProperty.call(row, "__isShow__") ? row.__isShow__ : true;
+                }
+            }
+        },
+
+        // 展开／隐藏节点
+        toggleExpand (row, bool = true) {
+            this.isExpandAction = true;
+            this.$set(row, "__isExpand__", bool);
+
+            this.toggleDescendantsShow(row, bool);
+        },
+        // 切换子孙后代的显示／隐藏
+        toggleDescendantsShow (row, bool) {
+            const loop = (row, isFirstSon) => {
+                if (row.children && row.children.length) {
+                    row.children.forEach(subRow => {
+                        if (isFirstSon) {
+                            this.$set(subRow, "__isShow__", bool);
+                            this.$set(subRow, "__isTmpShow__", bool);
+                        } else {
+                            this.$set(subRow, "__isShow__", bool ? !!subRow.__isTmpShow__ : false);
+                        }
+
+                        loop(subRow);
+                    });
+                }
+            };
+
+            loop(row, true);
+        },
+        // getNewRowData时，额外补充的行相关的数据
+        getSelfNewRowData (level) {
+            return {
+                // __isExpand__: false, // 此行不用也行
+                // __isTmpShow__: true // 此行不用也行
+            };
         }
     }
 };