vxe-table 3.15.45 → 3.15.46

package/es/table/module/custom/panel.js

@@ -851,12 +851,12 @@ export default {
     data() {
         const reactData = {
             dragCol: null,
-            dragGroup: null,
-            dragValues: null,
             dragTipText: ''
         };
         const internalData = {
         // prevDragCol: undefined,
+        // prevDragGroup: undefined,
+        // prevDragValues: undefined,
         // prevDragToChild: false,
         // prevDragPos: null
         };
@@ -1133,12 +1133,12 @@ export default {
         },
         sortDragstartEvent(evnt) {
             const $xeTableCustomPanel = this;
-            const customPanelReactData = $xeTableCustomPanel.reactData;
+            const customPanelInternalData = $xeTableCustomPanel.internalData;
             if (evnt.dataTransfer) {
                 evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
             }
-            customPanelReactData.dragGroup = null;
-            customPanelReactData.dragValues = null;
+            customPanelInternalData.prevDragGroup = null;
+            customPanelInternalData.prevDragValues = null;
         },
         sortDragendEvent(evnt) {
             const $xeTableCustomPanel = this;
@@ -1156,10 +1156,10 @@ export default {
             const trEl = evnt.currentTarget;
             const columnDragOpts = $xeTable.computeColumnDragOpts;
             const { isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod } = columnDragOpts;
-            const { dragCol, dragGroup, dragValues } = customPanelReactData;
-            const { prevDragCol, prevDragPos, prevDragToChild } = customPanelInternalData;
+            const { dragCol } = customPanelReactData;
+            const { prevDragCol, prevDragGroup, prevDragValues, prevDragPos, prevDragToChild } = customPanelInternalData;
             const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
-            if (dragGroup || dragValues) {
+            if (prevDragGroup || prevDragValues) {
                 if ($xeTable.handlePivotTableAggregatePanelDragendEvent) {
                     $xeTable.handlePivotTableAggregatePanelDragendEvent(evnt);
                 }
@@ -1318,8 +1318,8 @@ export default {
             }
             hideDropTip($xeTableCustomPanel);
             customPanelReactData.dragCol = null;
-            customPanelReactData.dragGroup = null;
-            customPanelReactData.dragValues = null;
+            customPanelInternalData.prevDragGroup = null;
+            customPanelInternalData.prevDragValues = null;
             trEl.draggable = false;
             trEl.removeAttribute('drag-pos');
             removeClass(trEl, 'active--drag-target');
@@ -1339,8 +1339,8 @@ export default {
             const isControlKey = hasControlKey(evnt);
             const colid = optEl.getAttribute('colid');
             const column = $xeTable.getColumnById(colid);
-            customPanelReactData.dragGroup = null;
-            customPanelReactData.dragValues = null;
+            customPanelInternalData.prevDragGroup = null;
+            customPanelInternalData.prevDragValues = null;
             // 是否移入有效列
             if (column && (isCrossDrag || column.level === 1)) {
                 evnt.preventDefault();

package/es/table/src/methods.js

@@ -6850,7 +6850,15 @@ const Methods = {
                         }
                         vLen++;
                     });
-                const isSelected = selectCheckboxMaps[rowid] || (sLen >= vLen && (vLen >= 1 || hLen >= 1));
+                let isSelected = (sLen >= vLen && (vLen >= 1 || hLen >= 1));
+                if (checkMethod) {
+                    if (checkMethod({ $table: $xeTable, row })) {
+                        isSelected = sLen >= vLen;
+                    }
+                    else {
+                        isSelected = selectCheckboxMaps[rowid];
+                    }
+                }
                 const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
                 if (checkField) {
                     XEUtils.set(row, checkField, isSelected);

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.45";
+const version = "3.15.46";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2662,7 +2662,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.45"}`;
+const log_version = `table v${"3.15.46"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -13143,7 +13143,17 @@ const Methods = {
           }
           vLen++;
         });
-        const isSelected = selectCheckboxMaps[rowid] || sLen >= vLen && (vLen >= 1 || hLen >= 1);
+        let isSelected = sLen >= vLen && (vLen >= 1 || hLen >= 1);
+        if (checkMethod) {
+          if (checkMethod({
+            $table: $xeTable,
+            row
+          })) {
+            isSelected = sLen >= vLen;
+          } else {
+            isSelected = selectCheckboxMaps[rowid];
+          }
+        }
         const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
         if (checkField) {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, isSelected);
@@ -20191,12 +20201,12 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
   data() {
     const reactData = {
       dragCol: null,
-      dragGroup: null,
-      dragValues: null,
       dragTipText: ''
     };
     const internalData = {
       // prevDragCol: undefined,
+      // prevDragGroup: undefined,
+      // prevDragValues: undefined,
       // prevDragToChild: false,
       // prevDragPos: null
     };
@@ -20499,12 +20509,12 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
     },
     sortDragstartEvent(evnt) {
       const $xeTableCustomPanel = this;
-      const customPanelReactData = $xeTableCustomPanel.reactData;
+      const customPanelInternalData = $xeTableCustomPanel.internalData;
       if (evnt.dataTransfer) {
         evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
       }
-      customPanelReactData.dragGroup = null;
-      customPanelReactData.dragValues = null;
+      customPanelInternalData.prevDragGroup = null;
+      customPanelInternalData.prevDragValues = null;
     },
     sortDragendEvent(evnt) {
       const $xeTableCustomPanel = this;
@@ -20536,17 +20546,17 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
         dragEndMethod
       } = columnDragOpts;
       const {
-        dragCol,
-        dragGroup,
-        dragValues
+        dragCol
       } = customPanelReactData;
       const {
         prevDragCol,
+        prevDragGroup,
+        prevDragValues,
         prevDragPos,
         prevDragToChild
       } = customPanelInternalData;
       const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
-      if (dragGroup || dragValues) {
+      if (prevDragGroup || prevDragValues) {
         if ($xeTable.handlePivotTableAggregatePanelDragendEvent) {
           $xeTable.handlePivotTableAggregatePanelDragendEvent(evnt);
         }
@@ -20706,8 +20716,8 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
       }
       panel_hideDropTip($xeTableCustomPanel);
       customPanelReactData.dragCol = null;
-      customPanelReactData.dragGroup = null;
-      customPanelReactData.dragValues = null;
+      customPanelInternalData.prevDragGroup = null;
+      customPanelInternalData.prevDragValues = null;
       trEl.draggable = false;
       trEl.removeAttribute('drag-pos');
       removeClass(trEl, 'active--drag-target');
@@ -20734,8 +20744,8 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
       const isControlKey = hasControlKey(evnt);
       const colid = optEl.getAttribute('colid');
       const column = $xeTable.getColumnById(colid);
-      customPanelReactData.dragGroup = null;
-      customPanelReactData.dragValues = null;
+      customPanelInternalData.prevDragGroup = null;
+      customPanelInternalData.prevDragValues = null;
       // 是否移入有效列
       if (column && (isCrossDrag || column.level === 1)) {
         evnt.preventDefault();