vxe-table 3.10.7 → 3.10.8

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.10.7";
+export const version = "3.10.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${"3.10.7"}`;
+const version = `table v${"3.10.8"}`;
 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.10.7";
+const version = "3.10.8";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2769,7 +2769,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.10.7"}`;
+const log_version = `table v${"3.10.8"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3545,23 +3545,30 @@ function renderCellBaseVNs(h, params, content) {
   const {
     $table,
     column,
-    row
+    row,
+    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;
+  const {
+    treeConfig
+  } = tableProps;
   const rowOpts = $table.computeRowOpts;
   const dragOpts = $table.computeDragOpts;
   const {
     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({
     row,
     column
   }))) {
-    vns.unshift(renderCellDragIcon(h, params));
+    if (!treeConfig || !level) {
+      vns.unshift(renderCellDragIcon(h, params));
+    }
   }
   return vns;
 }
@@ -5147,6 +5154,16 @@ function clearRowDropOrigin($xeTable) {
     });
   }
 }
+function updateRowDropOrigin($xeTable, row) {
+  const el = $xeTable.$el;
+  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);
+    });
+  }
+}
 function clearRowDropTarget($xeTable) {
   const el = $xeTable.$el;
   if (el) {
@@ -5156,6 +5173,17 @@ function clearRowDropTarget($xeTable) {
     });
   }
 }
+function updateRowDropTarget($xeTable, row, dragPos) {
+  const el = $xeTable.$el;
+  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);
+    });
+  }
+}
 function showRowDropTip(evnt, $xeTable) {
   const rdTipEl = $xeTable.$refs.refRowDragTipElem;
   if (!rdTipEl) {
@@ -10252,7 +10280,9 @@ const Methods = {
     } = reactData;
     const {
       afterFullData,
+      afterTreeFullData,
       tableFullData,
+      tableFullTreeData,
       prevDragRow,
       prevDragPos
     } = internalData;
@@ -10267,18 +10297,35 @@ const Methods = {
             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();
@@ -10330,8 +10377,7 @@ const Methods = {
       } = 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($xeTable, row, dragPos);
       internalData.prevDragRow = row;
       internalData.prevDragPos = dragPos;
       $xeTable.dispatchEvent('row-dragover', {
@@ -10366,7 +10412,7 @@ const Methods = {
     }
     reactData.dragRow = row;
     trEl.draggable = true;
-    addClass(trEl, 'row--drag-origin');
+    updateRowDropOrigin($xeTable, row);
     showRowDropTip(evnt, $xeTable);
     updateRowDropTipContent($xeTable, tdEl);
     $xeTable.dispatchEvent('row-dragstart', params, evnt);
@@ -13230,7 +13276,7 @@ const cellType = 'header';
       tId,
       isGroup,
       visibleColumn,
-      resizable,
+      resizable: allResizable,
       border,
       columnKey,
       headerRowClassName,
@@ -13401,7 +13447,7 @@ const cellType = 'header';
         /**
          * 列宽拖动
          */
-        !fixedHiddenColumn && !isColGroup && (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || resizable) ? 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) ? h('div', {
           class: ['vxe-resizable', {
             'is--line': !border || border === 'none'
           }],
@@ -14416,6 +14462,7 @@ const renderPopupPanel = (h, _vm) => {
     customStore
   } = _vm;
   const {
+    resizable: allResizable,
     customOpts,
     customColumnList,
     columnOpts,
@@ -14550,7 +14597,7 @@ const renderPopupPanel = (h, _vm) => {
         }
       }, colTitle)]), allowResizable ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--resizable'
-      }, [column.children && column.children.length ? h('span', '-') : VxeUINumberInputComponent ? 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) ? h('span', '-') : VxeUINumberInputComponent ? h(VxeUINumberInputComponent, {
         props: {
           type: 'integer',
           disabled: isDisabled || isHidden,