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

package/es/table/src/body.js

@@ -1,7 +1,7 @@
 import { defineComponent, TransitionGroup, h, ref, inject, nextTick, onMounted, onUnmounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
-import { getOffsetSize, calcTreeLine, mergeBodyMethod, getRowid } from './util';
+import { getOffsetSize, calcTreeLine, mergeBodyMethod, getRowid, createHandleGetRowId } from './util';
 import { updateCellTitle, getPropClass } from '../../ui/src/dom';
 import { isEnableConf } from '../../ui/src/utils';
 import { getSlotVNs } from '../../ui/src/vn';
@@ -36,7 +36,7 @@ export default defineComponent({
             const { lastScrollTime, isDragResize } = tableReactData;
             return !!(isDragResize || (lastScrollTime && Date.now() < lastScrollTime + delayHover));
         };
-        const renderLine = (params, cellHeight) => {
+        const renderLine = (rowid, params, cellHeight) => {
             const { row, column } = params;
             const { afterFullData } = tableInternalData;
             const { treeConfig } = tableProps;
@@ -46,7 +46,6 @@ export default defineComponent({
             if (slots && slots.line) {
                 return $xeTable.callSlot(slots.line, params);
             }
-            const rowid = getRowid($xeTable, row);
             const rest = fullAllDataRowIdData[rowid];
             let rLevel = 0;
             let prevRow = null;
@@ -283,7 +282,7 @@ export default defineComponent({
             }
             else {
                 // 渲染单元格
-                tdVNs.push(...renderLine(cellParams, cellHeight), h('div', {
+                tdVNs.push(...renderLine(rowid, cellParams, cellHeight), h('div', {
                     key: 'tc',
                     class: ['vxe-cell', {
                             'c--title': showTitle,
@@ -386,8 +385,8 @@ export default defineComponent({
         };
         const renderRows = (fixedType, isOptimizeMode, tableData, tableColumn) => {
             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 = computeCheckboxOpts.value;
             const radioOpts = computeRadioOpts.value;
             const treeOpts = computeTreeOpts.value;
@@ -398,6 +397,7 @@ export default defineComponent({
             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;
@@ -418,7 +418,7 @@ export default defineComponent({
                         $xeTable.clearHoverRow();
                     };
                 }
-                const rowid = getRowid($xeTable, row);
+                const rowid = handleGetRowId(row);
                 const rowRest = fullAllDataRowIdData[rowid];
                 let rowLevel = 0;
                 let seq = -1;
@@ -435,7 +435,7 @@ export default defineComponent({
                 }
                 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 = [];
@@ -445,7 +445,7 @@ export default defineComponent({
                 }
                 if (treeConfig && !scrollYLoad && !transform) {
                     rowChildren = row[childrenField];
-                    isExpandTree = rowChildren && rowChildren.length > 0 && !!treeExpandedMaps[rowid];
+                    isExpandTree = !!treeExpandedFlag && rowChildren && rowChildren.length > 0 && !!treeExpandedMaps[rowid];
                 }
                 // 拖拽行事件
                 if (rowOpts.drag && (!treeConfig || transform)) {
@@ -464,7 +464,7 @@ export default defineComponent({
                         'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
                         'row--radio': radioOpts.highlight && $xeTable.eqRow(selectRadioRow, row),
                         'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
-                        'row--pending': !!pendingRowMaps[rowid]
+                        'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
                     },
                     getPropClass(rowClassName, params)
                 ];

package/es/table/src/cell.js

@@ -380,8 +380,8 @@ export const Cell = {
         const tableReactData = $table.reactData;
         const tableInternalData = $table.internalData;
         const { computeTreeOpts } = $table.getComputeMaps();
-        const { treeExpandedMaps, treeExpandLazyLoadedMaps } = tableReactData;
-        const { fullAllDataRowIdData } = tableInternalData;
+        const { treeExpandedFlag } = tableReactData;
+        const { fullAllDataRowIdData, treeExpandedMaps, treeExpandLazyLoadedMaps } = tableInternalData;
         const treeOpts = computeTreeOpts.value;
         const { row, column, level } = params;
         const { slots } = column;
@@ -401,7 +401,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];
@@ -591,8 +591,10 @@ export const Cell = {
         const { $table, row, column, isHidden } = params;
         const tableProps = $table.props;
         const tableReactData = $table.reactData;
+        const tableInternalData = $table.internalData;
         const { treeConfig } = tableProps;
-        const { selectCheckboxMaps, treeIndeterminateMaps } = tableReactData;
+        const { updateCheckboxFlag } = tableReactData;
+        const { selectCheckboxMaps, treeIndeterminateRowMaps } = tableInternalData;
         const { computeCheckboxOpts } = $table.getComputeMaps();
         const checkboxOpts = computeCheckboxOpts.value;
         const { labelField, checkMethod, visibleMethod } = checkboxOpts;
@@ -606,7 +608,7 @@ export const Cell = {
         const ons = {};
         if (!isHidden) {
             const rowid = getRowid($table, row);
-            isChecked = !!selectCheckboxMaps[rowid];
+            isChecked = !!updateCheckboxFlag && !!selectCheckboxMaps[rowid];
             ons.onClick = (evnt) => {
                 if (!isDisabled && isVisible) {
                     $table.triggerCheckRowEvent(evnt, params, !isChecked);
@@ -616,7 +618,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 });
@@ -650,8 +652,10 @@ export const Cell = {
         const { $table, row, column, isHidden } = params;
         const tableProps = $table.props;
         const tableReactData = $table.reactData;
+        const tableInternalData = $table.internalData;
         const { treeConfig } = tableProps;
-        const { treeIndeterminateMaps } = tableReactData;
+        const { updateCheckboxFlag } = tableReactData;
+        const { treeIndeterminateRowMaps } = tableInternalData;
         const { computeCheckboxOpts } = $table.getComputeMaps();
         const checkboxOpts = computeCheckboxOpts.value;
         const { labelField, checkField, checkMethod, visibleMethod } = checkboxOpts;
@@ -666,7 +670,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.onClick = (evnt) => {
                 if (!isDisabled && isVisible) {
                     $table.triggerCheckRowEvent(evnt, params, !isChecked);
@@ -676,7 +680,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 });
@@ -711,8 +715,8 @@ export const Cell = {
      */
     renderExpandCell(params) {
         const { $table, isHidden, row, column } = params;
-        const tableReactData = $table.reactData;
-        const { rowExpandedMaps, rowExpandLazyLoadedMaps } = tableReactData;
+        const tableInternalData = $table.internalData;
+        const { rowExpandedMaps, rowExpandLazyLoadedMaps } = tableInternalData;
         const { computeExpandOpts } = $table.getComputeMaps();
         const expandOpts = computeExpandOpts.value;
         const { lazy, labelField, iconLoaded, showIcon, iconOpen, iconClose, visibleMethod } = expandOpts;