vxe-table 4.7.16-beta.0 → 4.7.17-beta.0

package/es/table/src/table.js

@@ -2541,6 +2541,22 @@ export default defineComponent({
                 return tableMethods.recalculate();
             });
         };
+        const handleCheckAllEvent = (evnt, value) => {
+            const checkboxOpts = computeCheckboxOpts.value;
+            const { trigger } = checkboxOpts;
+            if (trigger === 'manual') {
+                return;
+            }
+            handleCheckedAllCheckboxRow(value);
+            if (evnt) {
+                tableMethods.dispatchEvent('checkbox-all', {
+                    records: tableMethods.getCheckboxRecords(),
+                    reserves: tableMethods.getCheckboxReserveRecords(),
+                    indeterminates: tableMethods.getCheckboxIndeterminateRecords(),
+                    checked: value
+                }, evnt);
+            }
+        };
         /**
          * 纵向 Y 可视渲染处理
          */
@@ -3506,7 +3522,7 @@ export default defineComponent({
              * 多选，切换所有行的选中状态
              */
             toggleAllCheckboxRow() {
-                tablePrivateMethods.triggerCheckAllEvent(null, !reactData.isAllSelected);
+                handleCheckAllEvent(null, !reactData.isAllSelected);
                 return nextTick();
             },
             /**
@@ -5881,7 +5897,10 @@ export default defineComponent({
                 const checkboxOpts = computeCheckboxOpts.value;
                 const { row } = params;
                 const { afterFullData } = internalData;
-                const { checkMethod } = checkboxOpts;
+                const { checkMethod, trigger } = checkboxOpts;
+                if (trigger === 'manual') {
+                    return;
+                }
                 if (checkboxOpts.isShiftKey && evnt.shiftKey && !props.treeConfig) {
                     const checkboxRecords = tableMethods.getCheckboxRecords();
                     if (checkboxRecords.length) {
@@ -5911,15 +5930,12 @@ export default defineComponent({
              * 多选，选中所有事件
              */
             triggerCheckAllEvent(evnt, value) {
-                handleCheckedAllCheckboxRow(value);
-                if (evnt) {
-                    tableMethods.dispatchEvent('checkbox-all', {
-                        records: tableMethods.getCheckboxRecords(),
-                        reserves: tableMethods.getCheckboxReserveRecords(),
-                        indeterminates: tableMethods.getCheckboxIndeterminateRecords(),
-                        checked: value
-                    }, evnt);
+                const checkboxOpts = computeCheckboxOpts.value;
+                const { trigger } = checkboxOpts;
+                if (trigger === 'manual') {
+                    return;
                 }
+                handleCheckAllEvent(evnt, value);
             },
             /**
              * 单选，行选中事件
@@ -5928,6 +5944,10 @@ export default defineComponent({
                 const { selectRadioRow: oldValue } = reactData;
                 const { row } = params;
                 const radioOpts = computeRadioOpts.value;
+                const { trigger } = radioOpts;
+                if (trigger === 'manual') {
+                    return;
+                }
                 let newValue = row;
                 let isChange = oldValue !== newValue;
                 if (isChange) {
@@ -5960,7 +5980,10 @@ export default defineComponent({
                 const { rowExpandLazyLoadedMaps, expandColumn: column } = reactData;
                 const expandOpts = computeExpandOpts.value;
                 const { row } = params;
-                const { lazy } = expandOpts;
+                const { lazy, trigger } = expandOpts;
+                if (trigger === 'manual') {
+                    return;
+                }
                 const rowid = getRowid($xeTable, row);
                 if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
                     const expanded = !tableMethods.isRowExpandByRow(row);
@@ -5985,7 +6008,10 @@ export default defineComponent({
                 const { treeExpandLazyLoadedMaps } = reactData;
                 const treeOpts = computeTreeOpts.value;
                 const { row, column } = params;
-                const { lazy } = treeOpts;
+                const { lazy, trigger } = treeOpts;
+                if (trigger === 'manual') {
+                    return;
+                }
                 const rowid = getRowid($xeTable, row);
                 if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
                     const expanded = !tableMethods.isTreeExpandByRow(row);

package/es/ui/index.js

@@ -1,7 +1,7 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-VxeUI.version = "4.7.16-beta.0";
-VxeUI.tableVersion = "4.7.16-beta.0";
+VxeUI.version = "4.7.17-beta.0";
+VxeUI.tableVersion = "4.7.17-beta.0";
 VxeUI.setConfig({
     emptyCell: '　',
     table: {

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -1949,8 +1949,8 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-core_.VxeUI.version = "4.7.16-beta.0";
-core_.VxeUI.tableVersion = "4.7.16-beta.0";
+core_.VxeUI.version = "4.7.17-beta.0";
+core_.VxeUI.tableVersion = "4.7.17-beta.0";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2253,7 +2253,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const version = `table v${"4.7.16-beta.0"}`;
+const version = `table v${"4.7.17-beta.0"}`;
 const warnLog = log_log.create('warn', version);
 const errLog = log_log.create('error', version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -10987,6 +10987,24 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return tableMethods.recalculate();
       });
     };
+    const handleCheckAllEvent = (evnt, value) => {
+      const checkboxOpts = computeCheckboxOpts.value;
+      const {
+        trigger
+      } = checkboxOpts;
+      if (trigger === 'manual') {
+        return;
+      }
+      handleCheckedAllCheckboxRow(value);
+      if (evnt) {
+        tableMethods.dispatchEvent('checkbox-all', {
+          records: tableMethods.getCheckboxRecords(),
+          reserves: tableMethods.getCheckboxReserveRecords(),
+          indeterminates: tableMethods.getCheckboxIndeterminateRecords(),
+          checked: value
+        }, evnt);
+      }
+    };
     /**
      * 纵向 Y 可视渲染处理
      */
@@ -12111,7 +12129,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * 多选，切换所有行的选中状态
        */
       toggleAllCheckboxRow() {
-        tablePrivateMethods.triggerCheckAllEvent(null, !reactData.isAllSelected);
+        handleCheckAllEvent(null, !reactData.isAllSelected);
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
       /**
@@ -14842,8 +14860,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           afterFullData
         } = internalData;
         const {
-          checkMethod
+          checkMethod,
+          trigger
         } = checkboxOpts;
+        if (trigger === 'manual') {
+          return;
+        }
         if (checkboxOpts.isShiftKey && evnt.shiftKey && !props.treeConfig) {
           const checkboxRecords = tableMethods.getCheckboxRecords();
           if (checkboxRecords.length) {
@@ -14877,15 +14899,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * 多选，选中所有事件
        */
       triggerCheckAllEvent(evnt, value) {
-        handleCheckedAllCheckboxRow(value);
-        if (evnt) {
-          tableMethods.dispatchEvent('checkbox-all', {
-            records: tableMethods.getCheckboxRecords(),
-            reserves: tableMethods.getCheckboxReserveRecords(),
-            indeterminates: tableMethods.getCheckboxIndeterminateRecords(),
-            checked: value
-          }, evnt);
+        const checkboxOpts = computeCheckboxOpts.value;
+        const {
+          trigger
+        } = checkboxOpts;
+        if (trigger === 'manual') {
+          return;
         }
+        handleCheckAllEvent(evnt, value);
       },
       /**
        * 单选，行选中事件
@@ -14898,6 +14919,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           row
         } = params;
         const radioOpts = computeRadioOpts.value;
+        const {
+          trigger
+        } = radioOpts;
+        if (trigger === 'manual') {
+          return;
+        }
         let newValue = row;
         let isChange = oldValue !== newValue;
         if (isChange) {
@@ -14947,8 +14974,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           row
         } = params;
         const {
-          lazy
+          lazy,
+          trigger
         } = expandOpts;
+        if (trigger === 'manual') {
+          return;
+        }
         const rowid = getRowid($xeTable, row);
         if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
           const expanded = !tableMethods.isRowExpandByRow(row);
@@ -14979,8 +15010,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           column
         } = params;
         const {
-          lazy
+          lazy,
+          trigger
         } = treeOpts;
+        if (trigger === 'manual') {
+          return;
+        }
         const rowid = getRowid($xeTable, row);
         if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
           const expanded = !tableMethods.isTreeExpandByRow(row);