vxe-table 4.17.4 → 4.17.5

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

@@ -67,17 +67,17 @@ hooks.add('tableEditModule', {
                     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;
                 }
@@ -178,14 +178,16 @@ hooks.add('tableEditModule', {
                             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/src/table.js

@@ -1,7 +1,7 @@
 import { h, reactive, ref, provide, inject, nextTick, Teleport, onActivated, onDeactivated, onBeforeUnmount, onUnmounted, watch, computed, onMounted } from 'vue';
 import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
-import { initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey } from '../../ui/src/dom';
+import { initTpImg, 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 { createInternalData, getRowUniqueId, clearTableAllStatus, getColumnList, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight, getLastChildColumn } from './util';
@@ -46,6 +46,7 @@ export default defineVxeComponent({
         const VxeUILoadingComponent = VxeUI.getComponent('VxeLoading');
         const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
         const $xeTabs = inject('$xeTabs', null);
+        const $xeParentTable = inject('$xeTable', null);
         const $xeGrid = inject('$xeGrid', null);
         const $xeGantt = inject('$xeGantt', null);
         const $xeGGWrapper = $xeGrid || $xeGantt;
@@ -11422,6 +11423,21 @@ export default defineVxeComponent({
                         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;
                 }
@@ -12646,7 +12662,7 @@ export default defineVxeComponent({
         watch(dataFlag, () => {
             const { initStatus } = internalData;
             const value = props.data || [];
-            if (value && value.length >= 50000) {
+            if (value && value.length >= 20000) {
                 warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
             }
             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);