vxe-table 3.20.0-beta.26 → 3.20.0-beta.27

package/es/table/src/methods.js

@@ -8240,7 +8240,7 @@ const tableMethods = {
         const { selectRadioRow: oldValue } = reactData;
         const { row } = params;
         const radioOpts = $xeTable.computeRadioOpts;
-        const { trigger, checkMethod } = radioOpts;
+        const { trigger, strict, checkMethod } = radioOpts;
         if (trigger === 'manual') {
             return;
         }
@@ -8251,7 +8251,7 @@ const tableMethods = {
             if (isChange) {
                 handleCheckedRadioRow($xeTable, newValue);
             }
-            else if (!radioOpts.strict) {
+            else if (!strict) {
                 isChange = oldValue === newValue;
                 if (isChange) {
                     newValue = null;
@@ -8271,13 +8271,25 @@ const tableMethods = {
         const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
         const beforeRowMethod = currentColumnOpts.beforeSelectMethod || columnOpts.currentMethod;
         const { column: newValue } = params;
-        const { trigger } = currentColumnOpts;
+        const { trigger, strict } = currentColumnOpts;
         if (trigger === 'manual') {
             return;
         }
-        const isChange = oldValue !== newValue;
-        if (!beforeRowMethod || beforeRowMethod({ column: newValue, $table: $xeTable })) {
-            $xeTable.setCurrentColumn(newValue);
+        let isChange = oldValue !== newValue;
+        const selected = !isChange;
+        if (!beforeRowMethod || beforeRowMethod({ column: newValue, selected, $table: $xeTable })) {
+            if (strict) {
+                $xeTable.setCurrentColumn(newValue);
+            }
+            else {
+                isChange = true;
+                if (selected) {
+                    $xeTable.clearCurrentColumn();
+                }
+                else {
+                    $xeTable.setCurrentColumn(newValue);
+                }
+            }
             if (isChange) {
                 $xeTable.dispatchEvent('current-column-change', Object.assign({ oldValue, newValue }, params), evnt);
             }
@@ -8294,13 +8306,25 @@ const tableMethods = {
         const currentRowOpts = $xeTable.computeCurrentRowOpts;
         const beforeRowMethod = currentRowOpts.beforeSelectMethod || rowOpts.currentMethod;
         const { row: newValue } = params;
-        const { trigger } = currentRowOpts;
+        const { trigger, strict } = currentRowOpts;
         if (trigger === 'manual') {
             return;
         }
-        const isChange = oldValue !== newValue;
-        if (!beforeRowMethod || beforeRowMethod({ row: newValue, $table: $xeTable })) {
-            $xeTable.setCurrentRow(newValue);
+        let isChange = oldValue !== newValue;
+        const selected = !isChange;
+        if (!beforeRowMethod || beforeRowMethod({ row: newValue, selected, $table: $xeTable })) {
+            if (strict) {
+                $xeTable.setCurrentRow(newValue);
+            }
+            else {
+                isChange = true;
+                if (selected) {
+                    $xeTable.clearCurrentRow();
+                }
+                else {
+                    $xeTable.setCurrentRow(newValue);
+                }
+            }
             if (isChange) {
                 $xeTable.dispatchEvent('current-row-change', Object.assign({ oldValue, newValue }, 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 = "3.20.0-beta.26";
+export const version = "3.20.0-beta.27";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -40,6 +40,12 @@ VxeUI.setConfig({
             isSyncAutoWidth: true,
             minHeight: 18
         },
+        currentRowConfig: {
+            strict: true
+        },
+        currentColumnConfig: {
+            strict: true
+        },
         radioConfig: {
             // trigger: 'default'
             strict: true

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.20.0-beta.26";
+const version = "3.20.0-beta.27";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2045,6 +2045,12 @@ core_.VxeUI.setConfig({
       isSyncAutoWidth: true,
       minHeight: 18
     },
+    currentRowConfig: {
+      strict: true
+    },
+    currentColumnConfig: {
+      strict: true
+    },
     radioConfig: {
       // trigger: 'default'
       strict: true
@@ -2739,7 +2745,7 @@ function scrollTopTo(diffNum, cb) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.20.0-beta.26"}`;
+const log_version = `table v${"3.20.0-beta.27"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6819,7 +6825,7 @@ if(!isSelected&&!halfSelect&&showReserveStatus){halfSelect=!external_root_XEUtil
      */clearCheckboxRow(){const $xeTable=this;const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{treeConfig}=props;const{tableFullData}=internalData;const treeOpts=$xeTable.computeTreeOpts;const childrenField=treeOpts.children||treeOpts.childrenField;const checkboxOpts=$xeTable.computeCheckboxOpts;const{checkField,reserve}=checkboxOpts;// indeterminateField 仅支持读取
 const indeterminateField=checkboxOpts.indeterminateField||checkboxOpts.halfField;if(checkField){const handleClearChecked=item=>{if(treeConfig&&indeterminateField){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item,indeterminateField,false);}external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item,checkField,false);};if(treeConfig){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullData,handleClearChecked,{children:childrenField});}else{tableFullData.forEach(handleClearChecked);}}if(reserve){tableFullData.forEach(row=>this.handleCheckboxReserveRow(row,false));}reactData.isAllSelected=false;reactData.isIndeterminate=false;internalData.selectCheckboxMaps={};internalData.treeIndeterminateRowMaps={};reactData.updateCheckboxFlag++;return this.$nextTick();},/**
      * 单选，行选中事件
-     */triggerRadioRowEvent(evnt,params){const $xeTable=this;const reactData=$xeTable;const{selectRadioRow:oldValue}=reactData;const{row}=params;const radioOpts=$xeTable.computeRadioOpts;const{trigger,checkMethod}=radioOpts;if(trigger==='manual'){return;}evnt.stopPropagation();if(!checkMethod||checkMethod({$table:$xeTable,row})){let newValue=row;let isChange=oldValue!==newValue;if(isChange){handleCheckedRadioRow($xeTable,newValue);}else if(!radioOpts.strict){isChange=oldValue===newValue;if(isChange){newValue=null;$xeTable.clearRadioRow();}}if(isChange){$xeTable.dispatchEvent('radio-change',{oldValue,newValue,...params},evnt);}}},triggerCurrentColumnEvent(evnt,params){const $xeTable=this;const reactData=$xeTable;const{currentColumn:oldValue}=reactData;const columnOpts=$xeTable.computeColumnOpts;const currentColumnOpts=$xeTable.computeCurrentColumnOpts;const beforeRowMethod=currentColumnOpts.beforeSelectMethod||columnOpts.currentMethod;const{column:newValue}=params;const{trigger}=currentColumnOpts;if(trigger==='manual'){return;}const isChange=oldValue!==newValue;if(!beforeRowMethod||beforeRowMethod({column:newValue,$table:$xeTable})){$xeTable.setCurrentColumn(newValue);if(isChange){$xeTable.dispatchEvent('current-column-change',{oldValue,newValue,...params},evnt);}}else{$xeTable.dispatchEvent('current-column-disabled',params,evnt);}},triggerCurrentRowEvent(evnt,params){const $xeTable=this;const reactData=$xeTable;const{currentRow:oldValue}=reactData;const rowOpts=$xeTable.computeRowOpts;const currentRowOpts=$xeTable.computeCurrentRowOpts;const beforeRowMethod=currentRowOpts.beforeSelectMethod||rowOpts.currentMethod;const{row:newValue}=params;const{trigger}=currentRowOpts;if(trigger==='manual'){return;}const isChange=oldValue!==newValue;if(!beforeRowMethod||beforeRowMethod({row:newValue,$table:$xeTable})){$xeTable.setCurrentRow(newValue);if(isChange){$xeTable.dispatchEvent('current-row-change',{oldValue,newValue,...params},evnt);// 已废弃
+     */triggerRadioRowEvent(evnt,params){const $xeTable=this;const reactData=$xeTable;const{selectRadioRow:oldValue}=reactData;const{row}=params;const radioOpts=$xeTable.computeRadioOpts;const{trigger,strict,checkMethod}=radioOpts;if(trigger==='manual'){return;}evnt.stopPropagation();if(!checkMethod||checkMethod({$table:$xeTable,row})){let newValue=row;let isChange=oldValue!==newValue;if(isChange){handleCheckedRadioRow($xeTable,newValue);}else if(!strict){isChange=oldValue===newValue;if(isChange){newValue=null;$xeTable.clearRadioRow();}}if(isChange){$xeTable.dispatchEvent('radio-change',{oldValue,newValue,...params},evnt);}}},triggerCurrentColumnEvent(evnt,params){const $xeTable=this;const reactData=$xeTable;const{currentColumn:oldValue}=reactData;const columnOpts=$xeTable.computeColumnOpts;const currentColumnOpts=$xeTable.computeCurrentColumnOpts;const beforeRowMethod=currentColumnOpts.beforeSelectMethod||columnOpts.currentMethod;const{column:newValue}=params;const{trigger,strict}=currentColumnOpts;if(trigger==='manual'){return;}let isChange=oldValue!==newValue;const selected=!isChange;if(!beforeRowMethod||beforeRowMethod({column:newValue,selected,$table:$xeTable})){if(strict){$xeTable.setCurrentColumn(newValue);}else{isChange=true;if(selected){$xeTable.clearCurrentColumn();}else{$xeTable.setCurrentColumn(newValue);}}if(isChange){$xeTable.dispatchEvent('current-column-change',{oldValue,newValue,...params},evnt);}}else{$xeTable.dispatchEvent('current-column-disabled',params,evnt);}},triggerCurrentRowEvent(evnt,params){const $xeTable=this;const reactData=$xeTable;const{currentRow:oldValue}=reactData;const rowOpts=$xeTable.computeRowOpts;const currentRowOpts=$xeTable.computeCurrentRowOpts;const beforeRowMethod=currentRowOpts.beforeSelectMethod||rowOpts.currentMethod;const{row:newValue}=params;const{trigger,strict}=currentRowOpts;if(trigger==='manual'){return;}let isChange=oldValue!==newValue;const selected=!isChange;if(!beforeRowMethod||beforeRowMethod({row:newValue,selected,$table:$xeTable})){if(strict){$xeTable.setCurrentRow(newValue);}else{isChange=true;if(selected){$xeTable.clearCurrentRow();}else{$xeTable.setCurrentRow(newValue);}}if(isChange){$xeTable.dispatchEvent('current-row-change',{oldValue,newValue,...params},evnt);// 已废弃
 $xeTable.dispatchEvent('current-change',{oldValue,newValue,...params},evnt);}}else{$xeTable.dispatchEvent('current-row-disabled',params,evnt);}},/**
      * 用于当前行，设置某一行为高亮状态
      * @param {Row} row 行对象