vxe-table 4.8.6 → 4.8.8

package/es/table/src/table.js

@@ -5470,6 +5470,16 @@ export default defineComponent({
                 });
             }
         };
+        const updateRowDropOrigin = (row) => {
+            const el = refElem.value;
+            if (el) {
+                const clss = 'row--drag-origin';
+                const rowid = getRowid($xeTable, row);
+                XEUtils.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), (elem) => {
+                    addClass(elem, clss);
+                });
+            }
+        };
         const clearRowDropTarget = () => {
             const el = refElem.value;
             if (el) {
@@ -5479,6 +5489,17 @@ export default defineComponent({
                 });
             }
         };
+        const updateRowDropTarget = (row, dragPos) => {
+            const el = refElem.value;
+            if (el) {
+                const clss = 'row--drag-active-target';
+                const rowid = getRowid($xeTable, row);
+                XEUtils.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), (elem) => {
+                    addClass(elem, clss);
+                    elem.setAttribute('drag-pos', dragPos);
+                });
+            }
+        };
         const showRowDropTip = (evnt) => {
             const rdTipEl = refRowDragTipElem.value;
             if (!rdTipEl) {
@@ -6614,7 +6635,7 @@ export default defineComponent({
                 const treeOpts = computeTreeOpts.value;
                 const { transform } = treeOpts;
                 const { dragRow } = reactData;
-                const { afterFullData, tableFullData, prevDragRow, prevDragPos } = internalData;
+                const { afterFullData, afterTreeFullData, tableFullData, tableFullTreeData, prevDragRow, prevDragPos } = internalData;
                 if (prevDragRow && dragRow) {
                     // 判断是否有拖动
                     if (prevDragRow !== dragRow) {
@@ -6628,18 +6649,36 @@ export default defineComponent({
                                 return;
                             }
                             const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
-                            // 移出源位置
-                            const oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
-                            const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
-                            afterFullData.splice(oafIndex, 1);
-                            tableFullData.splice(otfIndex, 1);
-                            // 插新位置
-                            const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
-                            const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
-                            const nafIndex = pafIndex + dragOffsetIndex;
-                            const ntfIndex = ptfIndex + dragOffsetIndex;
-                            afterFullData.splice(nafIndex, 0, dragRow);
-                            tableFullData.splice(ntfIndex, 0, dragRow);
+                            let oafIndex = -1;
+                            let nafIndex = -1;
+                            if (treeConfig) {
+                                // 移出源位置
+                                oafIndex = $xeTable.findRowIndexOf(afterTreeFullData, dragRow);
+                                const otfIndex = $xeTable.findRowIndexOf(tableFullTreeData, dragRow);
+                                afterTreeFullData.splice(oafIndex, 1);
+                                tableFullTreeData.splice(otfIndex, 1);
+                                // 插新位置
+                                const pafIndex = $xeTable.findRowIndexOf(afterTreeFullData, prevDragRow);
+                                const ptfIndex = $xeTable.findRowIndexOf(tableFullTreeData, prevDragRow);
+                                nafIndex = pafIndex + dragOffsetIndex;
+                                const ntfIndex = ptfIndex + dragOffsetIndex;
+                                afterTreeFullData.splice(nafIndex, 0, dragRow);
+                                tableFullTreeData.splice(ntfIndex, 0, dragRow);
+                            }
+                            else {
+                                // 移出源位置
+                                oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
+                                const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
+                                afterFullData.splice(oafIndex, 1);
+                                tableFullData.splice(otfIndex, 1);
+                                // 插新位置
+                                const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
+                                const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
+                                nafIndex = pafIndex + dragOffsetIndex;
+                                const ntfIndex = ptfIndex + dragOffsetIndex;
+                                afterFullData.splice(nafIndex, 0, dragRow);
+                                tableFullData.splice(ntfIndex, 0, dragRow);
+                            }
                             reactData.isDragRowMove = true;
                             $xeTable.cacheRowMap();
                             $xeTable.updateScrollYStatus();
@@ -6687,8 +6726,7 @@ export default defineComponent({
                     const { dragRow } = reactData;
                     const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
                     const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
-                    addClass(trEl, 'row--drag-active-target');
-                    trEl.setAttribute('drag-pos', dragPos);
+                    updateRowDropTarget(row, dragPos);
                     internalData.prevDragRow = row;
                     internalData.prevDragPos = dragPos;
                     dispatchEvent('row-dragover', {
@@ -6718,7 +6756,7 @@ export default defineComponent({
                 }
                 reactData.dragRow = row;
                 trEl.draggable = true;
-                addClass(trEl, 'row--drag-origin');
+                updateRowDropOrigin(row);
                 showRowDropTip(evnt);
                 updateRowDropTipContent(tdEl);
                 dispatchEvent('row-dragstart', params, evnt);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.8.6";
+export const version = "4.8.8";
 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${"4.8.6"}`;
+const version = `table v${"4.8.8"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -1998,7 +1998,7 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.8.6";
+const version = "4.8.8";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2389,7 +2389,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.8.6"}`;
+const log_version = `table v${"4.8.8"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3388,12 +3388,16 @@ function renderCellDragIcon(params) {
 function renderCellBaseVNs(params, content) {
   const {
     $table,
-    column
+    column,
+    level
   } = params;
   const {
     dragSort
   } = column;
-  const vns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(content) ? content : [content];
+  const tableProps = $table.props;
+  const {
+    treeConfig
+  } = tableProps;
   const {
     computeRowOpts,
     computeDragOpts
@@ -3404,8 +3408,11 @@ function renderCellBaseVNs(params, content) {
     showRowIcon,
     rowVisibleMethod
   } = dragOpts;
+  const vns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(content) ? content : [content];
   if (dragSort && rowOpts.drag && showRowIcon && (!rowVisibleMethod || rowVisibleMethod(params))) {
-    vns.unshift(renderCellDragIcon(params));
+    if (!treeConfig || !level) {
+      vns.unshift(renderCellDragIcon(params));
+    }
   }
   return vns;
 }
@@ -5895,7 +5902,7 @@ const header_renderType = 'header';
         tableColumn
       } = props;
       const {
-        resizable,
+        resizable: allResizable,
         border,
         columnKey,
         headerRowClassName,
@@ -6057,7 +6064,7 @@ const header_renderType = 'header';
           /**
            * 列宽拖动
            */
-          !fixedHiddenColumn && !isColGroup && (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || resizable) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          !fixedHiddenColumn && !isColGroup && (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: ['vxe-resizable', {
               'is--line': !border || border === 'none'
             }],
@@ -6728,6 +6735,7 @@ const {
     const VxeUIRadioGroupComponent = core_.VxeUI.getComponent('VxeRadioGroup');
     const $xeTable = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeTable', {});
     const {
+      props: tableProps,
       reactData
     } = $xeTable;
     const {
@@ -7183,6 +7191,9 @@ const {
       const {
         customStore
       } = props;
+      const {
+        resizable: allResizable
+      } = tableProps;
       const {
         customColumnList
       } = reactData;
@@ -7310,7 +7321,7 @@ const {
             title: colTitle
           }, colTitle)]), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
             class: 'vxe-table-custom-popup--column-item col--resizable'
-          }, [column.children && column.children.length ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-') : VxeUINumberInputComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUINumberInputComponent, {
+          }, [column.children && column.children.length || !(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-') : VxeUINumberInputComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUINumberInputComponent, {
             type: 'integer',
             disabled: isDisabled || isHidden,
             modelValue: column.renderResizeWidth,
@@ -14809,6 +14820,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         });
       }
     };
+    const updateRowDropOrigin = row => {
+      const el = refElem.value;
+      if (el) {
+        const clss = 'row--drag-origin';
+        const rowid = getRowid($xeTable, row);
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), elem => {
+          addClass(elem, clss);
+        });
+      }
+    };
     const clearRowDropTarget = () => {
       const el = refElem.value;
       if (el) {
@@ -14818,6 +14839,17 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         });
       }
     };
+    const updateRowDropTarget = (row, dragPos) => {
+      const el = refElem.value;
+      if (el) {
+        const clss = 'row--drag-active-target';
+        const rowid = getRowid($xeTable, row);
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), elem => {
+          addClass(elem, clss);
+          elem.setAttribute('drag-pos', dragPos);
+        });
+      }
+    };
     const showRowDropTip = evnt => {
       const rdTipEl = refRowDragTipElem.value;
       if (!rdTipEl) {
@@ -16203,7 +16235,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         } = reactData;
         const {
           afterFullData,
+          afterTreeFullData,
           tableFullData,
+          tableFullTreeData,
           prevDragRow,
           prevDragPos
         } = internalData;
@@ -16218,18 +16252,35 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 return;
               }
               const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
-              // 移出源位置
-              const oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
-              const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
-              afterFullData.splice(oafIndex, 1);
-              tableFullData.splice(otfIndex, 1);
-              // 插新位置
-              const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
-              const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
-              const nafIndex = pafIndex + dragOffsetIndex;
-              const ntfIndex = ptfIndex + dragOffsetIndex;
-              afterFullData.splice(nafIndex, 0, dragRow);
-              tableFullData.splice(ntfIndex, 0, dragRow);
+              let oafIndex = -1;
+              let nafIndex = -1;
+              if (treeConfig) {
+                // 移出源位置
+                oafIndex = $xeTable.findRowIndexOf(afterTreeFullData, dragRow);
+                const otfIndex = $xeTable.findRowIndexOf(tableFullTreeData, dragRow);
+                afterTreeFullData.splice(oafIndex, 1);
+                tableFullTreeData.splice(otfIndex, 1);
+                // 插新位置
+                const pafIndex = $xeTable.findRowIndexOf(afterTreeFullData, prevDragRow);
+                const ptfIndex = $xeTable.findRowIndexOf(tableFullTreeData, prevDragRow);
+                nafIndex = pafIndex + dragOffsetIndex;
+                const ntfIndex = ptfIndex + dragOffsetIndex;
+                afterTreeFullData.splice(nafIndex, 0, dragRow);
+                tableFullTreeData.splice(ntfIndex, 0, dragRow);
+              } else {
+                // 移出源位置
+                oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
+                const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
+                afterFullData.splice(oafIndex, 1);
+                tableFullData.splice(otfIndex, 1);
+                // 插新位置
+                const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
+                const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
+                nafIndex = pafIndex + dragOffsetIndex;
+                const ntfIndex = ptfIndex + dragOffsetIndex;
+                afterFullData.splice(nafIndex, 0, dragRow);
+                tableFullData.splice(ntfIndex, 0, dragRow);
+              }
               reactData.isDragRowMove = true;
               $xeTable.cacheRowMap();
               $xeTable.updateScrollYStatus();
@@ -16278,8 +16329,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           } = reactData;
           const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
           const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
-          addClass(trEl, 'row--drag-active-target');
-          trEl.setAttribute('drag-pos', dragPos);
+          updateRowDropTarget(row, dragPos);
           internalData.prevDragRow = row;
           internalData.prevDragPos = dragPos;
           dispatchEvent('row-dragover', {
@@ -16312,7 +16362,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
         reactData.dragRow = row;
         trEl.draggable = true;
-        addClass(trEl, 'row--drag-origin');
+        updateRowDropOrigin(row);
         showRowDropTip(evnt);
         updateRowDropTipContent(tdEl);
         dispatchEvent('row-dragstart', params, evnt);