vxe-table 3.14.0-beta.20 → 3.14.0-beta.21

package/es/table/module/validator/mixin.js

@@ -153,8 +153,8 @@ export default {
             const internalData = $xeTable;
             const validRest = {};
             const { editRules, treeConfig } = props;
-            const { editStore, pendingRowMaps } = reactData;
-            const { afterFullData } = internalData;
+            const { editStore } = reactData;
+            const { afterFullData, pendingRowMaps } = internalData;
             const { removeMaps } = editStore;
             const treeOpts = $xeTable.computeTreeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;

package/es/table/src/body.js

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { isEnableConf, getClass } from '../../ui/src/utils';
-import { getOffsetSize, calcTreeLine, mergeBodyMethod, getRowid } from './util';
+import { getOffsetSize, calcTreeLine, mergeBodyMethod, getRowid, createHandleGetRowId } from './util';
 import { updateCellTitle } from '../../ui/src/dom';
 import { getSlotVNs } from '../../ui/src/vn';
 const { getI18n, renderer, renderEmptyElement } = VxeUI;
@@ -14,7 +14,7 @@ const isVMScrollProcess = ($xeTable) => {
     const { lastScrollTime, isDragResize } = tableReactData;
     return !!(isDragResize || (lastScrollTime && Date.now() < lastScrollTime + delayHover));
 };
-function renderLine(h, _vm, params, cellHeight) {
+function renderLine(h, _vm, rowid, params, cellHeight) {
     const $xeTable = _vm.$parent;
     const tableProps = $xeTable;
     const tableInternalData = $xeTable;
@@ -27,7 +27,6 @@ function renderLine(h, _vm, params, cellHeight) {
     if (slots && slots.line) {
         return $xeTable.callSlot(slots.line, params, h);
     }
-    const rowid = getRowid($xeTable, row);
     const rest = fullAllDataRowIdData[rowid];
     let rLevel = 0;
     let prevRow = null;
@@ -267,7 +266,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     }
     else {
         // 渲染单元格
-        tdVNs.push(...renderLine(h, _vm, cellParams, cellHeight), h('div', {
+        tdVNs.push(...renderLine(h, _vm, rowid, cellParams, cellHeight), h('div', {
             key: 'tc',
             class: ['vxe-cell', {
                     'c--title': showTitle,
@@ -388,8 +387,8 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
     const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, treeConfig } = tableProps;
-    const { hasFixedColumn, treeExpandedMaps, isColLoading, scrollXLoad, scrollYLoad, isAllOverflow, rowExpandedMaps, expandColumn, selectRadioRow, pendingRowMaps, isDragColMove, rowExpandHeightFlag } = tableReactData;
-    const { fullAllDataRowIdData } = tableInternalData;
+    const { hasFixedColumn, treeExpandedFlag, isColLoading, scrollXLoad, scrollYLoad, isAllOverflow, rowExpandedFlag, expandColumn, selectRadioRow, pendingRowFlag, isDragColMove, rowExpandHeightFlag } = tableReactData;
+    const { fullAllDataRowIdData, treeExpandedMaps, pendingRowMaps, rowExpandedMaps } = tableInternalData;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const radioOpts = $xeTable.computeRadioOpts;
     const treeOpts = $xeTable.computeTreeOpts;
@@ -400,6 +399,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     const { transform, seqMode } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const rows = [];
+    const { handleGetRowId } = createHandleGetRowId($xeTable);
     tableData.forEach((row, $rowIndex) => {
         const trOn = {};
         let rowIndex = $rowIndex;
@@ -420,7 +420,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
                 $xeTable.clearHoverRow();
             };
         }
-        const rowid = getRowid($xeTable, row);
+        const rowid = handleGetRowId(row);
         const rowRest = fullAllDataRowIdData[rowid];
         let rowLevel = 0;
         let seq = -1;
@@ -437,7 +437,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         }
         const params = { $table: $xeTable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex, _rowIndex };
         // 行是否被展开
-        const isExpandRow = expandColumn && !!rowExpandedMaps[rowid];
+        const isExpandRow = expandColumn && !!rowExpandedFlag && !!rowExpandedMaps[rowid];
         // 树节点是否被展开
         let isExpandTree = false;
         let rowChildren = [];
@@ -448,7 +448,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         }
         if (treeConfig && !scrollYLoad && !transform) {
             rowChildren = row[childrenField];
-            isExpandTree = rowChildren && rowChildren.length && !!treeExpandedMaps[rowid];
+            isExpandTree = !!treeExpandedFlag && rowChildren && rowChildren.length > 0 && !!treeExpandedMaps[rowid];
         }
         // 拖拽行事件
         if (rowOpts.drag && (!treeConfig || transform)) {
@@ -467,7 +467,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
                 'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
                 'row--radio': radioOpts.highlight && selectRadioRow === row,
                 'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
-                'row--pending': !!pendingRowMaps[rowid]
+                'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
             },
             rowClassName ? (XEUtils.isFunction(rowClassName) ? rowClassName(params) : rowClassName) : ''
         ];

package/es/table/src/cell.js

@@ -382,8 +382,8 @@ export const Cell = {
         const { $table, isHidden } = params;
         const tableReactData = $table;
         const tableInternalData = $table;
-        const { treeExpandedMaps, treeExpandLazyLoadedMaps } = tableReactData;
-        const { fullAllDataRowIdData } = tableInternalData;
+        const { treeExpandedFlag } = tableReactData;
+        const { fullAllDataRowIdData, treeExpandedMaps, treeExpandLazyLoadedMaps } = tableInternalData;
         const treeOpts = $table.computeTreeOpts;
         const { row, column, level } = params;
         const { slots } = column;
@@ -403,7 +403,7 @@ export const Cell = {
         }
         if (!isHidden) {
             const rowid = getRowid($table, row);
-            isActive = !!treeExpandedMaps[rowid];
+            isActive = !!treeExpandedFlag && !!treeExpandedMaps[rowid];
             if (lazy) {
                 const rest = fullAllDataRowIdData[rowid];
                 isLazyLoading = !!treeExpandLazyLoadedMaps[rowid];
@@ -600,8 +600,10 @@ export const Cell = {
         const { $table, row, column, isHidden } = params;
         const tableProps = $table;
         const tableReactData = $table;
+        const tableInternalData = $table;
         const { treeConfig } = tableProps;
-        const { selectCheckboxMaps, treeIndeterminateMaps } = tableReactData;
+        const { updateCheckboxFlag } = tableReactData;
+        const { selectCheckboxMaps, treeIndeterminateRowMaps } = tableInternalData;
         const checkboxOpts = $table.computeCheckboxOpts;
         const { labelField, checkMethod, visibleMethod } = checkboxOpts;
         const { slots } = column;
@@ -614,7 +616,7 @@ export const Cell = {
         const ons = {};
         if (!isHidden) {
             const rowid = getRowid($table, row);
-            isChecked = !!selectCheckboxMaps[rowid];
+            isChecked = !!updateCheckboxFlag && !!selectCheckboxMaps[rowid];
             ons.click = (evnt) => {
                 if (!isDisabled && isVisible) {
                     $table.triggerCheckRowEvent(evnt, params, !isChecked);
@@ -624,7 +626,7 @@ export const Cell = {
                 isDisabled = !checkMethod({ row });
             }
             if (treeConfig) {
-                indeterminate = !!treeIndeterminateMaps[rowid];
+                indeterminate = !!treeIndeterminateRowMaps[rowid];
             }
         }
         const checkboxParams = Object.assign(Object.assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate });
@@ -661,8 +663,10 @@ export const Cell = {
         const { $table, row, column, isHidden } = params;
         const tableProps = $table;
         const tableReactData = $table;
+        const tableInternalData = $table;
         const { treeConfig } = tableProps;
-        const { treeIndeterminateMaps } = tableReactData;
+        const { updateCheckboxFlag } = tableReactData;
+        const { treeIndeterminateRowMaps } = tableInternalData;
         const checkboxOpts = $table.computeCheckboxOpts;
         const { labelField, checkField, checkMethod, visibleMethod } = checkboxOpts;
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
@@ -676,7 +680,7 @@ export const Cell = {
         const ons = {};
         if (!isHidden) {
             const rowid = getRowid($table, row);
-            isChecked = XEUtils.get(row, checkField);
+            isChecked = !!updateCheckboxFlag && XEUtils.get(row, checkField);
             ons.click = (evnt) => {
                 if (!isDisabled && isVisible) {
                     $table.triggerCheckRowEvent(evnt, params, !isChecked);
@@ -686,7 +690,7 @@ export const Cell = {
                 isDisabled = !checkMethod({ row });
             }
             if (treeConfig) {
-                isIndeterminate = !!treeIndeterminateMaps[rowid];
+                isIndeterminate = !!treeIndeterminateRowMaps[rowid];
             }
         }
         const checkboxParams = Object.assign(Object.assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate: isIndeterminate });
@@ -724,8 +728,8 @@ export const Cell = {
      */
     renderExpandCell(h, params) {
         const { $table, isHidden, row, column } = params;
-        const tableReactData = $table;
-        const { rowExpandedMaps, rowExpandLazyLoadedMaps } = tableReactData;
+        const tableInternalData = $table;
+        const { rowExpandedMaps, rowExpandLazyLoadedMaps } = tableInternalData;
         const expandOpts = $table.computeExpandOpts;
         const { lazy, labelField, iconLoaded, showIcon, iconOpen, iconClose, visibleMethod } = expandOpts;
         const { slots } = column;