vxe-table 3.16.3 → 3.16.5

package/es/table/src/columnInfo.js

@@ -9,6 +9,7 @@ export class ColumnInfo {
     constructor($xeTable, _vm, { renderHeader, renderCell, renderFooter, renderData } = {}) {
         const tableProps = $xeTable;
         const $xeGrid = $xeTable.$xeGrid;
+        const { field, editRender } = _vm;
         const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
         const formatter = _vm.formatter;
         const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
@@ -53,11 +54,19 @@ export class ColumnInfo {
                 errLog('vxe.error.errProp', [`column.agg-func=${_vm.aggFunc}`, 'column.agg-func=true']);
             }
         }
+        if (field && editRender) {
+            if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
+                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
+            }
+            if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
+                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
+            }
+        }
         Object.assign(this, {
             // 基本属性
             type: _vm.type,
             property: _vm.field,
-            field: _vm.field,
+            field: field,
             title: _vm.title,
             width: _vm.width,
             minWidth: _vm.minWidth,
@@ -94,7 +103,7 @@ export class ColumnInfo {
             rowResize: _vm.rowResize,
             cellType: _vm.cellType,
             cellRender: _vm.cellRender,
-            editRender: _vm.editRender,
+            editRender: editRender,
             contentRender: _vm.contentRender,
             headerExportMethod: _vm.headerExportMethod,
             exportMethod: _vm.exportMethod,

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;
@@ -8662,8 +8670,7 @@ const Methods = {
     },
     setSort(sortConfs, isUpdate) {
         const $xeTable = this;
-        // 已废弃，即将去掉事件触发 new Event('click') -> null
-        return handleSortEvent($xeTable, new Event('click'), sortConfs, isUpdate);
+        return handleSortEvent($xeTable, null, sortConfs, isUpdate);
     },
     setSortByEvent(evnt, sortConfs, isUpdate) {
         const $xeTable = this;
@@ -9052,15 +9059,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/style.css

@@ -3496,6 +3496,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;