vxe-table 3.20.0 → 3.20.1

package/es/table/src/column.js

@@ -133,7 +133,7 @@ export const columnProps = {
     // 内容渲染配置项
     contentRender: Object,
     // 聚合函数
-    aggFunc: [String, Boolean],
+    aggFunc: [Boolean, String],
     // 将单元格复制到剪贴板
     copyMethod: Function,
     // 将剪贴单元格的值清除

package/es/table/src/methods.js

@@ -8248,6 +8248,7 @@ const tableMethods = {
         if (!checkMethod || checkMethod({ $table: $xeTable, row })) {
             let newValue = row;
             let isChange = oldValue !== newValue;
+            const selected = !isChange;
             if (isChange) {
                 handleCheckedRadioRow($xeTable, newValue);
             }
@@ -8259,7 +8260,7 @@ const tableMethods = {
                 }
             }
             if (isChange) {
-                $xeTable.dispatchEvent('radio-change', Object.assign({ oldValue, newValue }, params), evnt);
+                $xeTable.dispatchEvent('radio-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
             }
         }
     },
@@ -8270,7 +8271,7 @@ const tableMethods = {
         const columnOpts = $xeTable.computeColumnOpts;
         const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
         const beforeRowMethod = currentColumnOpts.beforeSelectMethod || columnOpts.currentMethod;
-        const { column: newValue } = params;
+        let { column: newValue } = params;
         const { trigger, strict } = currentColumnOpts;
         if (trigger === 'manual') {
             return;
@@ -8282,8 +8283,9 @@ const tableMethods = {
                 $xeTable.setCurrentColumn(newValue);
             }
             else {
-                isChange = true;
-                if (selected) {
+                isChange = oldValue === newValue;
+                if (isChange) {
+                    newValue = null;
                     $xeTable.clearCurrentColumn();
                 }
                 else {
@@ -8291,7 +8293,7 @@ const tableMethods = {
                 }
             }
             if (isChange) {
-                $xeTable.dispatchEvent('current-column-change', Object.assign({ oldValue, newValue }, params), evnt);
+                $xeTable.dispatchEvent('current-column-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
             }
         }
         else {
@@ -8305,7 +8307,7 @@ const tableMethods = {
         const rowOpts = $xeTable.computeRowOpts;
         const currentRowOpts = $xeTable.computeCurrentRowOpts;
         const beforeRowMethod = currentRowOpts.beforeSelectMethod || rowOpts.currentMethod;
-        const { row: newValue } = params;
+        let { row: newValue } = params;
         const { trigger, strict } = currentRowOpts;
         if (trigger === 'manual') {
             return;
@@ -8317,8 +8319,9 @@ const tableMethods = {
                 $xeTable.setCurrentRow(newValue);
             }
             else {
-                isChange = true;
-                if (selected) {
+                isChange = oldValue === newValue;
+                if (isChange) {
+                    newValue = null;
                     $xeTable.clearCurrentRow();
                 }
                 else {
@@ -8326,9 +8329,9 @@ const tableMethods = {
                 }
             }
             if (isChange) {
-                $xeTable.dispatchEvent('current-row-change', Object.assign({ oldValue, newValue }, params), evnt);
+                $xeTable.dispatchEvent('current-row-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
                 // 已废弃
-                $xeTable.dispatchEvent('current-change', Object.assign({ oldValue, newValue }, params), evnt);
+                $xeTable.dispatchEvent('current-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
             }
         }
         else {

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";
+export const version = "3.20.1";
 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.20.0"}`;
+const version = `table v${"3.20.1"}`;
 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";
+const version = "3.20.1";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2745,7 +2745,7 @@ function scrollTopTo(diffNum, cb) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.20.0"}`;
+const log_version = `table v${"3.20.1"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5711,7 +5711,7 @@ const columnProps = {
   // 内容渲染配置项
   contentRender: Object,
   // 聚合函数
-  aggFunc: [String, Boolean],
+  aggFunc: [Boolean, String],
   // 将单元格复制到剪贴板
   copyMethod: Function,
   // 将剪贴单元格的值清除
@@ -6825,8 +6825,8 @@ 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,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);}},/**
+     */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;const selected=!isChange;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,selected,...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;let{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=oldValue===newValue;if(isChange){newValue=null;$xeTable.clearCurrentColumn();}else{$xeTable.setCurrentColumn(newValue);}}if(isChange){$xeTable.dispatchEvent('current-column-change',{oldValue,newValue,selected,...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;let{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=oldValue===newValue;if(isChange){newValue=null;$xeTable.clearCurrentRow();}else{$xeTable.setCurrentRow(newValue);}}if(isChange){$xeTable.dispatchEvent('current-row-change',{oldValue,newValue,selected,...params},evnt);// 已废弃
+$xeTable.dispatchEvent('current-change',{oldValue,newValue,selected,...params},evnt);}}else{$xeTable.dispatchEvent('current-row-disabled',params,evnt);}},/**
      * 用于当前行，设置某一行为高亮状态
      * @param {Row} row 行对象
      */setCurrentRow(row){const $xeTable=this;const internalData=$xeTable;const $xeGanttView=internalData.xeGanttView;const el=$xeTable.$refs.refElem;const rowOpts=$xeTable.computeRowOpts;this.clearCurrentRow();// this.clearCurrentColumn()