vxe-pc-ui 4.16.6 → 4.16.8

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 (64) hide show
  1. package/dist/all.esm.js +236 -132
  2. package/dist/style.css +1 -1
  3. package/dist/style.min.css +1 -1
  4. package/es/cascader/src/cascader.js +66 -26
  5. package/es/cascader/style.css +9 -9
  6. package/es/cascader/style.min.css +1 -1
  7. package/es/date-range-picker/src/date-range-picker.js +25 -9
  8. package/es/icon/style.css +1 -1
  9. package/es/menu/src/menu.js +65 -17
  10. package/es/menu/style.css +15 -8
  11. package/es/menu/style.min.css +1 -1
  12. package/es/style.css +1 -1
  13. package/es/style.min.css +1 -1
  14. package/es/ui/index.js +3 -3
  15. package/es/ui/src/log.js +1 -1
  16. package/es/vxe-cascader/style.css +9 -9
  17. package/es/vxe-cascader/style.min.css +1 -1
  18. package/es/vxe-menu/style.css +15 -8
  19. package/es/vxe-menu/style.min.css +1 -1
  20. package/lib/cascader/src/cascader.js +73 -27
  21. package/lib/cascader/src/cascader.min.js +1 -1
  22. package/lib/cascader/style/style.css +9 -9
  23. package/lib/cascader/style/style.min.css +1 -1
  24. package/lib/date-range-picker/src/date-range-picker.js +27 -9
  25. package/lib/date-range-picker/src/date-range-picker.min.js +1 -1
  26. package/lib/icon/style/style.css +1 -1
  27. package/lib/icon/style/style.min.css +1 -1
  28. package/lib/index.umd.js +171 -53
  29. package/lib/index.umd.min.js +1 -1
  30. package/lib/menu/src/menu.js +66 -13
  31. package/lib/menu/src/menu.min.js +1 -1
  32. package/lib/menu/style/style.css +15 -8
  33. package/lib/menu/style/style.min.css +1 -1
  34. package/lib/style.css +1 -1
  35. package/lib/style.min.css +1 -1
  36. package/lib/ui/index.js +3 -3
  37. package/lib/ui/index.min.js +1 -1
  38. package/lib/ui/src/log.js +1 -1
  39. package/lib/ui/src/log.min.js +1 -1
  40. package/lib/vxe-cascader/style/style.css +9 -9
  41. package/lib/vxe-cascader/style/style.min.css +1 -1
  42. package/lib/vxe-menu/style/style.css +15 -8
  43. package/lib/vxe-menu/style/style.min.css +1 -1
  44. package/package.json +1 -1
  45. package/packages/cascader/src/cascader.ts +66 -25
  46. package/packages/date-range-picker/src/date-range-picker.ts +23 -9
  47. package/packages/menu/src/menu.ts +71 -17
  48. package/packages/ui/index.ts +2 -2
  49. package/styles/components/cascader.scss +9 -9
  50. package/styles/components/menu.scss +9 -5
  51. package/types/components/cascader.d.ts +1 -0
  52. package/types/components/menu.d.ts +6 -0
  53. /package/es/icon/{iconfont.1783838735018.ttf → iconfont.1783923662673.ttf} +0 -0
  54. /package/es/icon/{iconfont.1783838735018.woff → iconfont.1783923662673.woff} +0 -0
  55. /package/es/icon/{iconfont.1783838735018.woff2 → iconfont.1783923662673.woff2} +0 -0
  56. /package/es/{iconfont.1783838735018.ttf → iconfont.1783923662673.ttf} +0 -0
  57. /package/es/{iconfont.1783838735018.woff → iconfont.1783923662673.woff} +0 -0
  58. /package/es/{iconfont.1783838735018.woff2 → iconfont.1783923662673.woff2} +0 -0
  59. /package/lib/icon/style/{iconfont.1783838735018.ttf → iconfont.1783923662673.ttf} +0 -0
  60. /package/lib/icon/style/{iconfont.1783838735018.woff → iconfont.1783923662673.woff} +0 -0
  61. /package/lib/icon/style/{iconfont.1783838735018.woff2 → iconfont.1783923662673.woff2} +0 -0
  62. /package/lib/{iconfont.1783838735018.ttf → iconfont.1783923662673.ttf} +0 -0
  63. /package/lib/{iconfont.1783838735018.woff → iconfont.1783923662673.woff} +0 -0
  64. /package/lib/{iconfont.1783838735018.woff2 → iconfont.1783923662673.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.16.6";
29
+ const version = exports.version = "4.16.8";
30
30
  _core.VxeUI.uiVersion = version;
31
31
  _core.VxeUI.dynamicApp = _dynamics.dynamicApp;
32
32
  function config(options) {
@@ -522,8 +522,8 @@ const iconPrefix = 'vxe-icon-';
522
522
  BUTTON_LOADING: iconPrefix + 'spinner roll',
523
523
  BUTTON_TOOLTIP_ICON: iconPrefix + 'question-circle-fill',
524
524
  // menu
525
- MENU_ITEM_EXPAND_OPEN: iconPrefix + 'arrow-down rotate180',
526
- MENU_ITEM_EXPAND_CLOSE: iconPrefix + 'arrow-down',
525
+ MENU_ITEM_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
526
+ MENU_ITEM_EXPAND_CLOSE: iconPrefix + 'arrow-right',
527
527
  // select
528
528
  SELECT_LOADED: iconPrefix + 'spinner roll',
529
529
  SELECT_OPEN: iconPrefix + 'caret-down rotate180',
@@ -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.16.6";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},drawer:{position:"right",showHeader:!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:{},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,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,controlConfig:{enabled:!0,layout:"right",showButton:!0,isWheel:!0,isArrow:!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:{},segmented:{},select:{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}},splitterPanel:{},slider:{max:100,min:0},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},transfer:{},tree:{indent:20,minHeight:60,showOverflow:!0,radioConfig:{strict:!0},tooltipConfig:{mode:"tooltip",enterable:!0,leaveDelay:300,defaultPlacement:"top"},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:iconPrefix+"arrow-down",BUTTON_LOADING:iconPrefix+"spinner roll",BUTTON_TOOLTIP_ICON:iconPrefix+"question-circle-fill",MENU_ITEM_EXPAND_OPEN:iconPrefix+"arrow-down rotate180",MENU_ITEM_EXPAND_CLOSE:iconPrefix+"arrow-down",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",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.16.8";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},drawer:{position:"right",showHeader:!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:{},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,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,controlConfig:{enabled:!0,layout:"right",showButton:!0,isWheel:!0,isArrow:!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:{},segmented:{},select:{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}},splitterPanel:{},slider:{max:100,min:0},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},transfer:{},tree:{indent:20,minHeight:60,showOverflow:!0,radioConfig:{strict:!0},tooltipConfig:{mode:"tooltip",enterable:!0,leaveDelay:300,defaultPlacement:"top"},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: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",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.16.6"}`;
12
+ const uiVersion = `ui v${"4.16.8"}`;
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.16.6";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].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.16.8";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].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,22 +1,22 @@
1
1
  .vxe-cascader,
2
2
  .vxe-cascader--panel {
3
3
  --vxe-ui-cascader-current-font-size: var(--vxe-ui-font-size-default);
4
- --vxe-ui-cascader-current-font-size: var(--vxe-ui-layout-padding-default);
4
+ --vxe-ui-cascader-current-padding: var(--vxe-ui-layout-padding-default);
5
5
  }
6
6
  .vxe-cascader.size--medium,
7
7
  .vxe-cascader--panel.size--medium {
8
8
  --vxe-ui-cascader-current-font-size: var(--vxe-ui-font-size-medium);
9
- --vxe-ui-cascader-current-font-size: var(--vxe-ui-layout-padding-medium);
9
+ --vxe-ui-cascader-current-padding: var(--vxe-ui-layout-padding-medium);
10
10
  }
11
11
  .vxe-cascader.size--small,
12
12
  .vxe-cascader--panel.size--small {
13
13
  --vxe-ui-cascader-current-font-size: var(--vxe-ui-font-size-small);
14
- --vxe-ui-cascader-current-font-size: var(--vxe-ui-layout-padding-small);
14
+ --vxe-ui-cascader-current-padding: var(--vxe-ui-layout-padding-small);
15
15
  }
16
16
  .vxe-cascader.size--mini,
17
17
  .vxe-cascader--panel.size--mini {
18
18
  --vxe-ui-cascader-current-font-size: var(--vxe-ui-font-size-mini);
19
- --vxe-ui-cascader-current-font-size: var(--vxe-ui-layout-padding-mini);
19
+ --vxe-ui-cascader-current-padding: var(--vxe-ui-layout-padding-mini);
20
20
  }
21
21
 
22
22
  .vxe-cascader {
@@ -108,8 +108,8 @@
108
108
 
109
109
  .vxe-cascader--panel-search {
110
110
  display: block;
111
- padding: var(--vxe-ui-cascader-current-font-size);
112
- width: calc(var(--vxe-ui-cascader-node-width) * var(--vxe-ui-cascader-chunk-size));
111
+ padding: var(--vxe-ui-cascader-current-padding);
112
+ width: 100%;
113
113
  }
114
114
  .vxe-cascader--panel-search .vxe-cascader-search--input {
115
115
  width: 100%;
@@ -125,7 +125,7 @@
125
125
  }
126
126
 
127
127
  .vxe-cascader--total-btns {
128
- padding-left: var(--vxe-ui-cascader-current-font-size);
128
+ padding-left: var(--vxe-ui-cascader-current-padding);
129
129
  flex-grow: 1;
130
130
  }
131
131
 
@@ -272,7 +272,7 @@
272
272
  .vxe-cascader-chunk--item-wrapper {
273
273
  flex-shrink: 0;
274
274
  border-left: 1px solid var(--vxe-ui-base-popup-border-color);
275
- padding: var(--vxe-ui-cascader-current-font-size) 0;
275
+ padding: var(--vxe-ui-cascader-current-padding) 0;
276
276
  }
277
277
  .vxe-cascader-chunk--item-wrapper:first-child {
278
278
  border-left: 0;
@@ -295,7 +295,7 @@
295
295
  flex-direction: row;
296
296
  height: var(--vxe-ui-cascader-node-height);
297
297
  line-height: var(--vxe-ui-cascader-node-height);
298
- padding: 0 calc(var(--vxe-ui-cascader-current-font-size) + 18px) 0 var(--vxe-ui-cascader-current-font-size);
298
+ padding: 0 calc(var(--vxe-ui-cascader-current-padding) + 18px) 0 var(--vxe-ui-cascader-current-padding);
299
299
  cursor: pointer;
300
300
  }
301
301
  .vxe-cascader-chunk--node-item:hover {
@@ -1 +1 @@
1
- .vxe-cascader,.vxe-cascader--panel{--vxe-ui-cascader-current-font-size:var(--vxe-ui-font-size-default);--vxe-ui-cascader-current-font-size:var(--vxe-ui-layout-padding-default)}.vxe-cascader--panel.size--medium,.vxe-cascader.size--medium{--vxe-ui-cascader-current-font-size:var(--vxe-ui-font-size-medium);--vxe-ui-cascader-current-font-size:var(--vxe-ui-layout-padding-medium)}.vxe-cascader--panel.size--small,.vxe-cascader.size--small{--vxe-ui-cascader-current-font-size:var(--vxe-ui-font-size-small);--vxe-ui-cascader-current-font-size:var(--vxe-ui-layout-padding-small)}.vxe-cascader--panel.size--mini,.vxe-cascader.size--mini{--vxe-ui-cascader-current-font-size:var(--vxe-ui-font-size-mini);--vxe-ui-cascader-current-font-size:var(--vxe-ui-layout-padding-mini)}.vxe-cascader{position:relative;display:inline-block;width:180px;font-size:var(--vxe-ui-cascader-current-font-size);color:var(--vxe-ui-font-color);text-align:left;--vxe-ui-cascader-chunk-size:1}.vxe-cascader>.vxe-input .vxe-input--inner{cursor:pointer}.vxe-cascader.is--filterable .vxe-cascader-chunk--wrapper{padding-top:0}.vxe-cascader.is--filterable .vxe-cascader--panel-header{border-top:1px solid var(--vxe-ui-base-popup-border-color)}.vxe-cascader.is--disabled>.vxe-input .vxe-input--inner{cursor:no-drop}.vxe-cascader.is--loading>.vxe-input .vxe-input--inner{cursor:progress}.vxe-cascader>.vxe-input{width:100%}.vxe-cascader>.vxe-input .vxe-input--suffix-icon>i{display:inline-block;transition:transform .2s ease-in-out}.vxe-cascader.is--active:not(.is--filter)>.vxe-input{border-color:var(--vxe-ui-font-primary-color)}.vxe-cascader--readonly{color:var(--vxe-ui-font-color);display:inline-flex}.vxe-cascader--panel{font-size:var(--vxe-ui-cascader-current-font-size);pointer-events:none;display:none;position:absolute;left:0;padding:4px 0;color:var(--vxe-ui-font-color);text-align:left}.vxe-cascader--panel:not(.is--transfer){min-width:var(--vxe-ui-cascader-node-width)}.vxe-cascader--panel.is--transfer{position:fixed}.vxe-cascader--panel.ani--leave{display:block;opacity:0;transform:scaleY(.5);transition:transform .3s cubic-bezier(.23,1,.32,1),opacity .3s cubic-bezier(.23,1,.32,1);transform-origin:center top;backface-visibility:hidden}.vxe-cascader--panel.ani--leave[placement=top]{transform-origin:center bottom}.vxe-cascader--panel.ani--enter{opacity:1;transform:scaleY(1)}.vxe-cascader--panel.ani--enter>div::after{display:none}.vxe-cascader--panel>div::after{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:1;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-cascader--panel-search{display:block;padding:var(--vxe-ui-cascader-current-font-size);width:calc(var(--vxe-ui-cascader-node-width) * var(--vxe-ui-cascader-chunk-size))}.vxe-cascader--panel-search .vxe-cascader-search--input{width:100%}.vxe-cascader--footer-button,.vxe-cascader--header-button{display:flex;flex-direction:row;white-space:nowrap;align-items:center;min-height:2em}.vxe-cascader--total-btns{padding-left:var(--vxe-ui-cascader-current-font-size);flex-grow:1}.vxe-cascader--oper-btns,.vxe-cascader--total-btns{display:flex;flex-direction:row;align-items:center}.vxe-cascader--oper-btns{flex-shrink:0}.vxe-cascader--expand-btns,.vxe-cascader--footer-button,.vxe-cascader--selected-btns{display:flex;flex-direction:row;flex-grow:1}.vxe-cascader--selected-btns+.vxe-cascader--expand-btns{padding-left:2.2em}.vxe-cascader--panel-wrapper{display:flex;flex-direction:column;position:relative;border-radius:var(--vxe-ui-base-border-radius);border:1px solid var(--vxe-ui-base-popup-border-color);box-shadow:var(--vxe-ui-base-popup-box-shadow);background-color:var(--vxe-ui-layout-background-color);pointer-events:auto}.vxe-cascader--panel-header{border-bottom:1px solid var(--vxe-ui-base-popup-border-color)}.vxe-cascader--panel-footer{border-top:1px solid var(--vxe-ui-base-popup-border-color)}.vxe-cascader--panel-footer,.vxe-cascader--panel-header{padding:4px 0}.vxe-cascader--checkbox-option{padding-right:.4em}.vxe-cascader--checkbox-option{cursor:pointer}.vxe-cascader--checkbox-option .vxe-checkbox--icon{font-size:1.22em}.vxe-cascader--checkbox-option .vxe-checkbox--icon{color:var(--vxe-ui-input-border-color);vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-cascader--checkbox-option.is--checked,.vxe-cascader--checkbox-option.is--indeterminate{color:var(--vxe-ui-font-primary-color)}.vxe-cascader--checkbox-option.is--checked .vxe-checkbox--icon,.vxe-cascader--checkbox-option.is--indeterminate .vxe-checkbox--icon{color:var(--vxe-ui-font-primary-color)}.vxe-cascader--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon{color:var(--vxe-ui-font-primary-color)}.vxe-cascader--checkbox-option.is--hidden{cursor:default}.vxe-cascader--checkbox-option.is--readonly{cursor:auto}.vxe-cascader--checkbox-option.is--disabled{color:var(--vxe-ui-font-disabled-color);cursor:not-allowed}.vxe-cascader--checkbox-option.is--disabled .vxe-checkbox--icon{color:var(--vxe-ui-input-disabled-color)}.vxe-cascader--checkbox-option .vxe-checkbox--label{padding-left:.4em;vertical-align:middle}.vxe-cascader--radio-option{padding-right:.4em}.vxe-cascader--radio-option{cursor:pointer}.vxe-cascader--radio-option .vxe-radio--icon{font-size:1.26em}.vxe-cascader--radio-option .vxe-radio--icon{color:var(--vxe-ui-input-border-color);border-radius:50%;vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-cascader--radio-option.is--checked{color:var(--vxe-ui-font-primary-color)}.vxe-cascader--radio-option.is--checked .vxe-radio--icon{color:var(--vxe-ui-font-primary-color)}.vxe-cascader--radio-option:not(.is--disabled):hover .vxe-radio--icon{color:var(--vxe-ui-font-primary-color)}.vxe-cascader--radio-option.is--readonly{cursor:auto}.vxe-cascader--radio-option.is--disabled{color:var(--vxe-ui-font-disabled-color);cursor:not-allowed}.vxe-cascader--radio-option.is--disabled .vxe-radio--icon{color:var(--vxe-ui-input-disabled-color)}.vxe-cascader--radio-option .vxe-radio--label{padding-left:.4em;vertical-align:middle}.vxe-cascader-chunk--wrapper{position:relative;display:flex;flex-direction:row;outline:0}.vxe-cascader-chunk--item-wrapper{flex-shrink:0;border-left:1px solid var(--vxe-ui-base-popup-border-color);padding:var(--vxe-ui-cascader-current-font-size) 0}.vxe-cascader-chunk--item-wrapper:first-child{border-left:0}.vxe-cascader-chunk--item-wrapper .vxe-list .vxe-list--virtual-wrapper{height:var(--vxe-ui-cascader-chunk-height);width:var(--vxe-ui-cascader-node-width);overflow-x:hidden;overflow-y:hidden}.vxe-cascader-chunk--item-wrapper .vxe-list .vxe-list--virtual-wrapper:hover{overflow-y:auto}.vxe-cascader-chunk--item-wrapper .vxe-list .vxe-list--body{width:var(--vxe-ui-cascader-node-width)}.vxe-cascader-chunk--node-item{display:flex;flex-direction:row;height:var(--vxe-ui-cascader-node-height);line-height:var(--vxe-ui-cascader-node-height);padding:0 calc(var(--vxe-ui-cascader-current-font-size) + 18px) 0 var(--vxe-ui-cascader-current-font-size);cursor:pointer}.vxe-cascader-chunk--node-item:hover{background-color:var(--vxe-ui-cascader-node-hover-background-color)}.vxe-cascader-chunk--node-item.is--current,.vxe-cascader-chunk--node-item.is--expand{font-weight:700}.vxe-cascader-chunk--node-item.is--current{background-color:var(--vxe-ui-cascader-node-current-background-color)}.vxe-cascader-chunk--node-item.is-checkbox--indeterminate{color:var(--vxe-ui-cascader-node-checkbox-indeterminate-color)}.vxe-cascader-chunk--node-item.is-checkbox--checked,.vxe-cascader-chunk--node-item.is-radio--checked{color:var(--vxe-ui-cascader-node-checkbox-checked-color)}.vxe-cascader-chunk--node-item-inner{display:flex;flex-direction:row;overflow:hidden;flex-grow:1}.vxe-cascader-chunk--node-item-title{flex-grow:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-cascader-chunk--node-item-switcher{-webkit-user-select:none;-moz-user-select:none;user-select:none;flex-shrink:0;width:1em;position:relative}.vxe-cascader-chunk--node-item-switcher .vxe-cascader--node-item-icon>i{display:inline-block;transition:transform .2s ease-in-out}
1
+ .vxe-cascader,.vxe-cascader--panel{--vxe-ui-cascader-current-font-size:var(--vxe-ui-font-size-default);--vxe-ui-cascader-current-padding:var(--vxe-ui-layout-padding-default)}.vxe-cascader--panel.size--medium,.vxe-cascader.size--medium{--vxe-ui-cascader-current-font-size:var(--vxe-ui-font-size-medium);--vxe-ui-cascader-current-padding:var(--vxe-ui-layout-padding-medium)}.vxe-cascader--panel.size--small,.vxe-cascader.size--small{--vxe-ui-cascader-current-font-size:var(--vxe-ui-font-size-small);--vxe-ui-cascader-current-padding:var(--vxe-ui-layout-padding-small)}.vxe-cascader--panel.size--mini,.vxe-cascader.size--mini{--vxe-ui-cascader-current-font-size:var(--vxe-ui-font-size-mini);--vxe-ui-cascader-current-padding:var(--vxe-ui-layout-padding-mini)}.vxe-cascader{position:relative;display:inline-block;width:180px;font-size:var(--vxe-ui-cascader-current-font-size);color:var(--vxe-ui-font-color);text-align:left;--vxe-ui-cascader-chunk-size:1}.vxe-cascader>.vxe-input .vxe-input--inner{cursor:pointer}.vxe-cascader.is--filterable .vxe-cascader-chunk--wrapper{padding-top:0}.vxe-cascader.is--filterable .vxe-cascader--panel-header{border-top:1px solid var(--vxe-ui-base-popup-border-color)}.vxe-cascader.is--disabled>.vxe-input .vxe-input--inner{cursor:no-drop}.vxe-cascader.is--loading>.vxe-input .vxe-input--inner{cursor:progress}.vxe-cascader>.vxe-input{width:100%}.vxe-cascader>.vxe-input .vxe-input--suffix-icon>i{display:inline-block;transition:transform .2s ease-in-out}.vxe-cascader.is--active:not(.is--filter)>.vxe-input{border-color:var(--vxe-ui-font-primary-color)}.vxe-cascader--readonly{color:var(--vxe-ui-font-color);display:inline-flex}.vxe-cascader--panel{font-size:var(--vxe-ui-cascader-current-font-size);pointer-events:none;display:none;position:absolute;left:0;padding:4px 0;color:var(--vxe-ui-font-color);text-align:left}.vxe-cascader--panel:not(.is--transfer){min-width:var(--vxe-ui-cascader-node-width)}.vxe-cascader--panel.is--transfer{position:fixed}.vxe-cascader--panel.ani--leave{display:block;opacity:0;transform:scaleY(.5);transition:transform .3s cubic-bezier(.23,1,.32,1),opacity .3s cubic-bezier(.23,1,.32,1);transform-origin:center top;backface-visibility:hidden}.vxe-cascader--panel.ani--leave[placement=top]{transform-origin:center bottom}.vxe-cascader--panel.ani--enter{opacity:1;transform:scaleY(1)}.vxe-cascader--panel.ani--enter>div::after{display:none}.vxe-cascader--panel>div::after{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:1;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-cascader--panel-search{display:block;padding:var(--vxe-ui-cascader-current-padding);width:100%}.vxe-cascader--panel-search .vxe-cascader-search--input{width:100%}.vxe-cascader--footer-button,.vxe-cascader--header-button{display:flex;flex-direction:row;white-space:nowrap;align-items:center;min-height:2em}.vxe-cascader--total-btns{padding-left:var(--vxe-ui-cascader-current-padding);flex-grow:1}.vxe-cascader--oper-btns,.vxe-cascader--total-btns{display:flex;flex-direction:row;align-items:center}.vxe-cascader--oper-btns{flex-shrink:0}.vxe-cascader--expand-btns,.vxe-cascader--footer-button,.vxe-cascader--selected-btns{display:flex;flex-direction:row;flex-grow:1}.vxe-cascader--selected-btns+.vxe-cascader--expand-btns{padding-left:2.2em}.vxe-cascader--panel-wrapper{display:flex;flex-direction:column;position:relative;border-radius:var(--vxe-ui-base-border-radius);border:1px solid var(--vxe-ui-base-popup-border-color);box-shadow:var(--vxe-ui-base-popup-box-shadow);background-color:var(--vxe-ui-layout-background-color);pointer-events:auto}.vxe-cascader--panel-header{border-bottom:1px solid var(--vxe-ui-base-popup-border-color)}.vxe-cascader--panel-footer{border-top:1px solid var(--vxe-ui-base-popup-border-color)}.vxe-cascader--panel-footer,.vxe-cascader--panel-header{padding:4px 0}.vxe-cascader--checkbox-option{padding-right:.4em}.vxe-cascader--checkbox-option{cursor:pointer}.vxe-cascader--checkbox-option .vxe-checkbox--icon{font-size:1.22em}.vxe-cascader--checkbox-option .vxe-checkbox--icon{color:var(--vxe-ui-input-border-color);vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-cascader--checkbox-option.is--checked,.vxe-cascader--checkbox-option.is--indeterminate{color:var(--vxe-ui-font-primary-color)}.vxe-cascader--checkbox-option.is--checked .vxe-checkbox--icon,.vxe-cascader--checkbox-option.is--indeterminate .vxe-checkbox--icon{color:var(--vxe-ui-font-primary-color)}.vxe-cascader--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon{color:var(--vxe-ui-font-primary-color)}.vxe-cascader--checkbox-option.is--hidden{cursor:default}.vxe-cascader--checkbox-option.is--readonly{cursor:auto}.vxe-cascader--checkbox-option.is--disabled{color:var(--vxe-ui-font-disabled-color);cursor:not-allowed}.vxe-cascader--checkbox-option.is--disabled .vxe-checkbox--icon{color:var(--vxe-ui-input-disabled-color)}.vxe-cascader--checkbox-option .vxe-checkbox--label{padding-left:.4em;vertical-align:middle}.vxe-cascader--radio-option{padding-right:.4em}.vxe-cascader--radio-option{cursor:pointer}.vxe-cascader--radio-option .vxe-radio--icon{font-size:1.26em}.vxe-cascader--radio-option .vxe-radio--icon{color:var(--vxe-ui-input-border-color);border-radius:50%;vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-cascader--radio-option.is--checked{color:var(--vxe-ui-font-primary-color)}.vxe-cascader--radio-option.is--checked .vxe-radio--icon{color:var(--vxe-ui-font-primary-color)}.vxe-cascader--radio-option:not(.is--disabled):hover .vxe-radio--icon{color:var(--vxe-ui-font-primary-color)}.vxe-cascader--radio-option.is--readonly{cursor:auto}.vxe-cascader--radio-option.is--disabled{color:var(--vxe-ui-font-disabled-color);cursor:not-allowed}.vxe-cascader--radio-option.is--disabled .vxe-radio--icon{color:var(--vxe-ui-input-disabled-color)}.vxe-cascader--radio-option .vxe-radio--label{padding-left:.4em;vertical-align:middle}.vxe-cascader-chunk--wrapper{position:relative;display:flex;flex-direction:row;outline:0}.vxe-cascader-chunk--item-wrapper{flex-shrink:0;border-left:1px solid var(--vxe-ui-base-popup-border-color);padding:var(--vxe-ui-cascader-current-padding) 0}.vxe-cascader-chunk--item-wrapper:first-child{border-left:0}.vxe-cascader-chunk--item-wrapper .vxe-list .vxe-list--virtual-wrapper{height:var(--vxe-ui-cascader-chunk-height);width:var(--vxe-ui-cascader-node-width);overflow-x:hidden;overflow-y:hidden}.vxe-cascader-chunk--item-wrapper .vxe-list .vxe-list--virtual-wrapper:hover{overflow-y:auto}.vxe-cascader-chunk--item-wrapper .vxe-list .vxe-list--body{width:var(--vxe-ui-cascader-node-width)}.vxe-cascader-chunk--node-item{display:flex;flex-direction:row;height:var(--vxe-ui-cascader-node-height);line-height:var(--vxe-ui-cascader-node-height);padding:0 calc(var(--vxe-ui-cascader-current-padding) + 18px) 0 var(--vxe-ui-cascader-current-padding);cursor:pointer}.vxe-cascader-chunk--node-item:hover{background-color:var(--vxe-ui-cascader-node-hover-background-color)}.vxe-cascader-chunk--node-item.is--current,.vxe-cascader-chunk--node-item.is--expand{font-weight:700}.vxe-cascader-chunk--node-item.is--current{background-color:var(--vxe-ui-cascader-node-current-background-color)}.vxe-cascader-chunk--node-item.is-checkbox--indeterminate{color:var(--vxe-ui-cascader-node-checkbox-indeterminate-color)}.vxe-cascader-chunk--node-item.is-checkbox--checked,.vxe-cascader-chunk--node-item.is-radio--checked{color:var(--vxe-ui-cascader-node-checkbox-checked-color)}.vxe-cascader-chunk--node-item-inner{display:flex;flex-direction:row;overflow:hidden;flex-grow:1}.vxe-cascader-chunk--node-item-title{flex-grow:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-cascader-chunk--node-item-switcher{-webkit-user-select:none;-moz-user-select:none;user-select:none;flex-shrink:0;width:1em;position:relative}.vxe-cascader-chunk--node-item-switcher .vxe-cascader--node-item-icon>i{display:inline-block;transition:transform .2s ease-in-out}
@@ -1,16 +1,20 @@
1
- .vxe-menu {
1
+ .vxe-menu,
2
+ .vxe-menu--collapse-wrapper {
2
3
  --vxe-ui-menu-current-font-size: var(--vxe-ui-font-size-default);
3
4
  --vxe-ui-menu-current-item-height: var(--vxe-ui-menu-item-height-default);
4
5
  }
5
- .vxe-menu.size--medium {
6
+ .vxe-menu.size--medium,
7
+ .vxe-menu--collapse-wrapper.size--medium {
6
8
  --vxe-ui-menu-current-font-size: var(--vxe-ui-font-size-medium);
7
9
  --vxe-ui-menu-current-item-height: var(--vxe-ui-menu-item-height-medium);
8
10
  }
9
- .vxe-menu.size--small {
11
+ .vxe-menu.size--small,
12
+ .vxe-menu--collapse-wrapper.size--small {
10
13
  --vxe-ui-menu-current-font-size: var(--vxe-ui-font-size-small);
11
14
  --vxe-ui-menu-current-item-height: var(--vxe-ui-menu-item-height-small);
12
15
  }
13
- .vxe-menu.size--mini {
16
+ .vxe-menu.size--mini,
17
+ .vxe-menu--collapse-wrapper.size--mini {
14
18
  --vxe-ui-menu-current-font-size: var(--vxe-ui-font-size-mini);
15
19
  --vxe-ui-menu-current-item-height: var(--vxe-ui-menu-item-height-mini);
16
20
  }
@@ -27,7 +31,8 @@
27
31
  min-height: 4em;
28
32
  }
29
33
 
30
- .vxe-menu {
34
+ .vxe-menu,
35
+ .vxe-menu--collapse-wrapper {
31
36
  font-size: var(--vxe-ui-menu-current-font-size);
32
37
  color: var(--vxe-ui-font-color);
33
38
  font-family: var(--vxe-ui-font-family);
@@ -124,9 +129,11 @@
124
129
  }
125
130
 
126
131
  .vxe-menu--item-group {
127
- max-height: 0;
132
+ height: 0;
128
133
  overflow: hidden;
129
- transition: max-height 0.3s ease-in-out;
134
+ }
135
+ .vxe-menu--item-group[data-effect] {
136
+ transition: height 0.3s ease-in-out;
130
137
  }
131
138
 
132
139
  .vxe-menu--item-wrapper.is--active > .vxe-menu--item-link {
@@ -137,5 +144,5 @@
137
144
  background-color: var(--vxe-ui-base-active-background-color);
138
145
  }
139
146
  .vxe-menu--item-wrapper.is--expand > .vxe-menu--item-group {
140
- max-height: 1000px;
147
+ height: auto;
141
148
  }
@@ -1 +1 @@
1
- .vxe-menu{--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-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-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-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-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{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;position:absolute;overflow:auto;background-color:var(--vxe-ui-layout-background-color)}.vxe-menu--collapse-wrapper.is--collapsed{display:block;transition:all .25s ease-in-out}.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{box-shadow:var(--vxe-ui-menu-collapse-wrapper-box-shadow)}.vxe-menu--item-link{display:flex;flex-direction:row;align-items:center;height:var(--vxe-ui-menu-current-item-height);color:var(--vxe-ui-font-color);text-decoration:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.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}.vxe-menu--item-link-collapse i{display:inline-block;font-size:.8em;transition:transform .25s ease-in-out}.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{max-height:0;overflow:hidden;transition:max-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{max-height:1000px}
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-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-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-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-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,.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;position:absolute;overflow:auto;background-color:var(--vxe-ui-layout-background-color)}.vxe-menu--collapse-wrapper.is--collapsed{display:block;transition:all .25s ease-in-out}.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{box-shadow:var(--vxe-ui-menu-collapse-wrapper-box-shadow)}.vxe-menu--item-link{display:flex;flex-direction:row;align-items:center;height:var(--vxe-ui-menu-current-item-height);color:var(--vxe-ui-font-color);text-decoration:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.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}.vxe-menu--item-link-collapse i{display:inline-block;font-size:.8em;transition:transform .25s ease-in-out}.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.16.6",
3
+ "version": "4.16.8",
4
4
  "description": "A vue based PC component library",
5
5
  "scripts": {
6
6
  "update": "npm install --legacy-peer-deps",
@@ -60,6 +60,7 @@ function createInternalData (): CascaderInternalData {
60
60
  selectCheckboxMaps: {},
61
61
  treeExpandedMaps: {},
62
62
  treeExpandLazyLoadedMaps: {}
63
+ // isUpdateMode: false
63
64
  }
64
65
  }
65
66
 
@@ -361,6 +362,21 @@ export default defineVxeComponent({
361
362
  return enNodeValue(nodeKey)
362
363
  }
363
364
 
365
+ const isPathInTree = (treeData: any[], pathIds: string[]) => {
366
+ if (!pathIds || !pathIds.length) {
367
+ return false
368
+ }
369
+ let currentNodes = treeData
370
+ for (const nodeid of pathIds) {
371
+ const found = currentNodes.find(node => getNodeId(node) === nodeid)
372
+ if (!found) {
373
+ return false
374
+ }
375
+ currentNodes = found.children || []
376
+ }
377
+ return true
378
+ }
379
+
364
380
  const isCheckedByCheckboxNodeId = (nodeid: any) => {
365
381
  const { updateCheckboxFlag } = reactData
366
382
  const { selectCheckboxMaps } = internalData
@@ -565,7 +581,7 @@ export default defineVxeComponent({
565
581
  if (transform) {
566
582
  treeList = XEUtils.searchTree(treeFullData, handleSearch, {
567
583
  original: true,
568
- isEvery: true,
584
+ isEvery: false,
569
585
  children: childrenField,
570
586
  mapChildren: mapChildrenField
571
587
  })
@@ -583,7 +599,7 @@ export default defineVxeComponent({
583
599
  if (transform) {
584
600
  treeList = XEUtils.searchTree(treeFullData, () => true, {
585
601
  original: true,
586
- isEvery: true,
602
+ isEvery: false,
587
603
  children: childrenField,
588
604
  mapChildren: mapChildrenField
589
605
  })
@@ -681,16 +697,25 @@ export default defineVxeComponent({
681
697
 
682
698
  const triggerSearchEvent = XEUtils.debounce(() => {
683
699
  handleData(true)
684
- updateModelChecked()
700
+ updateCheckboxStatus()
701
+ const { currentItems } = reactData
702
+ const { afterTreeList } = internalData
685
703
  const filterOpts = computeFilterOpts.value
686
704
  const { autoExpandMode } = filterOpts
687
- const { afterTreeList } = internalData
688
- // 默认展开第
689
- if (autoExpandMode === 'first' || autoExpandMode === 'last') {
690
- const stItems = handleHasChildNodeIds(afterTreeList, autoExpandMode)
691
- reactData.currentItems = stItems
692
- } else {
693
- handleCurrentItems()
705
+ // 如果当前不在列表情况下,触发默认行为
706
+ if (!isPathInTree(afterTreeList, currentItems)) {
707
+ // 默认展开
708
+ if (autoExpandMode === 'first' || autoExpandMode === 'last') {
709
+ const stItems = handleHasChildNodeIds(afterTreeList, autoExpandMode)
710
+ const expandedMaps: Record<string, boolean> = {}
711
+ stItems.forEach(nodeid => {
712
+ expandedMaps[nodeid] = true
713
+ })
714
+ internalData.treeExpandedMaps = expandedMaps
715
+ reactData.currentItems = stItems
716
+ } else {
717
+ handleCurrentItems()
718
+ }
694
719
  }
695
720
  updateCurrentChunk()
696
721
  }, 350, { trailing: true })
@@ -841,6 +866,7 @@ export default defineVxeComponent({
841
866
 
842
867
  const setCurrentNode = (node: any) => {
843
868
  reactData.currentNode = node
869
+ updateCurrentChunk()
844
870
  return nextTick()
845
871
  }
846
872
 
@@ -882,6 +908,7 @@ export default defineVxeComponent({
882
908
 
883
909
  const changeEvent = (evnt: Event, selectValue: any, node: any) => {
884
910
  const value = XEUtils.isArray(selectValue) ? selectValue.map(deNodeValue) : deNodeValue(selectValue)
911
+ internalData.isUpdateMode = true
885
912
  emitModel(value)
886
913
  if (value !== props.modelValue) {
887
914
  dispatchEvent('change', { value, node, option: node }, evnt)
@@ -1003,9 +1030,10 @@ export default defineVxeComponent({
1003
1030
  dispatchEvent('current-change', { node, checked: isChecked }, evnt)
1004
1031
  }
1005
1032
 
1006
- const changeRadioEvent = (evnt: Event, node: any) => {
1033
+ const changeRadioEvent = (evnt: MouseEvent, node: any, chunks: any[], chunkIndex: number) => {
1007
1034
  evnt.preventDefault()
1008
1035
  evnt.stopPropagation()
1036
+ const { currentItems } = reactData
1009
1037
  const { nodeMaps } = internalData
1010
1038
  const radioOpts = computeRadioOpts.value
1011
1039
  const childrenField = computeChildrenField.value
@@ -1025,6 +1053,10 @@ export default defineVxeComponent({
1025
1053
  const value = nodeid
1026
1054
  reactData.selectRadioKey = value
1027
1055
  changeEvent(evnt, value, node)
1056
+ if (!currentItems.includes(nodeid)) {
1057
+ changeCurrentEvent(evnt, node)
1058
+ toggleExpandEvent(evnt, node, chunks, chunkIndex)
1059
+ }
1028
1060
  hideOptionPanel(evnt)
1029
1061
  }
1030
1062
 
@@ -1161,7 +1193,6 @@ export default defineVxeComponent({
1161
1193
  handleBaseTreeExpand([node], expanded)
1162
1194
  }
1163
1195
  setCurrentNode(node)
1164
- updateCurrentChunk()
1165
1196
  dispatchEvent('node-expand', { node, expanded }, evnt)
1166
1197
  }
1167
1198
 
@@ -1267,9 +1298,11 @@ export default defineVxeComponent({
1267
1298
  }
1268
1299
  }
1269
1300
 
1270
- const changeCheckboxEvent = (evnt: Event, node: any) => {
1301
+ const changeCheckboxEvent = (evnt: MouseEvent, node: any, chunks: any[], chunkIndex: number) => {
1271
1302
  evnt.preventDefault()
1272
1303
  evnt.stopPropagation()
1304
+ // const { filterable } = props
1305
+ const { currentItems } = reactData
1273
1306
  const { selectCheckboxMaps, nodeMaps } = internalData
1274
1307
  const childrenField = computeChildrenField.value
1275
1308
  const mapChildrenField = computeMapChildrenField.value
@@ -1294,11 +1327,11 @@ export default defineVxeComponent({
1294
1327
  selectCheckboxMaps[nodeid] = node
1295
1328
  }
1296
1329
  if (!checkStrictly) {
1297
- XEUtils.eachTree(XEUtils.get(node, transform ? mapChildrenField : childrenField), (childNode) => {
1330
+ XEUtils.eachTree(childList, (childNode) => {
1298
1331
  const childNodeid = getNodeId(childNode)
1299
1332
  if (isChecked) {
1300
1333
  if (!selectCheckboxMaps[childNodeid]) {
1301
- selectCheckboxMaps[childNodeid] = true
1334
+ selectCheckboxMaps[childNodeid] = childNode
1302
1335
  }
1303
1336
  } else {
1304
1337
  if (selectCheckboxMaps[childNodeid]) {
@@ -1307,11 +1340,16 @@ export default defineVxeComponent({
1307
1340
  }
1308
1341
  }, { children: transform ? mapChildrenField : childrenField })
1309
1342
  }
1343
+ selectCheckboxMaps[nodeid] = node
1310
1344
  reactData.updateCheckboxFlag++
1311
1345
  updateCheckboxStatus()
1312
1346
  const nodeids = XEUtils.keys(selectCheckboxMaps)
1313
1347
  const value = nodeids
1314
1348
  changeEvent(evnt, value, node)
1349
+ if (!currentItems.includes(nodeid)) {
1350
+ changeCurrentEvent(evnt, node)
1351
+ toggleExpandEvent(evnt, node, chunks, chunkIndex)
1352
+ }
1315
1353
  }
1316
1354
 
1317
1355
  const handleNodeClickEvent = (evnt: MouseEvent, node: any, chunks: any[], chunkIndex: number) => {
@@ -1336,12 +1374,12 @@ export default defineVxeComponent({
1336
1374
  if (multiple) {
1337
1375
  if (checkboxOpts.trigger === 'node' || (!showCheckbox && (!childList || !childList.length))) {
1338
1376
  triggerCheckbox = true
1339
- changeCheckboxEvent(evnt, node)
1377
+ changeCheckboxEvent(evnt, node, chunks, chunkIndex)
1340
1378
  }
1341
1379
  } else {
1342
1380
  if (radioOpts.trigger === 'node' || (!showRadio && (!childList || !childList.length))) {
1343
1381
  triggerRadio = true
1344
- changeRadioEvent(evnt, node)
1382
+ changeRadioEvent(evnt, node, chunks, chunkIndex)
1345
1383
  }
1346
1384
  }
1347
1385
  dispatchEvent('node-click', { node, triggerCurrent, triggerRadio, triggerCheckbox, triggerExpand }, evnt)
@@ -1475,7 +1513,7 @@ export default defineVxeComponent({
1475
1513
  return true
1476
1514
  }
1477
1515
 
1478
- const renderRadio = (node: any, isExistChild: boolean, nLevel: number, isChecked: boolean) => {
1516
+ const renderRadio = (node: any, isExistChild: boolean, nLevel: number, isChecked: boolean, chunks: any[], chunkIndex: number) => {
1479
1517
  const { showRadio } = props
1480
1518
  const radioOpts = computeRadioOpts.value
1481
1519
  const { checkMode, checkMethod, visibleMode, visibleMethod } = radioOpts
@@ -1489,7 +1527,7 @@ export default defineVxeComponent({
1489
1527
  }],
1490
1528
  onClick: (evnt) => {
1491
1529
  if (!isDisabled) {
1492
- changeRadioEvent(evnt, node)
1530
+ changeRadioEvent(evnt, node, chunks, chunkIndex)
1493
1531
  }
1494
1532
  }
1495
1533
  }, [
@@ -1501,7 +1539,7 @@ export default defineVxeComponent({
1501
1539
  return renderEmptyElement($xeCascader)
1502
1540
  }
1503
1541
 
1504
- const renderCheckbox = (node: any, isExistChild: boolean, nLevel: number, isChecked: boolean, isIndeterminate: boolean) => {
1542
+ const renderCheckbox = (node: any, isExistChild: boolean, nLevel: number, isChecked: boolean, isIndeterminate: boolean, chunks: any[], chunkIndex: number) => {
1505
1543
  const { showCheckbox } = props
1506
1544
  const checkboxOpts = computeCheckboxOpts.value
1507
1545
  const { checkMode, checkMethod, visibleMode, visibleMethod } = checkboxOpts
@@ -1516,7 +1554,7 @@ export default defineVxeComponent({
1516
1554
  }],
1517
1555
  onClick: (evnt) => {
1518
1556
  if (!isDisabled) {
1519
- changeCheckboxEvent(evnt, node)
1557
+ changeCheckboxEvent(evnt, node, chunks, chunkIndex)
1520
1558
  }
1521
1559
  }
1522
1560
  }, [
@@ -1588,7 +1626,7 @@ export default defineVxeComponent({
1588
1626
  handleNodeClickEvent(evnt, node, chunks, chunkIndex)
1589
1627
  }
1590
1628
  }, [
1591
- multiple ? renderCheckbox(node, isExistChild, nLevel, isCheckboxChecked, isIndeterminate) : renderRadio(node, isExistChild, nLevel, isRadioChecked),
1629
+ multiple ? renderCheckbox(node, isExistChild, nLevel, isCheckboxChecked, isIndeterminate, chunks, chunkIndex) : renderRadio(node, isExistChild, nLevel, isRadioChecked, chunks, chunkIndex),
1592
1630
  h('div', {
1593
1631
  class: 'vxe-cascader-chunk--node-item-inner'
1594
1632
  }, [
@@ -1812,9 +1850,12 @@ export default defineVxeComponent({
1812
1850
  }
1813
1851
 
1814
1852
  watch(() => props.modelValue, () => {
1815
- updateModelChecked()
1816
- handleCurrentItems()
1817
- updateCurrentChunk()
1853
+ if (!internalData.isUpdateMode) {
1854
+ updateModelChecked()
1855
+ handleCurrentItems()
1856
+ updateCurrentChunk()
1857
+ }
1858
+ internalData.isUpdateMode = false
1818
1859
  })
1819
1860
 
1820
1861
  watch(() => props.options, () => {
@@ -693,17 +693,24 @@ export default defineVxeComponent({
693
693
  }
694
694
 
695
695
  const startPanelChangeEvent = (params: any) => {
696
+ const { paneStartVal } = reactData
696
697
  const { selectStatus } = internalData
697
698
  const { value, currValue, $event } = params
698
699
  const paneVals = value ? (XEUtils.isString(value) ? value.split(',') : [value]) : []
699
700
  let startValue = ''
700
701
  let endValue = ''
701
702
  if (selectStatus) {
702
- startValue = paneVals[0]
703
- if (paneVals[1]) {
704
- endValue = paneVals[1]
703
+ // 如果选择同一天
704
+ if (!value && currValue === paneStartVal[0]) {
705
+ startValue = currValue
706
+ endValue = currValue
705
707
  } else {
706
- endValue = reactData.selectEdValue
708
+ startValue = paneVals[0]
709
+ if (paneVals[1]) {
710
+ endValue = paneVals[1]
711
+ } else {
712
+ endValue = reactData.selectEdValue
713
+ }
707
714
  }
708
715
  } else {
709
716
  startValue = currValue || XEUtils.last(paneVals)
@@ -725,18 +732,25 @@ export default defineVxeComponent({
725
732
  }
726
733
 
727
734
  const endPanelChangeEvent = (params: any) => {
735
+ const { paneEndVal } = reactData
728
736
  const { selectStatus } = internalData
729
737
  const { value, currValue, $event } = params
730
738
  const paneVals = value ? (XEUtils.isString(value) ? value.split(',') : [value]) : []
731
739
  let startValue = ''
732
740
  let endValue = ''
733
741
  if (selectStatus) {
734
- endValue = paneVals[0]
735
- if (paneVals[1]) {
736
- startValue = paneVals[0]
737
- endValue = paneVals[1]
742
+ // 如果选择同一天
743
+ if (!value && currValue === paneEndVal[1]) {
744
+ startValue = currValue
745
+ endValue = currValue
738
746
  } else {
739
- startValue = reactData.selectStValue
747
+ endValue = paneVals[0]
748
+ if (paneVals[1]) {
749
+ startValue = paneVals[0]
750
+ endValue = paneVals[1]
751
+ } else {
752
+ startValue = reactData.selectStValue
753
+ }
740
754
  }
741
755
  } else {
742
756
  endValue = currValue || XEUtils.last(paneVals)