vxe-pc-ui 4.19.6 → 4.19.7

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 (62) hide show
  1. package/dist/all.esm.js +332 -293
  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/row/src/col.js +39 -18
  6. package/es/row/src/row.js +34 -16
  7. package/es/row/style.css +101 -24
  8. package/es/row/style.min.css +1 -1
  9. package/es/scrollbar/src/scrollbar.js +6 -4
  10. package/es/space/style.css +1 -0
  11. package/es/space/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 +1 -1
  15. package/es/ui/src/log.js +1 -1
  16. package/es/vxe-row/style.css +101 -24
  17. package/es/vxe-row/style.min.css +1 -1
  18. package/es/vxe-space/style.css +1 -0
  19. package/es/vxe-space/style.min.css +1 -1
  20. package/lib/icon/style/style.css +1 -1
  21. package/lib/icon/style/style.min.css +1 -1
  22. package/lib/index.umd.js +89 -36
  23. package/lib/index.umd.min.js +1 -1
  24. package/lib/row/src/col.js +43 -17
  25. package/lib/row/src/col.min.js +1 -1
  26. package/lib/row/src/row.js +38 -14
  27. package/lib/row/src/row.min.js +1 -1
  28. package/lib/row/style/style.css +101 -24
  29. package/lib/row/style/style.min.css +1 -1
  30. package/lib/scrollbar/src/scrollbar.js +6 -3
  31. package/lib/scrollbar/src/scrollbar.min.js +1 -1
  32. package/lib/space/style/style.css +1 -0
  33. package/lib/space/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 +1 -1
  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-row/style/style.css +101 -24
  41. package/lib/vxe-row/style/style.min.css +1 -1
  42. package/lib/vxe-space/style/style.css +1 -0
  43. package/lib/vxe-space/style/style.min.css +1 -1
  44. package/package.json +1 -1
  45. package/packages/row/src/col.ts +41 -18
  46. package/packages/row/src/row.ts +36 -17
  47. package/packages/scrollbar/src/scrollbar.ts +7 -4
  48. package/styles/components/row.scss +21 -3
  49. package/styles/components/space.scss +1 -0
  50. package/types/components/row.d.ts +2 -0
  51. /package/es/icon/{iconfont.1791769645781.ttf → iconfont.1791794447472.ttf} +0 -0
  52. /package/es/icon/{iconfont.1791769645781.woff → iconfont.1791794447472.woff} +0 -0
  53. /package/es/icon/{iconfont.1791769645781.woff2 → iconfont.1791794447472.woff2} +0 -0
  54. /package/es/{iconfont.1791769645781.ttf → iconfont.1791794447472.ttf} +0 -0
  55. /package/es/{iconfont.1791769645781.woff → iconfont.1791794447472.woff} +0 -0
  56. /package/es/{iconfont.1791769645781.woff2 → iconfont.1791794447472.woff2} +0 -0
  57. /package/lib/icon/style/{iconfont.1791769645781.ttf → iconfont.1791794447472.ttf} +0 -0
  58. /package/lib/icon/style/{iconfont.1791769645781.woff → iconfont.1791794447472.woff} +0 -0
  59. /package/lib/icon/style/{iconfont.1791769645781.woff2 → iconfont.1791794447472.woff2} +0 -0
  60. /package/lib/{iconfont.1791769645781.ttf → iconfont.1791794447472.ttf} +0 -0
  61. /package/lib/{iconfont.1791769645781.woff → iconfont.1791794447472.woff} +0 -0
  62. /package/lib/{iconfont.1791769645781.woff2 → iconfont.1791794447472.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.6";
29
+ const version = exports.version = "4.19.7";
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.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},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.7";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.6"}`;
12
+ const uiVersion = `ui v${"4.19.7"}`;
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.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].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.7";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);
@@ -34,78 +34,155 @@
34
34
  .vxe-col.align--right {
35
35
  text-align: right;
36
36
  }
37
- .vxe-col.span1 {
37
+
38
+ .vxe-row.def--layout > .vxe-col.span1 {
38
39
  width: 4.16667%;
39
40
  }
40
- .vxe-col.span2 {
41
+ .vxe-row.def--layout > .vxe-col.span2 {
41
42
  width: 8.33333%;
42
43
  }
43
- .vxe-col.span3 {
44
+ .vxe-row.def--layout > .vxe-col.span3 {
44
45
  width: 12.5%;
45
46
  }
46
- .vxe-col.span4 {
47
+ .vxe-row.def--layout > .vxe-col.span4 {
47
48
  width: 16.66667%;
48
49
  }
49
- .vxe-col.span5 {
50
+ .vxe-row.def--layout > .vxe-col.span5 {
50
51
  width: 20.83333%;
51
52
  }
52
- .vxe-col.span6 {
53
+ .vxe-row.def--layout > .vxe-col.span6 {
53
54
  width: 25%;
54
55
  }
55
- .vxe-col.span7 {
56
+ .vxe-row.def--layout > .vxe-col.span7 {
56
57
  width: 29.16667%;
57
58
  }
58
- .vxe-col.span8 {
59
+ .vxe-row.def--layout > .vxe-col.span8 {
59
60
  width: 33.33333%;
60
61
  }
61
- .vxe-col.span9 {
62
+ .vxe-row.def--layout > .vxe-col.span9 {
62
63
  width: 37.5%;
63
64
  }
64
- .vxe-col.span10 {
65
+ .vxe-row.def--layout > .vxe-col.span10 {
65
66
  width: 41.66667%;
66
67
  }
67
- .vxe-col.span11 {
68
+ .vxe-row.def--layout > .vxe-col.span11 {
68
69
  width: 45.83333%;
69
70
  }
70
- .vxe-col.span12 {
71
+ .vxe-row.def--layout > .vxe-col.span12 {
71
72
  width: 50%;
72
73
  }
73
- .vxe-col.span13 {
74
+ .vxe-row.def--layout > .vxe-col.span13 {
74
75
  width: 54.16667%;
75
76
  }
76
- .vxe-col.span14 {
77
+ .vxe-row.def--layout > .vxe-col.span14 {
77
78
  width: 58.33333%;
78
79
  }
79
- .vxe-col.span15 {
80
+ .vxe-row.def--layout > .vxe-col.span15 {
80
81
  width: 62.5%;
81
82
  }
82
- .vxe-col.span16 {
83
+ .vxe-row.def--layout > .vxe-col.span16 {
83
84
  width: 66.66667%;
84
85
  }
85
- .vxe-col.span17 {
86
+ .vxe-row.def--layout > .vxe-col.span17 {
86
87
  width: 70.83333%;
87
88
  }
88
- .vxe-col.span18 {
89
+ .vxe-row.def--layout > .vxe-col.span18 {
89
90
  width: 75%;
90
91
  }
91
- .vxe-col.span19 {
92
+ .vxe-row.def--layout > .vxe-col.span19 {
92
93
  width: 79.16667%;
93
94
  }
94
- .vxe-col.span20 {
95
+ .vxe-row.def--layout > .vxe-col.span20 {
95
96
  width: 83.33333%;
96
97
  }
97
- .vxe-col.span21 {
98
+ .vxe-row.def--layout > .vxe-col.span21 {
98
99
  width: 87.5%;
99
100
  }
100
- .vxe-col.span22 {
101
+ .vxe-row.def--layout > .vxe-col.span22 {
101
102
  width: 91.66667%;
102
103
  }
103
- .vxe-col.span23 {
104
+ .vxe-row.def--layout > .vxe-col.span23 {
104
105
  width: 95.83333%;
105
106
  }
106
- .vxe-col.span24 {
107
+ .vxe-row.def--layout > .vxe-col.span24 {
107
108
  width: 100%;
108
109
  }
110
+ .vxe-row.grid--layout {
111
+ display: grid;
112
+ grid-template-columns: repeat(24, minmax(0, 1fr));
113
+ }
114
+ .vxe-row.grid--layout > .vxe-col.span1 {
115
+ grid-column: span 1;
116
+ }
117
+ .vxe-row.grid--layout > .vxe-col.span2 {
118
+ grid-column: span 2;
119
+ }
120
+ .vxe-row.grid--layout > .vxe-col.span3 {
121
+ grid-column: span 3;
122
+ }
123
+ .vxe-row.grid--layout > .vxe-col.span4 {
124
+ grid-column: span 4;
125
+ }
126
+ .vxe-row.grid--layout > .vxe-col.span5 {
127
+ grid-column: span 5;
128
+ }
129
+ .vxe-row.grid--layout > .vxe-col.span6 {
130
+ grid-column: span 6;
131
+ }
132
+ .vxe-row.grid--layout > .vxe-col.span7 {
133
+ grid-column: span 7;
134
+ }
135
+ .vxe-row.grid--layout > .vxe-col.span8 {
136
+ grid-column: span 8;
137
+ }
138
+ .vxe-row.grid--layout > .vxe-col.span9 {
139
+ grid-column: span 9;
140
+ }
141
+ .vxe-row.grid--layout > .vxe-col.span10 {
142
+ grid-column: span 10;
143
+ }
144
+ .vxe-row.grid--layout > .vxe-col.span11 {
145
+ grid-column: span 11;
146
+ }
147
+ .vxe-row.grid--layout > .vxe-col.span12 {
148
+ grid-column: span 12;
149
+ }
150
+ .vxe-row.grid--layout > .vxe-col.span13 {
151
+ grid-column: span 13;
152
+ }
153
+ .vxe-row.grid--layout > .vxe-col.span14 {
154
+ grid-column: span 14;
155
+ }
156
+ .vxe-row.grid--layout > .vxe-col.span15 {
157
+ grid-column: span 15;
158
+ }
159
+ .vxe-row.grid--layout > .vxe-col.span16 {
160
+ grid-column: span 16;
161
+ }
162
+ .vxe-row.grid--layout > .vxe-col.span17 {
163
+ grid-column: span 17;
164
+ }
165
+ .vxe-row.grid--layout > .vxe-col.span18 {
166
+ grid-column: span 18;
167
+ }
168
+ .vxe-row.grid--layout > .vxe-col.span19 {
169
+ grid-column: span 19;
170
+ }
171
+ .vxe-row.grid--layout > .vxe-col.span20 {
172
+ grid-column: span 20;
173
+ }
174
+ .vxe-row.grid--layout > .vxe-col.span21 {
175
+ grid-column: span 21;
176
+ }
177
+ .vxe-row.grid--layout > .vxe-col.span22 {
178
+ grid-column: span 22;
179
+ }
180
+ .vxe-row.grid--layout > .vxe-col.span23 {
181
+ grid-column: span 23;
182
+ }
183
+ .vxe-row.grid--layout > .vxe-col.span24 {
184
+ grid-column: span 24;
185
+ }
109
186
 
110
187
  .vxe-col--inner {
111
188
  width: 100%;
@@ -1 +1 @@
1
- .vxe-row{position:relative;display:flex;flex-direction:row;flex-grow:1}.vxe-row.is--vertical{flex-direction:column}.vxe-row.is--wrap{flex-wrap:wrap}.vxe-col{display:block}.vxe-col.is--ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-col.is--fill{flex-grow:1}.vxe-col:not(.is--fill){flex-shrink:0}.vxe-col.align--left{text-align:left}.vxe-col.align--center{text-align:center}.vxe-col.align--right{text-align:right}.vxe-col.span1{width:4.16667%}.vxe-col.span2{width:8.33333%}.vxe-col.span3{width:12.5%}.vxe-col.span4{width:16.66667%}.vxe-col.span5{width:20.83333%}.vxe-col.span6{width:25%}.vxe-col.span7{width:29.16667%}.vxe-col.span8{width:33.33333%}.vxe-col.span9{width:37.5%}.vxe-col.span10{width:41.66667%}.vxe-col.span11{width:45.83333%}.vxe-col.span12{width:50%}.vxe-col.span13{width:54.16667%}.vxe-col.span14{width:58.33333%}.vxe-col.span15{width:62.5%}.vxe-col.span16{width:66.66667%}.vxe-col.span17{width:70.83333%}.vxe-col.span18{width:75%}.vxe-col.span19{width:79.16667%}.vxe-col.span20{width:83.33333%}.vxe-col.span21{width:87.5%}.vxe-col.span22{width:91.66667%}.vxe-col.span23{width:95.83333%}.vxe-col.span24{width:100%}.vxe-col--inner{width:100%}.vxe-col.is--span>.vxe-col--inner>.vxe-date-picker,.vxe-col.is--span>.vxe-col--inner>.vxe-default-select,.vxe-col.is--span>.vxe-col--inner>.vxe-default-textarea,.vxe-col.is--span>.vxe-col--inner>.vxe-ico-picker,.vxe-col.is--span>.vxe-col--inner>.vxe-input,.vxe-col.is--span>.vxe-col--inner>.vxe-number-input,.vxe-col.is--span>.vxe-col--inner>.vxe-password-input,.vxe-col.is--span>.vxe-col--inner>.vxe-select,.vxe-col.is--span>.vxe-col--inner>.vxe-table-select,.vxe-col.is--span>.vxe-col--inner>.vxe-textarea,.vxe-col.is--span>.vxe-col--inner>.vxe-tree-select,.vxe-col.is--width>.vxe-col--inner>.vxe-date-picker,.vxe-col.is--width>.vxe-col--inner>.vxe-default-select,.vxe-col.is--width>.vxe-col--inner>.vxe-default-textarea,.vxe-col.is--width>.vxe-col--inner>.vxe-ico-picker,.vxe-col.is--width>.vxe-col--inner>.vxe-input,.vxe-col.is--width>.vxe-col--inner>.vxe-number-input,.vxe-col.is--width>.vxe-col--inner>.vxe-password-input,.vxe-col.is--width>.vxe-col--inner>.vxe-select,.vxe-col.is--width>.vxe-col--inner>.vxe-table-select,.vxe-col.is--width>.vxe-col--inner>.vxe-textarea,.vxe-col.is--width>.vxe-col--inner>.vxe-tree-select{width:100%}
1
+ .vxe-row{position:relative;display:flex;flex-direction:row;flex-grow:1}.vxe-row.is--vertical{flex-direction:column}.vxe-row.is--wrap{flex-wrap:wrap}.vxe-col{display:block}.vxe-col.is--ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-col.is--fill{flex-grow:1}.vxe-col:not(.is--fill){flex-shrink:0}.vxe-col.align--left{text-align:left}.vxe-col.align--center{text-align:center}.vxe-col.align--right{text-align:right}.vxe-row.def--layout>.vxe-col.span1{width:4.16667%}.vxe-row.def--layout>.vxe-col.span2{width:8.33333%}.vxe-row.def--layout>.vxe-col.span3{width:12.5%}.vxe-row.def--layout>.vxe-col.span4{width:16.66667%}.vxe-row.def--layout>.vxe-col.span5{width:20.83333%}.vxe-row.def--layout>.vxe-col.span6{width:25%}.vxe-row.def--layout>.vxe-col.span7{width:29.16667%}.vxe-row.def--layout>.vxe-col.span8{width:33.33333%}.vxe-row.def--layout>.vxe-col.span9{width:37.5%}.vxe-row.def--layout>.vxe-col.span10{width:41.66667%}.vxe-row.def--layout>.vxe-col.span11{width:45.83333%}.vxe-row.def--layout>.vxe-col.span12{width:50%}.vxe-row.def--layout>.vxe-col.span13{width:54.16667%}.vxe-row.def--layout>.vxe-col.span14{width:58.33333%}.vxe-row.def--layout>.vxe-col.span15{width:62.5%}.vxe-row.def--layout>.vxe-col.span16{width:66.66667%}.vxe-row.def--layout>.vxe-col.span17{width:70.83333%}.vxe-row.def--layout>.vxe-col.span18{width:75%}.vxe-row.def--layout>.vxe-col.span19{width:79.16667%}.vxe-row.def--layout>.vxe-col.span20{width:83.33333%}.vxe-row.def--layout>.vxe-col.span21{width:87.5%}.vxe-row.def--layout>.vxe-col.span22{width:91.66667%}.vxe-row.def--layout>.vxe-col.span23{width:95.83333%}.vxe-row.def--layout>.vxe-col.span24{width:100%}.vxe-row.grid--layout{display:grid;grid-template-columns:repeat(24,minmax(0,1fr))}.vxe-row.grid--layout>.vxe-col.span1{grid-column:span 1}.vxe-row.grid--layout>.vxe-col.span2{grid-column:span 2}.vxe-row.grid--layout>.vxe-col.span3{grid-column:span 3}.vxe-row.grid--layout>.vxe-col.span4{grid-column:span 4}.vxe-row.grid--layout>.vxe-col.span5{grid-column:span 5}.vxe-row.grid--layout>.vxe-col.span6{grid-column:span 6}.vxe-row.grid--layout>.vxe-col.span7{grid-column:span 7}.vxe-row.grid--layout>.vxe-col.span8{grid-column:span 8}.vxe-row.grid--layout>.vxe-col.span9{grid-column:span 9}.vxe-row.grid--layout>.vxe-col.span10{grid-column:span 10}.vxe-row.grid--layout>.vxe-col.span11{grid-column:span 11}.vxe-row.grid--layout>.vxe-col.span12{grid-column:span 12}.vxe-row.grid--layout>.vxe-col.span13{grid-column:span 13}.vxe-row.grid--layout>.vxe-col.span14{grid-column:span 14}.vxe-row.grid--layout>.vxe-col.span15{grid-column:span 15}.vxe-row.grid--layout>.vxe-col.span16{grid-column:span 16}.vxe-row.grid--layout>.vxe-col.span17{grid-column:span 17}.vxe-row.grid--layout>.vxe-col.span18{grid-column:span 18}.vxe-row.grid--layout>.vxe-col.span19{grid-column:span 19}.vxe-row.grid--layout>.vxe-col.span20{grid-column:span 20}.vxe-row.grid--layout>.vxe-col.span21{grid-column:span 21}.vxe-row.grid--layout>.vxe-col.span22{grid-column:span 22}.vxe-row.grid--layout>.vxe-col.span23{grid-column:span 23}.vxe-row.grid--layout>.vxe-col.span24{grid-column:span 24}.vxe-col--inner{width:100%}.vxe-col.is--span>.vxe-col--inner>.vxe-date-picker,.vxe-col.is--span>.vxe-col--inner>.vxe-default-select,.vxe-col.is--span>.vxe-col--inner>.vxe-default-textarea,.vxe-col.is--span>.vxe-col--inner>.vxe-ico-picker,.vxe-col.is--span>.vxe-col--inner>.vxe-input,.vxe-col.is--span>.vxe-col--inner>.vxe-number-input,.vxe-col.is--span>.vxe-col--inner>.vxe-password-input,.vxe-col.is--span>.vxe-col--inner>.vxe-select,.vxe-col.is--span>.vxe-col--inner>.vxe-table-select,.vxe-col.is--span>.vxe-col--inner>.vxe-textarea,.vxe-col.is--span>.vxe-col--inner>.vxe-tree-select,.vxe-col.is--width>.vxe-col--inner>.vxe-date-picker,.vxe-col.is--width>.vxe-col--inner>.vxe-default-select,.vxe-col.is--width>.vxe-col--inner>.vxe-default-textarea,.vxe-col.is--width>.vxe-col--inner>.vxe-ico-picker,.vxe-col.is--width>.vxe-col--inner>.vxe-input,.vxe-col.is--width>.vxe-col--inner>.vxe-number-input,.vxe-col.is--width>.vxe-col--inner>.vxe-password-input,.vxe-col.is--width>.vxe-col--inner>.vxe-select,.vxe-col.is--width>.vxe-col--inner>.vxe-table-select,.vxe-col.is--width>.vxe-col--inner>.vxe-textarea,.vxe-col.is--width>.vxe-col--inner>.vxe-tree-select{width:100%}
@@ -37,6 +37,7 @@
37
37
  }
38
38
  .vxe-space.is--fill > .vxe-space--item {
39
39
  flex-grow: 1;
40
+ min-width: 100%;
40
41
  }
41
42
 
42
43
  .vxe-space--separator {
@@ -1 +1 @@
1
- .vxe-space{--vxe-ui-space-current-row-gap:var(--vxe-ui-space-row-gap-default);--vxe-ui-space-current-column-gap:var(--vxe-ui-space-column-gap-default)}.vxe-space.size--xlarge{--vxe-ui-space-current-row-gap:var(--vxe-ui-space-row-gap-xlarge);--vxe-ui-space-current-column-gap:var(--vxe-ui-space-column-gap-xlarge)}.vxe-space.size--large{--vxe-ui-space-current-row-gap:var(--vxe-ui-space-row-gap-large);--vxe-ui-space-current-column-gap:var(--vxe-ui-space-column-gap-large)}.vxe-space.size--medium{--vxe-ui-space-current-row-gap:var(--vxe-ui-space-row-gap-medium);--vxe-ui-space-current-column-gap:var(--vxe-ui-space-column-gap-medium)}.vxe-space.size--small{--vxe-ui-space-current-row-gap:var(--vxe-ui-space-row-gap-small);--vxe-ui-space-current-column-gap:var(--vxe-ui-space-column-gap-small)}.vxe-space.size--mini{--vxe-ui-space-current-row-gap:var(--vxe-ui-space-row-gap-mini);--vxe-ui-space-current-column-gap:var(--vxe-ui-space-column-gap-mini)}.vxe-space{display:inline-flex;flex-direction:row;align-items:center;gap:var(--vxe-ui-space-current-row-gap) var(--vxe-ui-space-current-column-gap)}.vxe-space.is--wrap{flex-wrap:wrap}.vxe-space.is--vertical{flex-direction:column}.vxe-space.is--fill>.vxe-space--item{flex-grow:1}.vxe-space--separator{flex-shrink:0}
1
+ .vxe-space{--vxe-ui-space-current-row-gap:var(--vxe-ui-space-row-gap-default);--vxe-ui-space-current-column-gap:var(--vxe-ui-space-column-gap-default)}.vxe-space.size--xlarge{--vxe-ui-space-current-row-gap:var(--vxe-ui-space-row-gap-xlarge);--vxe-ui-space-current-column-gap:var(--vxe-ui-space-column-gap-xlarge)}.vxe-space.size--large{--vxe-ui-space-current-row-gap:var(--vxe-ui-space-row-gap-large);--vxe-ui-space-current-column-gap:var(--vxe-ui-space-column-gap-large)}.vxe-space.size--medium{--vxe-ui-space-current-row-gap:var(--vxe-ui-space-row-gap-medium);--vxe-ui-space-current-column-gap:var(--vxe-ui-space-column-gap-medium)}.vxe-space.size--small{--vxe-ui-space-current-row-gap:var(--vxe-ui-space-row-gap-small);--vxe-ui-space-current-column-gap:var(--vxe-ui-space-column-gap-small)}.vxe-space.size--mini{--vxe-ui-space-current-row-gap:var(--vxe-ui-space-row-gap-mini);--vxe-ui-space-current-column-gap:var(--vxe-ui-space-column-gap-mini)}.vxe-space{display:inline-flex;flex-direction:row;align-items:center;gap:var(--vxe-ui-space-current-row-gap) var(--vxe-ui-space-current-column-gap)}.vxe-space.is--wrap{flex-wrap:wrap}.vxe-space.is--vertical{flex-direction:column}.vxe-space.is--fill>.vxe-space--item{flex-grow:1;min-width:100%}.vxe-space--separator{flex-shrink:0}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vxe-pc-ui",
3
- "version": "4.19.6",
3
+ "version": "4.19.7",
4
4
  "description": "A vue based PC component library",
5
5
  "scripts": {
6
6
  "update": "npm install --legacy-peer-deps",
@@ -1,11 +1,14 @@
1
- import { ref, h, reactive, computed, PropType, inject } from 'vue'
1
+ import { ref, h, reactive, computed, PropType, inject, onMounted } from 'vue'
2
2
  import { defineVxeComponent } from '../../ui/src/comp'
3
3
  import XEUtils from 'xe-utils'
4
4
  import { getConfig, createEvent, useSize } from '../../ui'
5
5
  import { toCssUnit } from '../../ui/src/dom'
6
+ import { createComponentLog } from '../../ui/src/log'
6
7
 
7
8
  import type { ColReactData, VxeColPropTypes, ColPrivateRef, VxeColEmits, ColMethods, ColPrivateMethods, VxeColPrivateComputed, VxeColConstructor, VxeColPrivateMethods, ValueOf, VxeRowConstructor, VxeRowPrivateMethods } from '../../../types'
8
9
 
10
+ const { errLog } = createComponentLog('col')
11
+
9
12
  export default defineVxeComponent({
10
13
  name: 'VxeCol',
11
14
  props: {
@@ -56,26 +59,32 @@ export default defineVxeComponent({
56
59
  const { width } = props
57
60
  const rowGutter = computeRowGutter.value
58
61
  const rowVertical = computeRowVertical.value
62
+ let gridLayout = false
63
+ if ($xeRow) {
64
+ gridLayout = !!$xeRow.props.gridLayout
65
+ }
59
66
  const style: Record<string, string | number> = {}
60
- if (rowGutter) {
61
- let [lrGutter, tbGutter] = XEUtils.isArray(rowGutter) ? rowGutter : [rowGutter]
62
- if (rowVertical) {
63
- tbGutter = lrGutter
64
- lrGutter = ''
67
+ if (!gridLayout) {
68
+ if (rowGutter) {
69
+ let [lrGutter, tbGutter] = XEUtils.isArray(rowGutter) ? rowGutter : [rowGutter]
70
+ if (rowVertical) {
71
+ tbGutter = lrGutter
72
+ lrGutter = ''
73
+ }
74
+ if (lrGutter) {
75
+ const padding = XEUtils.isNumber(lrGutter) ? toCssUnit(lrGutter / 2) : `calc(${toCssUnit(lrGutter)} / 2)`
76
+ style.paddingLeft = padding
77
+ style.paddingRight = padding
78
+ }
79
+ if (tbGutter) {
80
+ const padding = XEUtils.isNumber(tbGutter) ? toCssUnit(tbGutter / 2) : `calc(${toCssUnit(tbGutter)} / 2)`
81
+ style.paddingTop = padding
82
+ style.paddingBottom = padding
83
+ }
65
84
  }
66
- if (lrGutter) {
67
- const padding = XEUtils.isNumber(lrGutter) ? toCssUnit(lrGutter / 2) : `calc(${toCssUnit(lrGutter)} / 2)`
68
- style.paddingLeft = padding
69
- style.paddingRight = padding
85
+ if (width) {
86
+ style.width = toCssUnit(width)
70
87
  }
71
- if (tbGutter) {
72
- const padding = XEUtils.isNumber(tbGutter) ? toCssUnit(tbGutter / 2) : `calc(${toCssUnit(tbGutter)} / 2)`
73
- style.paddingTop = padding
74
- style.paddingBottom = padding
75
- }
76
- }
77
- if (width) {
78
- style.width = toCssUnit(width)
79
88
  }
80
89
  return style
81
90
  })
@@ -126,6 +135,20 @@ export default defineVxeComponent({
126
135
  ])
127
136
  }
128
137
 
138
+ onMounted(() => {
139
+ const { width, fill } = props
140
+ if ($xeRow) {
141
+ if ($xeRow.props.gridLayout) {
142
+ if (width) {
143
+ errLog('vxe.error.notSupportProp', ['grid-layout', `width=${width}`, 'width=null'])
144
+ }
145
+ if (fill) {
146
+ errLog('vxe.error.notSupportProp', ['grid-layout', `fill=${fill}`, 'fill=false'])
147
+ }
148
+ }
149
+ }
150
+ })
151
+
129
152
  $xeCol.renderVN = renderVN
130
153
 
131
154
  return $xeCol
@@ -1,14 +1,21 @@
1
- import { ref, h, reactive, provide, PropType, computed } from 'vue'
1
+ import { ref, h, reactive, provide, PropType, computed, onMounted } from 'vue'
2
2
  import { defineVxeComponent } from '../../ui/src/comp'
3
3
  import XEUtils from 'xe-utils'
4
4
  import { getConfig, createEvent, useSize } from '../../ui'
5
5
  import { toCssUnit } from '../../ui/src/dom'
6
+ import { createComponentLog } from '../../ui/src/log'
6
7
 
7
8
  import type { VxeRowPropTypes, RowReactData, RowPrivateRef, VxeRowEmits, RowMethods, RowPrivateMethods, VxeRowPrivateComputed, VxeRowConstructor, VxeRowPrivateMethods, ValueOf } from '../../../types'
8
9
 
10
+ const { warnLog } = createComponentLog('row')
11
+
9
12
  export default defineVxeComponent({
10
13
  name: 'VxeRow',
11
14
  props: {
15
+ gridLayout: {
16
+ type: Boolean as PropType<VxeRowPropTypes.GridLayout>,
17
+ default: () => getConfig().row.gridLayout
18
+ },
12
19
  gutter: [Number, String, Array] as PropType<VxeRowPropTypes.Gutter>,
13
20
  wrap: {
14
21
  type: Boolean as PropType<VxeRowPropTypes.Wrap>,
@@ -40,23 +47,28 @@ export default defineVxeComponent({
40
47
  }
41
48
 
42
49
  const computeRowStyle = computed(() => {
43
- const { gutter, vertical } = props
50
+ const { gridLayout, gutter, vertical } = props
44
51
  const style: Record<string, string | number> = {}
45
52
  if (gutter) {
46
53
  let [lrGutter, tbGutter] = XEUtils.isArray(gutter) ? gutter : [gutter]
47
- if (vertical) {
48
- tbGutter = lrGutter
49
- lrGutter = ''
50
- }
51
- if (lrGutter) {
52
- const offsetSize = XEUtils.isNumber(lrGutter) ? toCssUnit(-(lrGutter / 2)) : `calc(${toCssUnit(lrGutter)} / 2 * -1)`
53
- style.marginLeft = offsetSize
54
- style.marginRight = offsetSize
55
- }
56
- if (tbGutter) {
57
- const offsetSize = XEUtils.isNumber(tbGutter) ? toCssUnit(-(tbGutter / 2)) : `calc(${toCssUnit(tbGutter)} / 2 * -1)`
58
- style.marginTop = offsetSize
59
- style.marginBottom = offsetSize
54
+ if (gridLayout) {
55
+ style.columnGap = toCssUnit(lrGutter)
56
+ style.rowGap = toCssUnit(tbGutter || lrGutter)
57
+ } else {
58
+ if (vertical) {
59
+ tbGutter = lrGutter
60
+ lrGutter = ''
61
+ }
62
+ if (lrGutter) {
63
+ const offsetSize = XEUtils.isNumber(lrGutter) ? toCssUnit(-(lrGutter / 2)) : `calc(${toCssUnit(lrGutter)} / 2 * -1)`
64
+ style.marginLeft = offsetSize
65
+ style.marginRight = offsetSize
66
+ }
67
+ if (tbGutter) {
68
+ const offsetSize = XEUtils.isNumber(tbGutter) ? toCssUnit(-(tbGutter / 2)) : `calc(${toCssUnit(tbGutter)} / 2 * -1)`
69
+ style.marginTop = offsetSize
70
+ style.marginBottom = offsetSize
71
+ }
60
72
  }
61
73
  }
62
74
  return style
@@ -93,12 +105,12 @@ export default defineVxeComponent({
93
105
  Object.assign($xeRow, rowMethods, rowPrivateMethods)
94
106
 
95
107
  const renderVN = () => {
96
- const { vertical, wrap } = props
108
+ const { gridLayout, vertical, wrap } = props
97
109
  const rowStyle = computeRowStyle.value
98
110
  const defaultSlot = slots.default
99
111
  return h('div', {
100
112
  ref: refElem,
101
- class: ['vxe-row', {
113
+ class: ['vxe-row', gridLayout ? 'grid--layout' : 'def--layout', {
102
114
  'is--vertical': vertical,
103
115
  'is--wrap': wrap
104
116
  }],
@@ -107,6 +119,13 @@ export default defineVxeComponent({
107
119
  }, defaultSlot ? defaultSlot({}) : [])
108
120
  }
109
121
 
122
+ onMounted(() => {
123
+ const { gridLayout, wrap } = props
124
+ if (gridLayout && !wrap) {
125
+ warnLog('vxe.error.notSupportProp', ['grid-layout', 'wrap=false', 'wrap=true'])
126
+ }
127
+ })
128
+
110
129
  provide('$xeRow', $xeRow)
111
130
 
112
131
  $xeRow.renderVN = renderVN
@@ -8,7 +8,7 @@ import VxeLoadingComponent from '../../loading'
8
8
 
9
9
  import type { ScrollbarReactData, ScrollbarInternalData, VxeScrollbarEmits, ScrollbarMethods, ScrollbarPrivateMethods, VxeScrollbarPropTypes, ValueOf, ScrollbarPrivateRef, VxeScrollbarPrivateComputed, VxeScrollbarConstructor, VxeScrollbarPrivateMethods, VxeComponentStyleType } from '../../../types'
10
10
 
11
- const { getConfig, createEvent, domUtils, globalResize, renderEmptyElement } = VxeUI
11
+ const { getConfig, createEvent, domUtils, globalResize, globalEvents, renderEmptyElement } = VxeUI
12
12
 
13
13
  function createReactData (): ScrollbarReactData {
14
14
  return {
@@ -599,9 +599,7 @@ export default defineVxeComponent({
599
599
  reFlag.value++
600
600
  })
601
601
  watch(reFlag, () => {
602
- $xeScrollbar.recalculate().then(() => {
603
- $xeScrollbar.recalculate()
604
- })
602
+ $xeScrollbar.recalculate()
605
603
  })
606
604
 
607
605
  onMounted(() => {
@@ -624,6 +622,10 @@ export default defineVxeComponent({
624
622
  }
625
623
 
626
624
  reFlag.value++
625
+
626
+ globalEvents.on($xeScrollbar, 'resize', () => {
627
+ reFlag.value++
628
+ })
627
629
  })
628
630
 
629
631
  onBeforeUnmount(() => {
@@ -631,6 +633,7 @@ export default defineVxeComponent({
631
633
  if (resizeObserver) {
632
634
  resizeObserver.disconnect()
633
635
  }
636
+ globalEvents.off($xeScrollbar, 'resize')
634
637
  })
635
638
 
636
639
  $xeScrollbar.renderVN = renderVN
@@ -36,9 +36,27 @@
36
36
  &.align--right {
37
37
  text-align: right;
38
38
  }
39
- @for $i from 0 to list.length(base_var.$colSpanList) {
40
- &.span#{$i + 1} {
41
- width: list.nth(base_var.$colSpanList, $i + 1);
39
+ }
40
+
41
+ .vxe-row {
42
+ &.def--layout {
43
+ & > .vxe-col {
44
+ @for $i from 0 to list.length(base_var.$colSpanList) {
45
+ &.span#{$i + 1} {
46
+ width: list.nth(base_var.$colSpanList, $i + 1);
47
+ }
48
+ }
49
+ }
50
+ }
51
+ &.grid--layout {
52
+ display: grid;
53
+ grid-template-columns: repeat(24, minmax(0, 1fr));
54
+ & > .vxe-col {
55
+ @for $i from 0 to list.length(base_var.$colSpanList) {
56
+ &.span#{$i + 1} {
57
+ grid-column: span $i + 1;
58
+ }
59
+ }
42
60
  }
43
61
  }
44
62
  }
@@ -38,6 +38,7 @@
38
38
  &.is--fill {
39
39
  & > .vxe-space--item {
40
40
  flex-grow: 1;
41
+ min-width: 100%;
41
42
  }
42
43
  }
43
44
  }
@@ -23,6 +23,7 @@ export interface RowPrivateRef {
23
23
  export interface VxeRowPrivateRef extends RowPrivateRef { }
24
24
 
25
25
  export namespace VxeRowPropTypes {
26
+ export type GridLayout = boolean
26
27
  export type Gutter = string | number | (string | number)[]
27
28
  export type Wrap = boolean
28
29
  export type Vertical = boolean
@@ -30,6 +31,7 @@ export namespace VxeRowPropTypes {
30
31
  }
31
32
 
32
33
  export type VxeRowProps = {
34
+ gridLayout?: VxeRowPropTypes.GridLayout
33
35
  gutter?: VxeRowPropTypes.Gutter
34
36
  wrap?: VxeRowPropTypes.Wrap
35
37
  vertical?: VxeRowPropTypes.Vertical