vxe-table 4.18.0 → 4.18.1

package/es/table/src/column.js

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

package/es/table/src/group.js

@@ -31,9 +31,10 @@ export default defineVxeComponent({
             destroyColumn($xeTable, columnConfig);
         });
         const renderVN = () => {
+            const defaultSlot = slots.default;
             return h('div', {
                 ref: refElem
-            }, slots.default ? slots.default() : []);
+            }, defaultSlot ? defaultSlot() : []);
         };
         const $xeColgroup = { columnConfig };
         provide('$xeColgroup', $xeColgroup);

package/es/table/src/table.js

@@ -5104,7 +5104,7 @@ export default defineVxeComponent({
                             cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : '';
                         }
                         else {
-                            cellLabel = `${formatter(formatParams)}`;
+                            cellLabel = formatter(formatParams);
                         }
                     }
                     else if (renderOpts && tcFormatter) {
@@ -10043,6 +10043,7 @@ export default defineVxeComponent({
                 if (!checkMethod || checkMethod({ $table: $xeTable, row })) {
                     let newValue = row;
                     let isChange = oldValue !== newValue;
+                    const selected = !isChange;
                     if (isChange) {
                         handleCheckedRadioRow(newValue);
                     }
@@ -10054,7 +10055,7 @@ export default defineVxeComponent({
                         }
                     }
                     if (isChange) {
-                        dispatchEvent('radio-change', Object.assign({ oldValue, newValue }, params), evnt);
+                        dispatchEvent('radio-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
                     }
                 }
             },
@@ -10063,7 +10064,7 @@ export default defineVxeComponent({
                 const columnOpts = computeColumnOpts.value;
                 const currentColumnOpts = computeCurrentColumnOpts.value;
                 const beforeRowMethod = currentColumnOpts.beforeSelectMethod || columnOpts.currentMethod;
-                const { column: newValue } = params;
+                let { column: newValue } = params;
                 const { trigger, strict } = currentColumnOpts;
                 if (trigger === 'manual') {
                     return;
@@ -10075,8 +10076,9 @@ export default defineVxeComponent({
                         $xeTable.setCurrentColumn(newValue);
                     }
                     else {
-                        isChange = true;
-                        if (selected) {
+                        isChange = oldValue === newValue;
+                        if (isChange) {
+                            newValue = null;
                             $xeTable.clearCurrentColumn();
                         }
                         else {
@@ -10084,7 +10086,7 @@ export default defineVxeComponent({
                         }
                     }
                     if (isChange) {
-                        dispatchEvent('current-column-change', Object.assign({ oldValue, newValue }, params), evnt);
+                        dispatchEvent('current-column-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
                     }
                 }
                 else {
@@ -10096,7 +10098,7 @@ export default defineVxeComponent({
                 const rowOpts = computeRowOpts.value;
                 const currentRowOpts = computeCurrentRowOpts.value;
                 const beforeRowMethod = currentRowOpts.beforeSelectMethod || rowOpts.currentMethod;
-                const { row: newValue } = params;
+                let { row: newValue } = params;
                 const { trigger, strict } = currentRowOpts;
                 if (trigger === 'manual') {
                     return;
@@ -10108,8 +10110,9 @@ export default defineVxeComponent({
                         $xeTable.setCurrentRow(newValue);
                     }
                     else {
-                        isChange = true;
-                        if (selected) {
+                        isChange = oldValue === newValue;
+                        if (isChange) {
+                            newValue = null;
                             $xeTable.clearCurrentRow();
                         }
                         else {
@@ -10117,9 +10120,9 @@ export default defineVxeComponent({
                         }
                     }
                     if (isChange) {
-                        dispatchEvent('current-row-change', Object.assign({ oldValue, newValue }, params), evnt);
+                        dispatchEvent('current-row-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
                         // 已废弃
-                        dispatchEvent('current-change', Object.assign({ oldValue, newValue }, params), evnt);
+                        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 = "4.18.0";
+export const version = "4.18.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${"4.18.0"}`;
+const version = `table v${"4.18.1"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3144,7 +3144,7 @@ function getDefaultConfig(val1, def1) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.18.0";
+const version = "4.18.1";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3668,7 +3668,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.18.0"}`;
+const log_version = `table v${"4.18.1"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6970,7 +6970,7 @@ const columnProps = {
   // 内容渲染配置项
   contentRender: Object,
   // 聚合函数
-  aggFunc: [String, Boolean],
+  aggFunc: [Boolean, String],
   // 将单元格复制到剪贴板
   copyMethod: Function,
   // 将剪贴单元格的值清除
@@ -7073,9 +7073,10 @@ const Column = VxeColumn;
       destroyColumn($xeTable, columnConfig);
     });
     const renderVN = () => {
+      const defaultSlot = slots.default;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refElem
-      }, slots.default ? slots.default() : []);
+      }, defaultSlot ? defaultSlot() : []);
     };
     const $xeColgroup = {
       columnConfig
@@ -19852,7 +19853,7 @@ if(virtualXOpts.scrollToLeftOnChange){targetScrollLeft=0;}if(virtualYOpts.scroll
              * @param {Array/Row} rows 行数据
              * @param {String} field 字段名
              */clearData(rows,field){const{tableFullData,visibleColumn}=internalData;if(!arguments.length){rows=tableFullData;}else if(rows&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)){rows=[rows];}if(field){rows.forEach(row=>external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row,field,null));}else{rows.forEach(row=>{visibleColumn.forEach(column=>{if(column.field){setCellValue(row,column,null);}});});}return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();},getCellElement(row,fieldOrColumn){const{elemStore}=internalData;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const rowid=getRowid($xeTable,row);const bodyScrollElem=getRefElem(elemStore['main-body-scroll']);const leftScrollElem=getRefElem(elemStore['left-body-scroll']);const rightScrollElem=getRefElem(elemStore['right-body-scroll']);let bodyElem;if(column){if(column.fixed){if(column.fixed==='left'){if(leftScrollElem){bodyElem=leftScrollElem;}}else{if(rightScrollElem){bodyElem=rightScrollElem;}}}if(!bodyElem){bodyElem=bodyScrollElem;}if(bodyElem){return bodyElem.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`);}}return null;},getCellLabel(row,fieldOrColumn){const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{editConfig}=props;const{formatter,editRender,cellRender}=column;// formatter > tableCellFormatter
-const renderOpts=formatter?null:editConfig&&isEnableConf(editRender)?editRender:isEnableConf(cellRender)?cellRender:null;const compConf=renderOpts?table_renderer.get(renderOpts.name):null;const tcFormatter=compConf?compConf.tableCellFormatter:null;const cellValue=getCellValue(row,column);let cellLabel=cellValue;if(formatter||tcFormatter){let formatData;const{fullAllDataRowIdData}=internalData;const rowid=getRowid($xeTable,row);const colid=column.id;const rowRest=fullAllDataRowIdData[rowid];if(rowRest){formatData=rowRest.formatData;if(!formatData){formatData=fullAllDataRowIdData[rowid].formatData={};}if(rowRest&&formatData[colid]){if(formatData[colid].value===cellValue){return formatData[colid].label;}}}const formatParams={$table:$xeTable,cellValue,row,rowIndex:$xeTable.getRowIndex(row),column,columnIndex:$xeTable.getColumnIndex(column)};if(formatter){if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)){const gFormatOpts=table_formats.get(formatter);const tcFormatMethod=gFormatOpts?gFormatOpts.tableCellFormatMethod||gFormatOpts.cellFormatMethod:null;cellLabel=tcFormatMethod?tcFormatMethod(formatParams):'';}else if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)){const gFormatOpts=table_formats.get(formatter[0]);const tcFormatMethod=gFormatOpts?gFormatOpts.tableCellFormatMethod||gFormatOpts.cellFormatMethod:null;cellLabel=tcFormatMethod?tcFormatMethod(formatParams,...formatter.slice(1)):'';}else{cellLabel=`${formatter(formatParams)}`;}}else if(renderOpts&&tcFormatter){cellLabel=tcFormatter(renderOpts,formatParams);}if(formatData){formatData[colid]={value:cellValue,label:cellLabel};}}return cellLabel;},getFooterCellLabel(row,fieldOrColumn){const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{footerFormatter}=column;const _columnIndex=$xeTable.getVTColumnIndex(column);let itemValue='';// 兼容老模式
+const renderOpts=formatter?null:editConfig&&isEnableConf(editRender)?editRender:isEnableConf(cellRender)?cellRender:null;const compConf=renderOpts?table_renderer.get(renderOpts.name):null;const tcFormatter=compConf?compConf.tableCellFormatter:null;const cellValue=getCellValue(row,column);let cellLabel=cellValue;if(formatter||tcFormatter){let formatData;const{fullAllDataRowIdData}=internalData;const rowid=getRowid($xeTable,row);const colid=column.id;const rowRest=fullAllDataRowIdData[rowid];if(rowRest){formatData=rowRest.formatData;if(!formatData){formatData=fullAllDataRowIdData[rowid].formatData={};}if(rowRest&&formatData[colid]){if(formatData[colid].value===cellValue){return formatData[colid].label;}}}const formatParams={$table:$xeTable,cellValue,row,rowIndex:$xeTable.getRowIndex(row),column,columnIndex:$xeTable.getColumnIndex(column)};if(formatter){if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)){const gFormatOpts=table_formats.get(formatter);const tcFormatMethod=gFormatOpts?gFormatOpts.tableCellFormatMethod||gFormatOpts.cellFormatMethod:null;cellLabel=tcFormatMethod?tcFormatMethod(formatParams):'';}else if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)){const gFormatOpts=table_formats.get(formatter[0]);const tcFormatMethod=gFormatOpts?gFormatOpts.tableCellFormatMethod||gFormatOpts.cellFormatMethod:null;cellLabel=tcFormatMethod?tcFormatMethod(formatParams,...formatter.slice(1)):'';}else{cellLabel=formatter(formatParams);}}else if(renderOpts&&tcFormatter){cellLabel=tcFormatter(renderOpts,formatParams);}if(formatData){formatData[colid]={value:cellValue,label:cellLabel};}}return cellLabel;},getFooterCellLabel(row,fieldOrColumn){const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{footerFormatter}=column;const _columnIndex=$xeTable.getVTColumnIndex(column);let itemValue='';// 兼容老模式
 if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(row)){itemValue=row[_columnIndex];}else{itemValue=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,column.field);}let cellLabel=itemValue;if(footerFormatter){let formatData;const{footerTableData}=reactData;const{footerFullDataRowData}=internalData;const colid=column.id;const $rowIndex=footerTableData.indexOf(row);let rowRest=null;if($rowIndex>-1){rowRest=footerFullDataRowData[$rowIndex];if(!rowRest){rowRest=footerFullDataRowData[$rowIndex]={};}formatData=rowRest.formatData;if(!formatData){formatData=footerFullDataRowData[$rowIndex].formatData={};}if(rowRest&&formatData[colid]){if(formatData[colid].value===itemValue){return formatData[colid].label;}}}const footerFormatParams={$table:$xeTable,cellValue:itemValue,itemValue,row,items:row,$rowIndex,column,_columnIndex,columnIndex:$xeTable.getColumnIndex(column)};if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(footerFormatter)){const gFormatOpts=table_formats.get(footerFormatter);const fcFormatMethod=gFormatOpts?gFormatOpts.tableFooterCellFormatMethod:null;cellLabel=fcFormatMethod?fcFormatMethod(footerFormatParams):'';}else if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(footerFormatter)){const gFormatOpts=table_formats.get(footerFormatter[0]);const fcFormatMethod=gFormatOpts?gFormatOpts.tableFooterCellFormatMethod:null;cellLabel=fcFormatMethod?fcFormatMethod(footerFormatParams,...footerFormatter.slice(1)):'';}else{cellLabel=footerFormatter(footerFormatParams);}if(formatData){formatData[colid]={value:itemValue,label:cellLabel};}}return cellLabel;},/**
              * 检查是否为临时行数据
              */isInsertByRow(row){const rowid=getRowid($xeTable,row);return!!reactData.insertRowFlag&&!!internalData.insertRowMaps[rowid];},isRemoveByRow(row){const rowid=getRowid($xeTable,row);return!!reactData.removeRowFlag&&!!internalData.removeRowMaps[rowid];},/**
@@ -20265,8 +20266,8 @@ if(isEnableConf(editConfig)&&editOpts.trigger==='dblclick'){if(actived.row&&acti
              * 多选，选中所有事件
              */triggerCheckAllEvent(evnt,value){const checkboxOpts=computeCheckboxOpts.value;const{trigger}=checkboxOpts;if(trigger==='manual'){return;}if(evnt){evnt.stopPropagation();}handleCheckAllEvent(evnt,value);},/**
              * 单选，行选中事件
-             */triggerRadioRowEvent(evnt,params){const{selectRadioRow:oldValue}=reactData;const{row}=params;const radioOpts=computeRadioOpts.value;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(newValue);}else if(!strict){isChange=oldValue===newValue;if(isChange){newValue=null;$xeTable.clearRadioRow();}}if(isChange){dispatchEvent('radio-change',{oldValue,newValue,...params},evnt);}}},triggerCurrentColumnEvent(evnt,params){const{currentColumn:oldValue}=reactData;const columnOpts=computeColumnOpts.value;const currentColumnOpts=computeCurrentColumnOpts.value;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){dispatchEvent('current-column-change',{oldValue,newValue,...params},evnt);}}else{dispatchEvent('current-column-disabled',params,evnt);}},triggerCurrentRowEvent(evnt,params){const{currentRow:oldValue}=reactData;const rowOpts=computeRowOpts.value;const currentRowOpts=computeCurrentRowOpts.value;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){dispatchEvent('current-row-change',{oldValue,newValue,...params},evnt);// 已废弃
-dispatchEvent('current-change',{oldValue,newValue,...params},evnt);}}else{dispatchEvent('current-row-disabled',params,evnt);}},/**
+             */triggerRadioRowEvent(evnt,params){const{selectRadioRow:oldValue}=reactData;const{row}=params;const radioOpts=computeRadioOpts.value;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(newValue);}else if(!strict){isChange=oldValue===newValue;if(isChange){newValue=null;$xeTable.clearRadioRow();}}if(isChange){dispatchEvent('radio-change',{oldValue,newValue,selected,...params},evnt);}}},triggerCurrentColumnEvent(evnt,params){const{currentColumn:oldValue}=reactData;const columnOpts=computeColumnOpts.value;const currentColumnOpts=computeCurrentColumnOpts.value;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){dispatchEvent('current-column-change',{oldValue,newValue,selected,...params},evnt);}}else{dispatchEvent('current-column-disabled',params,evnt);}},triggerCurrentRowEvent(evnt,params){const{currentRow:oldValue}=reactData;const rowOpts=computeRowOpts.value;const currentRowOpts=computeCurrentRowOpts.value;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){dispatchEvent('current-row-change',{oldValue,newValue,selected,...params},evnt);// 已废弃
+dispatchEvent('current-change',{oldValue,newValue,selected,...params},evnt);}}else{dispatchEvent('current-row-disabled',params,evnt);}},/**
              * 展开行事件
              */triggerRowExpandEvent(evnt,params){const{expandColumn}=reactData;const{rowExpandLazyLoadedMaps}=internalData;const expandOpts=computeExpandOpts.value;const{row}=params;const{lazy,trigger}=expandOpts;if(trigger==='manual'){return;}evnt.stopPropagation();const rowid=getRowid($xeTable,row);if(!lazy||!rowExpandLazyLoadedMaps[rowid]){const expanded=!$xeTable.isRowExpandByRow(row);const columnIndex=expandColumn?$xeTable.getColumnIndex(expandColumn):-1;const $columnIndex=expandColumn?$xeTable.getVMColumnIndex(expandColumn):-1;$xeTable.setRowExpand(row,expanded);dispatchEvent('toggle-row-expand',{expanded,column:expandColumn,columnIndex,$columnIndex,row,rowIndex:$xeTable.getRowIndex(row),$rowIndex:$xeTable.getVMRowIndex(row)},evnt);}},/**
              * 行分组事件