vxe-table 3.12.4 → 3.12.5

package/es/table/src/methods.js

@@ -108,6 +108,8 @@ function cacheColumnMap($xeTable) {
     const columnOpts = $xeTable.computeColumnOpts;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     const { isCrossDrag, isSelfToChildDrag } = columnDragOpts;
+    const customOpts = $xeTable.computeCustomOpts;
+    const { storage } = customOpts;
     const rowOpts = $xeTable.computeRowOpts;
     const isGroup = collectColumn.some(hasChildrenList);
     let isAllOverflow = !!props.showOverflow;
@@ -127,8 +129,8 @@ function cacheColumnMap($xeTable) {
             fullColumnFieldData[field] = rest;
         }
         else {
-            if (isCrossDrag || isSelfToChildDrag) {
-                errLog('vxe.error.emptyProp', ['column.field']);
+            if (storage || isCrossDrag || isSelfToChildDrag) {
+                errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
             }
         }
         if (!hasFixed && fixed) {
@@ -5413,26 +5415,25 @@ const Methods = {
             evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
         }
     },
-    handleRowDragDragendEvent(evnt) {
+    handleRowDragSwapEvent(evnt, isSyncRow, dragRow, prevDragRow, prevDragPos, prevDragToChild) {
         const $xeTable = this;
         const props = $xeTable;
         const reactData = $xeTable;
         const internalData = $xeTable;
         const { treeConfig, dragConfig } = props;
         const rowDragOpts = $xeTable.computeRowDragOpts;
-        const { fullAllDataRowIdData, prevDragToChild } = internalData;
+        const { fullAllDataRowIdData } = internalData;
         const { isPeerDrag, isCrossDrag, isSelfToChildDrag, dragEndMethod } = rowDragOpts;
         const treeOpts = $xeTable.computeTreeOpts;
         const { transform, rowField, mapChildrenField, parentField } = treeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
-        const { dragRow } = reactData;
-        const { afterFullData, tableFullData, prevDragRow, prevDragPos } = internalData;
+        const { afterFullData, tableFullData } = internalData;
         const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
         const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
         if (prevDragRow && dragRow) {
             // 判断是否有拖动
             if (prevDragRow !== dragRow) {
-                Promise.resolve(dEndMethod
+                return Promise.resolve(dEndMethod
                     ? dEndMethod({
                         oldRow: dragRow,
                         newRow: prevDragRow,
@@ -5583,6 +5584,38 @@ const Methods = {
                 });
             }
         }
+        return Promise.resolve();
+    },
+    handleRowDragDragendEvent(evnt) {
+        const $xeTable = this;
+        const props = $xeTable;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { fullAllDataRowIdData, prevDragToChild } = internalData;
+        const { dragRow } = reactData;
+        const treeOpts = $xeTable.computeTreeOpts;
+        const { lazy } = treeOpts;
+        const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+        const { prevDragRow, prevDragPos } = internalData;
+        if (treeConfig && prevDragToChild) {
+            // 懒加载
+            if (lazy) {
+                const newRowid = getRowid($xeTable, prevDragRow);
+                const rowRest = fullAllDataRowIdData[newRowid];
+                if (prevDragRow[hasChildField]) {
+                    if (rowRest && rowRest.treeLoaded) {
+                        $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+                    }
+                }
+                else {
+                    $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+                }
+            }
+        }
+        else {
+            $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+        }
         hideDropTip($xeTable);
         clearRowDropOrigin($xeTable);
         internalData.prevDragToChild = false;
@@ -5601,7 +5634,8 @@ const Methods = {
         const { fullAllDataRowIdData } = internalData;
         const { dragRow } = reactData;
         const treeOpts = $xeTable.computeTreeOpts;
-        const { transform, parentField } = treeOpts;
+        const { lazy, transform, parentField } = treeOpts;
+        const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
         const rowDragOpts = $xeTable.computeRowDragOpts;
         const { isPeerDrag, isCrossDrag, isToChildDrag } = rowDragOpts;
         if (!dragRow) {
@@ -5614,18 +5648,21 @@ const Methods = {
         const rest = fullAllDataRowIdData[rowid];
         if (rest) {
             const row = rest.row;
+            const rowid = getRowid($xeTable, row);
+            const rowRest = fullAllDataRowIdData[rowid];
             evnt.preventDefault();
             const { dragRow } = reactData;
             const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
             const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
+            internalData.prevDragToChild = !!(treeConfig && transform && isToChildDrag && hasCtrlKey);
+            internalData.prevDragRow = row;
+            internalData.prevDragPos = dragPos;
             if ($xeTable.eqRow(dragRow, row) ||
+                (hasCtrlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded) ||
                 (!isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level))) {
                 showDropTip($xeTable, evnt, trEl, null, false, dragPos);
                 return;
             }
-            internalData.prevDragToChild = !!(treeConfig && transform && isToChildDrag && hasCtrlKey);
-            internalData.prevDragRow = row;
-            internalData.prevDragPos = dragPos;
             showDropTip($xeTable, evnt, trEl, null, true, dragPos);
             $xeTable.dispatchEvent('row-dragover', {
                 oldRow: dragRow,
@@ -5884,15 +5921,15 @@ const Methods = {
             const { clientX } = evnt;
             const offsetX = clientX - thEl.getBoundingClientRect().x;
             const dragPos = offsetX < thEl.clientWidth / 2 ? 'left' : 'right';
+            internalData.prevDragToChild = !!((isCrossDrag && isToChildDrag) && hasCtrlKey);
+            internalData.prevDragCol = column;
+            internalData.prevDragPos = dragPos;
             if (column.fixed ||
                 (dragCol && dragCol.id === column.id) ||
                 (!isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : column.parentId))) {
                 showDropTip($xeTable, evnt, null, thEl, false, dragPos);
                 return;
             }
-            internalData.prevDragToChild = !!((isCrossDrag && isToChildDrag) && hasCtrlKey);
-            internalData.prevDragCol = column;
-            internalData.prevDragPos = dragPos;
             showDropTip($xeTable, evnt, null, thEl, true, dragPos);
             $xeTable.dispatchEvent('column-dragover', {
                 oldColumn: dragCol,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.12.4";
+export const version = "3.12.5";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.12.4"}`;
+const version = `table v${"3.12.5"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.4";
+const version = "3.12.5";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2814,7 +2814,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.4"}`;
+const log_version = `table v${"3.12.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4056,7 +4056,7 @@ const Cell = {
       style: {
         paddingLeft: `${level * indent}px`
       }
-    }, [showIcon && (lazy ? isLazyLoaded ? hasChild : hasLazyChilds : hasChild) ? [h('div', {
+    }, [showIcon && (lazy ? isLazyLoaded ? hasChild : hasChild || hasLazyChilds : hasChild) ? [h('div', {
       class: 'vxe-tree--btn-wrapper',
       on: ons
     }, [h('i', {
@@ -5137,6 +5137,10 @@ function cacheColumnMap($xeTable) {
     isCrossDrag,
     isSelfToChildDrag
   } = columnDragOpts;
+  const customOpts = $xeTable.computeCustomOpts;
+  const {
+    storage
+  } = customOpts;
   const rowOpts = $xeTable.computeRowOpts;
   const isGroup = collectColumn.some(hasChildrenList);
   let isAllOverflow = !!props.showOverflow;
@@ -5170,8 +5174,8 @@ function cacheColumnMap($xeTable) {
       }
       fullColumnFieldData[field] = rest;
     } else {
-      if (isCrossDrag || isSelfToChildDrag) {
-        errLog('vxe.error.emptyProp', ['column.field']);
+      if (storage || isCrossDrag || isSelfToChildDrag) {
+        errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
       }
     }
     if (!hasFixed && fixed) {
@@ -11393,7 +11397,7 @@ const Methods = {
       evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
     }
   },
-  handleRowDragDragendEvent(evnt) {
+  handleRowDragSwapEvent(evnt, isSyncRow, dragRow, prevDragRow, prevDragPos, prevDragToChild) {
     const $xeTable = this;
     const props = $xeTable;
     const reactData = $xeTable;
@@ -11404,8 +11408,7 @@ const Methods = {
     } = props;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
-      fullAllDataRowIdData,
-      prevDragToChild
+      fullAllDataRowIdData
     } = internalData;
     const {
       isPeerDrag,
@@ -11421,21 +11424,16 @@ const Methods = {
       parentField
     } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
-    const {
-      dragRow
-    } = reactData;
     const {
       afterFullData,
-      tableFullData,
-      prevDragRow,
-      prevDragPos
+      tableFullData
     } = internalData;
     const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
     const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
     if (prevDragRow && dragRow) {
       // 判断是否有拖动
       if (prevDragRow !== dragRow) {
-        Promise.resolve(dEndMethod ? dEndMethod({
+        return Promise.resolve(dEndMethod ? dEndMethod({
           oldRow: dragRow,
           newRow: prevDragRow,
           dragPos: prevDragPos,
@@ -11586,6 +11584,48 @@ const Methods = {
         }).catch(() => {});
       }
     }
+    return Promise.resolve();
+  },
+  handleRowDragDragendEvent(evnt) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      fullAllDataRowIdData,
+      prevDragToChild
+    } = internalData;
+    const {
+      dragRow
+    } = reactData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const {
+      lazy
+    } = treeOpts;
+    const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+    const {
+      prevDragRow,
+      prevDragPos
+    } = internalData;
+    if (treeConfig && prevDragToChild) {
+      // 懒加载
+      if (lazy) {
+        const newRowid = getRowid($xeTable, prevDragRow);
+        const rowRest = fullAllDataRowIdData[newRowid];
+        if (prevDragRow[hasChildField]) {
+          if (rowRest && rowRest.treeLoaded) {
+            $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+          }
+        } else {
+          $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+        }
+      }
+    } else {
+      $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+    }
     hideDropTip($xeTable);
     clearRowDropOrigin($xeTable);
     internalData.prevDragToChild = false;
@@ -11611,9 +11651,11 @@ const Methods = {
     } = reactData;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
+      lazy,
       transform,
       parentField
     } = treeOpts;
+    const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
       isPeerDrag,
@@ -11630,19 +11672,21 @@ const Methods = {
     const rest = fullAllDataRowIdData[rowid];
     if (rest) {
       const row = rest.row;
+      const rowid = getRowid($xeTable, row);
+      const rowRest = fullAllDataRowIdData[rowid];
       evnt.preventDefault();
       const {
         dragRow
       } = reactData;
       const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
       const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
-      if ($xeTable.eqRow(dragRow, row) || !isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level)) {
-        showDropTip($xeTable, evnt, trEl, null, false, dragPos);
-        return;
-      }
       internalData.prevDragToChild = !!(treeConfig && transform && isToChildDrag && hasCtrlKey);
       internalData.prevDragRow = row;
       internalData.prevDragPos = dragPos;
+      if ($xeTable.eqRow(dragRow, row) || hasCtrlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded || !isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level)) {
+        showDropTip($xeTable, evnt, trEl, null, false, dragPos);
+        return;
+      }
       showDropTip($xeTable, evnt, trEl, null, true, dragPos);
       $xeTable.dispatchEvent('row-dragover', {
         oldRow: dragRow,
@@ -11933,13 +11977,13 @@ const Methods = {
       } = evnt;
       const offsetX = clientX - thEl.getBoundingClientRect().x;
       const dragPos = offsetX < thEl.clientWidth / 2 ? 'left' : 'right';
+      internalData.prevDragToChild = !!(isCrossDrag && isToChildDrag && hasCtrlKey);
+      internalData.prevDragCol = column;
+      internalData.prevDragPos = dragPos;
       if (column.fixed || dragCol && dragCol.id === column.id || !isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : column.parentId)) {
         showDropTip($xeTable, evnt, null, thEl, false, dragPos);
         return;
       }
-      internalData.prevDragToChild = !!(isCrossDrag && isToChildDrag && hasCtrlKey);
-      internalData.prevDragCol = column;
-      internalData.prevDragPos = dragPos;
       showDropTip($xeTable, evnt, null, thEl, true, dragPos);
       $xeTable.dispatchEvent('column-dragover', {
         oldColumn: dragCol,
@@ -23344,10 +23388,10 @@ function validErrorRuleValue(rule, val) {
         allowFixed,
         allowResizable
       } = customOpts;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
-        if (parent) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parentColumn) => {
+        if (parentColumn) {
           // 更新子列信息
-          column.fixed = parent.fixed;
+          column.fixed = parentColumn.fixed;
         } else {
           if (allowSort) {
             const sortIndex = index + 1;