vxe-table 4.19.17 → 4.19.19

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 (58) hide show
  1. package/dist/all.esm.js +117 -51
  2. package/dist/style.css +1 -1
  3. package/dist/style.min.css +1 -1
  4. package/es/grid/src/grid.js +1 -1
  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/custom/panel.js +5 -2
  10. package/es/table/module/edit/hook.js +16 -4
  11. package/es/table/src/columnInfo.js +6 -6
  12. package/es/table/src/emits.js +4 -4
  13. package/es/table/src/footer.js +5 -5
  14. package/es/table/src/header.js +10 -8
  15. package/es/table/src/table.js +65 -17
  16. package/es/ui/index.js +1 -1
  17. package/es/ui/src/log.js +4 -3
  18. package/lib/grid/src/grid.js +1 -1
  19. package/lib/grid/src/grid.min.js +1 -1
  20. package/lib/index.css +1 -1
  21. package/lib/index.min.css +1 -1
  22. package/lib/index.umd.js +1012 -973
  23. package/lib/index.umd.min.js +1 -1
  24. package/lib/style.css +1 -1
  25. package/lib/style.min.css +1 -1
  26. package/lib/table/module/custom/panel.js +5 -2
  27. package/lib/table/module/custom/panel.min.js +1 -1
  28. package/lib/table/module/edit/hook.js +18 -4
  29. package/lib/table/module/edit/hook.min.js +1 -1
  30. package/lib/table/src/columnInfo.js +6 -0
  31. package/lib/table/src/emits.js +9 -1
  32. package/lib/table/src/footer.js +5 -4
  33. package/lib/table/src/footer.min.js +1 -1
  34. package/lib/table/src/header.js +12 -8
  35. package/lib/table/src/header.min.js +1 -1
  36. package/lib/table/src/table.js +7 -5
  37. package/lib/table/src/table.min.js +1 -1
  38. package/lib/ui/index.js +1 -1
  39. package/lib/ui/index.min.js +1 -1
  40. package/lib/ui/src/log.js +4 -3
  41. package/lib/ui/src/log.min.js +1 -1
  42. package/package.json +3 -3
  43. package/packages/grid/src/grid.ts +1 -1
  44. package/packages/table/module/custom/panel.ts +5 -2
  45. package/packages/table/module/edit/hook.ts +15 -4
  46. package/packages/table/src/footer.ts +5 -5
  47. package/packages/table/src/header.ts +10 -8
  48. package/packages/table/src/table.ts +61 -17
  49. package/packages/table/src/util.ts +2 -16
  50. package/packages/ui/src/log.ts +3 -2
  51. package/styles/theme/dark.scss +1 -1
  52. package/styles/variable.scss +1 -1
  53. /package/es/{iconfont.1781876895482.ttf → iconfont.1782286881041.ttf} +0 -0
  54. /package/es/{iconfont.1781876895482.woff → iconfont.1782286881041.woff} +0 -0
  55. /package/es/{iconfont.1781876895482.woff2 → iconfont.1782286881041.woff2} +0 -0
  56. /package/lib/{iconfont.1781876895482.ttf → iconfont.1782286881041.ttf} +0 -0
  57. /package/lib/{iconfont.1781876895482.woff → iconfont.1782286881041.woff} +0 -0
  58. /package/lib/{iconfont.1781876895482.woff2 → iconfont.1782286881041.woff2} +0 -0
package/lib/ui/index.js CHANGED
@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
13
13
  exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.hooks = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
14
14
  var _core = require("@vxe-ui/core");
15
15
  var _utils = require("./src/utils");
16
- const version = exports.version = "4.19.17";
16
+ const version = exports.version = "4.19.19";
17
17
  _core.VxeUI.version = version;
18
18
  _core.VxeUI.tableVersion = version;
19
19
  _core.VxeUI.setConfig({
@@ -1 +1 @@
1
- Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="4.19.17",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},currentRowConfig:{strict:!0},currentColumnConfig:{strict:!0},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0,defaultPlacement:"top"},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{enterable:!0},validConfig:{showErrorMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{autoOptions:{isCalcHeader:!0,isCalcBody:!0,isCalcFooter:!0},maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},menuConfig:{destroyOnClose:!0},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showSortDragButton:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{destroyOnClose:!0,multiple:!0,showIcon:!0,maxHeight:280},floatingFilterConfig:{},aggregateConfig:{padding:!0,placement:"left",rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0,showRootLine:!0},expandConfig:{showIcon:!0,mode:"fixed"},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isAll:!0,isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{gt:24,preSize:1,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}},undoRedoHistoryConfig:{stackSize:50}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:"list",result:"result",total:"page.total",footerData:"footerData",message:"message"}}},toolbar:{},gantt:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_MENU_OPTION_LOADING:iconPrefix+"repeat roll",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
1
+ Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="4.19.19",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},currentRowConfig:{strict:!0},currentColumnConfig:{strict:!0},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0,defaultPlacement:"top"},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{enterable:!0},validConfig:{showErrorMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{autoOptions:{isCalcHeader:!0,isCalcBody:!0,isCalcFooter:!0},maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},menuConfig:{destroyOnClose:!0},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showSortDragButton:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{destroyOnClose:!0,multiple:!0,showIcon:!0,maxHeight:280},floatingFilterConfig:{},aggregateConfig:{padding:!0,placement:"left",rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0,showRootLine:!0},expandConfig:{showIcon:!0,mode:"fixed"},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isAll:!0,isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{gt:24,preSize:1,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}},undoRedoHistoryConfig:{stackSize:50}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:"list",result:"result",total:"page.total",footerData:"footerData",message:"message"}}},toolbar:{},gantt:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_MENU_OPTION_LOADING:iconPrefix+"repeat roll",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
package/lib/ui/src/log.js CHANGED
@@ -9,14 +9,15 @@ var _core = require("@vxe-ui/core");
9
9
  const {
10
10
  log
11
11
  } = _core.VxeUI;
12
- const tableVersion = `table v${"4.19.17"}`;
12
+ const tableVersion = `table v${"4.19.19"}`;
13
13
  function createComponentLog(name) {
14
14
  const uiVersion = _core.VxeUI.uiVersion ? `ui v${_core.VxeUI.uiVersion}` : '';
15
15
  const ganttVersion = _core.VxeUI.ganttVersion ? `gantt v${_core.VxeUI.ganttVersion}` : '';
16
16
  const designVersion = _core.VxeUI.designVersion ? `design v${_core.VxeUI.designVersion}` : '';
17
+ const versionInfo = [uiVersion, tableVersion, ganttVersion, designVersion].join(' ');
17
18
  return {
18
- warnLog: log.create('warn', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name),
19
- errLog: log.create('error', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name)
19
+ warnLog: log.create('warn', versionInfo + '] [' + name),
20
+ errLog: log.create('error', versionInfo + '] [' + name)
20
21
  };
21
22
  }
22
23
  const warnLog = exports.warnLog = log.create('warn', tableVersion);
@@ -1 +1 @@
1
- Object.defineProperty(exports,"__esModule",{value:!0}),exports.createComponentLog=createComponentLog,exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,tableVersion="table v4.19.17";function createComponentLog(e){var r=_core.VxeUI.uiVersion?"ui v"+_core.VxeUI.uiVersion:"",o=_core.VxeUI.ganttVersion?"gantt v"+_core.VxeUI.ganttVersion:"",t=_core.VxeUI.designVersion?"design v"+_core.VxeUI.designVersion:"";return{warnLog:log.create("warn",r+tableVersion+o+t+"] ["+e),errLog:log.create("error",r+tableVersion+o+t+"] ["+e)}}let warnLog=exports.warnLog=log.create("warn",tableVersion),errLog=exports.errLog=log.create("error",tableVersion);
1
+ Object.defineProperty(exports,"__esModule",{value:!0}),exports.createComponentLog=createComponentLog,exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,tableVersion="table v4.19.19";function createComponentLog(e){var r=_core.VxeUI.uiVersion?"ui v"+_core.VxeUI.uiVersion:"",o=_core.VxeUI.ganttVersion?"gantt v"+_core.VxeUI.ganttVersion:"",n=_core.VxeUI.designVersion?"design v"+_core.VxeUI.designVersion:"",r=[r,tableVersion,o,n].join(" ");return{warnLog:log.create("warn",r+"] ["+e),errLog:log.create("error",r+"] ["+e)}}let warnLog=exports.warnLog=log.create("warn",tableVersion),errLog=exports.errLog=log.create("error",tableVersion);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vxe-table",
3
- "version": "4.19.17",
3
+ "version": "4.19.19",
4
4
  "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
5
5
  "scripts": {
6
6
  "update": "npm install --legacy-peer-deps",
@@ -66,10 +66,10 @@
66
66
  "rollup": "^4.53.3",
67
67
  "sass": "^1.80.4",
68
68
  "sass-loader": "^14.2.0",
69
- "typescript": "~4.7.4",
69
+ "typescript": "~5.9.3",
70
70
  "vue": "3.4.27",
71
71
  "vue-router": "~4.5.1",
72
- "vxe-pc-ui": "4.15.4"
72
+ "vxe-pc-ui": "4.15.10"
73
73
  },
74
74
  "vetur": {
75
75
  "tags": "helper/vetur/tags.json",
@@ -21,7 +21,7 @@ const { warnLog, errLog } = createComponentLog('grid')
21
21
  const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI
22
22
 
23
23
  const tableComponentPropKeys = Object.keys(tableProps) as (keyof VxeTableProps)[]
24
- const tableComponentMethodKeys: (keyof VxeTableMethods)[] = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeRowChildren', 'getTreeRowLevel', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'recalcRowHeight', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'setFilterByEvent', 'sort', 'setSort', 'setSortByEvent', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'getScrollData', 'scrollTo', 'scrollToStartRow', 'scrollToEndRow', 'scrollToRow', 'scrollToStartColumn', 'scrollToEndColumn', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'setMergeHeaderCells', 'removeMergeHeaderCells', 'getMergeHeaderCells', 'clearMergeHeaderCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'setCustomStoreData', 'getCustomStoreData', 'setRowGroupExpand', 'setRowGroupExpandByField', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'isAggregateRecord', 'isAggregateExpandByRow', 'getAggregateContentByRow', 'getAggregateRowChildren', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'updateCellLabel', 'clearFormatterCache', 'getFooterCellLabel', 'updateFooterCellLabel', 'clearFooterFormatterCache', 'undo', 'redo', 'effectCellData', 'getCellElement', 'focus', 'blur', 'connect', 'connectToolbar']
24
+ const tableComponentMethodKeys: (keyof VxeTableMethods)[] = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeRowChildren', 'getTreeRowLevel', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'recalcRowHeight', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'setFilterByEvent', 'sort', 'setSort', 'setSortByEvent', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'getScrollData', 'scrollTo', 'scrollToStartRow', 'scrollToEndRow', 'scrollToRow', 'scrollToStartColumn', 'scrollToEndColumn', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'setMergeHeaderCells', 'removeMergeHeaderCells', 'getMergeHeaderCells', 'clearMergeHeaderCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'setCustomStoreData', 'getCustomStoreData', 'setRowGroupExpand', 'setRowGroupExpandByField', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'isAggregateRecord', 'isAggregateExpandByRow', 'getAggregateContentByRow', 'getAggregateRowChildren', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'updateCellLabel', 'clearFormatterCache', 'getFooterCellLabel', 'updateFooterCellLabel', 'clearFooterFormatterCache', 'getUpdateCells', 'undo', 'redo', 'effectCellData', 'getCellElement', 'focus', 'blur', 'connect', 'connectToolbar']
25
25
 
26
26
  function createReactData (): GridReactData {
27
27
  return {
@@ -1087,8 +1087,11 @@ export default defineVxeComponent({
1087
1087
  const resizeParams = {
1088
1088
  $table: $xeTable,
1089
1089
  column,
1090
- columnIndex: index,
1091
- $columnIndex: index,
1090
+ columnIndex: $xeTable.getColumnIndex(column),
1091
+ $columnIndex: $xeTable.getVMColumnIndex(column),
1092
+ _columnIndex: $xeTable.getVTColumnIndex(column),
1093
+ rowIndex: -1,
1094
+ _rowIndex: -1,
1092
1095
  $rowIndex: -1
1093
1096
  }
1094
1097
  if (reMinWidth) {
@@ -773,16 +773,27 @@ hooks.add('tableEditModule', {
773
773
  */
774
774
  getUpdateRecords () {
775
775
  const { keepSource, treeConfig } = props
776
- const { tableFullData } = internalData
776
+ const { tableFullData, tableFullTreeData } = internalData
777
777
  const treeOpts = computeTreeOpts.value
778
+ const updateRecords: any[] = []
778
779
  if (keepSource) {
779
780
  syncActivedCell()
780
781
  if (treeConfig) {
781
- return XEUtils.filterTree(tableFullData, row => $xeTable.isUpdateByRow(row), treeOpts)
782
+ const childrenField = treeOpts.children || treeOpts.childrenField
783
+ XEUtils.eachTree(tableFullTreeData, row => {
784
+ if ($xeTable.isUpdateByRow(row)) {
785
+ updateRecords.push(row)
786
+ }
787
+ }, { children: childrenField })
788
+ } else {
789
+ tableFullData.forEach((row) => {
790
+ if ($xeTable.isUpdateByRow(row)) {
791
+ updateRecords.push(row)
792
+ }
793
+ })
782
794
  }
783
- return tableFullData.filter((row: any) => $xeTable.isUpdateByRow(row))
784
795
  }
785
- return []
796
+ return updateRecords
786
797
  },
787
798
  getActiveRecord () {
788
799
  warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditCell'])
@@ -226,18 +226,18 @@ export default defineVxeComponent({
226
226
  const { fixedType, footerTableData } = props
227
227
  const { footerRowClassName, footerRowStyle } = tableProps
228
228
 
229
- return footerTableData.map((row, $rowIndex) => {
230
- const _rowIndex = $rowIndex
231
- const rowParams = { $table: $xeTable, row, _rowIndex, $rowIndex, fixed: fixedType, type: renderType }
229
+ return footerTableData.map((row, _rowIndex) => {
230
+ const $rowIndex = _rowIndex
231
+ const rowParams = { $table: $xeTable, row, rowIndex: _rowIndex, _rowIndex, $rowIndex, fixed: fixedType, type: renderType }
232
232
 
233
233
  return h('tr', {
234
- key: $rowIndex,
234
+ key: _rowIndex,
235
235
  class: [
236
236
  'vxe-footer--row',
237
237
  footerRowClassName ? XEUtils.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''
238
238
  ],
239
239
  style: footerRowStyle ? (XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle) : null
240
- }, renderRows(isOptimizeMode, renderColumnList, footerTableData, row, $rowIndex, _rowIndex))
240
+ }, renderRows(isOptimizeMode, renderColumnList, footerTableData, row, _rowIndex, _rowIndex))
241
241
  })
242
242
  }
243
243
 
@@ -58,7 +58,7 @@ export default defineVxeComponent({
58
58
  })
59
59
  }
60
60
 
61
- const renderRows = (isGroup: boolean, isOptimizeMode: boolean, headerGroups: VxeTableDefines.ColumnInfo[][], $rowIndex: number, cols: VxeTableDefines.ColumnInfo[]) => {
61
+ const renderRows = (isGroup: boolean, isOptimizeMode: boolean, headerGroups: VxeTableDefines.ColumnInfo[][], _rowIndex: number, cols: VxeTableDefines.ColumnInfo[]) => {
62
62
  const $xeGrid = $xeTable.xeGrid
63
63
  const $xeGantt = $xeTable.xeGantt
64
64
 
@@ -74,7 +74,7 @@ export default defineVxeComponent({
74
74
  const headerCellOpts = computeHeaderCellOpts.value
75
75
  const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight
76
76
  const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = columnDragOpts
77
- const isLastRow = $rowIndex === headerGroups.length - 1
77
+ const isLastRow = _rowIndex === headerGroups.length - 1
78
78
 
79
79
  return cols.map((column, $columnIndex) => {
80
80
  const { type, showHeaderOverflow, headerAlign, align, filters, headerClassName, editRender, cellRender } = column
@@ -105,7 +105,9 @@ export default defineVxeComponent({
105
105
  $table: $xeTable,
106
106
  $grid: $xeGrid,
107
107
  $gantt: $xeGantt,
108
- $rowIndex,
108
+ rowIndex: _rowIndex,
109
+ _rowIndex,
110
+ $rowIndex: _rowIndex,
109
111
  column,
110
112
  columnIndex,
111
113
  $columnIndex,
@@ -127,7 +129,7 @@ export default defineVxeComponent({
127
129
  thAttrs.rowspan = column.rowSpan > 1 ? column.rowSpan : null
128
130
  }
129
131
  if (mergeHeadFlag && mergeHeaderList.length && (showCustomHeader || isLastRow)) {
130
- const spanRest = mergeHeaderCellMaps[`${$rowIndex}:${showCustomHeader ? $columnIndex : _columnIndex}`]
132
+ const spanRest = mergeHeaderCellMaps[`${_rowIndex}:${showCustomHeader ? $columnIndex : _columnIndex}`]
131
133
  if (spanRest) {
132
134
  const { rowspan, colspan } = spanRest
133
135
  if (!rowspan || !colspan) {
@@ -367,16 +369,16 @@ export default defineVxeComponent({
367
369
 
368
370
  const { headerRowClassName, headerRowStyle } = tableProps
369
371
  const floatingFilterOpts = computeFloatingFilterOpts.value
370
- const rowVNs = headerGroups.map((cols, $rowIndex) => {
371
- const params = { $table: $xeTable, $rowIndex, fixed: fixedType, type: renderType }
372
+ const rowVNs = headerGroups.map((cols, _rowIndex) => {
373
+ const params = { $table: $xeTable, rowIndex: _rowIndex, _rowIndex, $rowIndex: _rowIndex, fixed: fixedType, type: renderType }
372
374
  return h('tr', {
373
- key: $rowIndex,
375
+ key: _rowIndex,
374
376
  class: [
375
377
  'vxe-header--row',
376
378
  headerRowClassName ? (XEUtils.isFunction(headerRowClassName) ? headerRowClassName(params) : headerRowClassName) : ''
377
379
  ],
378
380
  style: headerRowStyle ? (XEUtils.isFunction(headerRowStyle) ? headerRowStyle(params) : headerRowStyle) : null
379
- }, renderRows(isGroup, isOptimizeMode, headerGroups, $rowIndex, cols))
381
+ }, renderRows(isGroup, isOptimizeMode, headerGroups, _rowIndex, cols))
380
382
  })
381
383
 
382
384
  if (floatingFilterOpts.enabled) {
@@ -931,16 +931,18 @@ export default defineVxeComponent({
931
931
  xegrid: $xeGrid
932
932
  } as unknown as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods
933
933
 
934
- const eqCellValue = (row1: any, row2: any, field: string) => {
935
- const val1 = XEUtils.get(row1, field)
936
- const val2 = XEUtils.get(row2, field)
934
+ const eqCellValue = (newRow: any, oldRow: any, field: string) => {
935
+ const val1 = XEUtils.get(newRow, field)
936
+ const val2 = XEUtils.get(oldRow, field)
937
+ let result = false
937
938
  if (eqEmptyValue(val1) && eqEmptyValue(val2)) {
938
- return true
939
- }
940
- if (XEUtils.isString(val1) || XEUtils.isNumber(val1)) {
941
- return ('' + val1) === ('' + val2)
939
+ result = true
940
+ } else if (XEUtils.isString(val1) || XEUtils.isNumber(val1)) {
941
+ result = ('' + val1) === ('' + val2)
942
+ } else {
943
+ result = XEUtils.isEqual(val1, val2)
942
944
  }
943
- return XEUtils.isEqual(val1, val2)
945
+ return { newValue: val1, oldValue: val2, result }
944
946
  }
945
947
 
946
948
  const handleKeyField = () => {
@@ -5850,18 +5852,56 @@ export default defineVxeComponent({
5850
5852
  }
5851
5853
  const row = rowRest.row
5852
5854
  const oRow = sourceDataRowIdData[rowid]
5853
- if (oRow) {
5854
- if (arguments.length > 1) {
5855
- return !eqCellValue(oRow, row, field as string)
5855
+ if (!oRow) {
5856
+ return false
5857
+ }
5858
+ if (arguments.length > 1) {
5859
+ return !eqCellValue(oRow, row, field as string).result
5860
+ }
5861
+ for (let i = 0; i < keepFields.length; i++) {
5862
+ if (!eqCellValue(oRow, row, keepFields[i]).result) {
5863
+ return true
5864
+ }
5865
+ }
5866
+ }
5867
+ return false
5868
+ },
5869
+ getUpdateCells () {
5870
+ const { keepSource, treeConfig } = props
5871
+ const { tableFullData, tableFullTreeData, fullDataRowIdData, sourceDataRowIdData, fullColumnFieldData } = internalData
5872
+ const treeOpts = computeTreeOpts.value
5873
+ const keepFields = computeKeepFields.value
5874
+ const cellList: VxeTableDefines.UpdateCellObj[] = []
5875
+ if (keepSource) {
5876
+ const { handleGetRowId } = createHandleGetRowId($xeTable)
5877
+ const handleCell = (item: any) => {
5878
+ const rowid = handleGetRowId(item)
5879
+ const rowRest = fullDataRowIdData[rowid]
5880
+ // 新增的数据不需要检测
5881
+ if (!rowRest) {
5882
+ return
5883
+ }
5884
+ const row = rowRest.row
5885
+ const oRow = sourceDataRowIdData[rowid]
5886
+ if (!oRow) {
5887
+ return
5856
5888
  }
5857
5889
  for (let i = 0; i < keepFields.length; i++) {
5858
- if (!eqCellValue(oRow, row, keepFields[i])) {
5859
- return true
5890
+ const field = keepFields[i]
5891
+ const { result, newValue, oldValue } = eqCellValue(oRow, row, field)
5892
+ if (!result) {
5893
+ const column = fullColumnFieldData[field] ? fullColumnFieldData[field].column : null
5894
+ cellList.push({ row, rowid, column, field, newValue, oldValue })
5860
5895
  }
5861
5896
  }
5862
5897
  }
5898
+ if (treeConfig) {
5899
+ XEUtils.eachTree(tableFullTreeData, handleCell, treeOpts)
5900
+ } else {
5901
+ tableFullData.forEach(handleCell)
5902
+ }
5863
5903
  }
5864
- return false
5904
+ return cellList
5865
5905
  },
5866
5906
  /**
5867
5907
  * 获取表格的可视列,也可以指定索引获取列
@@ -10829,7 +10869,12 @@ export default defineVxeComponent({
10829
10869
  }
10830
10870
  if (editOpts.trigger === 'manual') {
10831
10871
  if (actived.args && actived.row === row && column !== actived.column) {
10832
- handleChangeCell(evnt, params)
10872
+ if (editOpts.mode === 'row') {
10873
+ handleChangeCell(evnt, params)
10874
+ } else {
10875
+ checkValidate('blur')
10876
+ .catch((e: any) => e)
10877
+ }
10833
10878
  }
10834
10879
  } else if (!actived.args || row !== actived.row || column !== actived.column) {
10835
10880
  if (editOpts.trigger === 'click') {
@@ -14837,8 +14882,7 @@ export default defineVxeComponent({
14837
14882
  }
14838
14883
  if ((props.showOverflow === true || props.showOverflow === 'tooltip') ||
14839
14884
  (props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip') ||
14840
- (props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip') ||
14841
- props.tooltipConfig || props.editRules) {
14885
+ (props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip')) {
14842
14886
  if (!VxeUITooltipComponent) {
14843
14887
  if (props.showOverflow === true) {
14844
14888
  errLog('vxe.error.errProp', ['show-overflow=true', 'show-overflow=title'])
@@ -774,14 +774,7 @@ export function getCalcHeight (height: number | 'unset' | undefined | null) {
774
774
  /**
775
775
  * 列宽拖动最大宽度
776
776
  */
777
- export function getColReMaxWidth (params: {
778
- $table: VxeTableConstructor & VxeTablePrivateMethods;
779
- column: VxeTableDefines.ColumnInfo;
780
- columnIndex: number;
781
- $columnIndex: number;
782
- $rowIndex: number;
783
- cell: HTMLTableCellElement;
784
- }) {
777
+ export function getColReMaxWidth (params: (VxeTableDefines.CellRenderHeaderParams| VxeTableDefines.CellRenderBodyParams | VxeTableDefines.CellRenderFooterParams) & { cell: HTMLTableCellElement }) {
785
778
  const { $table, column, cell } = params
786
779
  const internalData = $table.internalData
787
780
  const { elemStore } = internalData
@@ -819,14 +812,7 @@ export function getColReMaxWidth (params: {
819
812
  /**
820
813
  * 列宽拖动最小宽度
821
814
  */
822
- export function getColReMinWidth (params: {
823
- $table: VxeTableConstructor & VxeTablePrivateMethods;
824
- column: VxeTableDefines.ColumnInfo;
825
- columnIndex: number;
826
- $columnIndex: number;
827
- $rowIndex: number;
828
- cell: HTMLTableCellElement;
829
- }) {
815
+ export function getColReMinWidth (params: (VxeTableDefines.CellRenderHeaderParams| VxeTableDefines.CellRenderBodyParams | VxeTableDefines.CellRenderFooterParams) & { cell: HTMLTableCellElement }) {
830
816
  const { $table, column, cell } = params
831
817
  const tableProps = $table.props
832
818
  const internalData = $table.internalData
@@ -8,9 +8,10 @@ export function createComponentLog (name: string) {
8
8
  const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : ''
9
9
  const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : ''
10
10
  const designVersion = VxeUI.designVersion ? `design v${VxeUI.designVersion}` : ''
11
+ const versionInfo = [uiVersion, tableVersion, ganttVersion, designVersion].join(' ')
11
12
  return {
12
- warnLog: log.create('warn', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name),
13
- errLog: log.create('error', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name)
13
+ warnLog: log.create('warn', versionInfo + '] [' + name),
14
+ errLog: log.create('error', versionInfo + '] [' + name)
14
15
  }
15
16
  }
16
17
 
@@ -4,7 +4,7 @@
4
4
  color-scheme: dark;
5
5
 
6
6
  /*font color*/
7
- --vxe-ui-font-color: #a0a3a7;
7
+ --vxe-ui-font-color: rgba(255, 255, 255, 0.6);
8
8
  --vxe-ui-font-tinge-color: #33353b;
9
9
  --vxe-ui-font-lighten-color: #797b80;
10
10
  --vxe-ui-font-darken-color: #47494c;
@@ -1,5 +1,5 @@
1
1
  /*font color*/
2
- $vxe-ui-font-color: #606266 !default;
2
+ $vxe-ui-font-color: rgba(0, 0, 0, 0.6) !default;
3
3
  $vxe-ui-font-tinge-color: #d4d5d7 !default;
4
4
  $vxe-ui-font-lighten-color: #797b80 !default;
5
5
  $vxe-ui-font-darken-color: #47494c !default;