vxe-table 3.24.0-beta.0 → 3.24.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/grid/src/grid.js +2 -2
- package/es/style.css +1 -1
- package/es/table/module/edit/mixin.js +3 -1
- package/es/table/module/export/mixin.js +6 -4
- package/es/table/module/filter/mixin.js +4 -2
- package/es/table/module/filter/panel.js +4 -2
- package/es/table/src/body.js +4 -2
- package/es/table/src/cell.js +11 -6
- package/es/table/src/columnInfo.js +2 -1
- package/es/table/src/footer.js +2 -1
- package/es/table/src/header.js +5 -3
- package/es/table/src/methods.js +7 -4
- package/es/table/src/props.js +4 -0
- package/es/table/src/table.js +7 -1
- package/es/toolbar/src/toolbar.js +5 -4
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/grid/src/grid.js +2 -2
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.umd.js +66 -36
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/edit/mixin.js +3 -1
- package/lib/table/module/edit/mixin.min.js +1 -1
- package/lib/table/module/export/mixin.js +6 -4
- package/lib/table/module/export/mixin.min.js +1 -1
- package/lib/table/module/filter/mixin.js +4 -2
- package/lib/table/module/filter/mixin.min.js +1 -1
- package/lib/table/module/filter/panel.js +4 -2
- package/lib/table/module/filter/panel.min.js +1 -1
- package/lib/table/src/body.js +4 -2
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/cell.js +11 -6
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/columnInfo.js +2 -1
- package/lib/table/src/columnInfo.min.js +1 -1
- package/lib/table/src/footer.js +2 -1
- package/lib/table/src/footer.min.js +1 -1
- package/lib/table/src/header.js +5 -3
- package/lib/table/src/header.min.js +1 -1
- package/lib/table/src/methods.js +5 -5
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/props.js +4 -0
- package/lib/table/src/props.min.js +1 -1
- package/lib/table/src/table.js +7 -1
- package/lib/table/src/table.min.js +1 -1
- package/lib/toolbar/src/toolbar.js +5 -4
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/ui/index.js +1 -1
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +2 -2
- package/packages/grid/src/grid.ts +2 -2
- package/packages/table/module/edit/mixin.ts +3 -1
- package/packages/table/module/export/mixin.ts +6 -4
- package/packages/table/module/filter/mixin.ts +6 -4
- package/packages/table/module/filter/panel.ts +4 -2
- package/packages/table/src/body.ts +4 -2
- package/packages/table/src/cell.ts +11 -6
- package/packages/table/src/columnInfo.ts +2 -1
- package/packages/table/src/footer.ts +2 -1
- package/packages/table/src/header.ts +5 -3
- package/packages/table/src/methods.ts +7 -4
- package/packages/table/src/props.ts +4 -0
- package/packages/table/src/table.ts +8 -1
- package/packages/toolbar/src/toolbar.ts +5 -4
- /package/es/{iconfont.1789131659648.ttf → iconfont.1789914697948.ttf} +0 -0
- /package/es/{iconfont.1789131659648.woff → iconfont.1789914697948.woff} +0 -0
- /package/es/{iconfont.1789131659648.woff2 → iconfont.1789914697948.woff2} +0 -0
- /package/lib/{iconfont.1789131659648.ttf → iconfont.1789914697948.ttf} +0 -0
- /package/lib/{iconfont.1789131659648.woff → iconfont.1789914697948.woff} +0 -0
- /package/lib/{iconfont.1789131659648.woff2 → iconfont.1789914697948.woff2} +0 -0
package/lib/index.umd.js
CHANGED
|
@@ -3314,7 +3314,7 @@ function getDefaultConfig(val1, def1) {
|
|
|
3314
3314
|
/* unused harmony import specifier */ var VxeUI;
|
|
3315
3315
|
|
|
3316
3316
|
|
|
3317
|
-
const version = "3.24.0
|
|
3317
|
+
const version = "3.24.0";
|
|
3318
3318
|
core_.VxeUI.version = version;
|
|
3319
3319
|
core_.VxeUI.tableVersion = version;
|
|
3320
3320
|
core_.VxeUI.setConfig({
|
|
@@ -4276,7 +4276,7 @@ function getPopupAppendElement(appendTo) {
|
|
|
4276
4276
|
const {
|
|
4277
4277
|
log: log_log
|
|
4278
4278
|
} = core_.VxeUI;
|
|
4279
|
-
const tableVersion = `table v${"3.24.0
|
|
4279
|
+
const tableVersion = `table v${"3.24.0"}`;
|
|
4280
4280
|
function createComponentLog(name) {
|
|
4281
4281
|
const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
|
|
4282
4282
|
const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
|
|
@@ -4337,7 +4337,8 @@ class ColumnInfo {
|
|
|
4337
4337
|
const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
|
|
4338
4338
|
const defaultVisible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(visible) ? visible : true;
|
|
4339
4339
|
const defaultRenderWidth = width && isPx(width) && width !== 'auto' ? Math.max(0, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(width)) : 0;
|
|
4340
|
-
const
|
|
4340
|
+
const rendererOpts = $xeTable.computeRendererOpts;
|
|
4341
|
+
const flCompConf = filterRender && isEnableConf(filterRender) && filterRender.name ? rendererOpts[filterRender.name] || columnInfo_renderer.get(filterRender.name) : null;
|
|
4341
4342
|
const ctFilterOptions = flCompConf ? flCompConf.createTableFilterOptions : null;
|
|
4342
4343
|
const filters = toFilters(colConfs.filters, colId);
|
|
4343
4344
|
const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
|
|
@@ -6020,7 +6021,8 @@ function getFooterContent(h, params) {
|
|
|
6020
6021
|
const renderOpts = editRenderOpts || cellRenderOpts;
|
|
6021
6022
|
const itemValue = $table.getFooterCellLabel(row, column);
|
|
6022
6023
|
if (renderOpts) {
|
|
6023
|
-
const
|
|
6024
|
+
const rendererOpts = $table.computeRendererOpts;
|
|
6025
|
+
const compConf = renderOpts.name ? rendererOpts[renderOpts.name] || cell_renderer.get(renderOpts.name) : null;
|
|
6024
6026
|
const rtFooter = compConf ? compConf.renderTableFooter || compConf.renderFooter : null;
|
|
6025
6027
|
if (rtFooter) {
|
|
6026
6028
|
const footParams = Object.assign(params, {
|
|
@@ -6186,7 +6188,8 @@ const Cell = {
|
|
|
6186
6188
|
}
|
|
6187
6189
|
}
|
|
6188
6190
|
if (renderOpts) {
|
|
6189
|
-
const
|
|
6191
|
+
const rendererOpts = $table.computeRendererOpts;
|
|
6192
|
+
const compConf = renderOpts.name ? rendererOpts[renderOpts.name] || cell_renderer.get(renderOpts.name) : null;
|
|
6190
6193
|
const rtHeader = compConf ? compConf.renderTableHeader || compConf.renderHeader : null;
|
|
6191
6194
|
if (rtHeader) {
|
|
6192
6195
|
return getSlotVNs(renderTitleContent(h, params, rtHeader.call($table, h, renderOpts, params)));
|
|
@@ -6315,9 +6318,10 @@ const Cell = {
|
|
|
6315
6318
|
if (defaultSlot) {
|
|
6316
6319
|
return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h));
|
|
6317
6320
|
}
|
|
6321
|
+
const rendererOpts = $table.computeRendererOpts;
|
|
6318
6322
|
// 如果是编辑模式-查看:slot default > formatter > cellRender.renderTableDefault > editRender.renderTableCell > editRender.renderTableDefault > cellRender.tableCellFormatter > editRender.tableCellFormatter > field
|
|
6319
6323
|
// 如果是查看表格:slot default > formatter > cellRender。renderTableDefault > cellRender.tableCellFormatter > field
|
|
6320
|
-
const cellCompConf = cellRenderOpts ? cell_renderer.get(cellRenderOpts.name) : null;
|
|
6324
|
+
const cellCompConf = cellRenderOpts && cellRenderOpts.name ? rendererOpts[cellRenderOpts.name] || cell_renderer.get(cellRenderOpts.name) : null;
|
|
6321
6325
|
if (cellRenderOpts) {
|
|
6322
6326
|
const cellDefaultRenderFn = cellCompConf ? cellCompConf.renderTableDefault || cellCompConf.renderDefault : null;
|
|
6323
6327
|
if (cellDefaultRenderFn && cellRenderOpts) {
|
|
@@ -6327,7 +6331,7 @@ const Cell = {
|
|
|
6327
6331
|
}
|
|
6328
6332
|
}
|
|
6329
6333
|
if (editRenderOpts) {
|
|
6330
|
-
const editCompConf = editRenderOpts ? cell_renderer.get(editRenderOpts.name) : null;
|
|
6334
|
+
const editCompConf = editRenderOpts && editRenderOpts.name ? rendererOpts[editRenderOpts.name] || cell_renderer.get(editRenderOpts.name) : null;
|
|
6331
6335
|
const editCellRenderFn = editCompConf ? editCompConf.renderTableCell || editCompConf.renderCell || editCompConf.renderTableDefault || editCompConf.renderDefault : null;
|
|
6332
6336
|
if (editCellRenderFn) {
|
|
6333
6337
|
return renderCellBaseVNs(h, params, getSlotVNs(editCellRenderFn(h, editRenderOpts, Object.assign({
|
|
@@ -7021,7 +7025,8 @@ const Cell = {
|
|
|
7021
7025
|
return $table.callSlot(slots.content, params, h);
|
|
7022
7026
|
}
|
|
7023
7027
|
if (contentRender) {
|
|
7024
|
-
const
|
|
7028
|
+
const rendererOpts = $table.computeRendererOpts;
|
|
7029
|
+
const compConf = contentRender.name ? rendererOpts[contentRender.name] || cell_renderer.get(contentRender.name) : null;
|
|
7025
7030
|
const rtExpand = compConf ? compConf.renderTableExpand || compConf.renderExpand : null;
|
|
7026
7031
|
if (rtExpand) {
|
|
7027
7032
|
return getSlotVNs(rtExpand.call($table, h, contentRender, params));
|
|
@@ -7296,7 +7301,8 @@ const Cell = {
|
|
|
7296
7301
|
if (slots && slots.edit) {
|
|
7297
7302
|
return $table.callSlot(slots.edit, cellParams, h);
|
|
7298
7303
|
}
|
|
7299
|
-
const
|
|
7304
|
+
const rendererOpts = $table.computeRendererOpts;
|
|
7305
|
+
const compConf = editRenderOpts.name ? rendererOpts[editRenderOpts.name] || cell_renderer.get(editRenderOpts.name) : null;
|
|
7300
7306
|
const rtEdit = compConf ? compConf.renderTableEdit || compConf.renderEdit : null;
|
|
7301
7307
|
if (rtEdit) {
|
|
7302
7308
|
return getSlotVNs(rtEdit.call($table, h, editRender, cellParams));
|
|
@@ -7958,6 +7964,10 @@ const tableProps = {
|
|
|
7958
7964
|
type: Number,
|
|
7959
7965
|
default: () => props_getConfig().table.delayHover
|
|
7960
7966
|
},
|
|
7967
|
+
/**
|
|
7968
|
+
* 渲染器配置项
|
|
7969
|
+
*/
|
|
7970
|
+
rendererConfig: Object,
|
|
7961
7971
|
// 额外的参数
|
|
7962
7972
|
params: Object
|
|
7963
7973
|
};
|
|
@@ -8072,10 +8082,10 @@ const matchObj=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe
|
|
|
8072
8082
|
*/function handleVirtualTreeToList($xeTable){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{treeConfig}=props;const{isRowGroupStatus}=reactData;const{fullAllDataRowIdData,treeExpandedMaps,rowGroupExpandedMaps}=internalData;const aggregateOpts=$xeTable.computeAggregateOpts;const treeOpts=$xeTable.computeTreeOpts;const{handleGetRowId}=createHandleGetRowId($xeTable);const fullData=[];const expandMaps={};if(treeConfig&&treeOpts.transform){const childrenField=treeOpts.children||treeOpts.childrenField;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(internalData.afterTreeFullData,(row,index,items,path,parentRow)=>{const rowid=handleGetRowId(row);const parentRowid=handleGetRowId(parentRow);if(!parentRow||expandMaps[parentRowid]&&treeExpandedMaps[parentRowid]){const rowRest=fullAllDataRowIdData[rowid];if(rowRest){rowRest._index=fullData.length;}expandMaps[rowid]=1;fullData.push(row);}},{children:childrenField});internalData.afterFullData=fullData;updateScrollYStatus($xeTable,fullData);return fullData;}else if(isRowGroupStatus){const{childrenField}=aggregateOpts;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(internalData.afterGroupFullData,(row,index,items,path,parentRow)=>{const rowid=handleGetRowId(row);const parentRowid=handleGetRowId(parentRow);if(!parentRow||expandMaps[parentRowid]&&rowGroupExpandedMaps[parentRowid]){const rowRest=fullAllDataRowIdData[rowid];if(rowRest){rowRest._index=fullData.length;}expandMaps[rowid]=1;fullData.push(row);}},{children:childrenField});internalData.afterFullData=fullData;updateScrollYStatus($xeTable,fullData);return fullData;}return internalData.afterFullData;}/**
|
|
8073
8083
|
* 编译处理后全量的表格数据
|
|
8074
8084
|
* 如果存在筛选条件,继续处理
|
|
8075
|
-
*/function updateAfterFullData($xeTable){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{treeConfig}=props;const{isRowGroupStatus}=reactData;const{tableFullColumn,tableFullData,tableFullTreeData,tableFullGroupData}=internalData;const filterOpts=$xeTable.computeFilterOpts;const sortOpts=$xeTable.computeSortOpts;const aggregateOpts=$xeTable.computeAggregateOpts;const treeOpts=$xeTable.computeTreeOpts;const childrenField=treeOpts.children||treeOpts.childrenField;const{transform,rowField,parentField,mapChildrenField}=treeOpts;const{isEvery,remote:allRemoteFilter,filterMethod:allFilterMethod,isDeep:isFilterDeep}=filterOpts;const{remote:allRemoteSort,sortMethod:allSortMethod,multiple:sortMultiple,chronological,isDeep:isSortDeep}=sortOpts;let tableData=[];let tableTree=[];// 处理数据
|
|
8085
|
+
*/function updateAfterFullData($xeTable){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{treeConfig}=props;const{isRowGroupStatus}=reactData;const{tableFullColumn,tableFullData,tableFullTreeData,tableFullGroupData}=internalData;const filterOpts=$xeTable.computeFilterOpts;const sortOpts=$xeTable.computeSortOpts;const aggregateOpts=$xeTable.computeAggregateOpts;const rendererOpts=$xeTable.computeRendererOpts;const treeOpts=$xeTable.computeTreeOpts;const childrenField=treeOpts.children||treeOpts.childrenField;const{transform,rowField,parentField,mapChildrenField}=treeOpts;const{isEvery,remote:allRemoteFilter,filterMethod:allFilterMethod,isDeep:isFilterDeep}=filterOpts;const{remote:allRemoteSort,sortMethod:allSortMethod,multiple:sortMultiple,chronological,isDeep:isSortDeep}=sortOpts;let tableData=[];let tableTree=[];// 处理数据
|
|
8076
8086
|
if(!allRemoteFilter||!allRemoteSort){const filterColumns=[];let orderColumns=[];tableFullColumn.forEach(column=>{const{field,sortable,order,filters}=column;if(!allRemoteFilter&&filters&&filters.length){const valueList=[];const itemList=[];filters.forEach(item=>{if(item.checked){itemList.push(item);valueList.push(item.value);}});if(itemList.length){filterColumns.push({column,valueList,itemList});}}if(!allRemoteSort&&sortable&&order){orderColumns.push({column,field,property:field,order:order,sortTime:column.sortTime});}});if(sortMultiple&&chronological&&orderColumns.length>1){orderColumns=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(orderColumns,'sortTime');}// 处理筛选
|
|
8077
8087
|
// 支持单列、多列、组合筛选
|
|
8078
|
-
if(!allRemoteFilter&&filterColumns.length){const handleFilter=row=>{return filterColumns.every(({column,valueList,itemList})=>{const{filterMethod,filterRender}=column;const compConf=isEnableConf(filterRender)?methods_renderer.get(filterRender.name):null;const compFilterMethod=compConf?compConf.tableFilterMethod||compConf.filterMethod:null;const tdFilterMethod=compConf?compConf.tableFilterDefaultMethod||compConf.defaultTableFilterMethod||compConf.defaultFilterMethod:null;const cellValue=getCellValue(row,column);if(filterMethod){return itemList.some(item=>filterMethod({value:item.value,option:item,cellValue,row,column,$table:$xeTable}));}else if(compFilterMethod){return itemList.some(item=>compFilterMethod({value:item.value,option:item,cellValue,row,column,$table:$xeTable}));}else if(allFilterMethod){return allFilterMethod({$table:$xeTable,options:itemList,values:valueList,cellValue,row,column});}else if(tdFilterMethod){return itemList.some(item=>tdFilterMethod({value:item.value,option:item,cellValue,row,column,$table:$xeTable}));}return valueList.indexOf(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,column.field))>-1;});};if(isRowGroupStatus){// 行分组
|
|
8088
|
+
if(!allRemoteFilter&&filterColumns.length){const handleFilter=row=>{return filterColumns.every(({column,valueList,itemList})=>{const{filterMethod,filterRender}=column;const compConf=isEnableConf(filterRender)&&filterRender.name?rendererOpts[filterRender.name]||methods_renderer.get(filterRender.name):null;const compFilterMethod=compConf?compConf.tableFilterMethod||compConf.filterMethod:null;const tdFilterMethod=compConf?compConf.tableFilterDefaultMethod||compConf.defaultTableFilterMethod||compConf.defaultFilterMethod:null;const cellValue=getCellValue(row,column);if(filterMethod){return itemList.some(item=>filterMethod({value:item.value,option:item,cellValue,row,column,$table:$xeTable}));}else if(compFilterMethod){return itemList.some(item=>compFilterMethod({value:item.value,option:item,cellValue,row,column,$table:$xeTable}));}else if(allFilterMethod){return allFilterMethod({$table:$xeTable,options:itemList,values:valueList,cellValue,row,column});}else if(tdFilterMethod){return itemList.some(item=>tdFilterMethod({value:item.value,option:item,cellValue,row,column,$table:$xeTable}));}return valueList.indexOf(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,column.field))>-1;});};if(isRowGroupStatus){// 行分组
|
|
8079
8089
|
tableTree=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullGroupData,handleFilter,{original:true,isEvery:true,children:aggregateOpts.mapChildrenField,mapChildren:aggregateOpts.childrenField});tableData=tableTree;}else if(treeConfig&&transform&&isFilterDeep!==false){// 筛选虚拟树
|
|
8080
8090
|
tableTree=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData,handleFilter,{original:true,isEvery,children:mapChildrenField,mapChildren:childrenField});tableData=tableTree;}else{tableData=treeConfig?tableFullTreeData.filter(handleFilter):tableFullData.filter(handleFilter);tableTree=tableData;}}else{if(isRowGroupStatus){// 还原行分组
|
|
8081
8091
|
tableTree=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullGroupData,()=>true,{original:true,isEvery:true,children:aggregateOpts.mapChildrenField,mapChildren:aggregateOpts.childrenField});tableData=tableTree;}else if(treeConfig&&transform&&isFilterDeep!==false){// 还原虚拟树
|
|
@@ -8392,8 +8402,8 @@ if(eqEmptyValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_x
|
|
|
8392
8402
|
* 如果还额外传了 field 则清空指定单元格内容
|
|
8393
8403
|
* @param {Array/Row} rows 行数据
|
|
8394
8404
|
* @param {String} field 字段名
|
|
8395
|
-
*/clearData(rows,field){const $xeTable=this;const internalData=$xeTable;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 $xeTable.$nextTick();},effectCellData(row,column,options){const $xeTable=this;const internalData=$xeTable;const{fullCellStoreMaps}=internalData;const editOpts=$xeTable.computeEditOpts;const{key,isChanged,setValue,getResult}=options;const rowid=getRowid($xeTable,row);const colid=column.id;let rowStore=fullCellStoreMaps[rowid];const cellValue=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,column.field);const restParams={$table:$xeTable,row,rowid,column,colid,cellValue,oldValue:null};if(editOpts.cache===false&&key==='render_table_cell'){const rest=restParams;rest.cellResult=getResult?getResult(restParams):cellValue;return rest;}if(!rowStore){rowStore={};fullCellStoreMaps[rowid]=rowStore;}let cellStore=rowStore[colid];if(!cellStore){cellStore={value:undefined,result:{}};rowStore[colid]=cellStore;}const restData=rowStore[colid];const oldValue=restData.value;restParams.oldValue=oldValue;if(isChanged?!isChanged(restParams):oldValue!==cellValue){restData.value=setValue?setValue(restParams):cellValue;restData.result={};}const storeData=restData.result;if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(storeData[key])){storeData[key]=getResult?getResult(restParams):cellValue;}const cellResult=storeData[key];const rest=restParams;rest.cellResult=cellResult;return rest;},getCellElement(row,fieldOrColumn){const $xeTable=this;const internalData=$xeTable;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 $xeTable=this;const props=$xeTable;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{editConfig}=props;const{formatter,editRender,cellRender}=column;let etOpSize=null;let etOgSize=null;let clOpSize=null;let clOgSize=null;if(editRender){etOpSize=editRender.options?editRender.options.length:0;etOgSize=editRender.optionGroups?editRender.optionGroups.length:0;}if(cellRender){clOpSize=cellRender.options?cellRender.options.length:0;clOgSize=cellRender.optionGroups?cellRender.optionGroups.length:0;}const isEnableEdit=editConfig&&isEnableConf(editConfig);const editRenderOpts=formatter?null:isEnableEdit&&isEnableConf(editRender)?editRender:null;const cellRenderOpts=formatter?null:isEnableConf(cellRender)?cellRender:null;// formatter > cellRender.tableCellFormatter > editRender.tableCellFormatter
|
|
8396
|
-
const cellCompConf=cellRenderOpts?methods_renderer.get(cellRenderOpts.name):null;const editCompConf=editRenderOpts?methods_renderer.get(editRenderOpts.name):null;const cellDfFormatter=cellCompConf?cellCompConf.tableCellFormatter:null;const editDfFormatter=editCompConf?editCompConf.tableCellFormatter:null;const cellValue=getCellValue(row,column);let cellLabel=cellValue;if(formatter||cellDfFormatter||editDfFormatter){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]){const ftValue=formatData[colid].value;if(ftValue&&ftValue[0]===cellValue&&ftValue[1]===etOpSize&&ftValue[2]===etOgSize&&ftValue[3]===clOpSize&&ftValue[4]===clOgSize){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=methods_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=methods_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(cellRenderOpts&&cellDfFormatter){cellLabel=cellDfFormatter(cellRenderOpts,formatParams);}else if(editRenderOpts&&editDfFormatter){cellLabel=editDfFormatter(editRenderOpts,formatParams);}if(formatData){const ftValue=[cellValue,etOpSize,etOgSize,clOpSize,clOgSize];formatData[colid]={value:ftValue,label:cellLabel};}}return cellLabel;},updateCellLabel(row,fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{fullAllDataRowIdData}=internalData;const rowid=getRowid($xeTable,row);if(rowid){const colid=column.id;const rowid=getRowid($xeTable,row);const rowRest=fullAllDataRowIdData[rowid];if(rowRest){const formatData=rowRest.formatData;if(formatData){delete formatData[colid];}}}return $xeTable.getFooterCellLabel(row,column);},clearFormatterCache(isUpdate){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{tableData,tableColumn}=reactData;const{fullAllDataRowIdData}=internalData;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(fullAllDataRowIdData,rowRest=>{if(rowRest.formatData){rowRest.formatData=undefined;}});if(isUpdate){tableData.forEach(row=>{tableColumn.forEach(column=>{$xeTable.getCellLabel(row,column);});});}return $xeTable.$nextTick();},getHeaderCellLabel(fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{headerFormatter}=column;const _columnIndex=$xeTable.getVTColumnIndex(column);let cellLabel=column.getTitle();if(headerFormatter){let formatData;const{headerFullDataColData}=internalData;const colid=column.id;let colRest=headerFullDataColData[colid];if(!colRest){colRest=headerFullDataColData[colid]={};}const formatObj=colRest.formatObj;if(formatObj&&formatObj.value===cellLabel){return formatObj.label;}const headFormatParams={$table:$xeTable,cellTitle:cellLabel,cellValue:cellLabel,column,_columnIndex,columnIndex:$xeTable.getColumnIndex(column)};if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(headerFormatter)){const gFormatOpts=methods_formats.get(headerFormatter);const fcFormatMethod=gFormatOpts?gFormatOpts.tableHeaderCellFormatMethod:null;cellLabel=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(fcFormatMethod?fcFormatMethod(headFormatParams):'');}else if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(headerFormatter)){const gFormatOpts=methods_formats.get(headerFormatter[0]);const fcFormatMethod=gFormatOpts?gFormatOpts.tableHeaderCellFormatMethod:null;cellLabel=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(fcFormatMethod?fcFormatMethod(headFormatParams,...headerFormatter.slice(1)):'');}else{cellLabel=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(headerFormatter(headFormatParams));}if(formatData){colRest.formatObj={value:cellLabel,label:cellLabel};}}return cellLabel;},updateHeaderCellLabel(fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return'';}const{headerFullDataColData}=internalData;const colid=column.id;const colRest=headerFullDataColData[colid];if(colRest){colRest.formatObj=undefined;}return $xeTable.getHeaderCellLabel(column);},clearHeaderFormatterCache(isUpdate){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{tableColumn}=reactData;const{headerFullDataColData}=internalData;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(headerFullDataColData,colRest=>{if(colRest.formatObj){colRest.formatObj=undefined;}});if(isUpdate){tableColumn.forEach(column=>{$xeTable.getHeaderCellLabel(column);});}return $xeTable.$nextTick();},getFooterCellLabel(row,fieldOrColumn){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{footerFormatter}=column;const _columnIndex=$xeTable.getVTColumnIndex(column);let itemValue='';// 兼容老模式
|
|
8405
|
+
*/clearData(rows,field){const $xeTable=this;const internalData=$xeTable;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 $xeTable.$nextTick();},effectCellData(row,column,options){const $xeTable=this;const internalData=$xeTable;const{fullCellStoreMaps}=internalData;const editOpts=$xeTable.computeEditOpts;const{key,isChanged,setValue,getResult}=options;const rowid=getRowid($xeTable,row);const colid=column.id;let rowStore=fullCellStoreMaps[rowid];const cellValue=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,column.field);const restParams={$table:$xeTable,row,rowid,column,colid,cellValue,oldValue:null};if(editOpts.cache===false&&key==='render_table_cell'){const rest=restParams;rest.cellResult=getResult?getResult(restParams):cellValue;return rest;}if(!rowStore){rowStore={};fullCellStoreMaps[rowid]=rowStore;}let cellStore=rowStore[colid];if(!cellStore){cellStore={value:undefined,result:{}};rowStore[colid]=cellStore;}const restData=rowStore[colid];const oldValue=restData.value;restParams.oldValue=oldValue;if(isChanged?!isChanged(restParams):oldValue!==cellValue){restData.value=setValue?setValue(restParams):cellValue;restData.result={};}const storeData=restData.result;if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(storeData[key])){storeData[key]=getResult?getResult(restParams):cellValue;}const cellResult=storeData[key];const rest=restParams;rest.cellResult=cellResult;return rest;},getCellElement(row,fieldOrColumn){const $xeTable=this;const internalData=$xeTable;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 $xeTable=this;const props=$xeTable;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{editConfig}=props;const{formatter,editRender,cellRender}=column;const rendererOpts=$xeTable.computeRendererOpts;let etOpSize=null;let etOgSize=null;let clOpSize=null;let clOgSize=null;if(editRender){etOpSize=editRender.options?editRender.options.length:0;etOgSize=editRender.optionGroups?editRender.optionGroups.length:0;}if(cellRender){clOpSize=cellRender.options?cellRender.options.length:0;clOgSize=cellRender.optionGroups?cellRender.optionGroups.length:0;}const isEnableEdit=editConfig&&isEnableConf(editConfig);const editRenderOpts=formatter?null:isEnableEdit&&isEnableConf(editRender)?editRender:null;const cellRenderOpts=formatter?null:isEnableConf(cellRender)?cellRender:null;// formatter > cellRender.tableCellFormatter > editRender.tableCellFormatter
|
|
8406
|
+
const cellCompConf=cellRenderOpts&&cellRenderOpts.name?rendererOpts[cellRenderOpts.name]||methods_renderer.get(cellRenderOpts.name):null;const editCompConf=editRenderOpts&&editRenderOpts.name?rendererOpts[editRenderOpts.name]||methods_renderer.get(editRenderOpts.name):null;const cellDfFormatter=cellCompConf?cellCompConf.tableCellFormatter:null;const editDfFormatter=editCompConf?editCompConf.tableCellFormatter:null;const cellValue=getCellValue(row,column);let cellLabel=cellValue;if(formatter||cellDfFormatter||editDfFormatter){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]){const ftValue=formatData[colid].value;if(ftValue&&ftValue[0]===cellValue&&ftValue[1]===etOpSize&&ftValue[2]===etOgSize&&ftValue[3]===clOpSize&&ftValue[4]===clOgSize){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=methods_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=methods_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(cellRenderOpts&&cellDfFormatter){cellLabel=cellDfFormatter(cellRenderOpts,formatParams);}else if(editRenderOpts&&editDfFormatter){cellLabel=editDfFormatter(editRenderOpts,formatParams);}if(formatData){const ftValue=[cellValue,etOpSize,etOgSize,clOpSize,clOgSize];formatData[colid]={value:ftValue,label:cellLabel};}}return cellLabel;},updateCellLabel(row,fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{fullAllDataRowIdData}=internalData;const rowid=getRowid($xeTable,row);if(rowid){const colid=column.id;const rowid=getRowid($xeTable,row);const rowRest=fullAllDataRowIdData[rowid];if(rowRest){const formatData=rowRest.formatData;if(formatData){delete formatData[colid];}}}return $xeTable.getFooterCellLabel(row,column);},clearFormatterCache(isUpdate){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{tableData,tableColumn}=reactData;const{fullAllDataRowIdData}=internalData;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(fullAllDataRowIdData,rowRest=>{if(rowRest.formatData){rowRest.formatData=undefined;}});if(isUpdate){tableData.forEach(row=>{tableColumn.forEach(column=>{$xeTable.getCellLabel(row,column);});});}return $xeTable.$nextTick();},getHeaderCellLabel(fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{headerFormatter}=column;const _columnIndex=$xeTable.getVTColumnIndex(column);let cellLabel=column.getTitle();if(headerFormatter){let formatData;const{headerFullDataColData}=internalData;const colid=column.id;let colRest=headerFullDataColData[colid];if(!colRest){colRest=headerFullDataColData[colid]={};}const formatObj=colRest.formatObj;if(formatObj&&formatObj.value===cellLabel){return formatObj.label;}const headFormatParams={$table:$xeTable,cellTitle:cellLabel,cellValue:cellLabel,column,_columnIndex,columnIndex:$xeTable.getColumnIndex(column)};if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(headerFormatter)){const gFormatOpts=methods_formats.get(headerFormatter);const fcFormatMethod=gFormatOpts?gFormatOpts.tableHeaderCellFormatMethod:null;cellLabel=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(fcFormatMethod?fcFormatMethod(headFormatParams):'');}else if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(headerFormatter)){const gFormatOpts=methods_formats.get(headerFormatter[0]);const fcFormatMethod=gFormatOpts?gFormatOpts.tableHeaderCellFormatMethod:null;cellLabel=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(fcFormatMethod?fcFormatMethod(headFormatParams,...headerFormatter.slice(1)):'');}else{cellLabel=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(headerFormatter(headFormatParams));}if(formatData){colRest.formatObj={value:cellLabel,label:cellLabel};}}return cellLabel;},updateHeaderCellLabel(fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return'';}const{headerFullDataColData}=internalData;const colid=column.id;const colRest=headerFullDataColData[colid];if(colRest){colRest.formatObj=undefined;}return $xeTable.getHeaderCellLabel(column);},clearHeaderFormatterCache(isUpdate){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{tableColumn}=reactData;const{headerFullDataColData}=internalData;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(headerFullDataColData,colRest=>{if(colRest.formatObj){colRest.formatObj=undefined;}});if(isUpdate){tableColumn.forEach(column=>{$xeTable.getHeaderCellLabel(column);});}return $xeTable.$nextTick();},getFooterCellLabel(row,fieldOrColumn){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{footerFormatter}=column;const _columnIndex=$xeTable.getVTColumnIndex(column);let itemValue='';// 兼容老模式
|
|
8397
8407
|
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=methods_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=methods_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;},updateFooterCellLabel(row,fieldOrColumn){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(!column){return null;}const{footerTableData}=reactData;const{footerFullDataRowData}=internalData;const colid=column.id;const $rowIndex=footerTableData.indexOf(row);const rowRest=footerFullDataRowData[$rowIndex];if(rowRest){const formatData=rowRest.formatData;if(formatData){delete formatData[colid];}}return $xeTable.getFooterCellLabel(row,column);},clearFooterFormatterCache(isUpdate){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{tableData,tableColumn}=reactData;const{footerFullDataRowData}=internalData;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(footerFullDataRowData,rowRest=>{if(rowRest.formatData){rowRest.formatData=undefined;}});if(isUpdate){tableData.forEach(row=>{tableColumn.forEach(column=>{$xeTable.getFooterCellLabel(row,column);});});}return $xeTable.$nextTick();},/**
|
|
8398
8408
|
* 检查是否为临时行数据
|
|
8399
8409
|
*/isInsertByRow(row){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const rowid=getRowid($xeTable,row);return!!reactData.insertRowFlag&&!!internalData.insertRowMaps[rowid];},isRemoveByRow(row){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const rowid=getRowid($xeTable,row);return!!reactData.removeRowFlag&&!!internalData.removeRowMaps[rowid];},/**
|
|
@@ -8490,7 +8500,7 @@ const{isRowGroupStatus,rowGroupList}=reactData;if(isRowGroupStatus&&!!$xeTable.h
|
|
|
8490
8500
|
if(isCustomFixed&&(column.fixed||'')!==(column.defaultFixed||'')){hasFixed=1;fixedData[colKey]=column.fixed;}}if(isCustomAlign&&column.align){hasAlign=1;alignData[colKey]=column.align;}if(isCustomHeaderAlign&&column.headerAlign){hasHeaderAlign=1;headerAlignData[colKey]=column.headerAlign;}if(isCustomFooterAlign&&column.footerAlign){hasFooterAlign=1;footerAlignData[colKey]=column.footerAlign;}if(isCustomResizable&&column.resizeWidth){hasResizable=1;resizableData[colKey]=column.renderWidth;}if(isCustomVisible&&(!checkMethod||checkMethod({$table:$xeTable,column}))){if(!column.visible&&column.defaultVisible){hasVisible=1;visibleData[colKey]=false;}else if(column.visible&&!column.defaultVisible){hasVisible=1;visibleData[colKey]=true;}}if(isCustomAggFunc&&(column.aggFunc||'')!==(column.defaultAggFunc||'')){hasAggFunc=1;aggFuncData[colKey]=column.aggFunc;}});if(hasAlign){storeData.alignData=alignData;}if(hasHeaderAlign){storeData.headerAlignData=headerAlignData;}if(hasFooterAlign){storeData.footerAlignData=footerAlignData;}if(hasResizable){storeData.resizableData=resizableData;}if(hasSort){storeData.sortData=sortData;}if(hasFixed){storeData.fixedData=fixedData;}if(hasVisible){storeData.visibleData=visibleData;}if(isCustomAggGroup&&isRowGroupStatus){rowGroupList.forEach(aggConf=>{const colRest=fullColumnFieldData[aggConf.field];if(colRest){aggGroupData[colRest.column.getKey()]=true;}});storeData.aggGroupData=aggGroupData;}if(hasAggFunc){storeData.aggFuncData=aggFuncData;}return storeData;},/**
|
|
8491
8501
|
* @private
|
|
8492
8502
|
*/saveCustomStore(type){const $xeTable=this;const props=$xeTable;const reactData=$xeTable;const{customConfig}=props;const tableId=$xeTable.computeTableId;const customOpts=$xeTable.computeCustomOpts;const{updateStore,storage}=customOpts;const{isCustomAlign,isCustomHeaderAlign,isCustomFooterAlign,isCustomResizable,isCustomVisible,isCustomFixed,isCustomSort,isCustomAggGroup,isCustomAggFunc,isCustomPager}=handleCustomStoreConfig($xeTable);if(type!=='reset'){// fix:修复拖动列宽,重置按钮无法点击的问题
|
|
8493
|
-
reactData.isCustomStatus=true;}if(storage&&(customConfig?isEnableConf(customOpts):customOpts.enabled)&&(isCustomAlign||isCustomHeaderAlign||isCustomFooterAlign||isCustomResizable||isCustomVisible||isCustomFixed||isCustomSort||isCustomAggGroup||isCustomAggFunc||isCustomPager)){if(!tableId){methods_errLog('vxe.error.reqProp',['id']);return $xeTable.$nextTick();}const storeData=type==='reset'?{pagerData:{},alignData:{},headerAlignData:{},footerAlignData:{},resizableData:{},sortData:[],visibleData:{},fixedData:{},aggGroupData:{},aggFuncData:{}}:$xeTable.getCustomStoreData();if(updateStore){return updateStore({$table:$xeTable,id:tableId,type,storeData});}else{setCustomStorageMap(tableId,type==='reset'?null:storeData);}}return $xeTable.$nextTick();},handleUpdateDataQueue(){const $xeTable=this;const reactData=$xeTable;reactData.upDataFlag++;},handleRefreshColumnQueue(){const $xeTable=this;const reactData=$xeTable;reactData.reColumnFlag++;},handleFilterOptions(column){const $xeTable=this;const reactData=$xeTable;if(column){const{filterStore}=reactData;const{filterRender,filters}=column;const filterOptions=filters||[];const compConf=isEnableConf(filterRender)?methods_renderer.get(filterRender.name):null;const frMethod=column.filterRecoverMethod||(compConf?compConf.tableFilterRecoverMethod||compConf.filterRecoverMethod:null);filterStore.column=column;// 复原状态
|
|
8503
|
+
reactData.isCustomStatus=true;}if(storage&&(customConfig?isEnableConf(customOpts):customOpts.enabled)&&(isCustomAlign||isCustomHeaderAlign||isCustomFooterAlign||isCustomResizable||isCustomVisible||isCustomFixed||isCustomSort||isCustomAggGroup||isCustomAggFunc||isCustomPager)){if(!tableId){methods_errLog('vxe.error.reqProp',['id']);return $xeTable.$nextTick();}const storeData=type==='reset'?{pagerData:{},alignData:{},headerAlignData:{},footerAlignData:{},resizableData:{},sortData:[],visibleData:{},fixedData:{},aggGroupData:{},aggFuncData:{}}:$xeTable.getCustomStoreData();if(updateStore){return updateStore({$table:$xeTable,id:tableId,type,storeData});}else{setCustomStorageMap(tableId,type==='reset'?null:storeData);}}return $xeTable.$nextTick();},handleUpdateDataQueue(){const $xeTable=this;const reactData=$xeTable;reactData.upDataFlag++;},handleRefreshColumnQueue(){const $xeTable=this;const reactData=$xeTable;reactData.reColumnFlag++;},handleFilterOptions(column){const $xeTable=this;const reactData=$xeTable;if(column){const{filterStore}=reactData;const{filterRender,filters}=column;const rendererOpts=$xeTable.computeRendererOpts;const filterOptions=filters||[];const compConf=isEnableConf(filterRender)&&filterRender.name?rendererOpts[filterRender.name]||methods_renderer.get(filterRender.name):null;const frMethod=column.filterRecoverMethod||(compConf?compConf.tableFilterRecoverMethod||compConf.filterRecoverMethod:null);filterStore.column=column;// 复原状态
|
|
8494
8504
|
filterOptions.forEach(option=>{const{_checked,checked}=option;option._checked=checked;if(!checked&&_checked!==checked){if(frMethod){frMethod({option,column,$table:$xeTable});}}});$xeTable.checkFilterOptions();}},/**
|
|
8495
8505
|
* 刷新列配置
|
|
8496
8506
|
*/refreshColumn(initSort){const $xeTable=this;if(initSort){handleUpdateColumn($xeTable);}return parseColumns($xeTable,true).then(()=>{return $xeTable.refreshScroll();}).then(()=>{return handleLazyRecalculate($xeTable,false,true,true);});},/**
|
|
@@ -9088,6 +9098,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
|
|
|
9088
9098
|
const tooltipOpts = $xeTable.computeTooltipOpts;
|
|
9089
9099
|
const virtualXOpts = $xeTable.computeVirtualXOpts;
|
|
9090
9100
|
const virtualYOpts = $xeTable.computeVirtualYOpts;
|
|
9101
|
+
const rendererOpts = $xeTable.computeRendererOpts;
|
|
9091
9102
|
const {
|
|
9092
9103
|
isAllColumnDrag,
|
|
9093
9104
|
isAllRowDrag
|
|
@@ -9134,7 +9145,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
|
|
|
9134
9145
|
const colid = column.id;
|
|
9135
9146
|
const colRest = fullColumnIdData[colid] || {};
|
|
9136
9147
|
const renderOpts = editRender || cellRender;
|
|
9137
|
-
const compConf = renderOpts ? body_renderer.get(renderOpts.name) : null;
|
|
9148
|
+
const compConf = renderOpts && renderOpts.name ? rendererOpts[renderOpts.name] || body_renderer.get(renderOpts.name) : null;
|
|
9138
9149
|
const compCellClassName = compConf ? compConf.tableCellClassName || compConf.cellClassName : null;
|
|
9139
9150
|
const compCellStyle = compConf ? compConf.tableCellStyle || compConf.cellStyle : '';
|
|
9140
9151
|
const showAllTip = tooltipOpts.showAll;
|
|
@@ -9872,7 +9883,8 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
|
|
|
9872
9883
|
if (emptySlot) {
|
|
9873
9884
|
emptyContent = emptySlot.call($xeTable, emptyParams);
|
|
9874
9885
|
} else {
|
|
9875
|
-
const
|
|
9886
|
+
const rendererOpts = $xeTable.computeRendererOpts;
|
|
9887
|
+
const compConf = emptyOpts.name ? rendererOpts[emptyOpts.name] || body_renderer.get(emptyOpts.name) : null;
|
|
9876
9888
|
const rtEmptyView = compConf ? compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty : null;
|
|
9877
9889
|
if (rtEmptyView) {
|
|
9878
9890
|
emptyContent = getSlotVNs(rtEmptyView.call($xeTable, h, emptyOpts, emptyParams));
|
|
@@ -10034,6 +10046,7 @@ function header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIn
|
|
|
10034
10046
|
const cellOpts = $xeTable.computeCellOpts;
|
|
10035
10047
|
const defaultRowHeight = $xeTable.computeDefaultRowHeight;
|
|
10036
10048
|
const headerCellOpts = $xeTable.computeHeaderCellOpts;
|
|
10049
|
+
const rendererOpts = $xeTable.computeRendererOpts;
|
|
10037
10050
|
const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight;
|
|
10038
10051
|
const {
|
|
10039
10052
|
disabledMethod: dragDisabledMethod,
|
|
@@ -10056,7 +10069,7 @@ function header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIn
|
|
|
10056
10069
|
const colid = column.id;
|
|
10057
10070
|
const colRest = fullColumnIdData[colid] || {};
|
|
10058
10071
|
const renderOpts = editRender || cellRender;
|
|
10059
|
-
const compConf = renderOpts ? header_renderer.get(renderOpts.name) : null;
|
|
10072
|
+
const compConf = renderOpts && renderOpts.name ? rendererOpts[renderOpts.name] || header_renderer.get(renderOpts.name) : null;
|
|
10060
10073
|
const isColGroup = column.children && column.children.length;
|
|
10061
10074
|
const fixedHiddenColumn = overflowX && !isColGroup && (fixedType ? column.fixed !== fixedType : !!column.fixed);
|
|
10062
10075
|
const cellPadding = getDefaultConfig(headerCellOpts.padding, cellOpts.padding);
|
|
@@ -10254,6 +10267,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
|
|
|
10254
10267
|
const defaultRowHeight = $xeTable.computeDefaultRowHeight;
|
|
10255
10268
|
const headerCellOpts = $xeTable.computeHeaderCellOpts;
|
|
10256
10269
|
const floatingFilterOpts = $xeTable.computeFloatingFilterOpts;
|
|
10270
|
+
const rendererOpts = $xeTable.computeRendererOpts;
|
|
10257
10271
|
const {
|
|
10258
10272
|
cellClassName
|
|
10259
10273
|
} = floatingFilterOpts;
|
|
@@ -10274,8 +10288,8 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
|
|
|
10274
10288
|
const colid = column.id;
|
|
10275
10289
|
const colRest = fullColumnIdData[colid] || {};
|
|
10276
10290
|
const renderOpts = editRender || cellRender;
|
|
10277
|
-
const compConf = renderOpts ? header_renderer.get(renderOpts.name) : null;
|
|
10278
|
-
const flCompConf = isEnableConf(filterRender) ? header_renderer.get(filterRender.name) : null;
|
|
10291
|
+
const compConf = renderOpts && renderOpts.name ? rendererOpts[renderOpts.name] || header_renderer.get(renderOpts.name) : null;
|
|
10292
|
+
const flCompConf = isEnableConf(filterRender) && filterRender.name ? rendererOpts[filterRender.name] || header_renderer.get(filterRender.name) : null;
|
|
10279
10293
|
const rtFloatingFilter = flCompConf ? flCompConf.renderTableFloatingFilter : null;
|
|
10280
10294
|
const flSlot = slots ? slots.floatingFilter || slots['floating-filter'] : null;
|
|
10281
10295
|
const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
|
|
@@ -10697,6 +10711,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
|
|
|
10697
10711
|
const cellOpts = $xeTable.computeCellOpts;
|
|
10698
10712
|
const footerCellOpts = $xeTable.computeFooterCellOpts;
|
|
10699
10713
|
const currCellHeight = getCalcHeight(footerCellOpts.height) || defaultRowHeight;
|
|
10714
|
+
const rendererOpts = $xeTable.computeRendererOpts;
|
|
10700
10715
|
return tableColumn.map((column, $columnIndex) => {
|
|
10701
10716
|
const {
|
|
10702
10717
|
type,
|
|
@@ -10710,7 +10725,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
|
|
|
10710
10725
|
const colid = column.id;
|
|
10711
10726
|
const colRest = fullColumnIdData[colid] || {};
|
|
10712
10727
|
const renderOpts = editRender || cellRender;
|
|
10713
|
-
const compConf = renderOpts ? footer_renderer.get(renderOpts.name) : null;
|
|
10728
|
+
const compConf = renderOpts && renderOpts.name ? rendererOpts[renderOpts.name] || footer_renderer.get(renderOpts.name) : null;
|
|
10714
10729
|
const showAllTip = footerTooltipOpts.showAll;
|
|
10715
10730
|
const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
|
|
10716
10731
|
const cellPadding = getDefaultConfig(footerCellOpts.padding, cellOpts.padding);
|
|
@@ -13156,12 +13171,13 @@ function filterCheckAllEvent($xeFilterPanel, evnt, value) {
|
|
|
13156
13171
|
return [];
|
|
13157
13172
|
}
|
|
13158
13173
|
const filterOpts = $xeTable.computeFilterOpts;
|
|
13174
|
+
const rendererOpts = $xeTable.computeRendererOpts;
|
|
13159
13175
|
const hasCheckOption = $xeFilterPanel.computeHasCheckOption;
|
|
13160
13176
|
const {
|
|
13161
13177
|
filterRender,
|
|
13162
13178
|
filterMultiple
|
|
13163
13179
|
} = column;
|
|
13164
|
-
const compConf = isEnableConf(filterRender) ? panel_renderer.get(filterRender.name) : null;
|
|
13180
|
+
const compConf = filterRender && isEnableConf(filterRender) && filterRender.name ? rendererOpts[filterRender.name] || panel_renderer.get(filterRender.name) : null;
|
|
13165
13181
|
const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
|
|
13166
13182
|
return filterMultiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false) : true) ? [h('div', {
|
|
13167
13183
|
class: 'vxe-table--filter-footer'
|
|
@@ -13196,8 +13212,9 @@ function filterCheckAllEvent($xeFilterPanel, evnt, value) {
|
|
|
13196
13212
|
if (!column) {
|
|
13197
13213
|
return filter_panel_renderEmptyElement($xeFilterPanel);
|
|
13198
13214
|
}
|
|
13215
|
+
const rendererOpts = $xeTable.computeRendererOpts;
|
|
13199
13216
|
const filterRender = column ? column.filterRender : null;
|
|
13200
|
-
const compConf = filterRender && isEnableConf(filterRender) ? panel_renderer.get(filterRender.name) : null;
|
|
13217
|
+
const compConf = filterRender && isEnableConf(filterRender) && filterRender.name ? rendererOpts[filterRender.name] || panel_renderer.get(filterRender.name) : null;
|
|
13201
13218
|
const filterClassName = compConf ? compConf.tableFilterClassName || compConf.filterClassName : '';
|
|
13202
13219
|
const params = Object.assign({}, tableInternalData._currFilterParams, {
|
|
13203
13220
|
$panel: $xeFilterPanel,
|
|
@@ -14371,13 +14388,14 @@ function updatePopupStyle($xeTable) {
|
|
|
14371
14388
|
}
|
|
14372
14389
|
const tableEl = $xeTable.$refs.refElem;
|
|
14373
14390
|
const filterOpts = $xeTable.computeFilterOpts;
|
|
14391
|
+
const rendererOpts = $xeTable.computeRendererOpts;
|
|
14374
14392
|
const {
|
|
14375
14393
|
maxHeight: customMaxHeight,
|
|
14376
14394
|
transfer,
|
|
14377
14395
|
zIndex
|
|
14378
14396
|
} = filterOpts;
|
|
14379
14397
|
const filterRender = column ? column.filterRender : null;
|
|
14380
|
-
const compConf = filterRender && isEnableConf(filterRender) ? mixin_renderer.get(filterRender.name) : null;
|
|
14398
|
+
const compConf = filterRender && isEnableConf(filterRender) && filterRender.name ? rendererOpts[filterRender.name] || mixin_renderer.get(filterRender.name) : null;
|
|
14381
14399
|
const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
|
|
14382
14400
|
if (!headerScrollElem) {
|
|
14383
14401
|
return $xeTable.$nextTick();
|
|
@@ -14869,7 +14887,8 @@ function updatePopupStyle($xeTable) {
|
|
|
14869
14887
|
filterRender
|
|
14870
14888
|
} = column;
|
|
14871
14889
|
if (filters) {
|
|
14872
|
-
const
|
|
14890
|
+
const rendererOpts = $xeTable.computeRendererOpts;
|
|
14891
|
+
const compConf = isEnableConf(filterRender) && filterRender.name ? rendererOpts[filterRender.name] || mixin_renderer.get(filterRender.name) : null;
|
|
14873
14892
|
const filterResetMethod = column.filterResetMethod || (compConf ? compConf.tableFilterResetMethod || compConf.filterResetMethod : null);
|
|
14874
14893
|
filters.forEach(item => {
|
|
14875
14894
|
item._checked = false;
|
|
@@ -16573,7 +16592,9 @@ function handleEditCell($xeTable, row, fieldOrColumn, options) {
|
|
|
16573
16592
|
} = column;
|
|
16574
16593
|
const editOpts = $xeTable.computeEditOpts;
|
|
16575
16594
|
if (editConfig && isEnableConf(editRender)) {
|
|
16576
|
-
const
|
|
16595
|
+
const rendererOpts = $xeTable.computeRendererOpts;
|
|
16596
|
+
const renderName = editRender.name;
|
|
16597
|
+
const compRender = renderName ? rendererOpts[renderName] || edit_mixin_renderer.get(renderName) : null;
|
|
16577
16598
|
let autoFocus = editRender.autofocus || editRender.autoFocus;
|
|
16578
16599
|
let autoSelect = editRender.autoSelect || editRender.autoselect;
|
|
16579
16600
|
let inputElem = null;
|
|
@@ -16956,6 +16977,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
|
|
|
16956
16977
|
const treeOpts = $xeTable.computeTreeOpts;
|
|
16957
16978
|
const columnOpts = $xeTable.computeColumnOpts;
|
|
16958
16979
|
const aggregateOpts = $xeTable.computeAggregateOpts;
|
|
16980
|
+
const rendererOpts = $xeTable.computeRendererOpts;
|
|
16959
16981
|
if (!htmlCellElem) {
|
|
16960
16982
|
htmlCellElem = document.createElement('div');
|
|
16961
16983
|
}
|
|
@@ -17004,7 +17026,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
|
|
|
17004
17026
|
const renderOpts = editRender || cellRender;
|
|
17005
17027
|
let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
|
|
17006
17028
|
if (!bodyExportMethod && renderOpts && renderOpts.name) {
|
|
17007
|
-
const compConf = export_mixin_renderer.get(renderOpts.name);
|
|
17029
|
+
const compConf = rendererOpts[renderOpts.name] || export_mixin_renderer.get(renderOpts.name);
|
|
17008
17030
|
if (compConf) {
|
|
17009
17031
|
bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
|
|
17010
17032
|
}
|
|
@@ -17162,7 +17184,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
|
|
|
17162
17184
|
const renderOpts = column.editRender || column.cellRender;
|
|
17163
17185
|
let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
|
|
17164
17186
|
if (!bodyExportMethod && renderOpts && renderOpts.name) {
|
|
17165
|
-
const compConf = export_mixin_renderer.get(renderOpts.name);
|
|
17187
|
+
const compConf = rendererOpts[renderOpts.name] || export_mixin_renderer.get(renderOpts.name);
|
|
17166
17188
|
if (compConf) {
|
|
17167
17189
|
bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
|
|
17168
17190
|
}
|
|
@@ -17243,7 +17265,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
|
|
|
17243
17265
|
const renderOpts = column.editRender || column.cellRender;
|
|
17244
17266
|
let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
|
|
17245
17267
|
if (!bodyExportMethod && renderOpts && renderOpts.name) {
|
|
17246
|
-
const compConf = export_mixin_renderer.get(renderOpts.name);
|
|
17268
|
+
const compConf = rendererOpts[renderOpts.name] || export_mixin_renderer.get(renderOpts.name);
|
|
17247
17269
|
if (compConf) {
|
|
17248
17270
|
bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
|
|
17249
17271
|
}
|
|
@@ -17334,10 +17356,11 @@ function getHeaderTitle($xeTable, opts, column) {
|
|
|
17334
17356
|
}
|
|
17335
17357
|
function getFooterCellValue($xeTable, opts, row, column) {
|
|
17336
17358
|
const columnOpts = $xeTable.computeColumnOpts;
|
|
17359
|
+
const rendererOpts = $xeTable.computeRendererOpts;
|
|
17337
17360
|
const renderOpts = column.editRender || column.cellRender;
|
|
17338
17361
|
let footLabelMethod = column.footerExportMethod;
|
|
17339
17362
|
if (!footLabelMethod && renderOpts && renderOpts.name) {
|
|
17340
|
-
const compConf = export_mixin_renderer.get(renderOpts.name);
|
|
17363
|
+
const compConf = rendererOpts[renderOpts.name] || export_mixin_renderer.get(renderOpts.name);
|
|
17341
17364
|
if (compConf) {
|
|
17342
17365
|
footLabelMethod = compConf.tableFooterExportMethod || compConf.footerExportMethod || compConf.footerCellExportMethod;
|
|
17343
17366
|
}
|
|
@@ -21334,7 +21357,8 @@ function renderEmptyBody(h, $xeTable) {
|
|
|
21334
21357
|
if (emptySlot) {
|
|
21335
21358
|
emptyContent = emptySlot.call($xeTable, emptyParams);
|
|
21336
21359
|
} else {
|
|
21337
|
-
const
|
|
21360
|
+
const rendererOpts = $xeTable.computeRendererOpts;
|
|
21361
|
+
const compConf = emptyOpts.name ? rendererOpts[emptyOpts.name] || table_renderer.get(emptyOpts.name) : null;
|
|
21338
21362
|
const rtEmptyView = compConf ? compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty : null;
|
|
21339
21363
|
if (rtEmptyView) {
|
|
21340
21364
|
emptyContent = getSlotVNs(rtEmptyView.call($xeTable, h, emptyOpts, emptyParams));
|
|
@@ -22680,6 +22704,11 @@ function renderBody(h, $xeTable) {
|
|
|
22680
22704
|
const props = $xeTable;
|
|
22681
22705
|
return Object.assign({}, table_getConfig().table.undoRedoHistoryConfig, props.undoRedoHistoryConfig);
|
|
22682
22706
|
},
|
|
22707
|
+
computeRendererOpts() {
|
|
22708
|
+
const $xeTable = this;
|
|
22709
|
+
const props = $xeTable;
|
|
22710
|
+
return Object.assign({}, table_getConfig().table.rendererConfig, props.rendererConfig);
|
|
22711
|
+
},
|
|
22683
22712
|
combineTabsResizeFlag() {
|
|
22684
22713
|
const $xeTable = this;
|
|
22685
22714
|
const $xeTabs = $xeTable.$xeTabs;
|
|
@@ -24311,13 +24340,14 @@ function toolbar_createInternalData() {
|
|
|
24311
24340
|
const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix'];
|
|
24312
24341
|
const btnVNs = [];
|
|
24313
24342
|
if (buttons) {
|
|
24343
|
+
const rendererOpts = ($table ? $table.computeRendererOpts : null) || {};
|
|
24314
24344
|
buttons.forEach(item => {
|
|
24315
24345
|
const {
|
|
24316
24346
|
dropdowns,
|
|
24317
24347
|
buttonRender
|
|
24318
24348
|
} = item;
|
|
24319
24349
|
if (item.visible !== false) {
|
|
24320
|
-
const compConf = buttonRender ? toolbar_renderer.get(buttonRender.name) : null;
|
|
24350
|
+
const compConf = buttonRender && buttonRender.name ? rendererOpts[buttonRender.name] || toolbar_renderer.get(buttonRender.name) : null;
|
|
24321
24351
|
if (buttonRender && compConf && compConf.renderToolbarButton) {
|
|
24322
24352
|
const toolbarButtonClassName = compConf.toolbarButtonClassName;
|
|
24323
24353
|
const params = {
|
|
@@ -24395,14 +24425,14 @@ function toolbar_createInternalData() {
|
|
|
24395
24425
|
const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix'];
|
|
24396
24426
|
const btnVNs = [];
|
|
24397
24427
|
if (tools) {
|
|
24428
|
+
const rendererOpts = ($table ? $table.computeRendererOpts : null) || {};
|
|
24398
24429
|
tools.forEach((item, tIndex) => {
|
|
24399
24430
|
const {
|
|
24400
24431
|
dropdowns,
|
|
24401
24432
|
toolRender
|
|
24402
24433
|
} = item;
|
|
24403
24434
|
if (item.visible !== false) {
|
|
24404
|
-
const
|
|
24405
|
-
const compConf = toolRender ? toolbar_renderer.get(rdName) : null;
|
|
24435
|
+
const compConf = toolRender && toolRender.name ? rendererOpts[toolRender.name] || toolbar_renderer.get(toolRender.name) : null;
|
|
24406
24436
|
if (toolRender && compConf && compConf.renderToolbarTool) {
|
|
24407
24437
|
const toolbarToolClassName = compConf.toolbarToolClassName;
|
|
24408
24438
|
const params = {
|
|
@@ -24412,7 +24442,7 @@ function toolbar_createInternalData() {
|
|
|
24412
24442
|
tool: item
|
|
24413
24443
|
};
|
|
24414
24444
|
btnVNs.push(h('span', {
|
|
24415
|
-
key:
|
|
24445
|
+
key: tIndex,
|
|
24416
24446
|
class: ['vxe-tool--item', toolbarToolClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName : '']
|
|
24417
24447
|
}, getSlotVNs(compConf.renderToolbarTool(h, toolRender, params))));
|
|
24418
24448
|
} else {
|
|
@@ -26475,7 +26505,7 @@ function grid_createInternalData() {
|
|
|
26475
26505
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(columns, column => {
|
|
26476
26506
|
if (column.slots) {
|
|
26477
26507
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(column.slots, func => {
|
|
26478
|
-
if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
|
|
26508
|
+
if (func && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
|
|
26479
26509
|
if (!slots[func]) {
|
|
26480
26510
|
grid_errLog('vxe.error.notSlot', [func]);
|
|
26481
26511
|
}
|
|
@@ -26602,7 +26632,7 @@ function grid_createInternalData() {
|
|
|
26602
26632
|
// 处理插槽
|
|
26603
26633
|
formOpts.items.forEach(item => {
|
|
26604
26634
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(item.slots, func => {
|
|
26605
|
-
if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
|
|
26635
|
+
if (func && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
|
|
26606
26636
|
if (slots[func]) {
|
|
26607
26637
|
formSlots[func] = slots[func];
|
|
26608
26638
|
}
|