vxe-table 3.12.1-beta.5 → 3.12.1-beta.6

package/es/table/src/methods.js

@@ -3,7 +3,7 @@ import { browse, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEv
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import Cell from './cell';
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn } from './util';
+import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeUI;
@@ -3010,11 +3010,15 @@ const Methods = {
             const { column } = params;
             const colid = column.id;
             const colRest = fullColumnIdData[colid];
+            const dragBtnElem = evnt.target;
+            const cell = dragBtnElem.parentNode;
+            const cellParams = Object.assign(params, { cell });
+            const colMinWidth = getColReMinWidth(cellParams);
             let resizeWidth = calcColumnAutoWidth(column, el);
             if (colRest) {
                 resizeWidth = Math.max(resizeWidth, colRest.width);
             }
-            column.resizeWidth = resizeWidth;
+            column.resizeWidth = Math.max(colMinWidth, resizeWidth);
             reactData._isResize = false;
             internalData._lastResizeTime = Date.now();
             $xeTable.analyColumnWidth();
@@ -5317,16 +5321,17 @@ const Methods = {
         const mouseOpts = $xeTable.computeMouseOpts;
         const columnOpts = $xeTable.computeColumnOpts;
         const columnDragOpts = $xeTable.computeColumnDragOpts;
-        const { trigger, disabledMethod } = columnDragOpts;
+        const { trigger, isCrossDrag, isPeerDrag, disabledMethod } = columnDragOpts;
         const cell = evnt.currentTarget;
         const triggerInput = cell && cell.tagName && cell.tagName.toLowerCase() === 'input';
         const triggerCheckbox = getEventTargetNode(evnt, cell, 'vxe-cell--checkbox').flag;
         const triggerSort = getEventTargetNode(evnt, cell, 'vxe-cell--sort').flag;
         const triggerFilter = getEventTargetNode(evnt, cell, 'vxe-cell--filter').flag;
         let triggerDrag = false;
+        const isColDragCell = columnOpts.drag && trigger === 'cell';
         if (!(triggerInput || triggerCheckbox || triggerSort || triggerFilter)) {
             const { column } = params;
-            if (columnOpts.drag && !column.fixed && trigger === 'cell' && !(disabledMethod && disabledMethod(params))) {
+            if (isColDragCell && !column.fixed && (isCrossDrag || isPeerDrag || !column.parentId) && !(disabledMethod && disabledMethod(params))) {
                 triggerDrag = true;
                 $xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
             }
@@ -5351,7 +5356,7 @@ const Methods = {
         const isExpandType = type === 'expand';
         const rowOpts = $xeTable.computeRowOpts;
         const rowDragOpts = $xeTable.computeRowDragOpts;
-        const { trigger, disabledMethod } = rowDragOpts;
+        const { trigger, isCrossDrag, isPeerDrag, disabledMethod } = rowDragOpts;
         const cell = evnt.currentTarget;
         params.cell = cell;
         const triggerInput = cell && cell.tagName && cell.tagName.toLowerCase() === 'input';
@@ -5365,7 +5370,7 @@ const Methods = {
         }
         let triggerDrag = false;
         if (!(triggerInput || triggerRadio || triggerCheckbox || triggerTreeNode || triggerExpandNode)) {
-            if (isColDragCell && !(disabledMethod && disabledMethod(params))) {
+            if (isColDragCell && (isCrossDrag || isPeerDrag || !params.level) && !(disabledMethod && disabledMethod(params))) {
                 triggerDrag = true;
                 $xeTable.handleCellDragMousedownEvent(evnt, params);
             }
@@ -5442,7 +5447,7 @@ const Methods = {
                                 let isSelfToChildStatus = false;
                                 if (oldLevel && newLevel) {
                                     // 子到子
-                                    if (isPeerDrag) {
+                                    if (isPeerDrag && !isCrossDrag) {
                                         if (oldRest.row[parentField] !== newRest.row[parentField]) {
                                             // 非同级
                                             return;
@@ -5698,7 +5703,7 @@ const Methods = {
                     let isSelfToChildStatus = false;
                     if (oldColumn.parentId && newColumn.parentId) {
                         // 子到子
-                        if (isPeerDrag) {
+                        if (isPeerDrag && !isCrossDrag) {
                             if (oldColumn.parentId !== newColumn.parentId) {
                                 // 非同级
                                 return;

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.1-beta.5";
+export const version = "3.12.1-beta.6";
 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.1-beta.5"}`;
+const version = `table v${"3.12.1-beta.6"}`;
 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.1-beta.5";
+const version = "3.12.1-beta.6";
 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.1-beta.5"}`;
+const log_version = `table v${"3.12.1-beta.6"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4545,41 +4545,46 @@ const Cell = {
       $table,
       column
     } = params;
+    const sortOpts = $table.computeSortOpts;
     const {
       showIcon,
       iconLayout,
       iconAsc,
-      iconDesc
-    } = $table.sortOpts;
-    return showIcon ? [h('span', {
-      class: ['vxe-cell--sort', `vxe-cell--sort-${iconLayout}-layout`]
-    }, [h('i', {
-      class: ['vxe-sort--asc-btn', iconAsc || cell_getIcon().TABLE_SORT_ASC, {
-        'sort--active': column.order === 'asc'
-      }],
-      attrs: {
-        title: cell_getI18n('vxe.table.sortAsc')
-      },
-      on: {
-        click(evnt) {
-          evnt.stopPropagation();
-          $table.triggerSortEvent(evnt, column, 'asc');
+      iconDesc,
+      iconVisibleMethod
+    } = sortOpts;
+    if (showIcon && (!iconVisibleMethod || iconVisibleMethod(params))) {
+      return [h('span', {
+        class: ['vxe-cell--sort', `vxe-cell--sort-${iconLayout}-layout`]
+      }, [h('i', {
+        class: ['vxe-sort--asc-btn', iconAsc || cell_getIcon().TABLE_SORT_ASC, {
+          'sort--active': column.order === 'asc'
+        }],
+        attrs: {
+          title: cell_getI18n('vxe.table.sortAsc')
+        },
+        on: {
+          click(evnt) {
+            evnt.stopPropagation();
+            $table.triggerSortEvent(evnt, column, 'asc');
+          }
         }
-      }
-    }), h('i', {
-      class: ['vxe-sort--desc-btn', iconDesc || cell_getIcon().TABLE_SORT_DESC, {
-        'sort--active': column.order === 'desc'
-      }],
-      attrs: {
-        title: cell_getI18n('vxe.table.sortDesc')
-      },
-      on: {
-        click(evnt) {
-          evnt.stopPropagation();
-          $table.triggerSortEvent(evnt, column, 'desc');
+      }), h('i', {
+        class: ['vxe-sort--desc-btn', iconDesc || cell_getIcon().TABLE_SORT_DESC, {
+          'sort--active': column.order === 'desc'
+        }],
+        attrs: {
+          title: cell_getI18n('vxe.table.sortDesc')
+        },
+        on: {
+          click(evnt) {
+            evnt.stopPropagation();
+            $table.triggerSortEvent(evnt, column, 'desc');
+          }
         }
-      }
-    })])] : [];
+      })])];
+    }
+    return [];
   },
   /**
    * 筛选
@@ -4601,25 +4606,29 @@ const Cell = {
     const {
       showIcon,
       iconNone,
-      iconMatch
+      iconMatch,
+      iconVisibleMethod
     } = filterOpts;
-    return showIcon ? [h('span', {
-      class: ['vxe-cell--filter', {
-        'is--active': filterStore.visible && filterStore.column === column
-      }]
-    }, [h('i', {
-      class: ['vxe-filter--btn', hasFilter ? iconMatch || cell_getIcon().TABLE_FILTER_MATCH : iconNone || cell_getIcon().TABLE_FILTER_NONE],
-      attrs: {
-        title: cell_getI18n('vxe.table.filter')
-      },
-      on: {
-        click(evnt) {
-          if ($table.triggerFilterEvent) {
-            $table.triggerFilterEvent(evnt, params.column, params);
+    if (showIcon && (!iconVisibleMethod || iconVisibleMethod(params))) {
+      return [h('span', {
+        class: ['vxe-cell--filter', {
+          'is--active': filterStore.visible && filterStore.column === column
+        }]
+      }, [h('i', {
+        class: ['vxe-filter--btn', hasFilter ? iconMatch || cell_getIcon().TABLE_FILTER_MATCH : iconNone || cell_getIcon().TABLE_FILTER_NONE],
+        attrs: {
+          title: cell_getI18n('vxe.table.filter')
+        },
+        on: {
+          click(evnt) {
+            if ($table.triggerFilterEvent) {
+              $table.triggerFilterEvent(evnt, params.column, params);
+            }
           }
         }
-      }
-    })])] : [];
+      })])];
+    }
+    return [];
   },
   /**
    * 可编辑
@@ -8527,11 +8536,17 @@ const Methods = {
       } = params;
       const colid = column.id;
       const colRest = fullColumnIdData[colid];
+      const dragBtnElem = evnt.target;
+      const cell = dragBtnElem.parentNode;
+      const cellParams = Object.assign(params, {
+        cell
+      });
+      const colMinWidth = getColReMinWidth(cellParams);
       let resizeWidth = calcColumnAutoWidth(column, el);
       if (colRest) {
         resizeWidth = Math.max(resizeWidth, colRest.width);
       }
-      column.resizeWidth = resizeWidth;
+      column.resizeWidth = Math.max(colMinWidth, resizeWidth);
       reactData._isResize = false;
       internalData._lastResizeTime = Date.now();
       $xeTable.analyColumnWidth();
@@ -11279,6 +11294,8 @@ const Methods = {
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     const {
       trigger,
+      isCrossDrag,
+      isPeerDrag,
       disabledMethod
     } = columnDragOpts;
     const cell = evnt.currentTarget;
@@ -11287,11 +11304,12 @@ const Methods = {
     const triggerSort = getEventTargetNode(evnt, cell, 'vxe-cell--sort').flag;
     const triggerFilter = getEventTargetNode(evnt, cell, 'vxe-cell--filter').flag;
     let triggerDrag = false;
+    const isColDragCell = columnOpts.drag && trigger === 'cell';
     if (!(triggerInput || triggerCheckbox || triggerSort || triggerFilter)) {
       const {
         column
       } = params;
-      if (columnOpts.drag && !column.fixed && trigger === 'cell' && !(disabledMethod && disabledMethod(params))) {
+      if (isColDragCell && !column.fixed && (isCrossDrag || isPeerDrag || !column.parentId) && !(disabledMethod && disabledMethod(params))) {
         triggerDrag = true;
         $xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
       }
@@ -11327,6 +11345,8 @@ const Methods = {
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
       trigger,
+      isCrossDrag,
+      isPeerDrag,
       disabledMethod
     } = rowDragOpts;
     const cell = evnt.currentTarget;
@@ -11342,7 +11362,7 @@ const Methods = {
     }
     let triggerDrag = false;
     if (!(triggerInput || triggerRadio || triggerCheckbox || triggerTreeNode || triggerExpandNode)) {
-      if (isColDragCell && !(disabledMethod && disabledMethod(params))) {
+      if (isColDragCell && (isCrossDrag || isPeerDrag || !params.level) && !(disabledMethod && disabledMethod(params))) {
         triggerDrag = true;
         $xeTable.handleCellDragMousedownEvent(evnt, params);
       }
@@ -11446,7 +11466,7 @@ const Methods = {
                 let isSelfToChildStatus = false;
                 if (oldLevel && newLevel) {
                   // 子到子
-                  if (isPeerDrag) {
+                  if (isPeerDrag && !isCrossDrag) {
                     if (oldRest.row[parentField] !== newRest.row[parentField]) {
                       // 非同级
                       return;
@@ -11726,7 +11746,7 @@ const Methods = {
           let isSelfToChildStatus = false;
           if (oldColumn.parentId && newColumn.parentId) {
             // 子到子
-            if (isPeerDrag) {
+            if (isPeerDrag && !isCrossDrag) {
               if (oldColumn.parentId !== newColumn.parentId) {
                 // 非同级
                 return;
@@ -14062,7 +14082,9 @@ function renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, ro
   } = $xeTable;
   const rowDragOpts = $xeTable.computeRowDragOpts;
   const {
-    disabledMethod: dragDisabledMethod
+    disabledMethod: dragDisabledMethod,
+    isCrossDrag,
+    isPeerDrag
   } = rowDragOpts;
   const {
     selectCellToRow
@@ -14325,7 +14347,7 @@ function renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, ro
       'col--ellipsis': hasEllipsis,
       'fixed--width': !isAutoCellWidth,
       'fixed--hidden': fixedHiddenColumn,
-      'is--drag-cell': isRowDragCell,
+      'is--drag-cell': isRowDragCell && (isCrossDrag || isPeerDrag || !rowLevel),
       'is--drag-disabled': isDisabledDrag,
       'col--dirty': isDirty,
       'col--active': editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row'),
@@ -15041,7 +15063,9 @@ const header_renderRows = (h, _vm, cols, $rowIndex) => {
   } = $xeTable;
   const columnDragOpts = $xeTable.computeColumnDragOpts;
   const {
-    disabledMethod: dragDisabledMethod
+    disabledMethod: dragDisabledMethod,
+    isCrossDrag,
+    isPeerDrag
   } = columnDragOpts;
   return cols.map((column, $columnIndex) => {
     const {
@@ -15049,6 +15073,7 @@ const header_renderRows = (h, _vm, cols, $rowIndex) => {
       showHeaderOverflow,
       headerAlign,
       align,
+      filters,
       headerClassName,
       editRender,
       cellRender
@@ -15065,7 +15090,12 @@ const header_renderRows = (h, _vm, cols, $rowIndex) => {
     const showTitle = headOverflow === 'title';
     const showTooltip = headOverflow === true || headOverflow === 'tooltip';
     let hasEllipsis = showTitle || showTooltip || showEllipsis;
-    const hasFilter = column.filters && column.filters.some(item => item.checked);
+    let hasFilter = false;
+    let firstFilterOption = null;
+    if (filters) {
+      firstFilterOption = filters[0];
+      hasFilter = filters.some(item => item.checked);
+    }
     const columnIndex = $xeTable.getColumnIndex(column);
     const _columnIndex = $xeTable.getVTColumnIndex(column);
     const params = {
@@ -15076,6 +15106,7 @@ const header_renderRows = (h, _vm, cols, $rowIndex) => {
       columnIndex,
       $columnIndex,
       _columnIndex,
+      firstFilterOption,
       fixed: fixedType,
       type: cellType,
       isHidden: fixedHiddenColumn,
@@ -15124,9 +15155,9 @@ const header_renderRows = (h, _vm, cols, $rowIndex) => {
         'fixed--width': !isAutoCellWidth,
         'fixed--hidden': fixedHiddenColumn,
         'is--sortable': column.sortable,
-        'col--filter': !!column.filters,
+        'col--filter': !!filters,
         'is--filter-active': hasFilter,
-        'is--drag-active': !column.fixed && !isDisabledDrag,
+        'is--drag-active': !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
         'is--drag-disabled': isDisabledDrag,
         'col--current': currentColumn === column
       }, getClass(headerClassName, params), getClass(headerCellClassName, params)],