vxe-table 3.19.4 → 3.19.6

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

@@ -60,17 +60,17 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
             const { item: parentRow } = matchObj;
             const parentRest = fullAllDataRowIdData[getRowid($xeTable, parentRow)];
             const parentLevel = parentRest ? parentRest.level : 0;
-            let parentChilds = parentRow[childrenField];
-            let mapChilds = parentRow[mapChildrenField];
-            if (!XEUtils.isArray(parentChilds)) {
-                parentChilds = parentRow[childrenField] = [];
+            let pChilds = parentRow[childrenField];
+            let pMapChilds = parentRow[mapChildrenField];
+            if (!XEUtils.isArray(pChilds)) {
+                pChilds = parentRow[childrenField] = [];
             }
-            if (!XEUtils.isArray(mapChilds)) {
-                mapChilds = parentRow[childrenField] = [];
+            if (!XEUtils.isArray(pMapChilds)) {
+                pMapChilds = parentRow[mapChildrenField] = [];
             }
-            parentChilds[funcName](item);
-            mapChilds[funcName](item);
-            const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+            pChilds[funcName](item);
+            pMapChilds[funcName](item);
+            const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: pChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
             fullDataRowIdData[rowid] = rest;
             fullAllDataRowIdData[rowid] = rest;
         }
@@ -174,14 +174,16 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
                     treeRecords.forEach((row, i) => {
                         if (parentRow) {
                             if (row[parentField] !== parentRow[rowField]) {
-                                row[parentField] = parentRow[rowField];
                                 errLog('vxe.error.errProp', [`${parentField}=${row[parentField]}`, `${parentField}=${parentRow[rowField]}`]);
+                                row[parentField] = parentRow[rowField];
                             }
                         }
                         else {
                             if (row[parentField] !== null) {
+                                if (!XEUtils.eqNull(row[parentField])) {
+                                    errLog('vxe.error.errProp', [`${parentField}=${row[parentField]}`, 'null']);
+                                }
                                 row[parentField] = null;
-                                errLog('vxe.error.errProp', [`${parentField}=${row[parentField]}`, 'null']);
                             }
                         }
                         let targetIndex = matchMapObj.index + i;

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

@@ -16,15 +16,17 @@ function hasTreeChildren($xeTable, row) {
 }
 function getSeq($xeTable, cellValue, row, $rowIndex, column, $columnIndex) {
     const seqOpts = $xeTable.computeSeqOpts;
-    const seqMethod = seqOpts.seqMethod || column.seqMethod;
-    if (seqMethod) {
-        return seqMethod({
+    const seqMd = seqOpts.seqMethod || column.seqMethod;
+    if (seqMd) {
+        return seqMd({
             $table: $xeTable,
             row,
             rowIndex: $xeTable.getRowIndex(row),
+            _rowIndex: $xeTable.getVTRowIndex(row),
             $rowIndex,
             column,
             columnIndex: $xeTable.getColumnIndex(column),
+            _columnIndex: $xeTable.getVTColumnIndex(column),
             $columnIndex
         });
     }

package/es/table/src/cell.js

@@ -613,9 +613,9 @@ export const Cell = {
             return renderCellBaseVNs(h, params, $table.callSlot(slots.default, params, h));
         }
         const { seq } = params;
-        const seqMethod = seqOpts.seqMethod;
+        const seqMd = seqOpts.seqMethod;
         return renderCellBaseVNs(h, params, [
-            h('span', `${formatText(seqMethod ? seqMethod(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)}`)
+            h('span', `${formatText(seqMd ? seqMd(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)}`)
         ]);
     },
     renderDeepIndexCell(h, params) {

package/es/table/src/methods.js

@@ -1,5 +1,5 @@
 import XEUtils from 'xe-utils';
-import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey } from '../../ui/src/dom';
+import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey, checkTargetElement } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import Cell from './cell';
@@ -10933,6 +10933,7 @@ const Methods = {
     },
     triggerBodyWheelEvent(evnt) {
         const $xeTable = this;
+        const $xeParentTable = $xeTable.$xeParentTable;
         const tableProps = $xeTable;
         const reactData = $xeTable;
         const internalData = $xeTable;
@@ -10991,6 +10992,21 @@ const Methods = {
                 return;
             }
         }
+        // 展开行处理，如果展开行嵌入表格中
+        if ($xeParentTable) {
+            if (isRollY) {
+                if (checkTargetElement(evnt.target, [leftScrollElem, bodyScrollElem, rightScrollElem], evnt.currentTarget)) {
+                    evnt.stopPropagation();
+                    return;
+                }
+            }
+            if (isRollX) {
+                if (checkTargetElement(evnt.target, [headerScrollElem, bodyScrollElem, footerScrollElem], evnt.currentTarget)) {
+                    evnt.stopPropagation();
+                    return;
+                }
+            }
+        }
         if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
             return;
         }

package/es/table/src/table.js

@@ -497,6 +497,10 @@ export default {
         $xeTabs: {
             default: null
         },
+        $xeParentTable: {
+            from: '$xeTable',
+            default: null
+        },
         $xeGrid: {
             default: null
         },
@@ -1376,7 +1380,7 @@ export default {
             const $xeTable = this;
             const reactData = $xeTable;
             const { initStatus } = this;
-            if (value && value.length >= 50000) {
+            if (value && value.length >= 20000) {
                 warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
             }
             this.loadTableData(value || [], true).then(() => {

package/es/table/style.css

@@ -3547,13 +3547,14 @@
   left: 50%;
   font-size: 12px;
   line-height: 1em;
-  transform: translate(-50%, -50%);
+  transform: translate(-50%, -2px);
   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 {
+  position: relative;
   display: inline-block;
   border-radius: var(--vxe-ui-border-radius);
   pointer-events: auto;
@@ -3584,11 +3585,11 @@
 }
 .vxe-table--render-default.valid-msg--single .vxe-body--row:last-child .vxe-cell--valid-error-tip {
   bottom: 100%;
-  transform: translate(-50%, 50%);
+  transform: translate(-50%, 0);
 }
 .vxe-table--render-default.valid-msg--single .vxe-body--row:last-child:first-child .vxe-cell--valid-error-tip {
   bottom: auto;
-  transform: translate(-50%, -50%);
+  transform: translate(-50%, -2px);
 }
 .vxe-table--render-default.valid-msg--full .vxe-body--row:last-child .vxe-cell--valid-error-tip {
   top: calc(100% - 1.3em);