bri-components 1.3.96 → 1.3.98

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

@@ -80,12 +80,16 @@ export default {
             const list = this.data;
             const newRow = this.getNewRowData();
 
-            // 处理单元格合并相关（当前列是合并列，则该列之前的合并列，要复制这一行对应列的值；当前列是普通列，按最后合并列的操作处理）
+            // 处理单元格合并相关（当前列是合并列，则该列之前的合并列，要复制这一行对应列的值；当前列是普通列，按该列前的最后合并列的操作处理）
             if (col) {
-                if (col._mergeRow === true) {
+                if (this.mergeRowColKeys.includes(col._key)) {
                     const newList = this.allListData.slice(rowIndex); // 从该行开始截取
-                    const nextRowIndex = newList.findIndex(rowItem => rowItem[col._key] !== row[col._key]); // 寻找该单元格值开始不一样的行(特殊情况是最后一行，nextRowIndex为-1)
-                    row = nextRowIndex < 0 ? newList[newList.length - 1] : newList[nextRowIndex - 1]; // 取该单元格值一样的最后一行
+                    const nextRowIndex = this.$isEmptyData(row[col._key])
+                        ? 1
+                        : newList.findIndex(rowItem => rowItem[col._key] !== row[col._key]); // 寻找该单元格值开始不一样的行(特殊情况是最后一行，nextRowIndex为-1)
+                    row = nextRowIndex < 0
+                        ? newList[newList.length - 1]
+                        : newList[nextRowIndex - 1]; // 取该单元格值一样的最后一行
 
                     const colIndex = this.mergeRowColumns.findIndex(column => column._key === col._key);
                     this.mergeRowColumns.reduce((obj, column, columnIndex) => {
@@ -98,7 +102,7 @@ export default {
                 }
                 else {
                     const colIndex = this.selfColumns.findIndex(column => column._key === col._key);
-                    const mergeRowColumns = this.selfColumns.filter((column, columnIndex) => columnIndex < colIndex && column._mergeRow === true);
+                    const mergeRowColumns = this.selfColumns.filter((column, columnIndex) => columnIndex < colIndex && this.mergeRowColKeys.includes(column._key));
                     mergeRowColumns.slice(0, mergeRowColumns.length - 1).reduce((obj, column) => {
                         return Object.assign(obj, {
                             [column._key]: this.$deepCopy(row[column._key])
@@ -111,7 +115,7 @@ export default {
                 : list.length;
             list.splice(newRowIndex, 0, newRow);
 
-            this.change("createRow", null, newRow, newRowIndex);
+            this.change("createRow", newRow, newRowIndex, null);
         },
         // 点击 -删除行
         clickDelete (operationItem, row, rowIndex) {
@@ -121,12 +125,12 @@ export default {
                 onOk: () => {
                     this.data.splice(rowIndex, 1);
 
-                    this.change("deleteRow", null, row, rowIndex);
+                    this.change("deleteRow", row, rowIndex, null);
                 }
             });
         },
 
-        change (eventType, col, row, rowIndex, ...params) {
+        change (eventType, row, rowIndex, col, ...params) {
             this.$emit("change", { list: this.allListData, rowDefault: this.rowDefault }, eventType, col, row, rowIndex, ...params);
         }
     }

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

@@ -117,7 +117,7 @@ export default {
     },
     created () { },
     methods: {
-        change (eventType, col, row, rowIndex, ...params) {
+        change (eventType, row, rowIndex, col, ...params) {
             this.$emit("change", { tree: this.data, rowDefault: this.rowDefault }, eventType, col, row, rowIndex, ...params);
         },
 
@@ -198,7 +198,7 @@ export default {
                         }, rowItem);
                     }
 
-                    this.fixRowItem(rowItem);
+                    this.fixRowItem(rowItem, levelNum);
                 });
             loop(treeData);