vxe-table 4.14.1 → 4.14.3

package/es/table/src/body.js

@@ -217,7 +217,7 @@ export default defineVxeComponent({
                 if (spanRest) {
                     const { rowspan, colspan } = spanRest;
                     if (!rowspan || !colspan) {
-                        return null;
+                        return renderEmptyElement($xeTable);
                     }
                     if (rowspan > 1) {
                         isMergeCell = true;
@@ -235,7 +235,7 @@ export default defineVxeComponent({
                 // 自定义合并行或列的方法
                 const { rowspan = 1, colspan = 1 } = spanMethod(cellParams) || {};
                 if (!rowspan || !colspan) {
-                    return null;
+                    return renderEmptyElement($xeTable);
                 }
                 if (rowspan > 1) {
                     isMergeCell = true;
@@ -365,11 +365,8 @@ export default defineVxeComponent({
                 }
             }
             let showAreaRowStatus = false;
-            if (mouseConfig && mouseOpts.area && selectCellToRow) {
-                if ((!_columnIndex && selectCellToRow === true) ||
-                    (selectCellToRow === column.field)) {
-                    showAreaRowStatus = true;
-                }
+            if (mouseConfig && mouseOpts.area && !_columnIndex && selectCellToRow) {
+                showAreaRowStatus = true;
             }
             if (!fixedHiddenColumn && showResizable && isAllColumnDrag) {
                 tdVNs.push(h('div', {

package/es/table/src/table.js

@@ -6096,15 +6096,17 @@ export default defineVxeComponent({
              * 手动清空展开行状态，数据会恢复成未展开的状态
              */
             clearRowExpand() {
-                const { tableFullData } = internalData;
+                const { tableFullData, scrollYStore } = internalData;
                 const expandOpts = computeExpandOpts.value;
                 const { reserve } = expandOpts;
                 const expList = $xeTable.getRowExpandRecords();
                 internalData.rowExpandedMaps = {};
-                reactData.rowExpandedFlag++;
                 if (reserve) {
                     tableFullData.forEach((row) => handleRowExpandReserve(row, false));
                 }
+                reactData.rowExpandedFlag++;
+                scrollYStore.startIndex = 0;
+                scrollYStore.endIndex = 1;
                 return nextTick().then(() => {
                     if (expList.length) {
                         return handleLazyRecalculate(true, true, true);
@@ -8284,7 +8286,7 @@ export default defineVxeComponent({
                 const treeOpts = computeTreeOpts.value;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 const checkboxOpts = computeCheckboxOpts.value;
-                const { checkField, checkStrictly, checkMethod } = checkboxOpts;
+                const { checkField, indeterminateField, checkStrictly, checkMethod } = checkboxOpts;
                 if (checkStrictly) {
                     return;
                 }
@@ -8316,6 +8318,11 @@ export default defineVxeComponent({
                                 childRowMaps[rowid] = 1;
                                 childRowList.unshift([row, rowid, childList]);
                             }
+                            else {
+                                if (indeterminateField) {
+                                    XEUtils.set(row, indeterminateField, false);
+                                }
+                            }
                         }, { children: transform ? mapChildrenField : childrenField });
                     }
                     childRowList.forEach(vals => {
@@ -8325,7 +8332,7 @@ export default defineVxeComponent({
                         let sLen = 0; // 已选
                         let hLen = 0; // 半选
                         let vLen = 0; // 有效子行
-                        const cLen = childList.length; // 有效子行
+                        const cLen = childList.length; // 子行
                         childList.forEach(checkMethod
                             ? (item) => {
                                 const childRowid = handleGetRowId(item);
@@ -8385,6 +8392,9 @@ export default defineVxeComponent({
                         if (checkField) {
                             XEUtils.set(row, checkField, isSelected);
                         }
+                        if (indeterminateField) {
+                            XEUtils.set(row, indeterminateField, halfSelect);
+                        }
                         if (isSelected) {
                             if (!checkField) {
                                 selectCheckboxMaps[rowid] = row;

package/es/table/style.css

@@ -2105,7 +2105,13 @@
 }
 .vxe-table--cell-area .vxe-table--cell-col-status-area,
 .vxe-table--cell-area .vxe-table--cell-row-status-area {
-  background-color: var(--vxe-ui-table-checkbox-range-background-color);
+  background-color: var(--vxe-ui-table-cell-area-status-background-color);
+}
+.vxe-table--cell-area .vxe-table--cell-col-status-area {
+  border-bottom: var(--vxe-ui-table-cell-area-border-width) solid var(--vxe-ui-table-cell-area-border-color);
+}
+.vxe-table--cell-area .vxe-table--cell-row-status-area {
+  border-right: var(--vxe-ui-table-cell-area-border-width) solid var(--vxe-ui-table-cell-area-border-color);
 }
 
 @keyframes moveCopyCellBorder {