vxe-table 4.21.7 → 4.21.9

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 +52 -15
  2. package/dist/style.css +1 -1
  3. package/dist/style.min.css +1 -1
  4. package/es/index.css +1 -1
  5. package/es/index.min.css +1 -1
  6. package/es/locale/lang/en-US.js +2 -2
  7. package/es/locale/lang/zh-CHT.js +2 -2
  8. package/es/locale/lang/zh-CN.js +2 -2
  9. package/es/style.css +1 -1
  10. package/es/style.min.css +1 -1
  11. package/es/table/src/cell.js +39 -5
  12. package/es/table/src/table.js +3 -0
  13. package/es/toolbar/style.css +2 -0
  14. package/es/toolbar/style.min.css +1 -1
  15. package/es/ui/index.js +1 -1
  16. package/es/ui/src/log.js +1 -1
  17. package/es/vxe-toolbar/style.css +2 -0
  18. package/es/vxe-toolbar/style.min.css +1 -1
  19. package/lib/index.css +1 -1
  20. package/lib/index.min.css +1 -1
  21. package/lib/index.umd.js +42 -8
  22. package/lib/index.umd.min.js +1 -1
  23. package/lib/locale/lang/en-US.js +2 -2
  24. package/lib/locale/lang/en-US.min.js +1 -1
  25. package/lib/locale/lang/en-US.umd.js +2 -2
  26. package/lib/locale/lang/zh-CHT.js +2 -2
  27. package/lib/locale/lang/zh-CHT.min.js +1 -1
  28. package/lib/locale/lang/zh-CHT.umd.js +2 -2
  29. package/lib/locale/lang/zh-CN.js +2 -2
  30. package/lib/locale/lang/zh-CN.min.js +1 -1
  31. package/lib/locale/lang/zh-CN.umd.js +2 -2
  32. package/lib/style.css +1 -1
  33. package/lib/style.min.css +1 -1
  34. package/lib/table/src/cell.js +37 -3
  35. package/lib/table/src/cell.min.js +1 -1
  36. package/lib/table/src/table.js +1 -1
  37. package/lib/table/src/table.min.js +1 -1
  38. package/lib/toolbar/style/style.css +2 -0
  39. package/lib/toolbar/style/style.min.css +1 -1
  40. package/lib/ui/index.js +1 -1
  41. package/lib/ui/index.min.js +1 -1
  42. package/lib/ui/src/log.js +1 -1
  43. package/lib/ui/src/log.min.js +1 -1
  44. package/lib/vxe-toolbar/style/style.css +2 -0
  45. package/lib/vxe-toolbar/style/style.min.css +1 -1
  46. package/package.json +2 -2
  47. package/packages/locale/lang/en-US.ts +2 -2
  48. package/packages/locale/lang/zh-CHT.ts +2 -2
  49. package/packages/locale/lang/zh-CN.ts +2 -2
  50. package/packages/table/src/cell.ts +51 -5
  51. package/packages/table/src/table.ts +3 -0
  52. package/styles/components/toolbar.scss +2 -0
  53. /package/es/{iconfont.1788696081971.ttf → iconfont.1788956877759.ttf} +0 -0
  54. /package/es/{iconfont.1788696081971.woff → iconfont.1788956877759.woff} +0 -0
  55. /package/es/{iconfont.1788696081971.woff2 → iconfont.1788956877759.woff2} +0 -0
  56. /package/lib/{iconfont.1788696081971.ttf → iconfont.1788956877759.ttf} +0 -0
  57. /package/lib/{iconfont.1788696081971.woff → iconfont.1788956877759.woff} +0 -0
  58. /package/lib/{iconfont.1788696081971.woff2 → iconfont.1788956877759.woff2} +0 -0
@@ -4,6 +4,8 @@
4
4
  display: flex;
5
5
  flex-direction: row;
6
6
  align-items: center;
7
+ flex-wrap: wrap;
8
+ row-gap: 0.5em;
7
9
  padding: 0.5em 0;
8
10
  color: var(--vxe-ui-font-color);
9
11
  font-family: var(--vxe-ui-font-family);
@@ -1 +1 @@
1
- .vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.5em 0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid var(--vxe-ui-table-border-color);border-bottom-width:0;background-color:var(--vxe-ui-table-header-background-color)}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-tools--operate{flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:var(--vxe-ui-toolbar-custom-active-background-color);border-radius:50%}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-tool--item-wrapper{flex-grow:1}.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{flex-shrink:0}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--item-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{display:flex;align-items:center;flex-wrap:wrap}.vxe-toolbar{font-size:var(--vxe-ui-font-size-default);min-height:var(--vxe-ui-toolbar-height-default)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium);min-height:var(--vxe-ui-toolbar-height-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small);min-height:var(--vxe-ui-toolbar-height-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini);min-height:var(--vxe-ui-toolbar-height-mini)}
1
+ .vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;flex-wrap:wrap;row-gap:.5em;padding:.5em 0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid var(--vxe-ui-table-border-color);border-bottom-width:0;background-color:var(--vxe-ui-table-header-background-color)}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-tools--operate{flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:var(--vxe-ui-toolbar-custom-active-background-color);border-radius:50%}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-tool--item-wrapper{flex-grow:1}.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{flex-shrink:0}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--item-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{display:flex;align-items:center;flex-wrap:wrap}.vxe-toolbar{font-size:var(--vxe-ui-font-size-default);min-height:var(--vxe-ui-toolbar-height-default)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium);min-height:var(--vxe-ui-toolbar-height-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small);min-height:var(--vxe-ui-toolbar-height-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini);min-height:var(--vxe-ui-toolbar-height-mini)}
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.21.7";
16
+ const version = exports.version = "4.21.9";
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.21.7",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:{mode:"tooltip",enterable:!0,defaultPlacement:"top"},headerTooltipConfig:{mode:"tooltip",enterable:!0},footerTooltipConfig:{mode:"tooltip",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,allowAlign:!0,showSortDragButton:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0,align:!0,headerAlign:!0,footerAlign:!0,aggFunc:!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,isReuseKeep:!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_CUSTOM_FIXED_LEFT:iconPrefix+"fixed-left",TABLE_CUSTOM_FIXED_RIGHT:iconPrefix+"fixed-right",TABLE_CUSTOM_ALIGN_LEFT:iconPrefix+"align-left",TABLE_CUSTOM_ALIGN_CENTER:iconPrefix+"align-center",TABLE_CUSTOM_ALIGN_RIGHT:iconPrefix+"align-right",TABLE_CUSTOM_MOVE_UP:iconPrefix+"arrows-up",TABLE_CUSTOM_MOVE_DN:iconPrefix+"arrows-down",TABLE_CUSTOM_PUT_TOP:iconPrefix+"top",TABLE_CUSTOM_PUT_BOTTOM:iconPrefix+"bottom",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+"setting",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,i){return _core.VxeUI.modal.alert(e,o,i)},confirm(e,o,i){return _core.VxeUI.modal.confirm(e,o,i)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,i){return _core.VxeUI.modal.notification(e,o,i)}});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.21.9",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:{mode:"tooltip",enterable:!0,defaultPlacement:"top"},headerTooltipConfig:{mode:"tooltip",enterable:!0},footerTooltipConfig:{mode:"tooltip",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,allowAlign:!0,showSortDragButton:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0,align:!0,headerAlign:!0,footerAlign:!0,aggFunc:!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,isReuseKeep:!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_CUSTOM_FIXED_LEFT:iconPrefix+"fixed-left",TABLE_CUSTOM_FIXED_RIGHT:iconPrefix+"fixed-right",TABLE_CUSTOM_ALIGN_LEFT:iconPrefix+"align-left",TABLE_CUSTOM_ALIGN_CENTER:iconPrefix+"align-center",TABLE_CUSTOM_ALIGN_RIGHT:iconPrefix+"align-right",TABLE_CUSTOM_MOVE_UP:iconPrefix+"arrows-up",TABLE_CUSTOM_MOVE_DN:iconPrefix+"arrows-down",TABLE_CUSTOM_PUT_TOP:iconPrefix+"top",TABLE_CUSTOM_PUT_BOTTOM:iconPrefix+"bottom",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+"setting",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,i){return _core.VxeUI.modal.alert(e,o,i)},confirm(e,o,i){return _core.VxeUI.modal.confirm(e,o,i)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,i){return _core.VxeUI.modal.notification(e,o,i)}});var _default=exports.default=_core.VxeUI;
package/lib/ui/src/log.js CHANGED
@@ -9,7 +9,7 @@ var _core = require("@vxe-ui/core");
9
9
  const {
10
10
  log
11
11
  } = _core.VxeUI;
12
- const tableVersion = `table v${"4.21.7"}`;
12
+ const tableVersion = `table v${"4.21.9"}`;
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}` : '';
@@ -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.21.7";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:"",r=[r,tableVersion,o,t].filter(e=>e).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);
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.21.9";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:"",r=[r,tableVersion,o,t].filter(e=>e).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);
@@ -4,6 +4,8 @@
4
4
  display: flex;
5
5
  flex-direction: row;
6
6
  align-items: center;
7
+ flex-wrap: wrap;
8
+ row-gap: 0.5em;
7
9
  padding: 0.5em 0;
8
10
  color: var(--vxe-ui-font-color);
9
11
  font-family: var(--vxe-ui-font-family);
@@ -1 +1 @@
1
- .vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.5em 0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid var(--vxe-ui-table-border-color);border-bottom-width:0;background-color:var(--vxe-ui-table-header-background-color)}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-tools--operate{flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:var(--vxe-ui-toolbar-custom-active-background-color);border-radius:50%}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-tool--item-wrapper{flex-grow:1}.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{flex-shrink:0}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--item-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{display:flex;align-items:center;flex-wrap:wrap}.vxe-toolbar{font-size:var(--vxe-ui-font-size-default);min-height:var(--vxe-ui-toolbar-height-default)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium);min-height:var(--vxe-ui-toolbar-height-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small);min-height:var(--vxe-ui-toolbar-height-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini);min-height:var(--vxe-ui-toolbar-height-mini)}
1
+ .vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;flex-wrap:wrap;row-gap:.5em;padding:.5em 0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid var(--vxe-ui-table-border-color);border-bottom-width:0;background-color:var(--vxe-ui-table-header-background-color)}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-tools--operate{flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:var(--vxe-ui-toolbar-custom-active-background-color);border-radius:50%}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-tool--item-wrapper{flex-grow:1}.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{flex-shrink:0}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--item-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{display:flex;align-items:center;flex-wrap:wrap}.vxe-toolbar{font-size:var(--vxe-ui-font-size-default);min-height:var(--vxe-ui-toolbar-height-default)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium);min-height:var(--vxe-ui-toolbar-height-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small);min-height:var(--vxe-ui-toolbar-height-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini);min-height:var(--vxe-ui-toolbar-height-mini)}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vxe-table",
3
- "version": "4.21.7",
3
+ "version": "4.21.9",
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,7 +66,7 @@
66
66
  "typescript": "~5.9.3",
67
67
  "vue": "3.4.27",
68
68
  "vue-router": "~4.5.1",
69
- "vxe-pc-ui": "4.18.2"
69
+ "vxe-pc-ui": "4.18.9"
70
70
  },
71
71
  "vetur": {
72
72
  "tags": "helper/vetur/tags.json",
@@ -658,7 +658,7 @@ export default {
658
658
  mergeErr: 'This operation cannot be performed on merged cells',
659
659
  multiErr: 'This operation cannot be performed on multiple selection areas',
660
660
  selectErr: 'Unable to operate on cells in the specified range',
661
- extendErr: 'If the extended range contains merged cells, all merged cells must be the same size',
661
+ extendErr: 'To perform this operation, all merged cells must be of the same size',
662
662
  pasteMultiErr: 'Unable to paste, the copied and pasted areas need to be of the same size to perform this operation',
663
663
  cpInvalidErr: 'The operation cannot be performed. There are prohibited columns ({0}) in the range you selected.'
664
664
  },
@@ -810,7 +810,7 @@ export default {
810
810
  area: {
811
811
  mergeErr: 'This operation cannot be performed on merged cells',
812
812
  multiErr: 'This operation cannot be performed on multiple selection areas',
813
- extendErr: 'If the extended range contains merged cells, all merged cells must be the same size',
813
+ extendErr: 'To perform this operation, all merged cells must be of the same size',
814
814
  pasteMultiErr: 'Unable to paste, the copied and pasted areas need to be of the same size to perform this operation'
815
815
  },
816
816
  fnr: {
@@ -658,7 +658,7 @@ export default {
658
658
  mergeErr: '無法對合併單元格進行該操作',
659
659
  multiErr: '無法對多重選擇區域進行該操作',
660
660
  selectErr: '無法操作指定區域的單元格',
661
- extendErr: '如果延伸的區域包含被合併的單元格,所有合併的單元格需大小相同',
661
+ extendErr: '若要执行此操作,所有合併的單元格需大小相同',
662
662
  pasteMultiErr: '無法粘貼,需要相同大小的複制的區域和粘貼的區域才能執行此操作',
663
663
  cpInvalidErr: '該操作無法進行,您選擇的區域中存在被禁止的列({0})'
664
664
  },
@@ -810,7 +810,7 @@ export default {
810
810
  area: {
811
811
  mergeErr: '無法對合併單元格進行該操作',
812
812
  multiErr: '無法對多重選擇區域進行該操作',
813
- extendErr: '如果延伸的區域包含被合併的單元格,所有合併的單元格需大小相同',
813
+ extendErr: '若要执行此操作,所有合併的單元格需大小相同',
814
814
  pasteMultiErr: '無法粘貼,需要相同大小的複制的區域和粘貼的區域才能執行此操作'
815
815
  },
816
816
  fnr: {
@@ -658,7 +658,7 @@ export default {
658
658
  mergeErr: '无法对合并单元格进行该操作',
659
659
  multiErr: '无法对多重选择区域进行该操作',
660
660
  selectErr: '无法操作指定区域的单元格',
661
- extendErr: '如果延伸的区域包含被合并的单元格,所有合并的单元格需大小相同',
661
+ extendErr: '若要执行此操作,所有合并的单元格需大小相同',
662
662
  pasteMultiErr: '无法粘贴,需要相同大小的复制的区域和粘贴的区域才能执行此操作',
663
663
  cpInvalidErr: '该操作无法进行,您选择的区域中存在被禁止的列({0})'
664
664
  },
@@ -810,7 +810,7 @@ export default {
810
810
  area: {
811
811
  mergeErr: '无法对合并单元格进行该操作',
812
812
  multiErr: '无法对多重选择区域进行该操作',
813
- extendErr: '如果延伸的区域包含被合并的单元格,所有合并的单元格需大小相同',
813
+ extendErr: '若要执行此操作,所有合并的单元格需大小相同',
814
814
  pasteMultiErr: '无法粘贴,需要相同大小的复制的区域和粘贴的区域才能执行此操作'
815
815
  },
816
816
  fnr: {
@@ -8,7 +8,7 @@ import { getSlotVNs } from '../../ui/src/vn'
8
8
 
9
9
  import type { VxeTableConstructor, VxeTableDefines, VxeTablePrivateMethods, VxeComponentSlotType } from '../../../types'
10
10
 
11
- const { getI18n, getIcon, renderer, renderEmptyElement } = VxeUI
11
+ const { getConfig, getI18n, getIcon, renderer, renderEmptyElement } = VxeUI
12
12
 
13
13
  function renderTitlePrefixIcon (params: VxeTableDefines.CellRenderHeaderParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
14
14
  const { $table, column } = params
@@ -312,10 +312,15 @@ function renderHeaderHandle (params: VxeTableDefines.CellRenderHeaderParams & {
312
312
  const tableProps = $table.props
313
313
  const { editConfig } = tableProps
314
314
  const { type, filters, sortable, editRender, slots } = column
315
- const headerSlot = slots ? slots.header : null
316
- if (headerSlot) {
317
- return renderTitleContent(params, $table.callSlot(headerSlot, params))
315
+
316
+ // 兼容已废弃方式
317
+ if (getConfig().tableHeadeSlotToTitleSlot !== 'obsolete') {
318
+ const headerSlot = slots ? slots.header : null
319
+ if (headerSlot) {
320
+ return renderTitleContent(params, $table.callSlot(headerSlot, params))
321
+ }
318
322
  }
323
+
319
324
  switch (type) {
320
325
  case 'seq':
321
326
  return Cell.renderSeqHeader(params)
@@ -373,11 +378,20 @@ export const Cell = {
373
378
  const { $table, column } = params
374
379
  const tableProps = $table.props
375
380
  const { editConfig } = tableProps
376
- const { editRender, cellRender } = column
381
+ const { slots, editRender, cellRender } = column
377
382
  const isEnableEdit = editConfig && isEnableConf(editConfig)
378
383
  const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null
379
384
  const cellRenderOpts = isEnableConf(cellRender) ? cellRender : null
380
385
  const renderOpts = editRenderOpts || cellRenderOpts
386
+
387
+ // 兼容已废弃方式
388
+ if (getConfig().tableHeadeSlotToTitleSlot === 'obsolete') {
389
+ const headerSlot = slots ? slots.header : null
390
+ if (headerSlot) {
391
+ return renderTitleContent(params, $table.callSlot(headerSlot, params))
392
+ }
393
+ }
394
+
381
395
  if (renderOpts) {
382
396
  const compConf = renderer.get(renderOpts.name)
383
397
  if (compConf) {
@@ -649,6 +663,14 @@ export const Cell = {
649
663
  */
650
664
  renderSeqHeader (params: VxeTableDefines.CellRenderHeaderParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
651
665
  const { $table, column } = params
666
+
667
+ // 兼容已废弃方式
668
+ if (getConfig().tableHeadeSlotToTitleSlot === 'obsolete') {
669
+ const { slots } = column
670
+ const headerSlot = slots ? slots.header : null
671
+ return renderHeaderCellBaseVNs(params, renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : $table.getHeaderCellLabel(column)))
672
+ }
673
+
652
674
  return renderHeaderCellBaseVNs(params, renderTitleContent(params, $table.getHeaderCellLabel(column)))
653
675
  },
654
676
  renderSeqCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
@@ -679,6 +701,21 @@ export const Cell = {
679
701
  const { $table, column } = params
680
702
  const { slots } = column
681
703
  const titleSlot = slots ? slots.title : null
704
+
705
+ // 兼容已废弃方式
706
+ if (getConfig().tableHeadeSlotToTitleSlot === 'obsolete') {
707
+ const headerSlot = slots ? slots.header : null
708
+ return renderHeaderCellBaseVNs(params,
709
+ renderTitleContent(params, headerSlot
710
+ ? $table.callSlot(headerSlot, params)
711
+ : [
712
+ h('span', {
713
+ class: 'vxe-radio--label'
714
+ }, titleSlot ? $table.callSlot(titleSlot, params) : $table.getHeaderCellLabel(column))
715
+ ])
716
+ )
717
+ }
718
+
682
719
  return renderHeaderCellBaseVNs(params,
683
720
  renderTitleContent(params, [
684
721
  h('span', {
@@ -770,6 +807,15 @@ export const Cell = {
770
807
  }
771
808
  }
772
809
  const checkboxParams = { ...params, checked: isAllCheckboxSelected, disabled: isAllCheckboxDisabled, indeterminate: isAllCheckboxIndeterminate }
810
+
811
+ // 兼容已废弃方式
812
+ if (getConfig().tableHeadeSlotToTitleSlot === 'obsolete') {
813
+ const headerSlot = slots ? slots.header : null
814
+ if (headerSlot) {
815
+ return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, $table.callSlot(headerSlot, checkboxParams)))
816
+ }
817
+ }
818
+
773
819
  if (checkStrictly ? !showHeader : showHeader === false) {
774
820
  return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, [
775
821
  h('span', {
@@ -14814,6 +14814,9 @@ export default defineVxeComponent({
14814
14814
  if (mouseOpts.area && areaOpts.selectCellByHeader && columnOpts.drag && columnDragOpts.trigger === 'cell') {
14815
14815
  errLog('vxe.error.notSupportProp', ['area-config.selectCellByHeader & column-config.drag', 'column-drag-config.trigger=cell', 'column-drag-config.trigger=default | area-config.selectCellByHeader=false'])
14816
14816
  }
14817
+ if (mouseOpts.area && props.spanMethod) {
14818
+ errLog('vxe.error.notSupportProp', ['mouse-config.area', 'span-method', 'merge-cells'])
14819
+ }
14817
14820
  }
14818
14821
  if (!$xeTable.handlePivotTableAggData) {
14819
14822
  if (customOpts.allowGroup) {
@@ -4,6 +4,8 @@
4
4
  display: flex;
5
5
  flex-direction: row;
6
6
  align-items: center;
7
+ flex-wrap: wrap;
8
+ row-gap: 0.5em;
7
9
  padding: 0.5em 0;
8
10
  color: var(--vxe-ui-font-color);
9
11
  font-family: var(--vxe-ui-font-family);