vxe-pc-ui 4.19.0 → 4.19.2

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 (78) hide show
  1. package/dist/all.esm.js +128 -43
  2. package/dist/style.css +1 -1
  3. package/dist/style.min.css +1 -1
  4. package/es/icon/style.css +1 -1
  5. package/es/layout-aside/src/layout-aside.js +29 -16
  6. package/es/layout-aside/style.css +7 -0
  7. package/es/layout-aside/style.min.css +1 -1
  8. package/es/layout-body/src/layout-body.js +28 -12
  9. package/es/layout-body/style.css +5 -0
  10. package/es/layout-body/style.min.css +1 -1
  11. package/es/menu/src/menu.js +38 -13
  12. package/es/menu/style.css +14 -2
  13. package/es/menu/style.min.css +1 -1
  14. package/es/scrollbar/src/scrollbar.js +33 -0
  15. package/es/style.css +1 -1
  16. package/es/style.min.css +1 -1
  17. package/es/ui/index.js +1 -1
  18. package/es/ui/src/log.js +1 -1
  19. package/es/vxe-layout-aside/style.css +7 -0
  20. package/es/vxe-layout-aside/style.min.css +1 -1
  21. package/es/vxe-layout-body/style.css +5 -0
  22. package/es/vxe-layout-body/style.min.css +1 -1
  23. package/es/vxe-menu/style.css +14 -2
  24. package/es/vxe-menu/style.min.css +1 -1
  25. package/lib/icon/style/style.css +1 -1
  26. package/lib/icon/style/style.min.css +1 -1
  27. package/lib/index.umd.js +118 -28
  28. package/lib/index.umd.min.js +1 -1
  29. package/lib/layout-aside/src/layout-aside.js +20 -8
  30. package/lib/layout-aside/src/layout-aside.min.js +1 -1
  31. package/lib/layout-aside/style/style.css +7 -0
  32. package/lib/layout-aside/style/style.min.css +1 -1
  33. package/lib/layout-body/src/layout-body.js +20 -5
  34. package/lib/layout-body/src/layout-body.min.js +1 -1
  35. package/lib/layout-body/style/style.css +5 -0
  36. package/lib/layout-body/style/style.min.css +1 -1
  37. package/lib/menu/src/menu.js +43 -12
  38. package/lib/menu/src/menu.min.js +1 -1
  39. package/lib/menu/style/style.css +14 -2
  40. package/lib/menu/style/style.min.css +1 -1
  41. package/lib/scrollbar/src/scrollbar.js +33 -0
  42. package/lib/scrollbar/src/scrollbar.min.js +1 -1
  43. package/lib/style.css +1 -1
  44. package/lib/style.min.css +1 -1
  45. package/lib/ui/index.js +1 -1
  46. package/lib/ui/index.min.js +1 -1
  47. package/lib/ui/src/log.js +1 -1
  48. package/lib/ui/src/log.min.js +1 -1
  49. package/lib/vxe-layout-aside/style/style.css +7 -0
  50. package/lib/vxe-layout-aside/style/style.min.css +1 -1
  51. package/lib/vxe-layout-body/style/style.css +5 -0
  52. package/lib/vxe-layout-body/style/style.min.css +1 -1
  53. package/lib/vxe-menu/style/style.css +14 -2
  54. package/lib/vxe-menu/style/style.min.css +1 -1
  55. package/package.json +1 -1
  56. package/packages/layout-aside/src/layout-aside.ts +29 -16
  57. package/packages/layout-body/src/layout-body.ts +31 -15
  58. package/packages/menu/src/menu.ts +46 -18
  59. package/packages/scrollbar/src/scrollbar.ts +33 -0
  60. package/styles/components/layout-aside.scss +7 -0
  61. package/styles/components/layout-body.scss +4 -0
  62. package/styles/components/menu.scss +17 -2
  63. package/types/components/layout-aside.d.ts +2 -0
  64. package/types/components/layout-body.d.ts +2 -0
  65. package/types/components/menu.d.ts +2 -0
  66. package/types/components/scrollbar.d.ts +20 -0
  67. /package/es/icon/{iconfont.1791539010382.ttf → iconfont.1791548059987.ttf} +0 -0
  68. /package/es/icon/{iconfont.1791539010382.woff → iconfont.1791548059987.woff} +0 -0
  69. /package/es/icon/{iconfont.1791539010382.woff2 → iconfont.1791548059987.woff2} +0 -0
  70. /package/es/{iconfont.1791539010382.ttf → iconfont.1791548059987.ttf} +0 -0
  71. /package/es/{iconfont.1791539010382.woff → iconfont.1791548059987.woff} +0 -0
  72. /package/es/{iconfont.1791539010382.woff2 → iconfont.1791548059987.woff2} +0 -0
  73. /package/lib/icon/style/{iconfont.1791539010382.ttf → iconfont.1791548059987.ttf} +0 -0
  74. /package/lib/icon/style/{iconfont.1791539010382.woff → iconfont.1791548059987.woff} +0 -0
  75. /package/lib/icon/style/{iconfont.1791539010382.woff2 → iconfont.1791548059987.woff2} +0 -0
  76. /package/lib/{iconfont.1791539010382.ttf → iconfont.1791548059987.ttf} +0 -0
  77. /package/lib/{iconfont.1791539010382.woff → iconfont.1791548059987.woff} +0 -0
  78. /package/lib/{iconfont.1791539010382.woff2 → iconfont.1791548059987.woff2} +0 -0
package/lib/ui/index.js CHANGED
@@ -26,7 +26,7 @@ Object.keys(_core).forEach(function (key) {
26
26
  });
27
27
  var _dynamics = require("../dynamics");
28
28
  var _log = require("./src/log");
29
- const version = exports.version = "4.19.0";
29
+ const version = exports.version = "4.19.2";
30
30
  _core.VxeUI.uiVersion = version;
31
31
  _core.VxeUI.dynamicApp = _dynamics.dynamicApp;
32
32
  function config(options) {
@@ -1 +1 @@
1
- Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={version:!0,config:!0,setup:!0},_core=(exports.config=config,exports.default=void 0,exports.setup=setup,exports.version=void 0,require("@vxe-ui/core")),_dynamics=(Object.keys(_core).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_core[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _core[e]}})}),require("../dynamics")),_log=require("./src/log");let version=exports.version="4.19.0";function config(e){return(0,_log.warnLog)("vxe.error.delFunc",["config","setConfig"]),(0,_core.setConfig)(e)}function setup(e){return(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),(0,_core.setConfig)(e)}_core.VxeUI.uiVersion=version,_core.VxeUI.dynamicApp=_dynamics.dynamicApp,_core.VxeUI.config=config,_core.VxeUI.setup=setup,(0,_core.setConfig)({alert:{},anchor:{},anchorLink:{},avatar:{},backtop:{showIcon:!0,showContent:!0,showTop:!0,showBottom:!0,shadow:!0,threshold:20},badge:{},breadcrumb:{separator:"/"},breadcrumbItem:{},button:{trigger:"hover",prefixTooltip:{enterable:!0},suffixTooltip:{enterable:!0},showDropdownIcon:!0},buttonGroup:{},calendar:{minDate:new Date(1900,0,1),maxDate:new Date(2100,0,1),startDay:1,selectDay:1},card:{border:!0,padding:!0},carousel:{height:200,loop:!0,interval:5e3},carouselItem:{},cascader:{showFullLabel:!0,treeConfig:{showIcon:!0},filterConfig:{autoExpandMode:"first"}},checkbox:{},checkboxButton:{},checkboxGroup:{},col:{},collapse:{padding:!0,expandConfig:{showIcon:!0}},collapsePane:{},contextMenu:{autoLocate:!0},countdown:{},colorPicker:{type:"rgb",clearable:!0,showAlpha:!0,clickToCopy:!0,showColorExtractor:!0,showQuick:!0},datePanel:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1},datePicker:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),shortcutConfig:{align:"left",mode:"text",autoClose:!0},startDay:1,selectDay:1,autoClose:!0,showClearButton:null,showConfirmButton:null},dateRangePicker:{shortcutConfig:{align:"left",mode:"text",autoClose:!0},startDay:1,selectDay:1,separator:" ~ ",autoClose:!0,showClearButton:null,showConfirmButton:null},divider:{},drawer:{minWidth:40,minHeight:40,position:"right",showHeader:!0,border:!0,lockView:!0,mask:!0,showTitleOverflow:!0,showClose:!0,padding:!0,cancelClosable:!0,confirmClosable:!0},empty:{},form:{validConfig:{showErrorMessage:!0,autoPos:!0,theme:"beautify"},tooltipConfig:{enterable:!0},titleAsterisk:!0,titleOverflow:!1,padding:!0},formDesign:{height:400,showHeader:!0,showPc:!0},formGather:{},formGroup:{},formItem:{},formView:{},icon:{},iconPicker:{icons:["home","company","comment","setting","send","envelope","envelope-open","bell","search","print","pc","goods","chart-line","edit","delete","save","folder","microphone","flag","link","location","sunny","rmb","usd","user","add-user","add-users","star","unlock","time","text","feedback","calendar","association-form","cloud-download","cloud-upload","file","subtable","chart-bar-x","chart-bar-y","chart-line","chart-pie","chart-radar"],popupConfig:{}},image:{draggable:null,showPreview:!0,showPrintButton:!0},imageGroup:{showPreview:!0,showPrintButton:!0},imagePreview:{showPrintButton:!0,maskClosable:!0},input:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},layoutAside:{scrollbarConfig:{yConfig:{autoHide:!0}}},layoutBody:{backtopConfig:{}},layoutContainer:{},layoutFooter:{},layoutHeader:{},link:{underline:!0},listDesign:{height:400,showPc:!0},listView:{},list:{rowConfig:{contentField:"label"},dragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},virtualYConfig:{enabled:!0,gt:100}},loading:{showIcon:!0,showText:!0},menu:{},modal:{top:16,showHeader:!0,border:!0,minWidth:340,minHeight:140,lockView:!0,mask:!0,duration:3e3,marginSize:0,dblclickZoom:!0,showTitleOverflow:!0,animat:!0,showClose:!0,padding:!0,draggable:!0,showConfirmButton:null,cancelClosable:!0,confirmClosable:!0,zoomConfig:{minimizeMaxSize:10,minimizeVerticalOffset:{top:-24,left:0},minimizeHorizontalOffset:{top:0,left:32}},storageKey:"VXE_MODAL_POSITION"},noticeBar:{},numberInput:{digits:2,autoFill:!0,negative:!0,controlConfig:{enabled:!0,layout:"right",showButton:!0,isWheel:!0,isArrow:!0},tooltipConfig:{minWidth:60,enterable:!0,enterDelay:0}},optgroup:{},option:{},pager:{pageSizePlacement:"top"},print:{pageStyle:{}},passwordInput:{controls:!0},printPageBreak:{},pulldown:{},radio:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},rate:{},result:{},row:{},scrollbar:{autoResize:!0,xConfig:{},yConfig:{}},segmented:{},select:{emptyValue:null,multiCharOverflow:8,radioConfig:{showIcon:!0,trigger:"option"},checkboxConfig:{showIcon:!0,trigger:"option"},remoteConfig:{enabled:!0,autoLoad:!0},virtualYConfig:{enabled:!0,gt:50,oSize:2}},splitter:{resize:!0,itemConfig:{minWidth:40,minHeight:40},resizeConfig:{showTip:!0},actionConfig:{autoHideButton:!0}},splitterPanel:{},slider:{max:100,min:0,tooltipConfig:{enterDelay:0}},space:{},steps:{},switch:{},tabPane:{},tableSelect:{gridConfig:{showOverflow:!0,showHeaderOverflow:!0,showFooterOverflow:!0,rowConfig:{isHover:!0},virtualXConfig:{enabled:!0,gt:0},virtualYConfig:{enabled:!0,gt:0}}},tableTransfer:{},tabs:{},tag:{},textEllipsis:{underline:!0},text:{copyConfig:{showMessage:!0}},textarea:{resize:"none"},timeline:{},timelineItem:{},tip:{},tooltip:{trigger:"hover",theme:"dark",enterDelay:500,leaveDelay:300,isArrow:!0,defaultPlacement:"top"},transfer:{},tree:{indent:20,minHeight:60,showOverflow:!0,radioConfig:{strict:!0},tooltipConfig:{mode:"tooltip",enterable:!0,leaveDelay:300},dragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},virtualYConfig:{enabled:!0,gt:50,oSize:2}},treeSelect:{virtualYConfig:{enabled:!0,gt:0,oSize:2},treeConfig:{maxHeight:300,radioConfig:{},checkboxConfig:{},filterConfig:{autoExpandAll:!0}}},upload:{mode:"all",imageTypes:["jpg","jpeg","png","gif"],showList:!0,showUploadButton:!0,showButtonText:!0,showRemoveButton:!0,showButtonIcon:!0,showPreview:!0,dragToUpload:!0,showLimitSize:!0,showLimitCount:!0,autoSubmit:!0,maxSimultaneousUploads:5,previewImageConfig:{}},watermark:{rotate:-30,gap:[100,100]},table:{},colgroup:{},column:{},toolbar:{},grid:{},gantt:{}});let iconPrefix="vxe-icon-";(0,_core.setIcon)({LOADING:iconPrefix+"spinner roll vxe-loading--default-icon",BUTTON_DROPDOWN_OPEN:iconPrefix+"arrow-down rotate180",BUTTON_DROPDOWN_CLOSE:iconPrefix+"arrow-down",BUTTON_LOADING:iconPrefix+"spinner roll",BUTTON_TOOLTIP_ICON:iconPrefix+"question-circle-fill",MENU_ITEM_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",MENU_ITEM_EXPAND_CLOSE:iconPrefix+"arrow-right",SELECT_LOADED:iconPrefix+"spinner roll",SELECT_OPEN:iconPrefix+"caret-down rotate180",SELECT_CLOSE:iconPrefix+"caret-down",SELECT_ADD_OPTION:iconPrefix+"add",ICON_PICKER_OPEN:iconPrefix+"caret-down rotate180",ICON_PICKER_CLOSE:iconPrefix+"caret-down",PAGER_HOME:iconPrefix+"home-page",PAGER_END:iconPrefix+"end-page",PAGER_JUMP_PREV:iconPrefix+"arrow-double-left",PAGER_JUMP_NEXT:iconPrefix+"arrow-double-right",PAGER_PREV_PAGE:iconPrefix+"arrow-left",PAGER_NEXT_PAGE:iconPrefix+"arrow-right",PAGER_JUMP_MORE:iconPrefix+"ellipsis-h",RADIO_CHECKED:iconPrefix+"radio-checked-fill",RADIO_UNCHECKED:iconPrefix+"radio-unchecked",RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TEXTAREA_CLEAR:iconPrefix+"error-circle-fill",INPUT_CLEAR:iconPrefix+"error-circle-fill",INPUT_SEARCH:iconPrefix+"search",INPUT_PLUS_NUM:iconPrefix+"caret-up",INPUT_MINUS_NUM:iconPrefix+"caret-down",NUMBER_INPUT_MINUS_NUM:iconPrefix+"minus",NUMBER_INPUT_PLUS_NUM:iconPrefix+"add",DATE_PICKER_DATE:iconPrefix+"calendar",PASSWORD_INPUT_SHOW_PWD:iconPrefix+"eye-fill-close",PASSWORD_INPUT_HIDE_PWD:iconPrefix+"eye-fill",MODAL_ZOOM_MIN:iconPrefix+"minus",MODAL_ZOOM_REVERT:iconPrefix+"recover",MODAL_ZOOM_IN:iconPrefix+"square",MODAL_ZOOM_OUT:iconPrefix+"maximize",MODAL_CLOSE:iconPrefix+"close",MODAL_INFO:iconPrefix+"info-circle-fill",MODAL_SUCCESS:iconPrefix+"success-circle-fill",MODAL_WARNING:iconPrefix+"warning-circle-fill",MODAL_ERROR:iconPrefix+"error-circle-fill",MODAL_QUESTION:iconPrefix+"question-circle-fill",MODAL_LOADING:iconPrefix+"spinner roll",DRAWER_CLOSE:iconPrefix+"close",FORM_PREFIX:iconPrefix+"question-circle-fill",FORM_SUFFIX:iconPrefix+"question-circle-fill",FORM_FOLDING:iconPrefix+"arrow-up rotate180",FORM_UNFOLDING:iconPrefix+"arrow-up",FORM_VALID_ERROR_ICON:iconPrefix+"warning-circle-fill",FORM_DESIGN_STYLE_SETTING:iconPrefix+"layout",FORM_DESIGN_PROPS_PC:iconPrefix+"pc",FORM_DESIGN_PROPS_MOBILE:iconPrefix+"mobile",FORM_DESIGN_PROPS_ADD:iconPrefix+"add",FORM_DESIGN_PROPS_EDIT:iconPrefix+"edit",FORM_DESIGN_WIDGET_ADD:iconPrefix+"square-plus-fill",FORM_DESIGN_WIDGET_COPY:iconPrefix+"copy",FORM_DESIGN_WIDGET_DELETE:iconPrefix+"delete",FORM_DESIGN_WIDGET_SWAP_LR:iconPrefix+"swap",FORM_DESIGN_WIDGET_OPTION_DELETE:iconPrefix+"delete",FORM_DESIGN_WIDGET_OPTION_EXPAND_OPEN:iconPrefix+"square-plus",FORM_DESIGN_WIDGET_OPTION_EXPAND_CLOSE:iconPrefix+"square-minus",LIST_DESIGN_FIELD_SETTING:iconPrefix+"custom-column",LIST_DESIGN_LIST_SETTING:iconPrefix+"menu",LIST_DESIGN_LIST_SETTING_SEARCH_DELETE:iconPrefix+"delete",LIST_DESIGN_LIST_SETTING_ACTIVE_DELETE:iconPrefix+"delete",UPLOAD_FILE_ERROR:iconPrefix+"warning-circle-fill",UPLOAD_FILE_ADD:iconPrefix+"upload",UPLOAD_FILE_REMOVE:iconPrefix+"delete",UPLOAD_FILE_DOWNLOAD:iconPrefix+"download",UPLOAD_IMAGE_UPLOAD:iconPrefix+"upload",UPLOAD_IMAGE_RE_UPLOAD:iconPrefix+"repeat",UPLOAD_IMAGE_ADD:iconPrefix+"add",UPLOAD_IMAGE_REMOVE:iconPrefix+"close",UPLOAD_LOADING:iconPrefix+"spinner roll vxe-loading--default-icon",UPLOAD_FILE_TYPE_DEFAULT:iconPrefix+"file",UPLOAD_FILE_TYPE_XLSX:iconPrefix+"file-excel",UPLOAD_FILE_TYPE_XLS:iconPrefix+"file-excel",UPLOAD_FILE_TYPE_PDF:iconPrefix+"file-pdf",UPLOAD_FILE_TYPE_PNG:iconPrefix+"file-image",UPLOAD_FILE_TYPE_GIF:iconPrefix+"file-image",UPLOAD_FILE_TYPE_JPG:iconPrefix+"file-image",UPLOAD_FILE_TYPE_JPEG:iconPrefix+"file-image",UPLOAD_FILE_TYPE_MD:iconPrefix+"file-markdown",UPLOAD_FILE_TYPE_PPD:iconPrefix+"file-ppt",UPLOAD_FILE_TYPE_DOCX:iconPrefix+"file-word",UPLOAD_FILE_TYPE_DOC:iconPrefix+"file-word",UPLOAD_FILE_TYPE_ZIP:iconPrefix+"file-zip",UPLOAD_FILE_TYPE_TXT:iconPrefix+"file-txt",IMAGE_PREVIEW_CLOSE:iconPrefix+"close",IMAGE_PREVIEW_PREVIOUS:iconPrefix+"arrow-left",IMAGE_PREVIEW_NEXT:iconPrefix+"arrow-right",IMAGE_PREVIEW_PCT_FULL:iconPrefix+"pct-full",IMAGE_PREVIEW_PCT_1_1:iconPrefix+"pct-1-1",IMAGE_PREVIEW_ZOOM_OUT:iconPrefix+"search-zoom-out",IMAGE_PREVIEW_ZOOM_IN:iconPrefix+"search-zoom-in",IMAGE_PREVIEW_ROTATE_LEFT:iconPrefix+"rotate-left",IMAGE_PREVIEW_ROTATE_RIGHT:iconPrefix+"rotate-right",IMAGE_PREVIEW_PRINT:iconPrefix+"print",IMAGE_PREVIEW_DOWNLOAD:iconPrefix+"download",ALERT_CLOSE:iconPrefix+"close",ALERT_INFO:iconPrefix+"info-circle-fill",ALERT_SUCCESS:iconPrefix+"success-circle-fill",ALERT_WARNING:iconPrefix+"warning-circle-fill",ALERT_ERROR:iconPrefix+"error-circle-fill",TREE_NODE_OPEN:iconPrefix+"caret-right rotate90",TREE_NODE_CLOSE:iconPrefix+"caret-right",TREE_NODE_LOADED:iconPrefix+"spinner roll",TREE_DRAG:iconPrefix+"drag-handle",TREE_DRAG_STATUS_NODE:iconPrefix+"sort",TREE_DRAG_STATUS_SUB_NODE:iconPrefix+"add-sub",TREE_DRAG_DISABLED:iconPrefix+"no-drop",TREE_SELECT_LOADED:iconPrefix+"spinner roll",TREE_SELECT_OPEN:iconPrefix+"caret-down rotate180",TREE_SELECT_CLOSE:iconPrefix+"caret-down",TABLE_SELECT_LOADED:iconPrefix+"spinner roll",TABLE_SELECT_OPEN:iconPrefix+"caret-down rotate180",TABLE_SELECT_CLOSE:iconPrefix+"caret-down",TABS_TAB_BUTTON_TOP:iconPrefix+"arrow-up",TABS_TAB_BUTTON_BOTTOM:iconPrefix+"arrow-down",TABS_TAB_BUTTON_LEFT:iconPrefix+"arrow-left",TABS_TAB_BUTTON_RIGHT:iconPrefix+"arrow-right",TABS_TAB_CLOSE:iconPrefix+"close",TABS_TAB_REFRESH:iconPrefix+"refresh",TABS_TAB_REFRESH_LOADING:iconPrefix+"refresh roll",TEXT_COPY:iconPrefix+"copy",TEXT_LOADING:iconPrefix+"spinner roll",TAG_CLOSE:iconPrefix+"close",TAG_LOADING:iconPrefix+"spinner roll",CAROUSEL_HORIZONTAL_PREVIOUS:iconPrefix+"arrow-left",CAROUSEL_HORIZONTAL_NEXT:iconPrefix+"arrow-right",CAROUSEL_VERTICAL_PREVIOUS:iconPrefix+"arrow-up",CAROUSEL_VERTICAL_NEXT:iconPrefix+"arrow-down",COLLAPSE_OPEN:iconPrefix+"arrow-right rotate90",COLLAPSE_CLOSE:iconPrefix+"arrow-right",EMPTY_DEFAULT:iconPrefix+"empty",RESULT_INFO:iconPrefix+"info-circle-fill",RESULT_SUCCESS:iconPrefix+"success-circle-fill",RESULT_WARNING:iconPrefix+"warning-circle-fill",RESULT_ERROR:iconPrefix+"error-circle-fill",RESULT_QUESTION:iconPrefix+"question-circle-fill",RESULT_LOADING:iconPrefix+"spinner roll",RATE_CHECKED:iconPrefix+"star-fill",RATE_UNCHECKED:iconPrefix+"star",COLOR_PICKER_COLOR_COPY:iconPrefix+"copy",COLOR_PICKER_EYE_DROPPER:iconPrefix+"dropper",COLOR_PICKER_TPTY_OPEN:iconPrefix+"arrow-down rotate180",COLOR_PICKER_TPTY_CLOSE:iconPrefix+"arrow-down",SPLIT_TOP_ACTION:iconPrefix+"arrow-up",SPLIT_BOTTOM_ACTION:iconPrefix+"arrow-down",SPLIT_LEFT_ACTION:iconPrefix+"arrow-left",SPLIT_RIGHT_ACTION:iconPrefix+"arrow-right",BACKTOP_TOP:iconPrefix+"top",CONTEXT_MENU_OPTION_LOADING:iconPrefix+"spinner roll",CONTEXT_MENU_CHILDREN:iconPrefix+"arrow-right",CASCADER_NODE_OPEN:iconPrefix+"arrow-right",CASCADER_NODE_CLOSE:iconPrefix+"arrow-right",CASCADER_NODE_LOADED:iconPrefix+"spinner roll",LIST_DRAG:iconPrefix+"drag-handle",LIST_DRAG_STATUS_NODE:iconPrefix+"sort",LIST_DRAG_DISABLED:iconPrefix+"no-drop"});var _default=exports.default=_core.VxeUI;
1
+ Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={version:!0,config:!0,setup:!0},_core=(exports.config=config,exports.default=void 0,exports.setup=setup,exports.version=void 0,require("@vxe-ui/core")),_dynamics=(Object.keys(_core).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_core[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _core[e]}})}),require("../dynamics")),_log=require("./src/log");let version=exports.version="4.19.2";function config(e){return(0,_log.warnLog)("vxe.error.delFunc",["config","setConfig"]),(0,_core.setConfig)(e)}function setup(e){return(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),(0,_core.setConfig)(e)}_core.VxeUI.uiVersion=version,_core.VxeUI.dynamicApp=_dynamics.dynamicApp,_core.VxeUI.config=config,_core.VxeUI.setup=setup,(0,_core.setConfig)({alert:{},anchor:{},anchorLink:{},avatar:{},backtop:{showIcon:!0,showContent:!0,showTop:!0,showBottom:!0,shadow:!0,threshold:20},badge:{},breadcrumb:{separator:"/"},breadcrumbItem:{},button:{trigger:"hover",prefixTooltip:{enterable:!0},suffixTooltip:{enterable:!0},showDropdownIcon:!0},buttonGroup:{},calendar:{minDate:new Date(1900,0,1),maxDate:new Date(2100,0,1),startDay:1,selectDay:1},card:{border:!0,padding:!0},carousel:{height:200,loop:!0,interval:5e3},carouselItem:{},cascader:{showFullLabel:!0,treeConfig:{showIcon:!0},filterConfig:{autoExpandMode:"first"}},checkbox:{},checkboxButton:{},checkboxGroup:{},col:{},collapse:{padding:!0,expandConfig:{showIcon:!0}},collapsePane:{},contextMenu:{autoLocate:!0},countdown:{},colorPicker:{type:"rgb",clearable:!0,showAlpha:!0,clickToCopy:!0,showColorExtractor:!0,showQuick:!0},datePanel:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1},datePicker:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),shortcutConfig:{align:"left",mode:"text",autoClose:!0},startDay:1,selectDay:1,autoClose:!0,showClearButton:null,showConfirmButton:null},dateRangePicker:{shortcutConfig:{align:"left",mode:"text",autoClose:!0},startDay:1,selectDay:1,separator:" ~ ",autoClose:!0,showClearButton:null,showConfirmButton:null},divider:{},drawer:{minWidth:40,minHeight:40,position:"right",showHeader:!0,border:!0,lockView:!0,mask:!0,showTitleOverflow:!0,showClose:!0,padding:!0,cancelClosable:!0,confirmClosable:!0},empty:{},form:{validConfig:{showErrorMessage:!0,autoPos:!0,theme:"beautify"},tooltipConfig:{enterable:!0},titleAsterisk:!0,titleOverflow:!1,padding:!0},formDesign:{height:400,showHeader:!0,showPc:!0},formGather:{},formGroup:{},formItem:{},formView:{},icon:{},iconPicker:{icons:["home","company","comment","setting","send","envelope","envelope-open","bell","search","print","pc","goods","chart-line","edit","delete","save","folder","microphone","flag","link","location","sunny","rmb","usd","user","add-user","add-users","star","unlock","time","text","feedback","calendar","association-form","cloud-download","cloud-upload","file","subtable","chart-bar-x","chart-bar-y","chart-line","chart-pie","chart-radar"],popupConfig:{}},image:{draggable:null,showPreview:!0,showPrintButton:!0},imageGroup:{showPreview:!0,showPrintButton:!0},imagePreview:{showPrintButton:!0,maskClosable:!0},input:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},layoutAside:{scrollbarConfig:{yConfig:{autoHide:!0}}},layoutBody:{backtopConfig:{}},layoutContainer:{},layoutFooter:{},layoutHeader:{},link:{underline:!0},listDesign:{height:400,showPc:!0},listView:{},list:{rowConfig:{contentField:"label"},dragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},virtualYConfig:{enabled:!0,gt:100}},loading:{showIcon:!0,showText:!0},menu:{},modal:{top:16,showHeader:!0,border:!0,minWidth:340,minHeight:140,lockView:!0,mask:!0,duration:3e3,marginSize:0,dblclickZoom:!0,showTitleOverflow:!0,animat:!0,showClose:!0,padding:!0,draggable:!0,showConfirmButton:null,cancelClosable:!0,confirmClosable:!0,zoomConfig:{minimizeMaxSize:10,minimizeVerticalOffset:{top:-24,left:0},minimizeHorizontalOffset:{top:0,left:32}},storageKey:"VXE_MODAL_POSITION"},noticeBar:{},numberInput:{digits:2,autoFill:!0,negative:!0,controlConfig:{enabled:!0,layout:"right",showButton:!0,isWheel:!0,isArrow:!0},tooltipConfig:{minWidth:60,enterable:!0,enterDelay:0}},optgroup:{},option:{},pager:{pageSizePlacement:"top"},print:{pageStyle:{}},passwordInput:{controls:!0},printPageBreak:{},pulldown:{},radio:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},rate:{},result:{},row:{},scrollbar:{autoResize:!0,xConfig:{},yConfig:{}},segmented:{},select:{emptyValue:null,multiCharOverflow:8,radioConfig:{showIcon:!0,trigger:"option"},checkboxConfig:{showIcon:!0,trigger:"option"},remoteConfig:{enabled:!0,autoLoad:!0},virtualYConfig:{enabled:!0,gt:50,oSize:2}},splitter:{resize:!0,itemConfig:{minWidth:40,minHeight:40},resizeConfig:{showTip:!0},actionConfig:{autoHideButton:!0}},splitterPanel:{},slider:{max:100,min:0,tooltipConfig:{enterDelay:0}},space:{},steps:{},switch:{},tabPane:{},tableSelect:{gridConfig:{showOverflow:!0,showHeaderOverflow:!0,showFooterOverflow:!0,rowConfig:{isHover:!0},virtualXConfig:{enabled:!0,gt:0},virtualYConfig:{enabled:!0,gt:0}}},tableTransfer:{},tabs:{},tag:{},textEllipsis:{underline:!0},text:{copyConfig:{showMessage:!0}},textarea:{resize:"none"},timeline:{},timelineItem:{},tip:{},tooltip:{trigger:"hover",theme:"dark",enterDelay:500,leaveDelay:300,isArrow:!0,defaultPlacement:"top"},transfer:{},tree:{indent:20,minHeight:60,showOverflow:!0,radioConfig:{strict:!0},tooltipConfig:{mode:"tooltip",enterable:!0,leaveDelay:300},dragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},virtualYConfig:{enabled:!0,gt:50,oSize:2}},treeSelect:{virtualYConfig:{enabled:!0,gt:0,oSize:2},treeConfig:{maxHeight:300,radioConfig:{},checkboxConfig:{},filterConfig:{autoExpandAll:!0}}},upload:{mode:"all",imageTypes:["jpg","jpeg","png","gif"],showList:!0,showUploadButton:!0,showButtonText:!0,showRemoveButton:!0,showButtonIcon:!0,showPreview:!0,dragToUpload:!0,showLimitSize:!0,showLimitCount:!0,autoSubmit:!0,maxSimultaneousUploads:5,previewImageConfig:{}},watermark:{rotate:-30,gap:[100,100]},table:{},colgroup:{},column:{},toolbar:{},grid:{},gantt:{}});let iconPrefix="vxe-icon-";(0,_core.setIcon)({LOADING:iconPrefix+"spinner roll vxe-loading--default-icon",BUTTON_DROPDOWN_OPEN:iconPrefix+"arrow-down rotate180",BUTTON_DROPDOWN_CLOSE:iconPrefix+"arrow-down",BUTTON_LOADING:iconPrefix+"spinner roll",BUTTON_TOOLTIP_ICON:iconPrefix+"question-circle-fill",MENU_ITEM_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",MENU_ITEM_EXPAND_CLOSE:iconPrefix+"arrow-right",SELECT_LOADED:iconPrefix+"spinner roll",SELECT_OPEN:iconPrefix+"caret-down rotate180",SELECT_CLOSE:iconPrefix+"caret-down",SELECT_ADD_OPTION:iconPrefix+"add",ICON_PICKER_OPEN:iconPrefix+"caret-down rotate180",ICON_PICKER_CLOSE:iconPrefix+"caret-down",PAGER_HOME:iconPrefix+"home-page",PAGER_END:iconPrefix+"end-page",PAGER_JUMP_PREV:iconPrefix+"arrow-double-left",PAGER_JUMP_NEXT:iconPrefix+"arrow-double-right",PAGER_PREV_PAGE:iconPrefix+"arrow-left",PAGER_NEXT_PAGE:iconPrefix+"arrow-right",PAGER_JUMP_MORE:iconPrefix+"ellipsis-h",RADIO_CHECKED:iconPrefix+"radio-checked-fill",RADIO_UNCHECKED:iconPrefix+"radio-unchecked",RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TEXTAREA_CLEAR:iconPrefix+"error-circle-fill",INPUT_CLEAR:iconPrefix+"error-circle-fill",INPUT_SEARCH:iconPrefix+"search",INPUT_PLUS_NUM:iconPrefix+"caret-up",INPUT_MINUS_NUM:iconPrefix+"caret-down",NUMBER_INPUT_MINUS_NUM:iconPrefix+"minus",NUMBER_INPUT_PLUS_NUM:iconPrefix+"add",DATE_PICKER_DATE:iconPrefix+"calendar",PASSWORD_INPUT_SHOW_PWD:iconPrefix+"eye-fill-close",PASSWORD_INPUT_HIDE_PWD:iconPrefix+"eye-fill",MODAL_ZOOM_MIN:iconPrefix+"minus",MODAL_ZOOM_REVERT:iconPrefix+"recover",MODAL_ZOOM_IN:iconPrefix+"square",MODAL_ZOOM_OUT:iconPrefix+"maximize",MODAL_CLOSE:iconPrefix+"close",MODAL_INFO:iconPrefix+"info-circle-fill",MODAL_SUCCESS:iconPrefix+"success-circle-fill",MODAL_WARNING:iconPrefix+"warning-circle-fill",MODAL_ERROR:iconPrefix+"error-circle-fill",MODAL_QUESTION:iconPrefix+"question-circle-fill",MODAL_LOADING:iconPrefix+"spinner roll",DRAWER_CLOSE:iconPrefix+"close",FORM_PREFIX:iconPrefix+"question-circle-fill",FORM_SUFFIX:iconPrefix+"question-circle-fill",FORM_FOLDING:iconPrefix+"arrow-up rotate180",FORM_UNFOLDING:iconPrefix+"arrow-up",FORM_VALID_ERROR_ICON:iconPrefix+"warning-circle-fill",FORM_DESIGN_STYLE_SETTING:iconPrefix+"layout",FORM_DESIGN_PROPS_PC:iconPrefix+"pc",FORM_DESIGN_PROPS_MOBILE:iconPrefix+"mobile",FORM_DESIGN_PROPS_ADD:iconPrefix+"add",FORM_DESIGN_PROPS_EDIT:iconPrefix+"edit",FORM_DESIGN_WIDGET_ADD:iconPrefix+"square-plus-fill",FORM_DESIGN_WIDGET_COPY:iconPrefix+"copy",FORM_DESIGN_WIDGET_DELETE:iconPrefix+"delete",FORM_DESIGN_WIDGET_SWAP_LR:iconPrefix+"swap",FORM_DESIGN_WIDGET_OPTION_DELETE:iconPrefix+"delete",FORM_DESIGN_WIDGET_OPTION_EXPAND_OPEN:iconPrefix+"square-plus",FORM_DESIGN_WIDGET_OPTION_EXPAND_CLOSE:iconPrefix+"square-minus",LIST_DESIGN_FIELD_SETTING:iconPrefix+"custom-column",LIST_DESIGN_LIST_SETTING:iconPrefix+"menu",LIST_DESIGN_LIST_SETTING_SEARCH_DELETE:iconPrefix+"delete",LIST_DESIGN_LIST_SETTING_ACTIVE_DELETE:iconPrefix+"delete",UPLOAD_FILE_ERROR:iconPrefix+"warning-circle-fill",UPLOAD_FILE_ADD:iconPrefix+"upload",UPLOAD_FILE_REMOVE:iconPrefix+"delete",UPLOAD_FILE_DOWNLOAD:iconPrefix+"download",UPLOAD_IMAGE_UPLOAD:iconPrefix+"upload",UPLOAD_IMAGE_RE_UPLOAD:iconPrefix+"repeat",UPLOAD_IMAGE_ADD:iconPrefix+"add",UPLOAD_IMAGE_REMOVE:iconPrefix+"close",UPLOAD_LOADING:iconPrefix+"spinner roll vxe-loading--default-icon",UPLOAD_FILE_TYPE_DEFAULT:iconPrefix+"file",UPLOAD_FILE_TYPE_XLSX:iconPrefix+"file-excel",UPLOAD_FILE_TYPE_XLS:iconPrefix+"file-excel",UPLOAD_FILE_TYPE_PDF:iconPrefix+"file-pdf",UPLOAD_FILE_TYPE_PNG:iconPrefix+"file-image",UPLOAD_FILE_TYPE_GIF:iconPrefix+"file-image",UPLOAD_FILE_TYPE_JPG:iconPrefix+"file-image",UPLOAD_FILE_TYPE_JPEG:iconPrefix+"file-image",UPLOAD_FILE_TYPE_MD:iconPrefix+"file-markdown",UPLOAD_FILE_TYPE_PPD:iconPrefix+"file-ppt",UPLOAD_FILE_TYPE_DOCX:iconPrefix+"file-word",UPLOAD_FILE_TYPE_DOC:iconPrefix+"file-word",UPLOAD_FILE_TYPE_ZIP:iconPrefix+"file-zip",UPLOAD_FILE_TYPE_TXT:iconPrefix+"file-txt",IMAGE_PREVIEW_CLOSE:iconPrefix+"close",IMAGE_PREVIEW_PREVIOUS:iconPrefix+"arrow-left",IMAGE_PREVIEW_NEXT:iconPrefix+"arrow-right",IMAGE_PREVIEW_PCT_FULL:iconPrefix+"pct-full",IMAGE_PREVIEW_PCT_1_1:iconPrefix+"pct-1-1",IMAGE_PREVIEW_ZOOM_OUT:iconPrefix+"search-zoom-out",IMAGE_PREVIEW_ZOOM_IN:iconPrefix+"search-zoom-in",IMAGE_PREVIEW_ROTATE_LEFT:iconPrefix+"rotate-left",IMAGE_PREVIEW_ROTATE_RIGHT:iconPrefix+"rotate-right",IMAGE_PREVIEW_PRINT:iconPrefix+"print",IMAGE_PREVIEW_DOWNLOAD:iconPrefix+"download",ALERT_CLOSE:iconPrefix+"close",ALERT_INFO:iconPrefix+"info-circle-fill",ALERT_SUCCESS:iconPrefix+"success-circle-fill",ALERT_WARNING:iconPrefix+"warning-circle-fill",ALERT_ERROR:iconPrefix+"error-circle-fill",TREE_NODE_OPEN:iconPrefix+"caret-right rotate90",TREE_NODE_CLOSE:iconPrefix+"caret-right",TREE_NODE_LOADED:iconPrefix+"spinner roll",TREE_DRAG:iconPrefix+"drag-handle",TREE_DRAG_STATUS_NODE:iconPrefix+"sort",TREE_DRAG_STATUS_SUB_NODE:iconPrefix+"add-sub",TREE_DRAG_DISABLED:iconPrefix+"no-drop",TREE_SELECT_LOADED:iconPrefix+"spinner roll",TREE_SELECT_OPEN:iconPrefix+"caret-down rotate180",TREE_SELECT_CLOSE:iconPrefix+"caret-down",TABLE_SELECT_LOADED:iconPrefix+"spinner roll",TABLE_SELECT_OPEN:iconPrefix+"caret-down rotate180",TABLE_SELECT_CLOSE:iconPrefix+"caret-down",TABS_TAB_BUTTON_TOP:iconPrefix+"arrow-up",TABS_TAB_BUTTON_BOTTOM:iconPrefix+"arrow-down",TABS_TAB_BUTTON_LEFT:iconPrefix+"arrow-left",TABS_TAB_BUTTON_RIGHT:iconPrefix+"arrow-right",TABS_TAB_CLOSE:iconPrefix+"close",TABS_TAB_REFRESH:iconPrefix+"refresh",TABS_TAB_REFRESH_LOADING:iconPrefix+"refresh roll",TEXT_COPY:iconPrefix+"copy",TEXT_LOADING:iconPrefix+"spinner roll",TAG_CLOSE:iconPrefix+"close",TAG_LOADING:iconPrefix+"spinner roll",CAROUSEL_HORIZONTAL_PREVIOUS:iconPrefix+"arrow-left",CAROUSEL_HORIZONTAL_NEXT:iconPrefix+"arrow-right",CAROUSEL_VERTICAL_PREVIOUS:iconPrefix+"arrow-up",CAROUSEL_VERTICAL_NEXT:iconPrefix+"arrow-down",COLLAPSE_OPEN:iconPrefix+"arrow-right rotate90",COLLAPSE_CLOSE:iconPrefix+"arrow-right",EMPTY_DEFAULT:iconPrefix+"empty",RESULT_INFO:iconPrefix+"info-circle-fill",RESULT_SUCCESS:iconPrefix+"success-circle-fill",RESULT_WARNING:iconPrefix+"warning-circle-fill",RESULT_ERROR:iconPrefix+"error-circle-fill",RESULT_QUESTION:iconPrefix+"question-circle-fill",RESULT_LOADING:iconPrefix+"spinner roll",RATE_CHECKED:iconPrefix+"star-fill",RATE_UNCHECKED:iconPrefix+"star",COLOR_PICKER_COLOR_COPY:iconPrefix+"copy",COLOR_PICKER_EYE_DROPPER:iconPrefix+"dropper",COLOR_PICKER_TPTY_OPEN:iconPrefix+"arrow-down rotate180",COLOR_PICKER_TPTY_CLOSE:iconPrefix+"arrow-down",SPLIT_TOP_ACTION:iconPrefix+"arrow-up",SPLIT_BOTTOM_ACTION:iconPrefix+"arrow-down",SPLIT_LEFT_ACTION:iconPrefix+"arrow-left",SPLIT_RIGHT_ACTION:iconPrefix+"arrow-right",BACKTOP_TOP:iconPrefix+"top",CONTEXT_MENU_OPTION_LOADING:iconPrefix+"spinner roll",CONTEXT_MENU_CHILDREN:iconPrefix+"arrow-right",CASCADER_NODE_OPEN:iconPrefix+"arrow-right",CASCADER_NODE_CLOSE:iconPrefix+"arrow-right",CASCADER_NODE_LOADED:iconPrefix+"spinner roll",LIST_DRAG:iconPrefix+"drag-handle",LIST_DRAG_STATUS_NODE:iconPrefix+"sort",LIST_DRAG_DISABLED:iconPrefix+"no-drop"});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 uiVersion = `ui v${"4.19.0"}`;
12
+ const uiVersion = `ui v${"4.19.2"}`;
13
13
  function createComponentLog(name) {
14
14
  const tableVersion = _core.VxeUI.tableVersion ? `table v${_core.VxeUI.tableVersion}` : '';
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,uiVersion="ui v4.19.0";function createComponentLog(e){var r=_core.VxeUI.tableVersion?"table v"+_core.VxeUI.tableVersion:"",o=_core.VxeUI.ganttVersion?"gantt v"+_core.VxeUI.ganttVersion:"",n=_core.VxeUI.designVersion?"design v"+_core.VxeUI.designVersion:"",r=[uiVersion,r,o,n].filter(e=>e).join(" ");return{warnLog:log.create("warn",r+"] ["+e),errLog:log.create("error",r+"] ["+e)}}let warnLog=exports.warnLog=log.create("warn",uiVersion),errLog=exports.errLog=log.create("error",uiVersion);
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,uiVersion="ui v4.19.2";function createComponentLog(e){var r=_core.VxeUI.tableVersion?"table v"+_core.VxeUI.tableVersion:"",o=_core.VxeUI.ganttVersion?"gantt v"+_core.VxeUI.ganttVersion:"",n=_core.VxeUI.designVersion?"design v"+_core.VxeUI.designVersion:"",r=[uiVersion,r,o,n].filter(e=>e).join(" ");return{warnLog:log.create("warn",r+"] ["+e),errLog:log.create("error",r+"] ["+e)}}let warnLog=exports.warnLog=log.create("warn",uiVersion),errLog=exports.errLog=log.create("error",uiVersion);
@@ -16,6 +16,13 @@
16
16
  padding: var(--vxe-ui-layout-padding-default);
17
17
  }
18
18
 
19
+ .vxe-layout-aside--inner {
20
+ flex-grow: 1;
21
+ overflow-y: auto;
22
+ overflow-x: hidden;
23
+ outline: 0;
24
+ }
25
+
19
26
  .vxe-layout-aside--scrollbar {
20
27
  flex-grow: 1;
21
28
  overflow: hidden;
@@ -1 +1 @@
1
- .vxe-layout-aside{position:relative;display:flex;flex-direction:column;flex-shrink:0;width:var(--vxe-ui-layout-aside-default-width);overflow:hidden}.vxe-layout-aside.is--animat{transition:width .3s}.vxe-layout-aside.is--collapse{width:var(--vxe-ui-layout-aside-collapse-width)}.vxe-layout-aside.is--padding{padding:var(--vxe-ui-layout-padding-default)}.vxe-layout-aside--scrollbar{flex-grow:1;overflow:hidden}
1
+ .vxe-layout-aside{position:relative;display:flex;flex-direction:column;flex-shrink:0;width:var(--vxe-ui-layout-aside-default-width);overflow:hidden}.vxe-layout-aside.is--animat{transition:width .3s}.vxe-layout-aside.is--collapse{width:var(--vxe-ui-layout-aside-collapse-width)}.vxe-layout-aside.is--padding{padding:var(--vxe-ui-layout-padding-default)}.vxe-layout-aside--inner{flex-grow:1;overflow-y:auto;overflow-x:hidden;outline:0}.vxe-layout-aside--scrollbar{flex-grow:1;overflow:hidden}
@@ -9,6 +9,11 @@
9
9
  padding: var(--vxe-ui-layout-padding-double);
10
10
  }
11
11
 
12
+ .vxe-layout-body--inner {
13
+ flex-grow: 1;
14
+ overflow: auto;
15
+ }
16
+
12
17
  .vxe-layout-body--scrollbar {
13
18
  flex-grow: 1;
14
19
  overflow: hidden;
@@ -1 +1 @@
1
- .vxe-layout-body{position:relative;display:flex;flex-direction:column;flex-grow:1;overflow:hidden}.vxe-layout-body.is--padding{padding:var(--vxe-ui-layout-padding-double)}.vxe-layout-body--scrollbar{flex-grow:1;overflow:hidden}
1
+ .vxe-layout-body{position:relative;display:flex;flex-direction:column;flex-grow:1;overflow:hidden}.vxe-layout-body.is--padding{padding:var(--vxe-ui-layout-padding-double)}.vxe-layout-body--inner{flex-grow:1;overflow:auto}.vxe-layout-body--scrollbar{flex-grow:1;overflow:hidden}
@@ -97,17 +97,29 @@
97
97
  .vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--item-link-collapse {
98
98
  display: none;
99
99
  }
100
+ .vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--scrollbar-body .vxe-scrollbar--track-x,
101
+ .vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--scrollbar-body .vxe-scrollbar--track-y {
102
+ display: none;
103
+ }
104
+ .vxe-menu--collapse-wrapper:not(.is--enter) > .vxe-menu--body {
105
+ overflow: hidden;
106
+ }
100
107
  .vxe-menu--collapse-wrapper.is--enter {
101
108
  width: var(--vxe-ui-layout-aside-default-width);
102
109
  box-shadow: var(--vxe-ui-menu-collapse-wrapper-box-shadow);
103
110
  }
111
+ .vxe-menu--collapse-wrapper.is--enter > .vxe-menu--body {
112
+ overflow: auto;
113
+ }
104
114
  .vxe-menu--collapse-wrapper > .vxe-menu--header, .vxe-menu--collapse-wrapper > .vxe-menu--footer {
105
115
  flex-shrink: 0;
106
116
  }
107
- .vxe-menu--collapse-wrapper > .vxe-menu--body {
108
- flex-grow: 1;
117
+ .vxe-menu--collapse-wrapper > .vxe-menu--scrollbar-body {
109
118
  overflow: hidden;
110
119
  }
120
+ .vxe-menu--collapse-wrapper > .vxe-menu--body, .vxe-menu--collapse-wrapper > .vxe-menu--scrollbar-body {
121
+ flex-grow: 1;
122
+ }
111
123
 
112
124
  .vxe-menu--item-link {
113
125
  display: flex;
@@ -1 +1 @@
1
- .vxe-menu,.vxe-menu--collapse-wrapper{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-default);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-default);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-default);--vxe-ui-menu-current-margin:4px}.vxe-menu--collapse-wrapper.size--xlarge,.vxe-menu.size--xlarge{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-xlarge);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-xlarge);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-xlarge)}.vxe-menu--collapse-wrapper.size--large,.vxe-menu.size--large{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-large);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-large);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-large)}.vxe-menu--collapse-wrapper.size--medium,.vxe-menu.size--medium{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-medium);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-medium);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-medium)}.vxe-menu--collapse-wrapper.size--small,.vxe-menu.size--small{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-small);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-small);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-small)}.vxe-menu--collapse-wrapper.size--mini,.vxe-menu.size--mini{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-mini);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-mini);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-mini)}.vxe-menu--collapse-wrapper.size--large,.vxe-menu--collapse-wrapper.size--xlarge,.vxe-menu.size--large,.vxe-menu.size--xlarge{--vxe-ui-menu-current-margin:6px}.vxe-menu--collapse-wrapper.size--mini,.vxe-menu--collapse-wrapper.size--small,.vxe-menu.size--mini,.vxe-menu.size--small{--vxe-ui-menu-current-margin:2px}.vxe-menu{position:relative}.vxe-menu.is--collapsed .vxe-menu--item-custom-title,.vxe-menu.is--collapsed .vxe-menu--item-link-collapse,.vxe-menu.is--collapsed .vxe-menu--item-link-title{display:none}.vxe-menu.is--loading{min-height:4em}.vxe-menu.border--first .vxe-menu--item-level1>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu.border--first-group .vxe-menu--item-level1.has--child>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu.border--group .vxe-menu--item-wrapper.has--child>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu.border--all .vxe-menu--item-wrapper>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu,.vxe-menu--collapse-wrapper{font-size:var(--vxe-ui-menu-current-font-size);color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-menu--collapse-wrapper{display:none;flex-direction:column;position:absolute;overflow:hidden;background-color:var(--vxe-ui-layout-background-color)}.vxe-menu--collapse-wrapper.is--collapsed{display:flex;transition:all .25s ease-in-out}.vxe-menu--collapse-wrapper:not(.is--enter){width:var(--vxe-ui-layout-aside-collapse-width)}.vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--item-custom-title,.vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--item-link-collapse,.vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--item-link-title{display:none}.vxe-menu--collapse-wrapper.is--enter{width:var(--vxe-ui-layout-aside-default-width);box-shadow:var(--vxe-ui-menu-collapse-wrapper-box-shadow)}.vxe-menu--collapse-wrapper>.vxe-menu--footer,.vxe-menu--collapse-wrapper>.vxe-menu--header{flex-shrink:0}.vxe-menu--collapse-wrapper>.vxe-menu--body{flex-grow:1;overflow:hidden}.vxe-menu--item-link{display:flex;flex-direction:row;align-items:center;margin:0 var(--vxe-ui-menu-current-item-padding);height:var(--vxe-ui-menu-current-item-height);color:var(--vxe-ui-font-color);border-radius:var(--vxe-ui-base-border-radius);text-decoration:none;cursor:pointer}.vxe-menu--item-link:hover{background-color:var(--vxe-ui-base-hover-background-color)}.vxe-menu--item-custom-title,.vxe-menu--item-link,.vxe-menu--item-link-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-menu--item-link-icon{flex-shrink:0;width:var(--vxe-ui-menu-icon-width);text-align:center}.vxe-menu--item-custom-title,.vxe-menu--item-link-title{flex-grow:1;padding-left:.2em}.vxe-menu--item-link-collapse{flex-shrink:0;padding:.5em;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-menu--item-link-collapse i{display:inline-block;font-size:.8em;transition:transform .25s ease-in-out}.vxe-menu--item-wrapper{margin:var(--vxe-ui-menu-current-margin) 0}.vxe-menu--item-wrapper:first-child{margin-top:0}.vxe-menu--item-wrapper:last-child{margin-bottom:0}.vxe-menu--item-wrapper.vxe-menu--item-level1>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double)}.vxe-menu--item-wrapper.vxe-menu--item-level1>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 1)}.vxe-menu--item-wrapper.vxe-menu--item-level2>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 2)}.vxe-menu--item-wrapper.vxe-menu--item-level3>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 3)}.vxe-menu--item-wrapper.vxe-menu--item-level4>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 4)}.vxe-menu--item-wrapper.vxe-menu--item-level5>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 5)}.vxe-menu--item-wrapper.vxe-menu--item-level6>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 6)}.vxe-menu--item-wrapper.vxe-menu--item-level7>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 7)}.vxe-menu--item-group{height:0;overflow:hidden}.vxe-menu--item-group[data-effect]{transition:height .3s ease-in-out}.vxe-menu--item-wrapper.is--active>.vxe-menu--item-link{font-weight:700}.vxe-menu--item-wrapper.is--exact-active>.vxe-menu--item-link{color:var(--vxe-ui-font-primary-color);background-color:var(--vxe-ui-base-active-background-color)}.vxe-menu--item-wrapper.is--expand>.vxe-menu--item-group{height:auto}
1
+ .vxe-menu,.vxe-menu--collapse-wrapper{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-default);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-default);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-default);--vxe-ui-menu-current-margin:4px}.vxe-menu--collapse-wrapper.size--xlarge,.vxe-menu.size--xlarge{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-xlarge);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-xlarge);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-xlarge)}.vxe-menu--collapse-wrapper.size--large,.vxe-menu.size--large{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-large);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-large);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-large)}.vxe-menu--collapse-wrapper.size--medium,.vxe-menu.size--medium{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-medium);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-medium);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-medium)}.vxe-menu--collapse-wrapper.size--small,.vxe-menu.size--small{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-small);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-small);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-small)}.vxe-menu--collapse-wrapper.size--mini,.vxe-menu.size--mini{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-mini);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-mini);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-mini)}.vxe-menu--collapse-wrapper.size--large,.vxe-menu--collapse-wrapper.size--xlarge,.vxe-menu.size--large,.vxe-menu.size--xlarge{--vxe-ui-menu-current-margin:6px}.vxe-menu--collapse-wrapper.size--mini,.vxe-menu--collapse-wrapper.size--small,.vxe-menu.size--mini,.vxe-menu.size--small{--vxe-ui-menu-current-margin:2px}.vxe-menu{position:relative}.vxe-menu.is--collapsed .vxe-menu--item-custom-title,.vxe-menu.is--collapsed .vxe-menu--item-link-collapse,.vxe-menu.is--collapsed .vxe-menu--item-link-title{display:none}.vxe-menu.is--loading{min-height:4em}.vxe-menu.border--first .vxe-menu--item-level1>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu.border--first-group .vxe-menu--item-level1.has--child>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu.border--group .vxe-menu--item-wrapper.has--child>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu.border--all .vxe-menu--item-wrapper>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu,.vxe-menu--collapse-wrapper{font-size:var(--vxe-ui-menu-current-font-size);color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-menu--collapse-wrapper{display:none;flex-direction:column;position:absolute;overflow:hidden;background-color:var(--vxe-ui-layout-background-color)}.vxe-menu--collapse-wrapper.is--collapsed{display:flex;transition:all .25s ease-in-out}.vxe-menu--collapse-wrapper:not(.is--enter){width:var(--vxe-ui-layout-aside-collapse-width)}.vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--item-custom-title,.vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--item-link-collapse,.vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--item-link-title{display:none}.vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--scrollbar-body .vxe-scrollbar--track-x,.vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--scrollbar-body .vxe-scrollbar--track-y{display:none}.vxe-menu--collapse-wrapper:not(.is--enter)>.vxe-menu--body{overflow:hidden}.vxe-menu--collapse-wrapper.is--enter{width:var(--vxe-ui-layout-aside-default-width);box-shadow:var(--vxe-ui-menu-collapse-wrapper-box-shadow)}.vxe-menu--collapse-wrapper.is--enter>.vxe-menu--body{overflow:auto}.vxe-menu--collapse-wrapper>.vxe-menu--footer,.vxe-menu--collapse-wrapper>.vxe-menu--header{flex-shrink:0}.vxe-menu--collapse-wrapper>.vxe-menu--scrollbar-body{overflow:hidden}.vxe-menu--collapse-wrapper>.vxe-menu--body,.vxe-menu--collapse-wrapper>.vxe-menu--scrollbar-body{flex-grow:1}.vxe-menu--item-link{display:flex;flex-direction:row;align-items:center;margin:0 var(--vxe-ui-menu-current-item-padding);height:var(--vxe-ui-menu-current-item-height);color:var(--vxe-ui-font-color);border-radius:var(--vxe-ui-base-border-radius);text-decoration:none;cursor:pointer}.vxe-menu--item-link:hover{background-color:var(--vxe-ui-base-hover-background-color)}.vxe-menu--item-custom-title,.vxe-menu--item-link,.vxe-menu--item-link-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-menu--item-link-icon{flex-shrink:0;width:var(--vxe-ui-menu-icon-width);text-align:center}.vxe-menu--item-custom-title,.vxe-menu--item-link-title{flex-grow:1;padding-left:.2em}.vxe-menu--item-link-collapse{flex-shrink:0;padding:.5em;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-menu--item-link-collapse i{display:inline-block;font-size:.8em;transition:transform .25s ease-in-out}.vxe-menu--item-wrapper{margin:var(--vxe-ui-menu-current-margin) 0}.vxe-menu--item-wrapper:first-child{margin-top:0}.vxe-menu--item-wrapper:last-child{margin-bottom:0}.vxe-menu--item-wrapper.vxe-menu--item-level1>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double)}.vxe-menu--item-wrapper.vxe-menu--item-level1>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 1)}.vxe-menu--item-wrapper.vxe-menu--item-level2>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 2)}.vxe-menu--item-wrapper.vxe-menu--item-level3>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 3)}.vxe-menu--item-wrapper.vxe-menu--item-level4>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 4)}.vxe-menu--item-wrapper.vxe-menu--item-level5>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 5)}.vxe-menu--item-wrapper.vxe-menu--item-level6>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 6)}.vxe-menu--item-wrapper.vxe-menu--item-level7>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 7)}.vxe-menu--item-group{height:0;overflow:hidden}.vxe-menu--item-group[data-effect]{transition:height .3s ease-in-out}.vxe-menu--item-wrapper.is--active>.vxe-menu--item-link{font-weight:700}.vxe-menu--item-wrapper.is--exact-active>.vxe-menu--item-link{color:var(--vxe-ui-font-primary-color);background-color:var(--vxe-ui-base-active-background-color)}.vxe-menu--item-wrapper.is--expand>.vxe-menu--item-group{height:auto}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vxe-pc-ui",
3
- "version": "4.19.0",
3
+ "version": "4.19.2",
4
4
  "description": "A vue based PC component library",
5
5
  "scripts": {
6
6
  "update": "npm install --legacy-peer-deps",
@@ -3,6 +3,7 @@ import { defineVxeComponent } from '../../ui/src/comp'
3
3
  import { toCssUnit } from '../../ui/src/dom'
4
4
  import { getConfig, useSize, createEvent } from '../../ui'
5
5
  import XEUtils from 'xe-utils'
6
+ import VxeLoadingComponent from '../../loading'
6
7
  import VxeScrollbarComponent from '../../scrollbar'
7
8
 
8
9
  import type { VxeLayoutAsidePropTypes, LayoutAsideReactData, VxeLayoutAsideEmits, LayoutAsidePrivateRef, LayoutAsideMethods, LayoutAsidePrivateMethods, VxeLayoutAsidePrivateComputed, VxeLayoutAsideConstructor, VxeLayoutAsidePrivateMethods, ValueOf, VxeComponentStyleType } from '../../../types'
@@ -16,6 +17,10 @@ export default defineVxeComponent({
16
17
  loading: Boolean as PropType<VxeLayoutAsidePropTypes.Loading>,
17
18
  padding: Boolean as PropType<VxeLayoutAsidePropTypes.Padding>,
18
19
  collapseConfig: Object as PropType<VxeLayoutAsidePropTypes.CollapseConfig>,
20
+ useScrollbar: {
21
+ type: Boolean as PropType<VxeLayoutAsidePropTypes.UseScrollbar>,
22
+ default: () => getConfig().layoutAside.useScrollbar
23
+ },
19
24
  scrollbarConfig: Object as PropType<VxeLayoutAsidePropTypes.ScrollbarConfig>,
20
25
  size: {
21
26
  type: String as PropType<VxeLayoutAsidePropTypes.Size>,
@@ -87,7 +92,7 @@ export default defineVxeComponent({
87
92
  Object.assign($xeLayoutAside, layoutAsideMethods, layoutAsidePrivateMethods)
88
93
 
89
94
  const renderVN = () => {
90
- const { collapsed, loading, padding } = props
95
+ const { collapsed, loading, padding, useScrollbar } = props
91
96
  const varStyle = computeVarStyle.value
92
97
  const vSize = computeSize.value
93
98
  const collapseOpts = computeCollapseOpts.value
@@ -106,21 +111,29 @@ export default defineVxeComponent({
106
111
  }],
107
112
  style: varStyle
108
113
  }, [
109
- h(VxeScrollbarComponent, {
110
- loading,
111
- native,
112
- xConfig: {
113
- visible: 'hidden'
114
- },
115
- yConfig,
116
- className: 'vxe-layout-aside--scrollbar' + (className ? (' ' + className) : ''),
117
- viewAttrs,
118
- viewClassName: 'vxe-layout-aside--view' + (viewClassName ? (' ' + viewClassName) : ''),
119
- viewInnerClassName: 'vxe-layout-aside--inner' + (viewInnerClassName ? (' ' + viewInnerClassName) : '')
120
- }, {
121
- default: () => {
122
- return defaultSlot ? defaultSlot({}) : []
123
- }
114
+ useScrollbar
115
+ ? h(VxeScrollbarComponent, {
116
+ native,
117
+ xConfig: {
118
+ visible: 'hidden'
119
+ },
120
+ yConfig,
121
+ className: 'vxe-layout-aside--scrollbar' + (className ? (' ' + className) : ''),
122
+ viewAttrs,
123
+ viewClassName: 'vxe-layout-aside--scrollbar-view' + (viewClassName ? (' ' + viewClassName) : ''),
124
+ viewInnerClassName: 'vxe-layout-aside--scrollbar-inner' + (viewInnerClassName ? (' ' + viewInnerClassName) : '')
125
+ }, {
126
+ default: () => defaultSlot ? defaultSlot({}) : []
127
+ })
128
+ : h('div', {
129
+ class: 'vxe-layout-aside--inner'
130
+ }, defaultSlot ? defaultSlot({}) : []),
131
+ /**
132
+ * 加载中
133
+ */
134
+ h(VxeLoadingComponent, {
135
+ class: 'vxe-layout-aside-view--loading',
136
+ modelValue: loading
124
137
  })
125
138
  ])
126
139
  }
@@ -2,6 +2,7 @@ import { ref, h, reactive, PropType, computed } from 'vue'
2
2
  import { defineVxeComponent } from '../../ui/src/comp'
3
3
  import { getConfig, useSize, createEvent, renderEmptyElement } from '../../ui'
4
4
  import XEUtils from 'xe-utils'
5
+ import VxeLoadingComponent from '../../loading'
5
6
  import VxeScrollbarComponent from '../../scrollbar'
6
7
  import VxeUIBacktopComponent from '../../backtop'
7
8
 
@@ -25,6 +26,10 @@ export default defineVxeComponent({
25
26
  default: () => getConfig().layoutBody.showBacktop
26
27
  },
27
28
  backtopConfig: Object as PropType<VxeLayoutBodyPropTypes.BacktopConfig>,
29
+ useScrollbar: {
30
+ type: Boolean as PropType<VxeLayoutBodyPropTypes.UseScrollbar>,
31
+ default: () => getConfig().layoutBody.useScrollbar
32
+ },
28
33
  scrollbarConfig: Object as PropType<VxeLayoutBodyPropTypes.ScrollbarConfig>,
29
34
  size: {
30
35
  type: String as PropType<VxeLayoutBodyPropTypes.Size>,
@@ -88,7 +93,7 @@ export default defineVxeComponent({
88
93
  Object.assign($xeLayoutBody, layoutBodyMethods, layoutBodyPrivateMethods)
89
94
 
90
95
  const renderVN = () => {
91
- const { loading, padding, showBacktop } = props
96
+ const { loading, padding, showBacktop, useScrollbar } = props
92
97
  const backtopOpts = computeBacktopOpts.value
93
98
  const scrollbarOpts = computeScrollbarOpts.value
94
99
  const { native, xConfig, yConfig, className, viewAttrs, viewClassName, viewInnerClassName } = scrollbarOpts
@@ -119,20 +124,31 @@ export default defineVxeComponent({
119
124
  'is--padding': padding
120
125
  }]
121
126
  }, [
122
- h(VxeScrollbarComponent, {
123
- loading,
124
- native,
125
- xConfig,
126
- yConfig,
127
- className: 'vxe-layout-body--scrollbar' + (className ? (' ' + className) : ''),
128
- viewAttrs: {
129
- ...viewAttrs,
130
- id: showBacktop ? (backtopId || null) : null
131
- },
132
- viewClassName: 'vxe-layout-body--view' + (viewClassName ? (' ' + viewClassName) : ''),
133
- viewInnerClassName: 'vxe-layout-body--inner' + (viewInnerClassName ? (' ' + viewInnerClassName) : '')
134
- }, {
135
- default: () => defaultSlot ? defaultSlot({}) : []
127
+ useScrollbar
128
+ ? h(VxeScrollbarComponent, {
129
+ native,
130
+ xConfig,
131
+ yConfig,
132
+ className: 'vxe-layout-body--scrollbar' + (className ? (' ' + className) : ''),
133
+ viewAttrs: {
134
+ ...viewAttrs,
135
+ id: showBacktop ? (backtopId || null) : null
136
+ },
137
+ viewClassName: 'vxe-layout-body--scrollbar-view' + (viewClassName ? (' ' + viewClassName) : ''),
138
+ viewInnerClassName: 'vxe-layout-body--scrollbar-inner' + (viewInnerClassName ? (' ' + viewInnerClassName) : '')
139
+ }, {
140
+ default: () => defaultSlot ? defaultSlot({}) : []
141
+ })
142
+ : h('div', {
143
+ id: showBacktop ? backtopId : '',
144
+ class: 'vxe-layout-body--inner'
145
+ }, defaultSlot ? defaultSlot({}) : []),
146
+ /**
147
+ * 加载中
148
+ */
149
+ h(VxeLoadingComponent, {
150
+ class: 'vxe-layout-body-view--loading',
151
+ modelValue: loading
136
152
  }),
137
153
  /**
138
154
  * 回到顶部
@@ -9,7 +9,7 @@ import { createComponentLog } from '../../ui/src/log'
9
9
  import VxeLoadingComponent from '../../loading'
10
10
  import VxeScrollbarComponent from '../../scrollbar'
11
11
 
12
- import type { VxeMenuDefines, VxeMenuPropTypes, MenuInternalData, MenuReactData, VxeMenuEmits, MenuMethods, VxeComponentSlotType, MenuPrivateMethods, MenuPrivateRef, VxeMenuPrivateComputed, VxeMenuConstructor, VxeMenuPrivateMethods, ValueOf, VxeLayoutAsideConstructor, VxeLayoutAsidePrivateMethods } from '../../../types'
12
+ import type { VxeMenuDefines, VxeMenuPropTypes, MenuInternalData, MenuReactData, VxeMenuEmits, MenuMethods, VxeComponentSlotType, MenuPrivateMethods, MenuPrivateRef, VxeMenuPrivateComputed, VxeMenuConstructor, VxeMenuPrivateMethods, ValueOf, VxeLayoutAsideConstructor, VxeLayoutAsidePrivateMethods, VxeScrollbarInstance } from '../../../types'
13
13
 
14
14
  const { errLog } = createComponentLog('menu')
15
15
 
@@ -72,6 +72,10 @@ export default defineVxeComponent({
72
72
  default: () => getConfig().menu.size || getConfig().size
73
73
  },
74
74
  menuConfig: Object as PropType<VxeMenuPropTypes.MenuConfig>,
75
+ useScrollbar: {
76
+ type: Boolean as PropType<VxeMenuPropTypes.UseScrollbar>,
77
+ default: () => getConfig().menu.useScrollbar
78
+ },
75
79
  scrollbarConfig: Object as PropType<VxeMenuPropTypes.ScrollbarConfig>,
76
80
  appendTo: {
77
81
  type: [String, Function] as PropType<VxeMenuPropTypes.AppendTo>,
@@ -93,6 +97,8 @@ export default defineVxeComponent({
93
97
 
94
98
  const refElem = ref<HTMLDivElement>()
95
99
  const refCollapseElem = ref<HTMLDivElement>()
100
+ const refCollapseBodyElem = ref<HTMLDivElement>()
101
+ const refCollapseBodyScrollbar = ref<VxeScrollbarInstance>()
96
102
 
97
103
  const { computeSize } = useSize(props)
98
104
 
@@ -278,16 +284,21 @@ export default defineVxeComponent({
278
284
  const isCollapsed = computeIsCollapsed.value
279
285
  const el = refElem.value
280
286
  if (el) {
281
- const clientRect = el.getBoundingClientRect()
282
- const parentNode = el.parentNode as HTMLElement
283
- reactData.collapseStyle = isCollapsed
284
- ? {
285
- top: toCssUnit(clientRect.top),
286
- left: toCssUnit(clientRect.left),
287
- height: toCssUnit(parentNode.clientHeight),
288
- zIndex: reactData.collapseZindex
289
- }
290
- : {}
287
+ let clientRect = el.getBoundingClientRect()
288
+ const parentElement = el.parentElement
289
+ if (parentElement) {
290
+ if (clientRect.top < 0) {
291
+ clientRect = parentElement.getBoundingClientRect()
292
+ }
293
+ reactData.collapseStyle = isCollapsed
294
+ ? {
295
+ top: toCssUnit(clientRect.top),
296
+ left: toCssUnit(clientRect.left),
297
+ height: toCssUnit(parentElement.clientHeight),
298
+ zIndex: reactData.collapseZindex
299
+ }
300
+ : {}
301
+ }
291
302
  }
292
303
  })
293
304
  }
@@ -429,6 +440,14 @@ export default defineVxeComponent({
429
440
  }
430
441
 
431
442
  const handleMenuMouseleave = () => {
443
+ const $collapseBodyScrollbar = refCollapseBodyScrollbar.value
444
+ const collapseBodyEl = refCollapseBodyElem.value
445
+ if (collapseBodyEl) {
446
+ collapseBodyEl.scrollTop = 0
447
+ }
448
+ if ($collapseBodyScrollbar) {
449
+ $collapseBodyScrollbar.clearScroll()
450
+ }
432
451
  reactData.isEnterCollapse = false
433
452
  }
434
453
 
@@ -682,13 +701,14 @@ export default defineVxeComponent({
682
701
  }
683
702
 
684
703
  const renderVN = () => {
685
- const { loading, collapseFixed, appendTo } = props
704
+ const { loading, collapseFixed, appendTo, useScrollbar } = props
686
705
  const { initialized, menuList, collapseStyle, isEnterCollapse } = reactData
687
706
  const vSize = computeSize.value
688
707
  const isCollapsed = computeIsCollapsed.value
689
708
  const currBorder = computeCurrBorder.value
690
709
  const varStyle = computeVarStyle.value
691
710
  const scrollbarOpts = computeScrollbarOpts.value
711
+ const { viewClassName, viewInnerClassName } = scrollbarOpts
692
712
  const headerSlot = slots.header
693
713
  const footerSlot = slots.footer
694
714
  let ons: Record<string, any> = {}
@@ -742,12 +762,20 @@ export default defineVxeComponent({
742
762
  class: 'vxe-menu--header'
743
763
  }, headerSlot(stParams))
744
764
  : renderEmptyElement($xeMenu),
745
- h(VxeScrollbarComponent, {
746
- class: 'vxe-menu--body',
747
- ...scrollbarOpts
748
- }, {
749
- default: () => menuList.map(child => renderDefaultChildren(child, menuList))
750
- }),
765
+ useScrollbar && isEnterCollapse
766
+ ? h(VxeScrollbarComponent, {
767
+ ref: refCollapseBodyScrollbar,
768
+ class: 'vxe-menu--scrollbar-body',
769
+ ...scrollbarOpts,
770
+ viewClassName: 'vxe-menu--scrollbar-body-view' + (viewClassName ? (' ' + viewClassName) : ''),
771
+ viewInnerClassName: 'vxe-menu--scrollbar-body-inner' + (viewClassName ? (' ' + viewInnerClassName) : '')
772
+ }, {
773
+ default: () => menuList.map(child => renderDefaultChildren(child, menuList))
774
+ })
775
+ : h('div', {
776
+ ref: refCollapseBodyElem,
777
+ class: 'vxe-menu--body'
778
+ }, menuList.map(child => renderDefaultChildren(child, menuList))),
751
779
  footerSlot
752
780
  ? h('div', {
753
781
  class: 'vxe-menu--footer'
@@ -204,6 +204,39 @@ export default defineVxeComponent({
204
204
  viewEl.scrollIntoView()
205
205
  }
206
206
  },
207
+ setScrollTop (top) {
208
+ const viewEl = refViewElem.value
209
+ if (viewEl) {
210
+ viewEl.scrollTop = top
211
+ }
212
+ },
213
+ setScrollLeft (left) {
214
+ const viewEl = refViewElem.value
215
+ if (viewEl) {
216
+ viewEl.scrollLeft = left
217
+ }
218
+ },
219
+ getScrollTop () {
220
+ const viewEl = refViewElem.value
221
+ if (viewEl) {
222
+ return viewEl.scrollTop
223
+ }
224
+ return 0
225
+ },
226
+ getScrollLeft () {
227
+ const viewEl = refViewElem.value
228
+ if (viewEl) {
229
+ return viewEl.scrollLeft
230
+ }
231
+ return 0
232
+ },
233
+ clearScroll () {
234
+ const viewEl = refViewElem.value
235
+ if (viewEl) {
236
+ viewEl.scrollTop = 0
237
+ viewEl.scrollLeft = 0
238
+ }
239
+ },
207
240
  recalculate () {
208
241
  updateThumbSize()
209
242
  updateThumbOffset()
@@ -15,6 +15,13 @@
15
15
  padding: var(--vxe-ui-layout-padding-default);
16
16
  }
17
17
  }
18
+
19
+ .vxe-layout-aside--inner {
20
+ flex-grow: 1;
21
+ overflow-y: auto;
22
+ overflow-x: hidden;
23
+ outline: 0;
24
+ }
18
25
  .vxe-layout-aside--scrollbar {
19
26
  flex-grow: 1;
20
27
  overflow: hidden;
@@ -8,6 +8,10 @@
8
8
  padding: var(--vxe-ui-layout-padding-double);
9
9
  }
10
10
  }
11
+ .vxe-layout-body--inner {
12
+ flex-grow: 1;
13
+ overflow: auto;
14
+ }
11
15
  .vxe-layout-body--scrollbar {
12
16
  flex-grow: 1;
13
17
  overflow: hidden;
@@ -113,19 +113,34 @@
113
113
  .vxe-menu--item-link-collapse {
114
114
  display: none;
115
115
  }
116
+ .vxe-menu--scrollbar-body {
117
+ .vxe-scrollbar--track-x,
118
+ .vxe-scrollbar--track-y {
119
+ display: none;
120
+ }
121
+ }
122
+ & > .vxe-menu--body {
123
+ overflow: hidden;
124
+ }
116
125
  }
117
126
  &.is--enter {
118
127
  width: var(--vxe-ui-layout-aside-default-width);
119
128
  box-shadow: var(--vxe-ui-menu-collapse-wrapper-box-shadow);
129
+ & > .vxe-menu--body {
130
+ overflow: auto;
131
+ }
120
132
  }
121
133
  & > .vxe-menu--header,
122
134
  & > .vxe-menu--footer {
123
135
  flex-shrink: 0;
124
136
  }
125
- & > .vxe-menu--body {
126
- flex-grow: 1;
137
+ & > .vxe-menu--scrollbar-body {
127
138
  overflow: hidden;
128
139
  }
140
+ & > .vxe-menu--body,
141
+ & > .vxe-menu--scrollbar-body {
142
+ flex-grow: 1;
143
+ }
129
144
  }
130
145
 
131
146
  .vxe-menu--item-link {
@@ -36,6 +36,7 @@ export namespace VxeLayoutAsidePropTypes {
36
36
  */
37
37
  animation?: boolean
38
38
  }
39
+ export type UseScrollbar = boolean
39
40
  export interface ScrollbarConfig extends Pick<VxeScrollbarProps, 'native' | 'yConfig' | 'className' | 'viewAttrs' | 'viewClassName' | 'viewInnerClassName'> {}
40
41
  }
41
42
 
@@ -47,6 +48,7 @@ export interface VxeLayoutAsideProps {
47
48
  padding?: VxeLayoutAsidePropTypes.Padding
48
49
  size?: VxeLayoutAsidePropTypes.Size
49
50
  collapseConfig?: VxeLayoutAsidePropTypes.CollapseConfig
51
+ useScrollbar?: VxeLayoutAsidePropTypes.UseScrollbar
50
52
  scrollbarConfig?: VxeLayoutAsidePropTypes.ScrollbarConfig
51
53
  }
52
54
  export interface LayoutAsidePrivateComputed {
@@ -31,6 +31,7 @@ export namespace VxeLayoutBodyPropTypes {
31
31
  export type Padding = boolean
32
32
  export type ShowBacktop = boolean
33
33
  export interface BacktopConfig extends Omit<VxeBacktopProps, 'target'> {}
34
+ export type UseScrollbar = boolean
34
35
  export interface ScrollbarConfig extends Pick<VxeScrollbarProps, 'native' | 'xConfig' | 'yConfig' | 'className' | 'viewAttrs' | 'viewClassName' | 'viewInnerClassName'> {}
35
36
  }
36
37
  export interface VxeLayoutBodyProps {
@@ -39,6 +40,7 @@ export interface VxeLayoutBodyProps {
39
40
  padding?: VxeLayoutBodyPropTypes.Padding
40
41
  showBacktop?: VxeLayoutBodyPropTypes.ShowBacktop
41
42
  backtopConfig?: VxeLayoutBodyPropTypes.BacktopConfig
43
+ useScrollbar?: VxeLayoutBodyPropTypes.UseScrollbar
42
44
  scrollbarConfig?: VxeLayoutBodyPropTypes.ScrollbarConfig
43
45
  }
44
46
 
@@ -86,6 +86,7 @@ export namespace VxeMenuPropTypes {
86
86
  }): boolean
87
87
  }
88
88
  export type AppendTo = string | HTMLElement | ((params: {}) => string | HTMLElement)
89
+ export type UseScrollbar = boolean
89
90
  export interface ScrollbarConfig extends VxeScrollbarProps {}
90
91
  }
91
92
 
@@ -108,6 +109,7 @@ export interface VxeMenuProps {
108
109
  expandKeys?: VxeMenuPropTypes.ExpandKeys
109
110
  options?: VxeMenuPropTypes.Options
110
111
  menuConfig?: VxeMenuPropTypes.MenuConfig
112
+ useScrollbar?: VxeMenuPropTypes.UseScrollbar
111
113
  scrollbarConfig?: VxeMenuPropTypes.ScrollbarConfig
112
114
  /**
113
115
  * 挂载到指定元素下