vxe-table 3.19.25 → 3.19.27

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 (44) hide show
  1. package/es/index.css +1 -1
  2. package/es/index.min.css +1 -1
  3. package/es/style.css +1 -1
  4. package/es/style.min.css +1 -1
  5. package/es/table/src/methods.js +6 -2
  6. package/es/table/src/table.js +3 -3
  7. package/es/toolbar/src/toolbar.js +85 -103
  8. package/es/toolbar/style.css +10 -1
  9. package/es/toolbar/style.min.css +1 -1
  10. package/es/ui/index.js +1 -1
  11. package/es/ui/src/log.js +1 -1
  12. package/es/vxe-toolbar/style.css +10 -1
  13. package/es/vxe-toolbar/style.min.css +1 -1
  14. package/lib/index.css +1 -1
  15. package/lib/index.min.css +1 -1
  16. package/lib/index.umd.js +126 -152
  17. package/lib/index.umd.min.js +1 -1
  18. package/lib/style.css +1 -1
  19. package/lib/style.min.css +1 -1
  20. package/lib/table/src/methods.js +6 -2
  21. package/lib/table/src/methods.min.js +1 -1
  22. package/lib/table/src/table.js +3 -3
  23. package/lib/table/src/table.min.js +1 -1
  24. package/lib/toolbar/src/toolbar.js +121 -147
  25. package/lib/toolbar/src/toolbar.min.js +1 -1
  26. package/lib/toolbar/style/style.css +10 -1
  27. package/lib/toolbar/style/style.min.css +1 -1
  28. package/lib/ui/index.js +1 -1
  29. package/lib/ui/index.min.js +1 -1
  30. package/lib/ui/src/log.js +1 -1
  31. package/lib/ui/src/log.min.js +1 -1
  32. package/lib/vxe-toolbar/style/style.css +10 -1
  33. package/lib/vxe-toolbar/style/style.min.css +1 -1
  34. package/package.json +1 -1
  35. package/packages/table/src/methods.ts +6 -2
  36. package/packages/table/src/table.ts +3 -3
  37. package/packages/toolbar/src/toolbar.ts +91 -121
  38. package/styles/components/toolbar.scss +10 -1
  39. /package/es/{iconfont.1764811551687.ttf → iconfont.1765156950513.ttf} +0 -0
  40. /package/es/{iconfont.1764811551687.woff → iconfont.1765156950513.woff} +0 -0
  41. /package/es/{iconfont.1764811551687.woff2 → iconfont.1765156950513.woff2} +0 -0
  42. /package/lib/{iconfont.1764811551687.ttf → iconfont.1765156950513.ttf} +0 -0
  43. /package/lib/{iconfont.1764811551687.woff → iconfont.1765156950513.woff} +0 -0
  44. /package/lib/{iconfont.1764811551687.woff2 → iconfont.1765156950513.woff2} +0 -0
@@ -72,6 +72,16 @@
72
72
  border-radius: 50%;
73
73
  }
74
74
  .vxe-toolbar .vxe-button--item-wrapper,
75
+ .vxe-toolbar .vxe-tool--item-wrapper {
76
+ flex-grow: 1;
77
+ }
78
+ .vxe-toolbar .vxe-button--prefix-wrapper,
79
+ .vxe-toolbar .vxe-button--suffix-wrapper,
80
+ .vxe-toolbar .vxe-tool--prefix-wrapper,
81
+ .vxe-toolbar .vxe-tool--suffix-wrapper {
82
+ flex-shrink: 0;
83
+ }
84
+ .vxe-toolbar .vxe-button--item-wrapper,
75
85
  .vxe-toolbar .vxe-tool--item-wrapper,
76
86
  .vxe-toolbar .vxe-button--prefix-wrapper,
77
87
  .vxe-toolbar .vxe-button--suffix-wrapper,
@@ -79,7 +89,6 @@
79
89
  .vxe-toolbar .vxe-tool--suffix-wrapper {
80
90
  display: flex;
81
91
  align-items: center;
82
- flex-shrink: 0;
83
92
  flex-wrap: wrap;
84
93
  }
85
94
 
@@ -1 +1 @@
1
- .vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 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-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-shrink:0;flex-wrap:wrap}.vxe-toolbar{font-size:var(--vxe-ui-font-size-default)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini)}
1
+ .vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 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)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-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.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 = "3.19.25";
16
+ const version = exports.version = "3.19.27";
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.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="3.19.25",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},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},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{enterable:!0},validConfig:{showMessage:!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,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},floatingFilterConfig:{},aggregateConfig:{padding:!0,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:0,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}}},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,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.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="3.19.27",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},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},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{enterable:!0},validConfig:{showMessage:!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,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},floatingFilterConfig:{},aggregateConfig:{padding:!0,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:0,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}}},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,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
@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
8
8
  const {
9
9
  log
10
10
  } = _core.VxeUI;
11
- const version = `table v${"3.19.25"}`;
11
+ const version = `table v${"3.19.27"}`;
12
12
  const warnLog = exports.warnLog = log.create('warn', version);
13
13
  const errLog = exports.errLog = log.create('error', version);
@@ -1 +1 @@
1
- Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.19.25",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
1
+ Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.19.27",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
@@ -72,6 +72,16 @@
72
72
  border-radius: 50%;
73
73
  }
74
74
  .vxe-toolbar .vxe-button--item-wrapper,
75
+ .vxe-toolbar .vxe-tool--item-wrapper {
76
+ flex-grow: 1;
77
+ }
78
+ .vxe-toolbar .vxe-button--prefix-wrapper,
79
+ .vxe-toolbar .vxe-button--suffix-wrapper,
80
+ .vxe-toolbar .vxe-tool--prefix-wrapper,
81
+ .vxe-toolbar .vxe-tool--suffix-wrapper {
82
+ flex-shrink: 0;
83
+ }
84
+ .vxe-toolbar .vxe-button--item-wrapper,
75
85
  .vxe-toolbar .vxe-tool--item-wrapper,
76
86
  .vxe-toolbar .vxe-button--prefix-wrapper,
77
87
  .vxe-toolbar .vxe-button--suffix-wrapper,
@@ -79,7 +89,6 @@
79
89
  .vxe-toolbar .vxe-tool--suffix-wrapper {
80
90
  display: flex;
81
91
  align-items: center;
82
- flex-shrink: 0;
83
92
  flex-wrap: wrap;
84
93
  }
85
94
 
@@ -1 +1 @@
1
- .vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 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-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-shrink:0;flex-wrap:wrap}.vxe-toolbar{font-size:var(--vxe-ui-font-size-default)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini)}
1
+ .vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 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)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini)}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vxe-table",
3
- "version": "3.19.25",
3
+ "version": "3.19.27",
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",
@@ -4141,7 +4141,9 @@ function handleUpdateColResize ($xeTable: VxeTableConstructor & VxeTablePrivateM
4141
4141
  $xeTable.analyColumnWidth()
4142
4142
  $xeTable.recalculate().then(() => {
4143
4143
  $xeTable.saveCustomStore('update:width')
4144
- $xeTable.updateCellAreas()
4144
+ $xeTable.refreshScroll().then(() => {
4145
+ $xeTable.updateCellAreas()
4146
+ })
4145
4147
  $xeTable.dispatchEvent('column-resizable-change', params, evnt)
4146
4148
  // 已废弃 resizable-change
4147
4149
  $xeTable.dispatchEvent('resizable-change', params, evnt)
@@ -4154,7 +4156,9 @@ function handleUpdateRowResize ($xeTable: VxeTableConstructor & VxeTablePrivateM
4154
4156
 
4155
4157
  reactData.resizeHeightFlag++
4156
4158
  $xeTable.recalculate().then(() => {
4157
- $xeTable.updateCellAreas()
4159
+ $xeTable.refreshScroll().then(() => {
4160
+ $xeTable.updateCellAreas()
4161
+ })
4158
4162
  $xeTable.dispatchEvent('row-resizable-change', params, evnt)
4159
4163
  setTimeout(() => $xeTable.recalculate(true), 300)
4160
4164
  })
@@ -1003,9 +1003,9 @@ export default {
1003
1003
  const cellOpts = $xeTable.computeCellOpts
1004
1004
  let headCellHeight = XEUtils.toNumber(getCalcHeight(headerCellOpts.height || cellOpts.height))
1005
1005
  if ($xeGantt) {
1006
- const taskScaleConfs = $xeGantt.computeTaskScaleConfs
1007
- if (taskScaleConfs && taskScaleConfs.length > 2) {
1008
- const ganttMinHeadCellHeight = defaultRowHeight / 2 * taskScaleConfs.length
1006
+ const taskViewScales = $xeGantt.computeTaskViewScales
1007
+ if (taskViewScales && taskViewScales.length > 2) {
1008
+ const ganttMinHeadCellHeight = defaultRowHeight / 2 * taskViewScales.length
1009
1009
  headCellHeight = Math.max(ganttMinHeadCellHeight, headCellHeight)
1010
1010
  }
1011
1011
  }
@@ -475,69 +475,54 @@ export default /* define-vxe-component start */ defineVxeComponent({
475
475
  const buttonsSlot = slots.buttons
476
476
  const buttonPrefixSlot = slots.buttonPrefix || slots['button-prefix']
477
477
  const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix']
478
- const lbVNs: VxeComponentSlotType[] = []
479
- if (buttonPrefixSlot) {
480
- lbVNs.push(
481
- h('span', {
482
- key: 'tbp',
483
- class: 'vxe-button--prefix-wrapper'
484
- }, getSlotVNs(buttonPrefixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })))
485
- )
486
- }
487
- if (buttons || buttonsSlot) {
488
- const btnVNs: VxeComponentSlotType[] = []
489
- if (buttons) {
490
- buttons.forEach((item) => {
491
- const { dropdowns, buttonRender } = item
492
- if (item.visible !== false) {
493
- const compConf = buttonRender ? renderer.get(buttonRender.name) : null
494
- if (buttonRender && compConf && compConf.renderToolbarButton) {
495
- const toolbarButtonClassName = compConf.toolbarButtonClassName
496
- const params = { $grid: $xeGrid, $gantt: $xeGantt, $table: $table!, button: item }
478
+ const btnVNs: VxeComponentSlotType[] = []
479
+ if (buttons) {
480
+ buttons.forEach((item) => {
481
+ const { dropdowns, buttonRender } = item
482
+ if (item.visible !== false) {
483
+ const compConf = buttonRender ? renderer.get(buttonRender.name) : null
484
+ if (buttonRender && compConf && compConf.renderToolbarButton) {
485
+ const toolbarButtonClassName = compConf.toolbarButtonClassName
486
+ const params = { $grid: $xeGrid, $gantt: $xeGantt, $table: $table!, button: item }
487
+ btnVNs.push(
488
+ h('span', {
489
+ class: ['vxe-button--item', toolbarButtonClassName ? (XEUtils.isFunction(toolbarButtonClassName) ? toolbarButtonClassName(params) : toolbarButtonClassName) : '']
490
+ }, getSlotVNs(compConf.renderToolbarButton(h, buttonRender, params)))
491
+ )
492
+ } else {
493
+ if (VxeUIButtonComponent) {
497
494
  btnVNs.push(
498
- h('span', {
499
- class: ['vxe-button--item', toolbarButtonClassName ? (XEUtils.isFunction(toolbarButtonClassName) ? toolbarButtonClassName(params) : toolbarButtonClassName) : '']
500
- }, getSlotVNs(compConf.renderToolbarButton(h, buttonRender, params)))
495
+ h(VxeUIButtonComponent, {
496
+ props: Object.assign({}, item, {
497
+ content: item.content || item.name,
498
+ options: undefined
499
+ }),
500
+ on: {
501
+ click: (eventParams: VxeButtonDefines.ClickEventParams) => $xeToolbar.btnEvent(eventParams, item)
502
+ },
503
+ scopedSlots: dropdowns && dropdowns.length
504
+ ? {
505
+ dropdowns: () => $xeToolbar.renderDropdowns(h, item, true)
506
+ }
507
+ : {}
508
+ })
501
509
  )
502
- } else {
503
- if (VxeUIButtonComponent) {
504
- btnVNs.push(
505
- h(VxeUIButtonComponent, {
506
- props: Object.assign({}, item, {
507
- content: item.content || item.name,
508
- options: undefined
509
- }),
510
- on: {
511
- click: (eventParams: VxeButtonDefines.ClickEventParams) => $xeToolbar.btnEvent(eventParams, item)
512
- },
513
- scopedSlots: dropdowns && dropdowns.length
514
- ? {
515
- dropdowns: () => $xeToolbar.renderDropdowns(h, item, true)
516
- }
517
- : {}
518
- })
519
- )
520
- }
521
510
  }
522
511
  }
523
- })
524
- }
525
- lbVNs.push(
526
- h('span', {
527
- key: 'tti',
528
- class: 'vxe-button--item-wrapper'
529
- }, buttonsSlot ? getSlotVNs(buttonsSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : btnVNs)
530
- )
531
- }
532
- if (buttonSuffixSlot) {
533
- lbVNs.push(
534
- h('span', {
535
- key: 'tbs',
536
- class: 'vxe-button--suffix-wrapper'
537
- }, getSlotVNs(buttonSuffixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })))
538
- )
539
- }
540
- return lbVNs
512
+ }
513
+ })
514
+ }
515
+ return [
516
+ h('div', {
517
+ class: 'vxe-button--prefix-wrapper'
518
+ }, buttonPrefixSlot ? getSlotVNs(buttonPrefixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : []),
519
+ h('div', {
520
+ class: 'vxe-button--item-wrapper'
521
+ }, buttonsSlot ? getSlotVNs(buttonsSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : btnVNs),
522
+ h('div', {
523
+ class: 'vxe-button--suffix-wrapper'
524
+ }, buttonSuffixSlot ? getSlotVNs(buttonSuffixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : [])
525
+ ]
541
526
  },
542
527
  /**
543
528
  * 渲染右侧工具
@@ -559,72 +544,57 @@ export default /* define-vxe-component start */ defineVxeComponent({
559
544
  const toolsSlot = slots.tools
560
545
  const toolPrefixSlot = slots.toolPrefix || slots['tool-prefix']
561
546
  const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix']
562
- const rtVNs: VxeComponentSlotType[] = []
563
- if (toolPrefixSlot) {
564
- rtVNs.push(
565
- h('span', {
566
- key: 'ttp',
567
- class: 'vxe-tool--prefix-wrapper'
568
- }, getSlotVNs(toolPrefixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })))
569
- )
570
- }
571
- if (tools || toolsSlot) {
572
- const btnVNs: VxeComponentSlotType[] = []
573
- if (tools) {
574
- tools.forEach((item, tIndex) => {
575
- const { dropdowns, toolRender } = item
576
- if (item.visible !== false) {
577
- const rdName = toolRender ? toolRender.name : null
578
- const compConf = toolRender ? renderer.get(rdName) : null
579
- if (toolRender && compConf && compConf.renderToolbarTool) {
580
- const toolbarToolClassName = compConf.toolbarToolClassName
581
- const params = { $grid: $xeGrid, $gantt: $xeGantt, $table: $table!, tool: item }
547
+ const btnVNs: VxeComponentSlotType[] = []
548
+ if (tools) {
549
+ tools.forEach((item, tIndex) => {
550
+ const { dropdowns, toolRender } = item
551
+ if (item.visible !== false) {
552
+ const rdName = toolRender ? toolRender.name : null
553
+ const compConf = toolRender ? renderer.get(rdName) : null
554
+ if (toolRender && compConf && compConf.renderToolbarTool) {
555
+ const toolbarToolClassName = compConf.toolbarToolClassName
556
+ const params = { $grid: $xeGrid, $gantt: $xeGantt, $table: $table!, tool: item }
557
+ btnVNs.push(
558
+ h('span', {
559
+ key: rdName as string,
560
+ class: ['vxe-tool--item', toolbarToolClassName ? (XEUtils.isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName) : '']
561
+ }, getSlotVNs(compConf.renderToolbarTool(h, toolRender, params)))
562
+ )
563
+ } else {
564
+ if (VxeUIButtonComponent) {
582
565
  btnVNs.push(
583
- h('span', {
584
- key: rdName as string,
585
- class: ['vxe-tool--item', toolbarToolClassName ? (XEUtils.isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName) : '']
586
- }, getSlotVNs(compConf.renderToolbarTool(h, toolRender, params)))
566
+ h(VxeUIButtonComponent, {
567
+ key: tIndex,
568
+ props: Object.assign({}, item, {
569
+ content: item.content || item.name,
570
+ options: undefined
571
+ }),
572
+ on: {
573
+ click: (eventParams: VxeButtonDefines.ClickEventParams) => $xeToolbar.tolEvent(eventParams, item)
574
+ },
575
+ scopedSlots: dropdowns && dropdowns.length
576
+ ? {
577
+ dropdowns: () => $xeToolbar.renderDropdowns(h, item, false)
578
+ }
579
+ : {}
580
+ })
587
581
  )
588
- } else {
589
- if (VxeUIButtonComponent) {
590
- btnVNs.push(
591
- h(VxeUIButtonComponent, {
592
- key: tIndex,
593
- props: Object.assign({}, item, {
594
- content: item.content || item.name,
595
- options: undefined
596
- }),
597
- on: {
598
- click: (eventParams: VxeButtonDefines.ClickEventParams) => $xeToolbar.tolEvent(eventParams, item)
599
- },
600
- scopedSlots: dropdowns && dropdowns.length
601
- ? {
602
- dropdowns: () => $xeToolbar.renderDropdowns(h, item, false)
603
- }
604
- : {}
605
- })
606
- )
607
- }
608
582
  }
609
583
  }
610
- })
611
- }
612
- rtVNs.push(
613
- h('span', {
614
- key: 'tti',
615
- class: 'vxe-tool--item-wrapper'
616
- }, toolsSlot ? getSlotVNs(toolsSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : btnVNs)
617
- )
618
- }
619
- if (toolSuffixSlot) {
620
- rtVNs.push(
621
- h('span', {
622
- key: 'tts',
623
- class: 'vxe-tool--suffix-wrapper'
624
- }, getSlotVNs(toolSuffixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })))
625
- )
626
- }
627
- return rtVNs
584
+ }
585
+ })
586
+ }
587
+ return [
588
+ h('div', {
589
+ class: 'vxe-tool--prefix-wrapper'
590
+ }, toolPrefixSlot ? getSlotVNs(toolPrefixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : []),
591
+ h('div', {
592
+ class: 'vxe-tool--item-wrapper'
593
+ }, toolsSlot ? getSlotVNs(toolsSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : btnVNs),
594
+ h('div', {
595
+ class: 'vxe-tool--suffix-wrapper'
596
+ }, toolSuffixSlot ? getSlotVNs(toolSuffixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : [])
597
+ ]
628
598
  },
629
599
  renderToolImport (h: CreateElement) {
630
600
  // 使用已安装的组件,如果未安装则不渲染
@@ -81,6 +81,16 @@
81
81
  }
82
82
  }
83
83
  .vxe-button--item-wrapper,
84
+ .vxe-tool--item-wrapper {
85
+ flex-grow: 1;
86
+ }
87
+ .vxe-button--prefix-wrapper,
88
+ .vxe-button--suffix-wrapper,
89
+ .vxe-tool--prefix-wrapper,
90
+ .vxe-tool--suffix-wrapper {
91
+ flex-shrink: 0;
92
+ }
93
+ .vxe-button--item-wrapper,
84
94
  .vxe-tool--item-wrapper,
85
95
  .vxe-button--prefix-wrapper,
86
96
  .vxe-button--suffix-wrapper,
@@ -88,7 +98,6 @@
88
98
  .vxe-tool--suffix-wrapper {
89
99
  display: flex;
90
100
  align-items: center;
91
- flex-shrink: 0;
92
101
  flex-wrap: wrap;
93
102
  }
94
103
  }