bri-components 1.3.98 → 1.4.1

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

@@ -6,6 +6,15 @@ export default {
         return {};
     },
     computed: {
+        selfBasePropsObj () {
+            return {
+                _mergeRowColKeys: [] // 合并行的列
+            };
+        },
+        mergeRowColKeys () {
+            return this.selfPropsObj._mergeRowColKeys || []; // 配置端有问题，高级依赖时值成undefined了
+        },
+
         allListData () {
             this.data.forEach(rowItem => {
                 this.fixRowItem(rowItem);
@@ -45,11 +54,9 @@ export default {
                 ...(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]
+                        : []
                 )
             ];
         },
@@ -67,10 +74,13 @@ export default {
                         h("div", rowIndex + 1),
 
                         // 添加符
-                        ...this.createIconRender(h, { row, rowIndex, column })
+                        ...this.operationIconRender(h, { row, rowIndex, column })
                     ];
                 }
             };
+        },
+        mergeRowColumns () {
+            return this.selfColumns.filter(colItem => this.mergeRowColKeys.includes(colItem._key));
         }
     },
     created () { },
@@ -130,8 +140,34 @@ export default {
             });
         },
 
-        change (eventType, row, rowIndex, col, ...params) {
-            this.$emit("change", { list: this.allListData, rowDefault: this.rowDefault }, eventType, col, row, rowIndex, ...params);
+        bodyCellSpan ({ row, rowIndex, column }) {
+            // 合并单元格（单元格值为空时不合并）
+            if (this.mergeRowColKeys.includes(column._key)) {
+                if (this.$isEmptyData(row[column._key])) {
+                    return {
+                        rowspan: 1,
+                        colspan: 1
+                    };
+                }
+                else {
+                    if (
+                        rowIndex !== 0 &&
+                        row[column._key] === this.showListData[rowIndex - 1][column._key]
+                    ) {
+                        return {
+                            rowspan: 0,
+                            colspan: 0
+                        };
+                    } else {
+                        const newList = this.showListData.slice(rowIndex);
+                        const newIndex = newList.findIndex(rowItem => row[column._key] !== rowItem[column._key]);
+                        return {
+                            rowspan: newIndex === -1 ? newList.length : newIndex,
+                            colspan: 1
+                        };
+                    }
+                }
+            }
         }
     }
 };

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

@@ -6,6 +6,12 @@ export default {
         return {};
     },
     computed: {
+        selfBasePropsObj () {
+            return {
+                ...this.treeTableBasePropsObj
+            };
+        },
+
         allTreeData () {
             return this.getCalcuedTree(this.data, this.selfColumns);
         },
@@ -32,7 +38,7 @@ export default {
                             };
                         }, {
                             _id: this.$ObjectID().str,
-                            __index__: "汇总",
+                            __treeIndex__: "汇总",
                             __isExpand__: "-",
                             __operation__: "——"
                         })
@@ -47,11 +53,9 @@ export default {
                 ...(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]
+                        : []
                 )
             ];
         },
@@ -93,9 +97,9 @@ export default {
         indexColumn () {
             return {
                 title: "序号",
-                _key: "__index__",
-                key: "__index__",
-                field: "__index__",
+                _key: "__treeIndex__",
+                key: "__treeIndex__",
+                field: "__treeIndex__",
                 width: 28 + 16 + (this.maxLevel - 1) * 38,
                 align: "left",
                 fixed: "left",
@@ -109,7 +113,7 @@ export default {
                         }, row.__treeIndex__),
 
                         // 添加符
-                        ...this.createIconRender(h, { row, rowIndex, column })
+                        ...this.operationIconRender(h, { row, rowIndex, column })
                     ];
                 }
             };
@@ -117,10 +121,6 @@ export default {
     },
     created () { },
     methods: {
-        change (eventType, row, rowIndex, col, ...params) {
-            this.$emit("change", { tree: this.data, rowDefault: this.rowDefault }, eventType, col, row, rowIndex, ...params);
-        },
-
         /* ------ 工具方法 ------- */
         // 加工树形数据
         getCalcuedTree (treeData = [], cols = []) {