vxe-pc-ui 3.14.28 → 3.14.30

package/lib/ui/index.js

@@ -26,7 +26,7 @@ Object.keys(_core).forEach(function (key) {
 });
 var _dynamics = require("../dynamics");
 var _log = require("./src/log");
-var version = exports.version = "3.14.28";
+var version = exports.version = "3.14.30";
 _core.VxeUI.uiVersion = version;
 _core.VxeUI.dynamicApp = _dynamics.dynamicApp;
 function config(options) {

package/lib/ui/index.min.js

@@ -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"),version=exports.version="3.14.28";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:{autoClose:!0},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:{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:!0,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"]},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:{virtualYConfig:{enabled:!0,gt:60}},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}}},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},tree:{indent:20,minHeight:60,radioConfig:{strict:!0},dragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},virtualYConfig:{enabled:!0,gt:50,oSize:2}},treeSelect:{autoClose:null,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:{}});var iconPrefix="vxe-icon-",_default=((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"}),exports.default=_core.VxeUI);
+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"),version=exports.version="3.14.30";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:{autoClose:!0},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:{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:!0,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"]},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:{virtualYConfig:{enabled:!0,gt:60}},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}}},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},tree:{indent:20,minHeight:60,radioConfig:{strict:!0},dragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},virtualYConfig:{enabled:!0,gt:50,oSize:2}},treeSelect:{autoClose:null,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:{}});var iconPrefix="vxe-icon-",_default=((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"}),exports.default=_core.VxeUI);

package/lib/ui/src/log.js

@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.warnLog = exports.errLog = void 0;
 var _core = require("@vxe-ui/core");
-var version = "ui v".concat("3.14.28");
+var version = "ui v".concat("3.14.30");
 var warnLog = exports.warnLog = _core.log.create('warn', version);
 var errLog = exports.errLog = _core.log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core"),version="ui v".concat("3.14.28"),warnLog=exports.warnLog=_core.log.create("warn",version),errLog=exports.errLog=_core.log.create("error",version);
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core"),version="ui v".concat("3.14.30"),warnLog=exports.warnLog=_core.log.create("warn",version),errLog=exports.errLog=_core.log.create("error",version);

package/lib/watermark/src/util.js

@@ -65,21 +65,6 @@ function calcContentWH(contList) {
     contentHeight: contentHeight
   };
 }
-function calcCanvasWH(contentWidth, opts) {
-  var gap = opts.gap;
-  var _ref = gap ? _xeUtils.default.isArray(gap) ? gap : [gap, gap] : [],
-    _ref2 = _slicedToArray(_ref, 2),
-    _ref2$ = _ref2[0],
-    gapX = _ref2$ === void 0 ? 0 : _ref2$,
-    _ref2$2 = _ref2[1],
-    gapY = _ref2$2 === void 0 ? 0 : _ref2$2;
-  var canvasWidth = contentWidth + _xeUtils.default.toNumber(gapX);
-  var canvasHeight = contentWidth + _xeUtils.default.toNumber(gapY);
-  return {
-    canvasWidth: canvasWidth,
-    canvasHeight: canvasHeight
-  };
-}
 function getFontConf(item, key, opts) {
   return (item.font ? item.font[key] : '') || (opts.font ? opts.font[key] : '');
 }
@@ -87,12 +72,12 @@ function createMarkFont(contConf, defaultFontSize, opts) {
   var offset = opts.offset;
   var text = _xeUtils.default.toValueString(contConf.textContent);
   var fontSize = _xeUtils.default.toNumber(getFontConf(contConf, 'fontSize', opts) || defaultFontSize) || 14;
-  var _ref3 = offset ? _xeUtils.default.isArray(offset) ? offset : [offset, offset] : [],
-    _ref4 = _slicedToArray(_ref3, 2),
-    _ref4$ = _ref4[0],
-    offsetX = _ref4$ === void 0 ? 0 : _ref4$,
-    _ref4$2 = _ref4[1],
-    offsetY = _ref4$2 === void 0 ? 0 : _ref4$2;
+  var _ref = offset ? _xeUtils.default.isArray(offset) ? offset : [offset, offset] : [],
+    _ref2 = _slicedToArray(_ref, 2),
+    _ref2$ = _ref2[0],
+    offsetX = _ref2$ === void 0 ? 0 : _ref2$,
+    _ref2$2 = _ref2[1],
+    offsetY = _ref2$2 === void 0 ? 0 : _ref2$2;
   var _calcFontWH = calcFontWH(text, fontSize),
     width = _calcFontWH.width,
     height = _calcFontWH.height;
@@ -134,28 +119,39 @@ function getContentUrl(content, defaultFontSize, options) {
     }
     var ctx = canvasEl.getContext('2d');
     if (ctx && contList.length) {
+      var gap = opts.gap;
+      var gapList = gap ? _xeUtils.default.isArray(gap) ? gap : [gap, gap] : [];
+      var gapX = _xeUtils.default.toNumber(gapList[0]);
+      var gapY = _xeUtils.default.toNumber(gapList[1]);
       var _calcContentWH = calcContentWH(contList),
-        contentWidth = _calcContentWH.contentWidth,
-        contentHeight = _calcContentWH.contentHeight;
-      var _calcCanvasWH = calcCanvasWH(contentWidth, opts),
-        canvasWidth = _calcCanvasWH.canvasWidth,
-        canvasHeight = _calcCanvasWH.canvasHeight;
+        contentWidth = _calcContentWH.contentWidth;
+      var canvasWidth = contentWidth * 2 + gapX * 2 + gapX / 2;
+      var canvasHeight = contentWidth * 2 + gapY;
       canvasEl.width = canvasWidth;
       canvasEl.height = canvasHeight;
-      var x = (canvasWidth - contentWidth) / 2;
-      var y = (canvasHeight - contentHeight) / 2;
-      var drayX = x + contentWidth / 2;
-      var drayY = y + contentHeight / 2;
+      var drayX = gapX / 2;
+      var drayY = contentWidth + gapY / 2;
       ctx.save();
       ctx.translate(drayX, drayY);
       ctx.rotate(deg * Math.PI / 180);
       ctx.translate(-drayX, -drayY);
-      var offsetHeight = 0;
+      var txtOffsetY = 0;
+      contList.forEach(function (item) {
+        drayFont(ctx, item, opts);
+        var txtX = drayX;
+        var txtY = drayY + txtOffsetY;
+        ctx.fillText(item.text, txtX, txtY, contentWidth);
+        txtOffsetY += item.height;
+      });
+      var offsetX = gapX;
+      var offsetY = gapY + contentWidth;
+      txtOffsetY = 0;
       contList.forEach(function (item) {
-        var align = getFontConf(item, 'align', opts);
         drayFont(ctx, item, opts);
-        ctx.fillText(item.text, x + (align === 'center' ? (contentWidth - item.width) / 2 : 0), y + (contentHeight + contentHeight) / 2 + offsetHeight, contentWidth);
-        offsetHeight += item.height;
+        var txtX = drayX + offsetX;
+        var txtY = drayY + txtOffsetY + offsetY;
+        ctx.fillText(item.text, txtX, txtY, contentWidth);
+        txtOffsetY += item.height;
       });
       ctx.restore();
       resolve(canvasEl.toDataURL());

package/lib/watermark/src/util.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.getContentUrl=getContentUrl;var _xeUtils=_interopRequireDefault(require("xe-utils")),_dom=require("../../ui/src/dom");function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}function _slicedToArray(t,e){return _arrayWithHoles(t)||_iterableToArrayLimit(t,e)||_unsupportedIterableToArray(t,e)||_nonIterableRest()}function _nonIterableRest(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(t,e){var n;if(t)return"string"==typeof t?_arrayLikeToArray(t,e):"Map"===(n="Object"===(n={}.toString.call(t).slice(8,-1))&&t.constructor?t.constructor.name:n)||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?_arrayLikeToArray(t,e):void 0}function _arrayLikeToArray(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=Array(e);n<e;n++)r[n]=t[n];return r}function _iterableToArrayLimit(t,e){var n=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=n){var r,o,a,l,i=[],c=!0,f=!1;try{if(a=(n=n.call(t)).next,0===e){if(Object(n)!==n)return;c=!1}else for(;!(c=(r=a.call(n)).done)&&(i.push(r.value),i.length!==e);c=!0);}catch(t){f=!0,o=t}finally{try{if(!c&&null!=n.return&&(l=n.return(),Object(l)!==l))return}finally{if(f)throw o}}return i}}function _arrayWithHoles(t){if(Array.isArray(t))return t}var canvasEl=null,fontEl=null,fontCacheMaps={};function getMarkCanvas(){return canvasEl||((canvasEl=document.createElement("canvas")).style.position="absolute",canvasEl.style.top="0",canvasEl.style.left="0"),canvasEl}function removeMarkElement(t){var e;t&&(e=t.parentNode)&&e.removeChild(t)}function calcFontWH(t,e){var n="".concat(e,"_").concat(t);return fontCacheMaps[n]||((fontEl=fontEl||document.createElement("span")).parentNode||document.body.append(fontEl),fontEl.textContent=t,fontEl.style.fontSize=(0,_dom.toCssUnit)(e),t=fontEl.offsetWidth,e=fontEl.offsetHeight,fontCacheMaps[n]={width:t,height:e}),fontCacheMaps[n]}function calcContentWH(t){var e=0,n=0;return t.forEach(function(t){e=Math.max(t.width,e),n=Math.max(t.height,n)}),{contentWidth:e,contentHeight:n}}function calcCanvasWH(t,e){var e=e.gap,e=_slicedToArray(e?_xeUtils.default.isArray(e)?e:[e,e]:[],2),n=e[0],e=e[1],e=void 0===e?0:e;return{canvasWidth:t+_xeUtils.default.toNumber(void 0===n?0:n),canvasHeight:t+_xeUtils.default.toNumber(e)}}function getFontConf(t,e,n){return(t.font?t.font[e]:"")||(n.font?n.font[e]:"")}function createMarkFont(t,e,n){var r=n.offset,o=_xeUtils.default.toValueString(t.textContent),n=_xeUtils.default.toNumber(getFontConf(t,"fontSize",n)||e)||14,e=_slicedToArray(r?_xeUtils.default.isArray(r)?r:[r,r]:[],2),r=e[0],r=void 0===r?0:r,e=e[1],e=void 0===e?0:e,a=calcFontWH(o,n),l=a.width,a=a.height;return{text:o,fontSize:n,font:t.font,width:l+_xeUtils.default.toNumber(r),height:a+_xeUtils.default.toNumber(e)}}function drayFont(t,e,n){var r=getFontConf(e,"fontWeight",n);t.fillStyle="".concat(getFontConf(e,"color",n)||"rgba(0, 0, 0, 0.15)"),t.font=[getFontConf(e,"fontStyle",n)||"normal","bold"===r||"bolder"===r?"bold":"",(0,_dom.toCssUnit)(e.fontSize),getFontConf(e,"fontFamily",n)||"sans-serif"].join(" ")}function getContentUrl(t,e,n){var u=Object.assign({},n),n=u.rotate,s=_xeUtils.default.toNumber(n),d=(_xeUtils.default.isArray(t)?t:[t]).map(function(t){return t?t.textContent?createMarkFont(t,e,u):createMarkFont({textContent:"".concat(t)},e,u):createMarkFont({textContent:""},e,u)});return removeMarkElement(fontEl),new Promise(function(t){var n,r,o,a,e,l,i,c=getMarkCanvas(),f=(c.parentNode||document.body.append(c),c.getContext("2d"));f&&d.length?(l=calcContentWH(d),n=l.contentWidth,r=l.contentHeight,e=(l=calcCanvasWH(n,u)).canvasWidth,l=l.canvasHeight,c.width=e,c.height=l,e=(o=(e-n)/2)+n/2,l=(a=(l-r)/2)+r/2,f.save(),f.translate(e,l),f.rotate(s*Math.PI/180),f.translate(-e,-l),i=0,d.forEach(function(t){var e=getFontConf(t,"align",u);drayFont(f,t,u),f.fillText(t.text,o+("center"===e?(n-t.width)/2:0),a+(r+r)/2+i,n),i+=t.height}),f.restore(),t(c.toDataURL())):t(""),removeMarkElement(c)})}
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.getContentUrl=getContentUrl;var _xeUtils=_interopRequireDefault(require("xe-utils")),_dom=require("../../ui/src/dom");function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}function _slicedToArray(t,e){return _arrayWithHoles(t)||_iterableToArrayLimit(t,e)||_unsupportedIterableToArray(t,e)||_nonIterableRest()}function _nonIterableRest(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(t,e){var n;if(t)return"string"==typeof t?_arrayLikeToArray(t,e):"Map"===(n="Object"===(n={}.toString.call(t).slice(8,-1))&&t.constructor?t.constructor.name:n)||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?_arrayLikeToArray(t,e):void 0}function _arrayLikeToArray(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=Array(e);n<e;n++)r[n]=t[n];return r}function _iterableToArrayLimit(t,e){var n=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=n){var r,o,a,l,i=[],f=!0,u=!1;try{if(a=(n=n.call(t)).next,0===e){if(Object(n)!==n)return;f=!1}else for(;!(f=(r=a.call(n)).done)&&(i.push(r.value),i.length!==e);f=!0);}catch(t){u=!0,o=t}finally{try{if(!f&&null!=n.return&&(l=n.return(),Object(l)!==l))return}finally{if(u)throw o}}return i}}function _arrayWithHoles(t){if(Array.isArray(t))return t}var canvasEl=null,fontEl=null,fontCacheMaps={};function getMarkCanvas(){return canvasEl||((canvasEl=document.createElement("canvas")).style.position="absolute",canvasEl.style.top="0",canvasEl.style.left="0"),canvasEl}function removeMarkElement(t){var e;t&&(e=t.parentNode)&&e.removeChild(t)}function calcFontWH(t,e){var n="".concat(e,"_").concat(t);return fontCacheMaps[n]||((fontEl=fontEl||document.createElement("span")).parentNode||document.body.append(fontEl),fontEl.textContent=t,fontEl.style.fontSize=(0,_dom.toCssUnit)(e),t=fontEl.offsetWidth,e=fontEl.offsetHeight,fontCacheMaps[n]={width:t,height:e}),fontCacheMaps[n]}function calcContentWH(t){var e=0,n=0;return t.forEach(function(t){e=Math.max(t.width,e),n=Math.max(t.height,n)}),{contentWidth:e,contentHeight:n}}function getFontConf(t,e,n){return(t.font?t.font[e]:"")||(n.font?n.font[e]:"")}function createMarkFont(t,e,n){var r=n.offset,o=_xeUtils.default.toValueString(t.textContent),n=_xeUtils.default.toNumber(getFontConf(t,"fontSize",n)||e)||14,e=_slicedToArray(r?_xeUtils.default.isArray(r)?r:[r,r]:[],2),r=e[0],r=void 0===r?0:r,e=e[1],e=void 0===e?0:e,a=calcFontWH(o,n),l=a.width,a=a.height;return{text:o,fontSize:n,font:t.font,width:l+_xeUtils.default.toNumber(r),height:a+_xeUtils.default.toNumber(e)}}function drayFont(t,e,n){var r=getFontConf(e,"fontWeight",n);t.fillStyle="".concat(getFontConf(e,"color",n)||"rgba(0, 0, 0, 0.15)"),t.font=[getFontConf(e,"fontStyle",n)||"normal","bold"===r||"bolder"===r?"bold":"",(0,_dom.toCssUnit)(e.fontSize),getFontConf(e,"fontFamily",n)||"sans-serif"].join(" ")}function getContentUrl(t,e,n){var d=Object.assign({},n),n=d.rotate,h=_xeUtils.default.toNumber(n),y=(_xeUtils.default.isArray(t)?t:[t]).map(function(t){return t?t.textContent?createMarkFont(t,e,d):createMarkFont({textContent:"".concat(t)},e,d):createMarkFont({textContent:""},e,d)});return removeMarkElement(fontEl),new Promise(function(t){var e,n,r,o,a,l,i,f,u,c=getMarkCanvas(),s=(c.parentNode||document.body.append(c),c.getContext("2d"));s&&y.length?(n=(n=d.gap)?_xeUtils.default.isArray(n)?n:[n,n]:[],e=_xeUtils.default.toNumber(n[0]),n=_xeUtils.default.toNumber(n[1]),o=2*(r=calcContentWH(y).contentWidth)+n,c.width=2*r+2*e+e/2,c.height=o,a=e/2,l=r+n/2,s.save(),s.translate(a,l),s.rotate(h*Math.PI/180),s.translate(-a,-l),u=0,y.forEach(function(t){drayFont(s,t,d);var e=l+u;s.fillText(t.text,a,e,r),u+=t.height}),i=e,f=n+r,u=0,y.forEach(function(t){drayFont(s,t,d);var e=l+u+f;s.fillText(t.text,a+i,e,r),u+=t.height}),s.restore(),t(c.toDataURL())):t(""),removeMarkElement(c)})}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "3.14.28",
+  "version": "3.14.30",
   "description": "A vue based PC component library",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/date-panel/src/date-panel.ts

@@ -298,7 +298,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       if (isDatePanelType) {
         const { datePanelType, selectMonth } = reactData
         const yearList = $xeDatePanel.computeYearList
-        let year = ''
+        let year: string | number = ''
         let month
         if (selectMonth) {
           year = selectMonth.getFullYear()
@@ -981,20 +981,20 @@ export default /* define-vxe-component start */ defineVxeComponent({
       if (!isDisabledPrevDateBtn) {
         let viewDate
         if (type === 'year') {
-          viewDate = XEUtils.getWhatYear(selectMonth, -yearSize, 'first')
+          viewDate = XEUtils.getWhatYear(selectMonth as Date, -yearSize, 'first')
         } else if (type === 'month' || type === 'quarter') {
           if (datePanelType === 'year') {
-            viewDate = XEUtils.getWhatYear(selectMonth, -yearSize, 'first')
+            viewDate = XEUtils.getWhatYear(selectMonth as Date, -yearSize, 'first')
           } else {
-            viewDate = XEUtils.getWhatYear(selectMonth, -1, 'first')
+            viewDate = XEUtils.getWhatYear(selectMonth as Date, -1, 'first')
           }
         } else {
           if (datePanelType === 'year') {
-            viewDate = XEUtils.getWhatYear(selectMonth, -yearSize, 'first')
+            viewDate = XEUtils.getWhatYear(selectMonth as Date, -yearSize, 'first')
           } else if (datePanelType === 'month') {
-            viewDate = XEUtils.getWhatYear(selectMonth, -1, 'first')
+            viewDate = XEUtils.getWhatYear(selectMonth as Date, -1, 'first')
           } else {
-            viewDate = XEUtils.getWhatMonth(selectMonth, -1, 'first')
+            viewDate = XEUtils.getWhatMonth(selectMonth as Date, -1, 'first')
           }
         }
         reactData.selectMonth = viewDate
@@ -1007,11 +1007,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const reactData = $xeDatePanel.reactData
 
       $xeDatePanel.dateNowHandle()
-      $xeDatePanel.dateChange(reactData.currentDate, true)
+      $xeDatePanel.dateChange(reactData.currentDate as Date, true)
       if (!props.multiple) {
         $xeDatePanel.hidePanel()
       }
-      $xeDatePanel.dispatchEvent('date-today', { type: props.type }, evnt)
+      $xeDatePanel.dispatchEvent('date-today', { viewType: reactData.datePanelType, type: props.type, viewDate: reactData.selectMonth }, evnt)
     },
     dateNextEvent (evnt: Event) {
       const $xeDatePanel = this
@@ -1027,24 +1027,24 @@ export default /* define-vxe-component start */ defineVxeComponent({
       if (!isDisabledNextDateBtn) {
         let viewDate
         if (type === 'year') {
-          viewDate = XEUtils.getWhatYear(selectMonth, yearSize, 'first')
+          viewDate = XEUtils.getWhatYear(selectMonth as Date, yearSize, 'first')
         } else if (type === 'month' || type === 'quarter') {
           if (datePanelType === 'year') {
-            viewDate = XEUtils.getWhatYear(selectMonth, yearSize, 'first')
+            viewDate = XEUtils.getWhatYear(selectMonth as Date, yearSize, 'first')
           } else {
-            viewDate = XEUtils.getWhatYear(selectMonth, 1, 'first')
+            viewDate = XEUtils.getWhatYear(selectMonth as Date, 1, 'first')
           }
         } else {
           if (datePanelType === 'year') {
-            viewDate = XEUtils.getWhatYear(selectMonth, yearSize, 'first')
+            viewDate = XEUtils.getWhatYear(selectMonth as Date, yearSize, 'first')
           } else if (datePanelType === 'month') {
-            viewDate = XEUtils.getWhatYear(selectMonth, 1, 'first')
+            viewDate = XEUtils.getWhatYear(selectMonth as Date, 1, 'first')
           } else {
-            viewDate = XEUtils.getWhatMonth(selectMonth, 1, 'first')
+            viewDate = XEUtils.getWhatMonth(selectMonth as Date, 1, 'first')
           }
         }
         reactData.selectMonth = viewDate
-        $xeDatePanel.dispatchEvent('date-next', { viewType: datePanelType, value, type }, evnt)
+        $xeDatePanel.dispatchEvent('date-next', { viewType: datePanelType, value, type, viewDate }, evnt)
       }
     },
     isRangeDisabled (item: { date: Date }) {
@@ -1265,7 +1265,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
             $xeDatePanel.handleChange(dateMultipleValue.join(','), { type: 'update' })
           }
         } else {
-          $xeDatePanel.dateChange(dateValue || reactData.currentDate)
+          $xeDatePanel.dateChange(dateValue || reactData.currentDate as Date)
         }
       }
       $xeDatePanel.hidePanel()
@@ -1364,7 +1364,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const $xeDatePanel = this
       const reactData = $xeDatePanel.reactData
 
-      return reactData.selectMonth
+      const { selectMonth } = reactData
+      return selectMonth ? new Date(selectMonth.getTime()) : new Date()
     },
     checkValue (value: string) {
       const $xeDatePanel = this

package/packages/date-range-picker/src/date-range-picker.ts

@@ -11,7 +11,7 @@ import VxeDatePanelComponent from '../../date-panel/src/date-panel'
 import VxeButtonComponent from '../../button/src/button'
 import VxeButtonGroupComponent from '../../button/src/button-group'
 
-import type { VxeDateRangePickerConstructor, VxeDateRangePickerEmits, DateRangePickerReactData, DateRangePickerInternalData, VxeButtonGroupDefines, VxeComponentSizeType, VxeDateRangePickerPropTypes, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines, ValueOf, VxeModalConstructor, VxeDrawerConstructor, VxeModalMethods, VxeDrawerMethods, VxeDateRangePickerDefines, VxeDatePanelConstructor } from '../../../types'
+import type { VxeDateRangePickerConstructor, VxeDateRangePickerEmits, DateRangePickerReactData, DateRangePickerInternalData, VxeButtonGroupDefines, VxeComponentSizeType, VxeDateRangePickerPropTypes, VxeFormConstructor, VxeFormPrivateMethods, VxeDatePanelDefines, VxeFormDefines, ValueOf, VxeModalConstructor, VxeDrawerConstructor, VxeModalMethods, VxeDrawerMethods, VxeDateRangePickerDefines, VxeDatePanelConstructor } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'
 
 export default /* define-vxe-component start */ defineVxeComponent({
@@ -40,6 +40,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
       type: Boolean as PropType<VxeDateRangePickerPropTypes.Clearable>,
       default: () => getConfig().dateRangePicker.clearable
     },
+    linkedPanels: {
+      type: Boolean as PropType<VxeDateRangePickerPropTypes.LinkedPanels>,
+      default: () => getConfig().dateRangePicker.linkedPanels
+    },
     readonly: {
       type: Boolean as PropType<VxeDateRangePickerPropTypes.Readonly>,
       default: null
@@ -786,6 +790,74 @@ export default /* define-vxe-component start */ defineVxeComponent({
         }
       })
     },
+    startPanelDateBtnChangeEvent (params: VxeDatePanelDefines.DateTodayEventParams) {
+      const $xeDateRangePicker = this
+      const props = $xeDateRangePicker
+
+      const { linkedPanels } = props
+      if (linkedPanels) {
+        const { viewType } = params
+        const $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel as VxeDatePanelConstructor
+        const $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel as VxeDatePanelConstructor
+        if (!$startDatePanel || !$endDatePanel) {
+          return
+        }
+        const startPanelDate = $startDatePanel.getPanelDate()
+        if (!startPanelDate) {
+          return
+        }
+        const endYear = startPanelDate.getFullYear()
+        const endMonth = startPanelDate.getMonth()
+        switch (viewType) {
+          case 'day':
+          case 'date':
+          case 'week': {
+            if (endMonth < 11) {
+              startPanelDate.setMonth(endMonth + 1)
+            } else {
+              startPanelDate.setFullYear(endYear + 1)
+              startPanelDate.setMonth(0)
+            }
+            $endDatePanel.setPanelDate(startPanelDate)
+            break
+          }
+        }
+      }
+    },
+    endPanelDateBtnChangeEvent (params: VxeDatePanelDefines.DateTodayEventParams) {
+      const $xeDateRangePicker = this
+      const props = $xeDateRangePicker
+
+      const { linkedPanels } = props
+      if (linkedPanels) {
+        const { viewType } = params
+        const $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel as VxeDatePanelConstructor
+        const $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel as VxeDatePanelConstructor
+        if (!$startDatePanel || !$endDatePanel) {
+          return
+        }
+        const endPanelDate = $endDatePanel.getPanelDate()
+        if (!endPanelDate) {
+          return
+        }
+        const endYear = endPanelDate.getFullYear()
+        const endMonth = endPanelDate.getMonth()
+        switch (viewType) {
+          case 'day':
+          case 'date':
+          case 'week': {
+            if (endMonth) {
+              endPanelDate.setMonth(endMonth - 1)
+            } else {
+              endPanelDate.setFullYear(endYear - 1)
+              endPanelDate.setMonth(11)
+            }
+            $startDatePanel.setPanelDate(endPanelDate)
+            break
+          }
+        }
+      }
+    },
     // 全局事件
     handleGlobalMousedownEvent (evnt: Event) {
       const $xeDateRangePicker = this
@@ -1207,7 +1279,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
                         selectDay: props.selectDay
                       },
                       on: {
-                        change: $xeDateRangePicker.startPanelChangeEvent
+                        change: $xeDateRangePicker.startPanelChangeEvent,
+                        datePrev: $xeDateRangePicker.endPanelDateBtnChangeEvent,
+                        dateToday: $xeDateRangePicker.endPanelDateBtnChangeEvent,
+                        dateNext: $xeDateRangePicker.endPanelDateBtnChangeEvent
                       }
                     }),
                     h(VxeDatePanelComponent, {
@@ -1232,7 +1307,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
                         selectDay: props.selectDay
                       },
                       on: {
-                        change: $xeDateRangePicker.endPanelChangeEvent
+                        change: $xeDateRangePicker.endPanelChangeEvent,
+                        datePrev: $xeDateRangePicker.endPanelDateBtnChangeEvent,
+                        dateToday: $xeDateRangePicker.endPanelDateBtnChangeEvent,
+                        dateNext: $xeDateRangePicker.endPanelDateBtnChangeEvent
                       }
                     })
                   ]),

package/packages/watermark/src/util.ts

@@ -71,17 +71,6 @@ function calcContentWH (contList: VxeWatermarkDefines.ContentObj[]) {
   }
 }
 
-function calcCanvasWH (contentWidth: number, opts: ContentMarkOptions) {
-  const { gap } = opts
-  const [gapX = 0, gapY = 0] = gap ? ((XEUtils.isArray(gap) ? gap : [gap, gap])) : []
-  const canvasWidth = contentWidth + XEUtils.toNumber(gapX)
-  const canvasHeight = contentWidth + XEUtils.toNumber(gapY)
-  return {
-    canvasWidth,
-    canvasHeight
-  }
-}
-
 function getFontConf (item: VxeWatermarkDefines.ContentObj | VxeWatermarkDefines.ContentConf, key: keyof VxeWatermarkPropTypes.Font, opts: ContentMarkOptions) {
   return (item.font ? item.font[key] : '') || (opts.font ? opts.font[key] : '')
 }
@@ -139,31 +128,46 @@ export function getContentUrl (content: VxeWatermarkPropTypes.Content, defaultFo
     }
     const ctx = canvasEl.getContext('2d')
     if (ctx && contList.length) {
-      const { contentWidth, contentHeight } = calcContentWH(contList)
-      const { canvasWidth, canvasHeight } = calcCanvasWH(contentWidth, opts)
+      const { gap } = opts
+      const gapList = gap ? ((XEUtils.isArray(gap) ? gap : [gap, gap])) : []
+      const gapX = XEUtils.toNumber(gapList[0])
+      const gapY = XEUtils.toNumber(gapList[1])
+
+      const { contentWidth } = calcContentWH(contList)
+      const canvasWidth = contentWidth * 2 + gapX * 2 + (gapX / 2)
+      const canvasHeight = contentWidth * 2 + gapY
 
       canvasEl.width = canvasWidth
       canvasEl.height = canvasHeight
 
-      const x = (canvasWidth - contentWidth) / 2
-      const y = (canvasHeight - contentHeight) / 2
-
-      const drayX = x + (contentWidth / 2)
-      const drayY = y + (contentHeight / 2)
+      const drayX = (gapX / 2)
+      const drayY = contentWidth + (gapY / 2)
 
       ctx.save()
       ctx.translate(drayX, drayY)
       ctx.rotate(deg * Math.PI / 180)
       ctx.translate(-drayX, -drayY)
 
-      let offsetHeight = 0
+      let txtOffsetY = 0
       contList.forEach((item) => {
-        const align = getFontConf(item, 'align', opts)
         drayFont(ctx, item, opts)
-        ctx.fillText(item.text, x + (align === 'center' ? (contentWidth - item.width) / 2 : 0), y + (contentHeight + contentHeight) / 2 + offsetHeight, contentWidth)
-        offsetHeight += item.height
+        const txtX = drayX
+        const txtY = drayY + txtOffsetY
+        ctx.fillText(item.text, txtX, txtY, contentWidth)
+        txtOffsetY += item.height
       })
 
+      const offsetX = gapX
+      const offsetY = gapY + contentWidth
+
+      txtOffsetY = 0
+      contList.forEach((item) => {
+        drayFont(ctx, item, opts)
+        const txtX = drayX + offsetX
+        const txtY = drayY + txtOffsetY + offsetY
+        ctx.fillText(item.text, txtX, txtY, contentWidth)
+        txtOffsetY += item.height
+      })
       ctx.restore()
 
       resolve(canvasEl.toDataURL())

package/types/components/date-panel.d.ts

@@ -118,8 +118,8 @@ export interface DatePanelReactData {
   datePanelValue: Date | null
   datePanelLabel: string
   datePanelType: VxeDatePanelDefines.DatePanelType
-  selectMonth: any
-  currentDate: any
+  selectMonth: Date | null
+  currentDate: Date | null
 }
 
 export interface DatePanelInternalData {
@@ -257,24 +257,41 @@ export namespace VxeDatePanelDefines {
   export interface RevertEventParams extends DatePanelEventParams {
     label: string
   }
+
+  export interface DateTodayEventParams {
+    type: string
+    viewType: DatePanelType
+    value: string
+  }
+  export interface DatePrevEventParams extends DateTodayEventParams {}
+  export interface DateNextEventParams extends DateTodayEventParams {}
 }
 
 export type VxeDatePanelEventProps = {
   onChange?: VxeDatePanelEvents.Change
   onConfirm?: VxeDatePanelEvents.Confirm
   onRevert?: VxeDatePanelEvents.Revert
+  onDatePrev?: VxeDatePanelEvents.DatePrev
+  onDateToday?: VxeDatePanelEvents.DateToday
+  onDateNext?: VxeDatePanelEvents.DateNext
 }
 
 export interface VxeDatePanelListeners {
   change?: VxeDatePanelEvents.Change
   confirm?: VxeDatePanelEvents.Confirm
   revert?: VxeDatePanelEvents.Revert
+  onDatePrev?: VxeDatePanelEvents.DatePrev
+  onDateToday?: VxeDatePanelEvents.DateToday
+  onDateNext?: VxeDatePanelEvents.DateNext
 }
 
 export namespace VxeDatePanelEvents {
   export type Change = (params: VxeDatePanelDefines.ChangeEventParams) => void
   export type Confirm = (params: VxeDatePanelDefines.ConfirmEventParams) => void
   export type Revert = (params: VxeDatePanelDefines.RevertEventParams) => void
+  export type DatePrev = (params: VxeDatePanelDefines.DatePrevEventParams) => void
+  export type DateToday = (params: VxeDatePanelDefines.DateTodayEventParams) => void
+  export type DateNext = (params: VxeDatePanelDefines.DateNextEventParams) => void
 }
 
 export namespace VxeDatePanelSlotTypes {

package/types/components/date-range-picker.d.ts

@@ -28,6 +28,7 @@ export namespace VxeDateRangePickerPropTypes {
   export type Name = string
   export type Type = VxeDatePanelPropTypes.Type
   export type Clearable = boolean
+  export type LinkedPanels = boolean
   /**
    * 已废弃，请使用 PopupConfig.zIndex
    * @deprecated
@@ -117,6 +118,7 @@ export interface VxeDateRangePickerProps {
   name?: VxeDateRangePickerPropTypes.Name
   type?: VxeDateRangePickerPropTypes.Type
   clearable?: VxeDateRangePickerPropTypes.Clearable
+  linkedPanels?: VxeDateRangePickerPropTypes.LinkedPanels
   zIndex?: VxeDateRangePickerPropTypes.ZIndex
   readonly?: VxeDateRangePickerPropTypes.Readonly
   disabled?: VxeDateRangePickerPropTypes.Disabled

package/types/components/gantt.d.ts

@@ -688,6 +688,10 @@ export interface GanttMethods<D = any> extends Omit<GridMethods<D>, 'dispatchEve
    * 如果有滚动条，则滚动到对应的任务视图
    */
   scrollToTaskView(rowOrRowid: any): Promise<any>
+  /**
+   * 如果任务视图有横向滚动条，则滚动到任务视图对应的日期
+   */
+  scrollToDateView(colDate: string | Date | number): Promise<any>
 }
 export interface VxeGanttMethods<D = any> extends GanttMethods<D>, Omit<VxeGridMethods<D>, 'dispatchEvent'> { }
 

package/types/components/table.d.ts

@@ -4165,6 +4165,7 @@ export interface TableInternalData<D = any> {
   sourceDataRowIdData: Record<string, D>
   fullColumnIdData: Record<string, VxeTableDefines.ColumnCacheItem<D>>
   fullColumnFieldData: Record<string, VxeTableDefines.ColumnCacheItem<D>>
+  fullCellHeightMaps: Record<string, Record<string, number>>
 
   // 当前行
   currentRow: D | null