vxe-table 3.16.3 → 3.17.0-beta.0

package/es/table/src/methods.js

@@ -6827,7 +6827,7 @@ const Methods = {
         const treeOpts = $xeTable.computeTreeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const checkboxOpts = $xeTable.computeCheckboxOpts;
-        const { checkField, checkStrictly, checkMethod } = checkboxOpts;
+        const { checkField, indeterminateField, checkStrictly, checkMethod } = checkboxOpts;
         if (checkStrictly) {
             return;
         }
@@ -6859,6 +6859,11 @@ const Methods = {
                         childRowMaps[rowid] = 1;
                         childRowList.unshift([row, rowid, childList]);
                     }
+                    else {
+                        if (indeterminateField) {
+                            XEUtils.set(row, indeterminateField, false);
+                        }
+                    }
                 }, { children: transform ? mapChildrenField : childrenField });
             }
             childRowList.forEach(vals => {
@@ -6868,7 +6873,7 @@ const Methods = {
                 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);
@@ -6928,6 +6933,9 @@ const Methods = {
                 if (checkField) {
                     XEUtils.set(row, checkField, isSelected);
                 }
+                if (indeterminateField) {
+                    XEUtils.set(row, indeterminateField, halfSelect);
+                }
                 if (isSelected) {
                     if (!checkField) {
                         selectCheckboxMaps[rowid] = row;
@@ -9052,15 +9060,17 @@ const Methods = {
         const $xeTable = this;
         const reactData = $xeTable;
         const internalData = $xeTable;
-        const { tableFullData } = internalData;
+        const { tableFullData, scrollYStore } = internalData;
         const expandOpts = $xeTable.computeExpandOpts;
         const { reserve } = expandOpts;
         const expList = $xeTable.getRowExpandRecords();
         internalData.rowExpandedMaps = {};
-        reactData.rowExpandedFlag++;
         if (reserve) {
             tableFullData.forEach((row) => handleRowExpandReserve($xeTable, row, false));
         }
+        reactData.rowExpandedFlag++;
+        scrollYStore.startIndex = 0;
+        scrollYStore.endIndex = 1;
         return $xeTable.$nextTick().then(() => {
             if (expList.length) {
                 return handleLazyRecalculate($xeTable, true, true, true);

package/es/table/src/table.js

@@ -981,9 +981,12 @@ export default {
             return Object.assign({}, getConfig().table.clipConfig, this.clipConfig);
         },
         fnrOpts() {
-            return this.computeFNROpts;
+            return this.computeFnrOpts;
         },
         computeFNROpts() {
+            return this.computeFnrOpts;
+        },
+        computeFnrOpts() {
             return Object.assign({}, getConfig().table.fnrConfig, this.fnrConfig);
         },
         headerCtxMenu() {

package/es/table/style.css

@@ -2020,6 +2020,7 @@
 
 .vxe-table--checkbox-range,
 .vxe-table--cell-main-area,
+.vxe-table--cell-item-area,
 .vxe-table--cell-extend-area,
 .vxe-table--cell-active-area,
 .vxe-table--cell-copy-area,
@@ -2038,6 +2039,7 @@
 
 .vxe-table--fixed-left-wrapper .vxe-table--checkbox-range,
 .vxe-table--fixed-left-wrapper .vxe-table--cell-main-area,
+.vxe-table--fixed-left-wrapper .vxe-table--cell-item-area,
 .vxe-table--fixed-left-wrapper .vxe-table--cell-extend-area,
 .vxe-table--fixed-left-wrapper .vxe-table--cell-active-area,
 .vxe-table--fixed-left-wrapper .vxe-table--cell-copy-area,
@@ -2045,6 +2047,7 @@
 .vxe-table--fixed-left-wrapper .vxe-table--cell-row-status-area,
 .vxe-table--fixed-right-wrapper .vxe-table--checkbox-range,
 .vxe-table--fixed-right-wrapper .vxe-table--cell-main-area,
+.vxe-table--fixed-right-wrapper .vxe-table--cell-item-area,
 .vxe-table--fixed-right-wrapper .vxe-table--cell-extend-area,
 .vxe-table--fixed-right-wrapper .vxe-table--cell-active-area,
 .vxe-table--fixed-right-wrapper .vxe-table--cell-copy-area,
@@ -2054,21 +2057,23 @@
 }
 
 .vxe-table--fixed-left-wrapper .vxe-table--cell-main-area[half="1"],
+.vxe-table--fixed-left-wrapper .vxe-table--cell-item-area[half="1"],
 .vxe-table--fixed-left-wrapper .vxe-table--cell-extend-area[half="1"],
 .vxe-table--fixed-left-wrapper .vxe-table--cell-active-area[half="1"] {
   border-right: 0;
 }
 .vxe-table--fixed-left-wrapper .vxe-table--cell-copy-area[half="1"] {
-  background-size: var(--vxe-ui-table-cell-copy-area-border-width) 12px, 0 12px, 12px var(--vxe-ui-table-cell-copy-area-border-width), 12px var(--vxe-ui-table-cell-copy-area-border-width);
+  background-size: var(--vxe-ui-table-cell-clip-area-border-width) 12px, 0 12px, 12px var(--vxe-ui-table-cell-clip-area-border-width), 12px var(--vxe-ui-table-cell-clip-area-border-width);
 }
 
 .vxe-table--fixed-right-wrapper .vxe-table--cell-main-area[half="1"],
+.vxe-table--fixed-right-wrapper .vxe-table--cell-item-area[half="1"],
 .vxe-table--fixed-right-wrapper .vxe-table--cell-extend-area[half="1"],
 .vxe-table--fixed-right-wrapper .vxe-table--cell-active-area[half="1"] {
   border-left: 0;
 }
 .vxe-table--fixed-right-wrapper .vxe-table--cell-copy-area[half="1"] {
-  background-size: 0 12px, var(--vxe-ui-table-cell-copy-area-border-width) 12px, 12px var(--vxe-ui-table-cell-copy-area-border-width), 12px var(--vxe-ui-table-cell-copy-area-border-width);
+  background-size: 0 12px, var(--vxe-ui-table-cell-clip-area-border-width) 12px, 12px var(--vxe-ui-table-cell-clip-area-border-width), 12px var(--vxe-ui-table-cell-clip-area-border-width);
 }
 
 /*复选框-范围选择*/
@@ -2120,8 +2125,8 @@
   }
 }
 .vxe-table--cell-copy-area {
-  background: linear-gradient(0deg, transparent 6px, var(--vxe-ui-table-cell-copy-area-border-color) 6px) repeat-y, linear-gradient(0deg, transparent 50%, var(--vxe-ui-table-cell-copy-area-border-color) 0) repeat-y, linear-gradient(90deg, transparent 50%, var(--vxe-ui-table-cell-copy-area-border-color) 0) repeat-x, linear-gradient(90deg, transparent 50%, var(--vxe-ui-table-cell-copy-area-border-color) 0) repeat-x;
-  background-size: var(--vxe-ui-table-cell-copy-area-border-width) 12px, var(--vxe-ui-table-cell-copy-area-border-width) 12px, 12px var(--vxe-ui-table-cell-copy-area-border-width), 12px var(--vxe-ui-table-cell-copy-area-border-width);
+  background: linear-gradient(0deg, transparent 6px, var(--vxe-ui-table-cell-clip-area-border-color) 6px) repeat-y, linear-gradient(0deg, transparent 50%, var(--vxe-ui-table-cell-clip-area-border-color) 0) repeat-y, linear-gradient(90deg, transparent 50%, var(--vxe-ui-table-cell-clip-area-border-color) 0) repeat-x, linear-gradient(90deg, transparent 50%, var(--vxe-ui-table-cell-clip-area-border-color) 0) repeat-x;
+  background-size: var(--vxe-ui-table-cell-clip-area-border-width) 12px, var(--vxe-ui-table-cell-clip-area-border-width) 12px, 12px var(--vxe-ui-table-cell-clip-area-border-width), 12px var(--vxe-ui-table-cell-clip-area-border-width);
   background-position: 0 0, 100% 0, 0 0, 0 100%;
   animation: moveCopyCellBorder 0.5s infinite linear;
 }
@@ -2133,7 +2138,7 @@
   background-color: var(--vxe-ui-table-cell-active-area-background-color);
 }
 
-.vxe-table--cell-multi-area > .vxe-table--cell-main-area {
+.vxe-table--cell-multi-area > .vxe-table--cell-item-area {
   background-color: var(--vxe-ui-table-cell-area-background-color);
 }
 
@@ -3496,6 +3501,7 @@
   text-align: left;
   z-index: 4;
   padding: 0 var(--vxe-ui-table-cell-padding-default);
+  pointer-events: none;
 }
 .vxe-table--render-default .vxe-body--column .vxe-cell--valid-error-wrapper {
   display: inline-block;