vxe-table 3.19.4 → 3.19.5

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.19.4";
+const version = "3.19.5";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2622,6 +2622,23 @@ function updateCellTitle(overflowElem, column) {
     overflowElem.setAttribute('title', content);
   }
 }
+function checkTargetElement(target, exEls, endEl) {
+  let targetEl = target;
+  if (!exEls || !exEls.length) {
+    return false;
+  }
+  const [exEl1, exEl2, exEl3] = exEls;
+  while (targetEl) {
+    if (exEl1 === targetEl || exEl2 && targetEl === exEl2 || exEl3 && targetEl === exEl3) {
+      return true;
+    }
+    if (endEl && targetEl === endEl) {
+      return false;
+    }
+    targetEl = targetEl.parentElement;
+  }
+  return false;
+}
 /**
  * 检查触发源是否属于目标节点
  */
@@ -2696,7 +2713,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.19.4"}`;
+const log_version = `table v${"3.19.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -18635,6 +18652,7 @@ const Methods = {
   },
   triggerBodyWheelEvent(evnt) {
     const $xeTable = this;
+    const $xeParentTable = $xeTable.$xeParentTable;
     const tableProps = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -18708,6 +18726,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;
     }
@@ -25358,16 +25391,16 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
       } = matchObj;
       const parentRest = fullAllDataRowIdData[getRowid($xeTable, parentRow)];
       const parentLevel = parentRest ? parentRest.level : 0;
-      let parentChilds = parentRow[childrenField];
-      let mapChilds = parentRow[mapChildrenField];
-      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(parentChilds)) {
-        parentChilds = parentRow[childrenField] = [];
+      let pChilds = parentRow[childrenField];
+      let pMapChilds = parentRow[mapChildrenField];
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(pChilds)) {
+        pChilds = parentRow[childrenField] = [];
       }
-      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(mapChilds)) {
-        mapChilds = parentRow[childrenField] = [];
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(pMapChilds)) {
+        pMapChilds = parentRow[mapChildrenField] = [];
       }
-      parentChilds[funcName](item);
-      mapChilds[funcName](item);
+      pChilds[funcName](item);
+      pMapChilds[funcName](item);
       const rest = {
         row: item,
         rowid,
@@ -25377,7 +25410,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
         $index: -1,
         treeIndex: -1,
         _tIndex: -1,
-        items: parentChilds,
+        items: pChilds,
         parent: parentRow,
         level: parentLevel + 1,
         height: 0,
@@ -25560,13 +25593,15 @@ 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 (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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;
@@ -30681,6 +30716,10 @@ function renderBody(h, $xeTable) {
     $xeTabs: {
       default: null
     },
+    $xeParentTable: {
+      from: '$xeTable',
+      default: null
+    },
     $xeGrid: {
       default: null
     },
@@ -31645,7 +31684,7 @@ function renderBody(h, $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(() => {