vxe-table 3.23.10 → 3.24.0-beta.1

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.
Files changed (98) hide show
  1. package/es/grid/src/grid.js +29 -0
  2. package/es/iconfont.1789279209327.ttf +0 -0
  3. package/es/iconfont.1789279209327.woff +0 -0
  4. package/es/iconfont.1789279209327.woff2 +0 -0
  5. package/es/index.css +1 -1
  6. package/es/index.min.css +1 -1
  7. package/es/style.css +1 -1
  8. package/es/style.min.css +1 -1
  9. package/es/table/module/edit/mixin.js +3 -1
  10. package/es/table/module/export/mixin.js +14 -7
  11. package/es/table/module/filter/mixin.js +4 -2
  12. package/es/table/module/filter/panel.js +4 -2
  13. package/es/table/src/body.js +4 -2
  14. package/es/table/src/cell.js +27 -14
  15. package/es/table/src/columnInfo.js +2 -1
  16. package/es/table/src/footer.js +2 -1
  17. package/es/table/src/header.js +5 -3
  18. package/es/table/src/methods.js +19 -9
  19. package/es/table/src/props.js +4 -0
  20. package/es/table/src/table.js +7 -1
  21. package/es/table/style.css +3 -3
  22. package/es/table/style.min.css +1 -1
  23. package/es/toolbar/src/toolbar.js +5 -4
  24. package/es/ui/index.js +1 -1
  25. package/es/ui/src/log.js +1 -1
  26. package/es/vxe-table/style.css +3 -3
  27. package/es/vxe-table/style.min.css +1 -1
  28. package/lib/grid/src/grid.js +29 -0
  29. package/lib/grid/src/grid.min.js +1 -1
  30. package/lib/iconfont.1789279209327.ttf +0 -0
  31. package/lib/iconfont.1789279209327.woff +0 -0
  32. package/lib/iconfont.1789279209327.woff2 +0 -0
  33. package/lib/index.css +1 -1
  34. package/lib/index.min.css +1 -1
  35. package/lib/index.umd.js +121 -47
  36. package/lib/index.umd.min.js +1 -1
  37. package/lib/style.css +1 -1
  38. package/lib/style.min.css +1 -1
  39. package/lib/table/module/edit/mixin.js +3 -1
  40. package/lib/table/module/edit/mixin.min.js +1 -1
  41. package/lib/table/module/export/mixin.js +17 -7
  42. package/lib/table/module/export/mixin.min.js +1 -1
  43. package/lib/table/module/filter/mixin.js +4 -2
  44. package/lib/table/module/filter/mixin.min.js +1 -1
  45. package/lib/table/module/filter/panel.js +4 -2
  46. package/lib/table/module/filter/panel.min.js +1 -1
  47. package/lib/table/src/body.js +4 -2
  48. package/lib/table/src/body.min.js +1 -1
  49. package/lib/table/src/cell.js +28 -16
  50. package/lib/table/src/cell.min.js +1 -1
  51. package/lib/table/src/columnInfo.js +2 -1
  52. package/lib/table/src/columnInfo.min.js +1 -1
  53. package/lib/table/src/footer.js +2 -1
  54. package/lib/table/src/footer.min.js +1 -1
  55. package/lib/table/src/header.js +5 -3
  56. package/lib/table/src/header.min.js +1 -1
  57. package/lib/table/src/methods.js +5 -5
  58. package/lib/table/src/methods.min.js +1 -1
  59. package/lib/table/src/props.js +4 -0
  60. package/lib/table/src/props.min.js +1 -1
  61. package/lib/table/src/table.js +7 -1
  62. package/lib/table/src/table.min.js +1 -1
  63. package/lib/table/style/style.css +3 -3
  64. package/lib/table/style/style.min.css +1 -1
  65. package/lib/toolbar/src/toolbar.js +5 -4
  66. package/lib/toolbar/src/toolbar.min.js +1 -1
  67. package/lib/ui/index.js +1 -1
  68. package/lib/ui/index.min.js +1 -1
  69. package/lib/ui/src/log.js +1 -1
  70. package/lib/ui/src/log.min.js +1 -1
  71. package/lib/vxe-table/style/style.css +3 -3
  72. package/lib/vxe-table/style/style.min.css +1 -1
  73. package/package.json +2 -2
  74. package/packages/grid/src/grid.ts +32 -0
  75. package/packages/table/module/edit/mixin.ts +3 -1
  76. package/packages/table/module/export/mixin.ts +14 -7
  77. package/packages/table/module/filter/mixin.ts +6 -4
  78. package/packages/table/module/filter/panel.ts +4 -2
  79. package/packages/table/src/body.ts +4 -2
  80. package/packages/table/src/cell.ts +28 -14
  81. package/packages/table/src/columnInfo.ts +2 -1
  82. package/packages/table/src/footer.ts +2 -1
  83. package/packages/table/src/header.ts +5 -3
  84. package/packages/table/src/methods.ts +18 -9
  85. package/packages/table/src/props.ts +4 -0
  86. package/packages/table/src/table.ts +8 -1
  87. package/packages/toolbar/src/toolbar.ts +5 -4
  88. package/styles/components/icon.scss +2 -2
  89. package/styles/components/table.scss +1 -1
  90. package/styles/icon/iconfont.ttf +0 -0
  91. package/styles/icon/iconfont.woff +0 -0
  92. package/styles/icon/iconfont.woff2 +0 -0
  93. package/es/iconfont.1789034993794.ttf +0 -0
  94. package/es/iconfont.1789034993794.woff +0 -0
  95. package/es/iconfont.1789034993794.woff2 +0 -0
  96. package/lib/iconfont.1789034993794.ttf +0 -0
  97. package/lib/iconfont.1789034993794.woff +0 -0
  98. package/lib/iconfont.1789034993794.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.23.9";
3317
+ const version = "3.24.0-beta.1";
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.23.9"}`;
4279
+ const tableVersion = `table v${"3.24.0-beta.1"}`;
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 flCompConf = filterRender && isEnableConf(filterRender) ? columnInfo_renderer.get(filterRender.name) : null;
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 compConf = cell_renderer.get(renderOpts.name);
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 compConf = cell_renderer.get(renderOpts.name);
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,18 +6318,25 @@ const Cell = {
6315
6318
  if (defaultSlot) {
6316
6319
  return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h));
6317
6320
  }
6318
- const renderOpts = editRenderOpts || cellRenderOpts;
6319
- // 如果是编辑表格:renderTableCell > formatter
6320
- // 如果是查看表格:renderTableDefault > formatter
6321
- if (renderOpts) {
6322
- const compConf = cell_renderer.get(renderOpts.name);
6323
- if (compConf) {
6324
- const renderFn = editRenderOpts ? compConf.renderTableCell || compConf.renderCell : compConf.renderTableDefault || compConf.renderDefault;
6325
- if (renderFn) {
6326
- return renderCellBaseVNs(h, params, getSlotVNs(renderFn.call($table, h, renderOpts, Object.assign({
6327
- $type: editRenderOpts ? 'edit' : 'cell'
6328
- }, params))));
6329
- }
6321
+ const rendererOpts = $table.computeRendererOpts;
6322
+ // 如果是编辑模式-查看:slot default > formatter > cellRender.renderTableDefault > editRender.renderTableCell > editRender.renderTableDefault > cellRender.tableCellFormatter > editRender.tableCellFormatter > field
6323
+ // 如果是查看表格:slot default > formatter > cellRender。renderTableDefault > cellRender.tableCellFormatter > field
6324
+ const cellCompConf = cellRenderOpts && cellRenderOpts.name ? rendererOpts[cellRenderOpts.name] || cell_renderer.get(cellRenderOpts.name) : null;
6325
+ if (cellRenderOpts) {
6326
+ const cellDefaultRenderFn = cellCompConf ? cellCompConf.renderTableDefault || cellCompConf.renderDefault : null;
6327
+ if (cellDefaultRenderFn && cellRenderOpts) {
6328
+ return renderCellBaseVNs(h, params, getSlotVNs(cellDefaultRenderFn(h, cellRenderOpts, Object.assign({
6329
+ $type: editRenderOpts ? 'edit' : 'cell'
6330
+ }, params))));
6331
+ }
6332
+ }
6333
+ if (editRenderOpts) {
6334
+ const editCompConf = editRenderOpts && editRenderOpts.name ? rendererOpts[editRenderOpts.name] || cell_renderer.get(editRenderOpts.name) : null;
6335
+ const editCellRenderFn = editCompConf ? editCompConf.renderTableCell || editCompConf.renderCell || editCompConf.renderTableDefault || editCompConf.renderDefault : null;
6336
+ if (editCellRenderFn) {
6337
+ return renderCellBaseVNs(h, params, getSlotVNs(editCellRenderFn(h, editRenderOpts, Object.assign({
6338
+ $type: editRenderOpts ? 'edit' : 'cell'
6339
+ }, params))));
6330
6340
  }
6331
6341
  }
6332
6342
  cellValue = $table.getCellLabel(row, column);
@@ -7015,7 +7025,8 @@ const Cell = {
7015
7025
  return $table.callSlot(slots.content, params, h);
7016
7026
  }
7017
7027
  if (contentRender) {
7018
- const compConf = cell_renderer.get(contentRender.name);
7028
+ const rendererOpts = $table.computeRendererOpts;
7029
+ const compConf = contentRender.name ? rendererOpts[contentRender.name] || cell_renderer.get(contentRender.name) : null;
7019
7030
  const rtExpand = compConf ? compConf.renderTableExpand || compConf.renderExpand : null;
7020
7031
  if (rtExpand) {
7021
7032
  return getSlotVNs(rtExpand.call($table, h, contentRender, params));
@@ -7290,7 +7301,8 @@ const Cell = {
7290
7301
  if (slots && slots.edit) {
7291
7302
  return $table.callSlot(slots.edit, cellParams, h);
7292
7303
  }
7293
- const compConf = cell_renderer.get(editRender.name);
7304
+ const rendererOpts = $table.computeRendererOpts;
7305
+ const compConf = editRenderOpts.name ? rendererOpts[editRenderOpts.name] || cell_renderer.get(editRenderOpts.name) : null;
7294
7306
  const rtEdit = compConf ? compConf.renderTableEdit || compConf.renderEdit : null;
7295
7307
  if (rtEdit) {
7296
7308
  return getSlotVNs(rtEdit.call($table, h, editRender, cellParams));
@@ -7320,6 +7332,7 @@ const Cell = {
7320
7332
  return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, cellParams, h));
7321
7333
  }
7322
7334
  }
7335
+ // slot default > formatter
7323
7336
  if (formatter) {
7324
7337
  return renderCellBaseVNs(h, params, [h('span', {
7325
7338
  class: 'vxe-cell--label'
@@ -7951,6 +7964,10 @@ const tableProps = {
7951
7964
  type: Number,
7952
7965
  default: () => props_getConfig().table.delayHover
7953
7966
  },
7967
+ /**
7968
+ * 渲染器配置项
7969
+ */
7970
+ rendererConfig: Object,
7954
7971
  // 额外的参数
7955
7972
  params: Object
7956
7973
  };
@@ -8065,10 +8082,10 @@ const matchObj=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe
8065
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;}/**
8066
8083
  * 编译处理后全量的表格数据
8067
8084
  * 如果存在筛选条件,继续处理
8068
- */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=[];// 处理数据
8069
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');}// 处理筛选
8070
8087
  // 支持单列、多列、组合筛选
8071
- 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){// 行分组
8072
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){// 筛选虚拟树
8073
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){// 还原行分组
8074
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){// 还原虚拟树
@@ -8385,8 +8402,8 @@ if(eqEmptyValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_x
8385
8402
  * 如果还额外传了 field 则清空指定单元格内容
8386
8403
  * @param {Array/Row} rows 行数据
8387
8404
  * @param {String} field 字段名
8388
- */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;}// formatter > tableCellFormatter
8389
- const renderOpts=formatter?null:editConfig&&isEnableConf(editRender)?editRender:isEnableConf(cellRender)?cellRender:null;const compConf=renderOpts?methods_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]){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(renderOpts&&tcFormatter){cellLabel=tcFormatter(renderOpts,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='';// 兼容老模式
8390
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();},/**
8391
8408
  * 检查是否为临时行数据
8392
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];},/**
@@ -8483,7 +8500,7 @@ const{isRowGroupStatus,rowGroupList}=reactData;if(isRowGroupStatus&&!!$xeTable.h
8483
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;},/**
8484
8501
  * @private
8485
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:修复拖动列宽,重置按钮无法点击的问题
8486
- 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;// 复原状态
8487
8504
  filterOptions.forEach(option=>{const{_checked,checked}=option;option._checked=checked;if(!checked&&_checked!==checked){if(frMethod){frMethod({option,column,$table:$xeTable});}}});$xeTable.checkFilterOptions();}},/**
8488
8505
  * 刷新列配置
8489
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);});},/**
@@ -9081,6 +9098,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
9081
9098
  const tooltipOpts = $xeTable.computeTooltipOpts;
9082
9099
  const virtualXOpts = $xeTable.computeVirtualXOpts;
9083
9100
  const virtualYOpts = $xeTable.computeVirtualYOpts;
9101
+ const rendererOpts = $xeTable.computeRendererOpts;
9084
9102
  const {
9085
9103
  isAllColumnDrag,
9086
9104
  isAllRowDrag
@@ -9127,7 +9145,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
9127
9145
  const colid = column.id;
9128
9146
  const colRest = fullColumnIdData[colid] || {};
9129
9147
  const renderOpts = editRender || cellRender;
9130
- const compConf = renderOpts ? body_renderer.get(renderOpts.name) : null;
9148
+ const compConf = renderOpts && renderOpts.name ? rendererOpts[renderOpts.name] || body_renderer.get(renderOpts.name) : null;
9131
9149
  const compCellClassName = compConf ? compConf.tableCellClassName || compConf.cellClassName : null;
9132
9150
  const compCellStyle = compConf ? compConf.tableCellStyle || compConf.cellStyle : '';
9133
9151
  const showAllTip = tooltipOpts.showAll;
@@ -9865,7 +9883,8 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
9865
9883
  if (emptySlot) {
9866
9884
  emptyContent = emptySlot.call($xeTable, emptyParams);
9867
9885
  } else {
9868
- const compConf = emptyOpts.name ? body_renderer.get(emptyOpts.name) : null;
9886
+ const rendererOpts = $xeTable.computeRendererOpts;
9887
+ const compConf = emptyOpts.name ? rendererOpts[emptyOpts.name] || body_renderer.get(emptyOpts.name) : null;
9869
9888
  const rtEmptyView = compConf ? compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty : null;
9870
9889
  if (rtEmptyView) {
9871
9890
  emptyContent = getSlotVNs(rtEmptyView.call($xeTable, h, emptyOpts, emptyParams));
@@ -10027,6 +10046,7 @@ function header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIn
10027
10046
  const cellOpts = $xeTable.computeCellOpts;
10028
10047
  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
10029
10048
  const headerCellOpts = $xeTable.computeHeaderCellOpts;
10049
+ const rendererOpts = $xeTable.computeRendererOpts;
10030
10050
  const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight;
10031
10051
  const {
10032
10052
  disabledMethod: dragDisabledMethod,
@@ -10049,7 +10069,7 @@ function header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIn
10049
10069
  const colid = column.id;
10050
10070
  const colRest = fullColumnIdData[colid] || {};
10051
10071
  const renderOpts = editRender || cellRender;
10052
- const compConf = renderOpts ? header_renderer.get(renderOpts.name) : null;
10072
+ const compConf = renderOpts && renderOpts.name ? rendererOpts[renderOpts.name] || header_renderer.get(renderOpts.name) : null;
10053
10073
  const isColGroup = column.children && column.children.length;
10054
10074
  const fixedHiddenColumn = overflowX && !isColGroup && (fixedType ? column.fixed !== fixedType : !!column.fixed);
10055
10075
  const cellPadding = getDefaultConfig(headerCellOpts.padding, cellOpts.padding);
@@ -10247,6 +10267,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
10247
10267
  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
10248
10268
  const headerCellOpts = $xeTable.computeHeaderCellOpts;
10249
10269
  const floatingFilterOpts = $xeTable.computeFloatingFilterOpts;
10270
+ const rendererOpts = $xeTable.computeRendererOpts;
10250
10271
  const {
10251
10272
  cellClassName
10252
10273
  } = floatingFilterOpts;
@@ -10267,8 +10288,8 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
10267
10288
  const colid = column.id;
10268
10289
  const colRest = fullColumnIdData[colid] || {};
10269
10290
  const renderOpts = editRender || cellRender;
10270
- const compConf = renderOpts ? header_renderer.get(renderOpts.name) : null;
10271
- 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;
10272
10293
  const rtFloatingFilter = flCompConf ? flCompConf.renderTableFloatingFilter : null;
10273
10294
  const flSlot = slots ? slots.floatingFilter || slots['floating-filter'] : null;
10274
10295
  const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
@@ -10690,6 +10711,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
10690
10711
  const cellOpts = $xeTable.computeCellOpts;
10691
10712
  const footerCellOpts = $xeTable.computeFooterCellOpts;
10692
10713
  const currCellHeight = getCalcHeight(footerCellOpts.height) || defaultRowHeight;
10714
+ const rendererOpts = $xeTable.computeRendererOpts;
10693
10715
  return tableColumn.map((column, $columnIndex) => {
10694
10716
  const {
10695
10717
  type,
@@ -10703,7 +10725,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
10703
10725
  const colid = column.id;
10704
10726
  const colRest = fullColumnIdData[colid] || {};
10705
10727
  const renderOpts = editRender || cellRender;
10706
- const compConf = renderOpts ? footer_renderer.get(renderOpts.name) : null;
10728
+ const compConf = renderOpts && renderOpts.name ? rendererOpts[renderOpts.name] || footer_renderer.get(renderOpts.name) : null;
10707
10729
  const showAllTip = footerTooltipOpts.showAll;
10708
10730
  const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
10709
10731
  const cellPadding = getDefaultConfig(footerCellOpts.padding, cellOpts.padding);
@@ -13149,12 +13171,13 @@ function filterCheckAllEvent($xeFilterPanel, evnt, value) {
13149
13171
  return [];
13150
13172
  }
13151
13173
  const filterOpts = $xeTable.computeFilterOpts;
13174
+ const rendererOpts = $xeTable.computeRendererOpts;
13152
13175
  const hasCheckOption = $xeFilterPanel.computeHasCheckOption;
13153
13176
  const {
13154
13177
  filterRender,
13155
13178
  filterMultiple
13156
13179
  } = column;
13157
- 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;
13158
13181
  const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
13159
13182
  return filterMultiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false) : true) ? [h('div', {
13160
13183
  class: 'vxe-table--filter-footer'
@@ -13189,8 +13212,9 @@ function filterCheckAllEvent($xeFilterPanel, evnt, value) {
13189
13212
  if (!column) {
13190
13213
  return filter_panel_renderEmptyElement($xeFilterPanel);
13191
13214
  }
13215
+ const rendererOpts = $xeTable.computeRendererOpts;
13192
13216
  const filterRender = column ? column.filterRender : null;
13193
- 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;
13194
13218
  const filterClassName = compConf ? compConf.tableFilterClassName || compConf.filterClassName : '';
13195
13219
  const params = Object.assign({}, tableInternalData._currFilterParams, {
13196
13220
  $panel: $xeFilterPanel,
@@ -14364,13 +14388,14 @@ function updatePopupStyle($xeTable) {
14364
14388
  }
14365
14389
  const tableEl = $xeTable.$refs.refElem;
14366
14390
  const filterOpts = $xeTable.computeFilterOpts;
14391
+ const rendererOpts = $xeTable.computeRendererOpts;
14367
14392
  const {
14368
14393
  maxHeight: customMaxHeight,
14369
14394
  transfer,
14370
14395
  zIndex
14371
14396
  } = filterOpts;
14372
14397
  const filterRender = column ? column.filterRender : null;
14373
- 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;
14374
14399
  const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
14375
14400
  if (!headerScrollElem) {
14376
14401
  return $xeTable.$nextTick();
@@ -14862,7 +14887,8 @@ function updatePopupStyle($xeTable) {
14862
14887
  filterRender
14863
14888
  } = column;
14864
14889
  if (filters) {
14865
- const compConf = isEnableConf(filterRender) ? mixin_renderer.get(filterRender.name) : null;
14890
+ const rendererOpts = $xeTable.computeRendererOpts;
14891
+ const compConf = isEnableConf(filterRender) && filterRender.name ? rendererOpts[filterRender.name] || mixin_renderer.get(filterRender.name) : null;
14866
14892
  const filterResetMethod = column.filterResetMethod || (compConf ? compConf.tableFilterResetMethod || compConf.filterResetMethod : null);
14867
14893
  filters.forEach(item => {
14868
14894
  item._checked = false;
@@ -16566,7 +16592,9 @@ function handleEditCell($xeTable, row, fieldOrColumn, options) {
16566
16592
  } = column;
16567
16593
  const editOpts = $xeTable.computeEditOpts;
16568
16594
  if (editConfig && isEnableConf(editRender)) {
16569
- const compRender = edit_mixin_renderer.get(editRender.name);
16595
+ const rendererOpts = $xeTable.computeRendererOpts;
16596
+ const renderName = editRender.name;
16597
+ const compRender = renderName ? rendererOpts[renderName] || edit_mixin_renderer.get(renderName) : null;
16570
16598
  let autoFocus = editRender.autofocus || editRender.autoFocus;
16571
16599
  let autoSelect = editRender.autoSelect || editRender.autoselect;
16572
16600
  let inputElem = null;
@@ -16941,13 +16969,15 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
16941
16969
  isRowGroupStatus
16942
16970
  } = reactData;
16943
16971
  const {
16944
- fullColumnFieldData
16972
+ fullColumnFieldData,
16973
+ fullAllDataRowIdData
16945
16974
  } = internalData;
16946
16975
  const radioOpts = $xeTable.computeRadioOpts;
16947
16976
  const checkboxOpts = $xeTable.computeCheckboxOpts;
16948
16977
  const treeOpts = $xeTable.computeTreeOpts;
16949
16978
  const columnOpts = $xeTable.computeColumnOpts;
16950
16979
  const aggregateOpts = $xeTable.computeAggregateOpts;
16980
+ const rendererOpts = $xeTable.computeRendererOpts;
16951
16981
  if (!htmlCellElem) {
16952
16982
  htmlCellElem = document.createElement('div');
16953
16983
  }
@@ -16996,7 +17026,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
16996
17026
  const renderOpts = editRender || cellRender;
16997
17027
  let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
16998
17028
  if (!bodyExportMethod && renderOpts && renderOpts.name) {
16999
- const compConf = export_mixin_renderer.get(renderOpts.name);
17029
+ const compConf = rendererOpts[renderOpts.name] || export_mixin_renderer.get(renderOpts.name);
17000
17030
  if (compConf) {
17001
17031
  bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
17002
17032
  }
@@ -17124,8 +17154,11 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
17124
17154
  return rest;
17125
17155
  }
17126
17156
  if (treeConfig) {
17127
- const childrenField = treeOpts.children || treeOpts.childrenField;
17128
17157
  // 如果是树结构
17158
+ const {
17159
+ seqMode
17160
+ } = treeOpts;
17161
+ const childrenField = treeOpts.children || treeOpts.childrenField;
17129
17162
  const rest = [];
17130
17163
  const expandMaps = {};
17131
17164
  const useMaps = {};
@@ -17145,12 +17178,13 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
17145
17178
  _hasChild: hasRowChild,
17146
17179
  _expand: hasRowChild && $xeTable.isTreeExpandByRow(row)
17147
17180
  };
17181
+ const rowRest = fullAllDataRowIdData[rowid] || {};
17148
17182
  columns.forEach((column, $columnIndex) => {
17149
17183
  let cellValue = '';
17150
17184
  const renderOpts = column.editRender || column.cellRender;
17151
17185
  let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
17152
17186
  if (!bodyExportMethod && renderOpts && renderOpts.name) {
17153
- const compConf = export_mixin_renderer.get(renderOpts.name);
17187
+ const compConf = rendererOpts[renderOpts.name] || export_mixin_renderer.get(renderOpts.name);
17154
17188
  if (compConf) {
17155
17189
  bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
17156
17190
  }
@@ -17169,7 +17203,10 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
17169
17203
  switch (column.type) {
17170
17204
  case 'seq':
17171
17205
  {
17172
- const seqVal = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
17206
+ let seqVal = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
17207
+ if (seqMode === 'increasing') {
17208
+ seqVal = rowRest ? rowRest._index + 1 : -1;
17209
+ }
17173
17210
  cellValue = expMode === 'all' ? seqVal : getSeq($xeTable, seqVal, row, $rowIndex, column, $columnIndex);
17174
17211
  break;
17175
17212
  }
@@ -17228,7 +17265,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
17228
17265
  const renderOpts = column.editRender || column.cellRender;
17229
17266
  let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
17230
17267
  if (!bodyExportMethod && renderOpts && renderOpts.name) {
17231
- const compConf = export_mixin_renderer.get(renderOpts.name);
17268
+ const compConf = rendererOpts[renderOpts.name] || export_mixin_renderer.get(renderOpts.name);
17232
17269
  if (compConf) {
17233
17270
  bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
17234
17271
  }
@@ -17319,10 +17356,11 @@ function getHeaderTitle($xeTable, opts, column) {
17319
17356
  }
17320
17357
  function getFooterCellValue($xeTable, opts, row, column) {
17321
17358
  const columnOpts = $xeTable.computeColumnOpts;
17359
+ const rendererOpts = $xeTable.computeRendererOpts;
17322
17360
  const renderOpts = column.editRender || column.cellRender;
17323
17361
  let footLabelMethod = column.footerExportMethod;
17324
17362
  if (!footLabelMethod && renderOpts && renderOpts.name) {
17325
- const compConf = export_mixin_renderer.get(renderOpts.name);
17363
+ const compConf = rendererOpts[renderOpts.name] || export_mixin_renderer.get(renderOpts.name);
17326
17364
  if (compConf) {
17327
17365
  footLabelMethod = compConf.tableFooterExportMethod || compConf.footerExportMethod || compConf.footerCellExportMethod;
17328
17366
  }
@@ -21319,7 +21357,8 @@ function renderEmptyBody(h, $xeTable) {
21319
21357
  if (emptySlot) {
21320
21358
  emptyContent = emptySlot.call($xeTable, emptyParams);
21321
21359
  } else {
21322
- const compConf = emptyOpts.name ? table_renderer.get(emptyOpts.name) : null;
21360
+ const rendererOpts = $xeTable.computeRendererOpts;
21361
+ const compConf = emptyOpts.name ? rendererOpts[emptyOpts.name] || table_renderer.get(emptyOpts.name) : null;
21323
21362
  const rtEmptyView = compConf ? compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty : null;
21324
21363
  if (rtEmptyView) {
21325
21364
  emptyContent = getSlotVNs(rtEmptyView.call($xeTable, h, emptyOpts, emptyParams));
@@ -22665,6 +22704,11 @@ function renderBody(h, $xeTable) {
22665
22704
  const props = $xeTable;
22666
22705
  return Object.assign({}, table_getConfig().table.undoRedoHistoryConfig, props.undoRedoHistoryConfig);
22667
22706
  },
22707
+ computeRendererOpts() {
22708
+ const $xeTable = this;
22709
+ const props = $xeTable;
22710
+ return Object.assign({}, table_getConfig().table.rendererConfig, props.rendererConfig);
22711
+ },
22668
22712
  combineTabsResizeFlag() {
22669
22713
  const $xeTable = this;
22670
22714
  const $xeTabs = $xeTable.$xeTabs;
@@ -24296,13 +24340,14 @@ function toolbar_createInternalData() {
24296
24340
  const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix'];
24297
24341
  const btnVNs = [];
24298
24342
  if (buttons) {
24343
+ const rendererOpts = ($table ? $table.computeRendererOpts : null) || {};
24299
24344
  buttons.forEach(item => {
24300
24345
  const {
24301
24346
  dropdowns,
24302
24347
  buttonRender
24303
24348
  } = item;
24304
24349
  if (item.visible !== false) {
24305
- const compConf = buttonRender ? toolbar_renderer.get(buttonRender.name) : null;
24350
+ const compConf = buttonRender && buttonRender.name ? rendererOpts[buttonRender.name] || toolbar_renderer.get(buttonRender.name) : null;
24306
24351
  if (buttonRender && compConf && compConf.renderToolbarButton) {
24307
24352
  const toolbarButtonClassName = compConf.toolbarButtonClassName;
24308
24353
  const params = {
@@ -24380,14 +24425,14 @@ function toolbar_createInternalData() {
24380
24425
  const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix'];
24381
24426
  const btnVNs = [];
24382
24427
  if (tools) {
24428
+ const rendererOpts = ($table ? $table.computeRendererOpts : null) || {};
24383
24429
  tools.forEach((item, tIndex) => {
24384
24430
  const {
24385
24431
  dropdowns,
24386
24432
  toolRender
24387
24433
  } = item;
24388
24434
  if (item.visible !== false) {
24389
- const rdName = toolRender ? toolRender.name : null;
24390
- const compConf = toolRender ? toolbar_renderer.get(rdName) : null;
24435
+ const compConf = toolRender && toolRender.name ? rendererOpts[toolRender.name] || toolbar_renderer.get(toolRender.name) : null;
24391
24436
  if (toolRender && compConf && compConf.renderToolbarTool) {
24392
24437
  const toolbarToolClassName = compConf.toolbarToolClassName;
24393
24438
  const params = {
@@ -24397,7 +24442,7 @@ function toolbar_createInternalData() {
24397
24442
  tool: item
24398
24443
  };
24399
24444
  btnVNs.push(h('span', {
24400
- key: rdName,
24445
+ key: tIndex,
24401
24446
  class: ['vxe-tool--item', toolbarToolClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName : '']
24402
24447
  }, getSlotVNs(compConf.renderToolbarTool(h, toolRender, params))));
24403
24448
  } else {
@@ -25999,6 +26044,10 @@ function grid_createInternalData() {
25999
26044
  const formOpts = $xeGrid.computeFormOpts;
26000
26045
  return proxyConfig && isEnableConf(proxyOpts) && proxyOpts.form ? formData : formOpts.data;
26001
26046
  },
26047
+ /**
26048
+ * 已废弃,被 getFormFlatItems 替换
26049
+ * @deprecated
26050
+ */
26002
26051
  getFormItems(itemIndex) {
26003
26052
  const $xeGrid = this;
26004
26053
  const props = $xeGrid;
@@ -26015,8 +26064,33 @@ function grid_createInternalData() {
26015
26064
  }, {
26016
26065
  children: 'children'
26017
26066
  });
26067
+ // errLog('vxe.error.delFunc', ['getFormItems', 'getFormFlatItems'])
26018
26068
  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(itemIndex) ? itemList : itemList[itemIndex];
26019
26069
  },
26070
+ getFormFlatItems() {
26071
+ const $xeGrid = this;
26072
+ const $form = $xeGrid.$refs.refForm;
26073
+ if ($form) {
26074
+ return $form.getFlatItems();
26075
+ }
26076
+ return [];
26077
+ },
26078
+ getFormNestedItems() {
26079
+ const $xeGrid = this;
26080
+ const $form = $xeGrid.$refs.refForm;
26081
+ if ($form) {
26082
+ return $form.getNestedItems();
26083
+ }
26084
+ return [];
26085
+ },
26086
+ getFormItemByField(field) {
26087
+ const $xeGrid = this;
26088
+ const $form = $xeGrid.$refs.refForm;
26089
+ if ($form) {
26090
+ return $form.getItemByField(field);
26091
+ }
26092
+ return null;
26093
+ },
26020
26094
  resetForm() {
26021
26095
  const $xeGrid = this;
26022
26096
  const $form = $xeGrid.$refs.refForm;