vxe-pc-ui 4.2.0 → 4.2.2

package/lib/ui/index.js

@@ -27,7 +27,7 @@ Object.keys(_core).forEach(function (key) {
 var _dynamics = require("../dynamics");
 var _utils = require("./src/utils");
 var _log = require("./src/log");
-const version = exports.version = "4.2.0";
+const version = exports.version = "4.2.2";
 _core.VxeUI.version = version;
 _core.VxeUI.uiVersion = version;
 _core.VxeUI.tableVersion = '';
@@ -101,7 +101,9 @@ _core.VxeUI.setup = setup;
     mask: true,
     showTitleOverflow: true,
     showClose: true,
-    padding: true
+    padding: true,
+    cancelClosable: true,
+    confirmClosable: true
   },
   form: {
     // preventSubmit: false,
@@ -197,6 +199,8 @@ _core.VxeUI.setup = setup;
     padding: true,
     draggable: true,
     showConfirmButton: null,
+    cancelClosable: true,
+    confirmClosable: true,
     zoomConfig: {
       minimizeMaxSize: 10,
       minimizeVerticalOffset: {

package/lib/ui/index.min.js

@@ -1 +1 @@
-"use strict";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")),_utils=require("./src/utils"),_log=require("./src/log");const version=exports.version="4.2.0";function config(e){return"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["config","setConfig"]),(0,_core.setConfig)(e)}function setup(e){return"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),(0,_core.setConfig)(e)}_core.VxeUI.version=version,_core.VxeUI.uiVersion=version,_core.VxeUI.tableVersion="",_core.VxeUI.t=_core.VxeUI.getI18n,_core.VxeUI._t=_utils.getFuncText,_core.VxeUI.dynamicApp=_dynamics.dynamicApp,_core.VxeUI.config=config,_core.VxeUI.setup=setup,(0,_core.setConfig)({alert:{},anchor:{},anchorLink:{},breadcrumb:{separator:"/"},breadcrumbItem:{},button:{trigger:"hover"},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:{},checkbox:{},checkboxGroup:{},col:{},collapse:{},collapsePane:{},countdown:{},datePicker:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1},drawer:{position:"right",showHeader:!0,lockView:!0,mask:!0,showTitleOverflow:!0,showClose:!0,padding:!0},form:{validConfig:{showMessage:!0,autoPos:!0},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:{showPreview:!0,showPrintButton:!0},imageGroup:{showPreview:!0,showPrintButton:!0},imagePreview:{showPrintButton:!0},input:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},layoutAside:{},layoutBody:{},layoutContainer:{},layoutFooter:{},layoutHeader:{},link:{underline:!0},listDesign:{height:400,showPc:!0},listView:{},list:{scrollY:{enabled:!0,gt:100}},loading:{showIcon:!0,showText:!0},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,zoomConfig:{minimizeMaxSize:10,minimizeVerticalOffset:{top:-24,left:0},minimizeHorizontalOffset:{top:0,left:32}},storageKey:"VXE_MODAL_POSITION"},numberInput:{digits:2,controls:!0},optgroup:{},option:{},pager:{pageSizePlacement:"top"},print:{},passwordInput:{controls:!0},printPageBreak:{},pulldown:{},radio:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},row:{},select:{multiCharOverflow:8},switch:{},tabPane:{},tabs:{},tag:{},text:{},textarea:{resize:"none"},tip:{},tooltip:{trigger:"hover",theme:"dark",enterDelay:500,leaveDelay:300},tree:{indent:20,minHeight:60,radioConfig:{strict:!0}},treeSelect:{treeConfig:{radioConfig:{},checkboxConfig:{}}},upload:{mode:"all",imageTypes:["jpg","jpeg","png","gif"],showList:!0,showUploadButton:!0,showButtonText:!0,showRemoveButton:!0,showButtonIcon:!0,showPreview:!0,imageStyle:{}},table:{},colgroup:{},column:{},toolbar:{},grid:{}});const iconPrefix="vxe-icon-";(0,_core.setIcon)({LOADING:iconPrefix+"spinner roll vxe-loading--default-icon",BUTTON_DROPDOWN:iconPrefix+"arrow-down",BUTTON_LOADING:iconPrefix+"spinner roll",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",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",CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",INPUT_CLEAR:iconPrefix+"error-circle-fill",INPUT_SEARCH:iconPrefix+"search",NUMBER_INPUT_PREV_NUM:iconPrefix+"caret-up",NUMBER_INPUT_NEXT_NUM:iconPrefix+"caret-down",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_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_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_SELECT_LOADED:iconPrefix+"spinner roll",TREE_SELECT_OPEN:iconPrefix+"caret-down rotate180",TREE_SELECT_CLOSE:iconPrefix+"caret-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",CAROUSEL_HORIZONTAL_PREVIOUS:iconPrefix+"arrow-left",CAROUSEL_HORIZONTAL_NEXT:iconPrefix+"arrow-right",CAROUSEL_VERTICAL_PREVIOUS:iconPrefix+"arrow-up",CAROUSEL_VERTICAL_NEXT:iconPrefix+"arrow-down"});var _default=exports.default=_core.VxeUI;
+"use strict";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")),_utils=require("./src/utils"),_log=require("./src/log");const version=exports.version="4.2.2";function config(e){return"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["config","setConfig"]),(0,_core.setConfig)(e)}function setup(e){return"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),(0,_core.setConfig)(e)}_core.VxeUI.version=version,_core.VxeUI.uiVersion=version,_core.VxeUI.tableVersion="",_core.VxeUI.t=_core.VxeUI.getI18n,_core.VxeUI._t=_utils.getFuncText,_core.VxeUI.dynamicApp=_dynamics.dynamicApp,_core.VxeUI.config=config,_core.VxeUI.setup=setup,(0,_core.setConfig)({alert:{},anchor:{},anchorLink:{},breadcrumb:{separator:"/"},breadcrumbItem:{},button:{trigger:"hover"},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:{},checkbox:{},checkboxGroup:{},col:{},collapse:{},collapsePane:{},countdown:{},datePicker:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1},drawer:{position:"right",showHeader:!0,lockView:!0,mask:!0,showTitleOverflow:!0,showClose:!0,padding:!0,cancelClosable:!0,confirmClosable:!0},form:{validConfig:{showMessage:!0,autoPos:!0},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:{showPreview:!0,showPrintButton:!0},imageGroup:{showPreview:!0,showPrintButton:!0},imagePreview:{showPrintButton:!0},input:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},layoutAside:{},layoutBody:{},layoutContainer:{},layoutFooter:{},layoutHeader:{},link:{underline:!0},listDesign:{height:400,showPc:!0},listView:{},list:{scrollY:{enabled:!0,gt:100}},loading:{showIcon:!0,showText:!0},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"},numberInput:{digits:2,controls:!0},optgroup:{},option:{},pager:{pageSizePlacement:"top"},print:{},passwordInput:{controls:!0},printPageBreak:{},pulldown:{},radio:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},row:{},select:{multiCharOverflow:8},switch:{},tabPane:{},tabs:{},tag:{},text:{},textarea:{resize:"none"},tip:{},tooltip:{trigger:"hover",theme:"dark",enterDelay:500,leaveDelay:300},tree:{indent:20,minHeight:60,radioConfig:{strict:!0}},treeSelect:{treeConfig:{radioConfig:{},checkboxConfig:{}}},upload:{mode:"all",imageTypes:["jpg","jpeg","png","gif"],showList:!0,showUploadButton:!0,showButtonText:!0,showRemoveButton:!0,showButtonIcon:!0,showPreview:!0,imageStyle:{}},table:{},colgroup:{},column:{},toolbar:{},grid:{}});const iconPrefix="vxe-icon-";(0,_core.setIcon)({LOADING:iconPrefix+"spinner roll vxe-loading--default-icon",BUTTON_DROPDOWN:iconPrefix+"arrow-down",BUTTON_LOADING:iconPrefix+"spinner roll",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",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",CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",INPUT_CLEAR:iconPrefix+"error-circle-fill",INPUT_SEARCH:iconPrefix+"search",NUMBER_INPUT_PREV_NUM:iconPrefix+"caret-up",NUMBER_INPUT_NEXT_NUM:iconPrefix+"caret-down",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_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_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_SELECT_LOADED:iconPrefix+"spinner roll",TREE_SELECT_OPEN:iconPrefix+"caret-down rotate180",TREE_SELECT_CLOSE:iconPrefix+"caret-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",CAROUSEL_HORIZONTAL_PREVIOUS:iconPrefix+"arrow-left",CAROUSEL_HORIZONTAL_NEXT:iconPrefix+"arrow-right",CAROUSEL_VERTICAL_PREVIOUS:iconPrefix+"arrow-up",CAROUSEL_VERTICAL_NEXT:iconPrefix+"arrow-down"});var _default=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");
-const version = `ui v${"4.2.0"}`;
+const version = `ui v${"4.2.2"}`;
 const warnLog = exports.warnLog = _core.log.create('warn', version);
 const errLog = exports.errLog = _core.log.create('error', version);

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");const version="ui v4.2.0",warnLog=exports.warnLog=_core.log.create("warn",version),errLog=exports.errLog=_core.log.create("error",version);
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");const version="ui v4.2.2",warnLog=exports.warnLog=_core.log.create("warn",version),errLog=exports.errLog=_core.log.create("error",version);

package/lib/vxe-card/style/style.css

@@ -1,4 +1,5 @@
 .vxe-card {
+  position: relative;
   display: inline-flex;
   flex-direction: column;
   font-size: var(--vxe-ui-font-size-default);
@@ -10,8 +11,6 @@
 .vxe-card.is--shadow {
   box-shadow: var(--vxe-ui-base-popup-box-shadow);
 }
-.vxe-card.is--padding .vxe-card--header,
-.vxe-card.is--padding .vxe-card--footer,
 .vxe-card.is--padding .vxe-card--body-content,
 .vxe-card.is--padding .vxe-card--body-left,
 .vxe-card.is--padding .vxe-card--body-right {
@@ -37,6 +36,11 @@
   flex-shrink: 0;
 }
 
+.vxe-card--header,
+.vxe-card--footer {
+  padding: var(--vxe-ui-card-padding);
+}
+
 .vxe-card--body {
   overflow: hidden;
   flex-grow: 1;

package/lib/vxe-card/style/style.min.css

@@ -1 +1 @@
-.vxe-card{display:inline-flex;flex-direction:column;font-size:var(--vxe-ui-font-size-default);color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color);border-radius:var(--vxe-ui-base-border-radius)}.vxe-card.is--shadow{box-shadow:var(--vxe-ui-base-popup-box-shadow)}.vxe-card.is--padding .vxe-card--body-content,.vxe-card.is--padding .vxe-card--body-left,.vxe-card.is--padding .vxe-card--body-right,.vxe-card.is--padding .vxe-card--footer,.vxe-card.is--padding .vxe-card--header{padding:var(--vxe-ui-card-padding)}.vxe-card.is--border{border:1px solid var(--vxe-ui-input-border-color)}.vxe-card.is--border .vxe-card--header{border-bottom:1px solid var(--vxe-ui-input-border-color)}.vxe-card.is--border .vxe-card--footer{border-top:1px solid var(--vxe-ui-input-border-color)}.vxe-card--body,.vxe-card--header{display:flex;flex-direction:row}.vxe-card--header{flex-shrink:0}.vxe-card--body{overflow:hidden;flex-grow:1}.vxe-card--body-content,.vxe-card--body-left,.vxe-card--body-right{overflow:auto}.vxe-card--body-left,.vxe-card--body-right,.vxe-card--footer,.vxe-card--header,.vxe-card--header-extra{flex-shrink:0}.vxe-card--body-content,.vxe-card--header-title{flex-grow:1}.vxe-card--header-title.is--ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.vxe-card{position:relative;display:inline-flex;flex-direction:column;font-size:var(--vxe-ui-font-size-default);color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color);border-radius:var(--vxe-ui-base-border-radius)}.vxe-card.is--shadow{box-shadow:var(--vxe-ui-base-popup-box-shadow)}.vxe-card.is--padding .vxe-card--body-content,.vxe-card.is--padding .vxe-card--body-left,.vxe-card.is--padding .vxe-card--body-right{padding:var(--vxe-ui-card-padding)}.vxe-card.is--border{border:1px solid var(--vxe-ui-input-border-color)}.vxe-card.is--border .vxe-card--header{border-bottom:1px solid var(--vxe-ui-input-border-color)}.vxe-card.is--border .vxe-card--footer{border-top:1px solid var(--vxe-ui-input-border-color)}.vxe-card--body,.vxe-card--header{display:flex;flex-direction:row}.vxe-card--header{flex-shrink:0}.vxe-card--footer,.vxe-card--header{padding:var(--vxe-ui-card-padding)}.vxe-card--body{overflow:hidden;flex-grow:1}.vxe-card--body-content,.vxe-card--body-left,.vxe-card--body-right{overflow:auto}.vxe-card--body-left,.vxe-card--body-right,.vxe-card--footer,.vxe-card--header,.vxe-card--header-extra{flex-shrink:0}.vxe-card--body-content,.vxe-card--header-title{flex-grow:1}.vxe-card--header-title.is--ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

package/lib/vxe-col/style/style.css

@@ -92,4 +92,9 @@
 }
 .vxe-col.span24 {
   width: 100%;
+}
+
+.vxe-col--inner {
+  display: flex;
+  flex-direction: column;
 }

package/lib/vxe-col/style/style.min.css

@@ -1 +1 @@
-.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{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{display:flex;flex-direction:column}

package/lib/vxe-form/style/style.css

@@ -157,12 +157,16 @@
 .vxe-form--item-content {
   display: flex;
   flex-direction: row;
-  align-items: flex-start;
+  align-items: center;
   position: relative;
   flex-grow: 1;
   word-break: break-all;
 }
 
+.vxe-form--group-content {
+  align-items: flex-start;
+}
+
 .vxe-form--item-trigger-node {
   font-size: 12px;
   min-width: 100px;
@@ -242,6 +246,9 @@
   font-weight: normal;
   vertical-align: middle;
 }
+.vxe-form--item.is--tbg > .vxe-form--item-title {
+  background-color: var(--vxe-ui-form-title-background-color);
+}
 .vxe-form--item.is--vertical {
   flex-direction: column;
   align-items: initial;
@@ -417,9 +424,6 @@
 .vxe-form.is--border .vxe-form--item.is--padding:not(.is--vertical) > .vxe-form--item-title {
   border-right: 1px solid var(--vxe-ui-form-border-color);
 }
-.vxe-form.is--border .vxe-form--item.is--tbg > .vxe-form--item-title {
-  background-color: var(--vxe-ui-form-title-background-color);
-}
 
 .vxe-form .vxe-form--item.hide--content > .vxe-form--item-title {
   max-width: none;

package/lib/vxe-form/style/style.min.css

@@ -1 +1 @@
-.vxe-form--item .vxe-default-input[type=reset]:hover,.vxe-form--item .vxe-default-input[type=submit]:hover{color:var(--vxe-ui-font-primary-lighten-color);border-color:var(--vxe-ui-font-primary-lighten-color)}.vxe-form{position:relative;font-size:var(--vxe-ui-font-size-default);color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color);text-align:left}.vxe-form .vxe-row{flex-shrink:0}.vxe-form--item-row{display:flex;flex-direction:row;flex-wrap:wrap}.vxe-form--item-row>.vxe-form--item-col_1{width:4.16667%}.vxe-form--item-row>.vxe-form--item-col_2{width:8.33333%}.vxe-form--item-row>.vxe-form--item-col_3{width:12.5%}.vxe-form--item-row>.vxe-form--item-col_4{width:16.66667%}.vxe-form--item-row>.vxe-form--item-col_5{width:20.83333%}.vxe-form--item-row>.vxe-form--item-col_6{width:25%}.vxe-form--item-row>.vxe-form--item-col_7{width:29.16667%}.vxe-form--item-row>.vxe-form--item-col_8{width:33.33333%}.vxe-form--item-row>.vxe-form--item-col_9{width:37.5%}.vxe-form--item-row>.vxe-form--item-col_10{width:41.66667%}.vxe-form--item-row>.vxe-form--item-col_11{width:45.83333%}.vxe-form--item-row>.vxe-form--item-col_12{width:50%}.vxe-form--item-row>.vxe-form--item-col_13{width:54.16667%}.vxe-form--item-row>.vxe-form--item-col_14{width:58.33333%}.vxe-form--item-row>.vxe-form--item-col_15{width:62.5%}.vxe-form--item-row>.vxe-form--item-col_16{width:66.66667%}.vxe-form--item-row>.vxe-form--item-col_17{width:70.83333%}.vxe-form--item-row>.vxe-form--item-col_18{width:75%}.vxe-form--item-row>.vxe-form--item-col_19{width:79.16667%}.vxe-form--item-row>.vxe-form--item-col_20{width:83.33333%}.vxe-form--item-row>.vxe-form--item-col_21{width:87.5%}.vxe-form--item-row>.vxe-form--item-col_22{width:91.66667%}.vxe-form--item-row>.vxe-form--item-col_23{width:95.83333%}.vxe-form--item-row>.vxe-form--item-col_24{width:100%}.vxe-form-slots{display:none}.vxe-form--item-inner,.vxe-form--item-trigger-node{display:inline-block;vertical-align:middle}.vxe-form--item-title{display:flex;flex-direction:row;align-items:center;max-width:320px;padding-right:.8em}.vxe-form--item-title.is--ellipsis .vxe-form--item-title-content{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-form--item-title .vxe-form--item-title-postfix,.vxe-form--item-title .vxe-form--item-title-prefix,.vxe-form--item-title .vxe-form--item-title-suffix{flex-shrink:0}.vxe-form--item-title .vxe-form--item-title-prefix,.vxe-form--item-title .vxe-form--item-title-suffix{cursor:help;vertical-align:middle}.vxe-form--item-title .vxe-form--item-title-prefix{margin-right:.25em}.vxe-form--item-title .vxe-form--item-title-suffix{margin-left:.2em}.vxe-form--item-title .vxe-form--item-title-postfix{display:flex;align-items:center}.vxe-form--item-title .vxe-form--item-title-content{flex-grow:1}.vxe-form--item-title .vxe-form--item-title-label{vertical-align:middle}.vxe-form--item-title .vxe-form--item-title-extra{display:flex;flex-direction:row;align-items:center;justify-content:right;flex-grow:1}.vxe-form--item-title{flex-shrink:0}.vxe-form--item-content{display:flex;flex-direction:row;align-items:flex-start;position:relative;flex-grow:1;word-break:break-all}.vxe-form--item-trigger-node{font-size:12px;min-width:100px;color:#909399;text-align:center;-webkit-user-select:none;-moz-user-select:none;user-select:none;cursor:pointer}.vxe-form--item-trigger-node .vxe-form--item-trigger-icon{display:inline-block;margin:0 .25em;transition:all .1s}.vxe-form--item-valid{position:absolute;width:100%;font-size:12px;color:var(--vxe-ui-form-validate-error-color);background-color:var(--vxe-ui-form-validate-error-background-color);z-index:1;opacity:0;transform-origin:center top;transform:scaleY(0);transition:all .2s ease-in-out}.vxe-form--item-valid .vxe-form--item-valid-msg{line-height:1.2em;background-color:var(--vxe-ui-layout-background-color)}.vxe-form .vxe-form--wrapper{display:flex;flex-direction:row;flex-wrap:wrap}.vxe-form .vxe-form--item{display:none}.vxe-form .vxe-form--item.is--active:not(.is--hidden){display:inline-flex}.vxe-form--item-inner{position:relative;width:100%}.vxe-form--item.is--padding.is--vertical>.vxe-form--item-title{padding:0 .6em}.vxe-form--item.is--padding:not(.is--vertical)>.vxe-form--item-title{height:100%;padding:.6em}.vxe-form--item.is--padding>.vxe-form--item-content{padding:.6em}.vxe-form--item.is--padding>.vxe-form--group-content{padding:0}.vxe-form--item.is--bold>.vxe-form--item-title{font-weight:700}.vxe-form--item.is--colon>.vxe-form--item-title .vxe-form--item-title-postfix:after{content:":";font-weight:400;margin-left:.2em}.vxe-form--item.is--asterisk.is--required>.vxe-form--item-title .vxe-form--item-title-content:before{content:"*";color:var(--vxe-ui-form-validate-error-color);font-family:Verdana,Arial,Tahoma;margin-right:.2em;font-weight:400;vertical-align:middle}.vxe-form--item.is--vertical{flex-direction:column;align-items:initial}.vxe-form--item.is--vertical>.vxe-form--item-title{height:2.5em;line-height:2.3em;padding-right:0;max-width:none}.vxe-form--item.is--vertical>.vxe-form--item-title .vxe-form--item-title-content{flex-grow:initial}.vxe-form--item.is--span .vxe-date-picker,.vxe-form--item.is--span .vxe-default-input:not([type=submit]):not([type=reset]),.vxe-form--item.is--span .vxe-default-select,.vxe-form--item.is--span .vxe-default-textarea,.vxe-form--item.is--span .vxe-ico-picker,.vxe-form--item.is--span .vxe-input,.vxe-form--item.is--span .vxe-number-input,.vxe-form--item.is--span .vxe-password-input,.vxe-form--item.is--span .vxe-select,.vxe-form--item.is--span .vxe-textarea,.vxe-form--item.is--span .vxe-tree-select{width:100%}.vxe-form--item.is--error .vxe-date-picker,.vxe-form--item.is--error .vxe-default-input,.vxe-form--item.is--error .vxe-default-select,.vxe-form--item.is--error .vxe-default-textarea,.vxe-form--item.is--error .vxe-ico-picker,.vxe-form--item.is--error .vxe-input,.vxe-form--item.is--error .vxe-number-input,.vxe-form--item.is--error .vxe-password-input,.vxe-form--item.is--error .vxe-select,.vxe-form--item.is--error .vxe-textarea>.vxe-textarea--inner,.vxe-form--item.is--error .vxe-tree-select,.vxe-form--item.is--error .vxe-upload .vxe-upload--file-action-btn>.vxe-button,.vxe-form--item.is--error .vxe-upload .vxe-upload--image-action-box{border-color:var(--vxe-ui-form-validate-error-color)}.vxe-form--item.is--error .vxe-date-picker:focus,.vxe-form--item.is--error .vxe-default-input[type=search]:focus,.vxe-form--item.is--error .vxe-default-input[type=text]:focus,.vxe-form--item.is--error .vxe-default-select:focus,.vxe-form--item.is--error .vxe-default-textarea:focus,.vxe-form--item.is--error .vxe-input:focus,.vxe-form--item.is--error .vxe-number-input:focus,.vxe-form--item.is--error .vxe-password-input:focus,.vxe-form--item.is--error .vxe-textarea>.vxe-textarea--inner:focus{border-color:var(--vxe-ui-form-validate-error-color)}.vxe-form--item.is--error .vxe-form--item-valid{opacity:1;transform:scaleY(1)}.vxe-form--item .vxe-default-input,.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{outline:0;border:1px solid var(--vxe-ui-input-border-color);border-radius:var(--vxe-ui-base-border-radius)}.vxe-form--item .vxe-default-input,.vxe-form--item .vxe-default-select{height:var(--vxe-ui-button-height-default)}.vxe-form--item .vxe-default-input{padding:0 .8em}.vxe-form--item .vxe-default-textarea{height:calc(var(--vxe-ui-button-height-default) * 2);padding:.3em .6em}.vxe-form--item .vxe-default-input[type=number]{padding-right:.2em}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text]{padding:0 1em}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text],.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{color:var(--vxe-ui-font-color)}.vxe-form--item .vxe-default-input[type=search]:focus,.vxe-form--item .vxe-default-input[type=text]:focus,.vxe-form--item .vxe-default-select:focus,.vxe-form--item .vxe-default-textarea:focus{border:1px solid var(--vxe-ui-font-primary-color)}.vxe-form--item .vxe-default-input[type=search][disabled],.vxe-form--item .vxe-default-input[type=text][disabled],.vxe-form--item .vxe-default-select[disabled],.vxe-form--item .vxe-default-textarea[disabled]{cursor:not-allowed;background-color:var(--vxe-ui-input-disabled-background-color)}.vxe-form--item .vxe-default-input[type=reset],.vxe-form--item .vxe-default-input[type=submit]{line-height:calc(var(--vxe-ui-button-height-default) - 2px);background-color:#fff;cursor:pointer}.vxe-form--item .vxe-default-input[type=reset]:active,.vxe-form--item .vxe-default-input[type=submit]:active{color:var(--vxe-ui-font-primary-darken-color);border-color:var(--vxe-ui-font-primary-darken-color)}.vxe-form--item .vxe-default-input[type=date]::-webkit-inner-spin-button{margin-top:6px}.vxe-form--item .vxe-default-input[type=date]::-webkit-inner-spin-button,.vxe-form--item .vxe-default-input[type=number]::-webkit-inner-spin-button{height:24px}.vxe-form--item .vxe-default-input::-moz-placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-form--item .vxe-default-input::placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text],.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{width:180px}.vxe-form--item .vxe-default-textarea{resize:none;vertical-align:middle}.vxe-form--item .vxe-default-textarea::-moz-placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-form--item .vxe-default-textarea::placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-form.is--border{position:relative;overflow:hidden}.vxe-form.is--border::before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;border:1px solid var(--vxe-ui-form-border-color);pointer-events:none;z-index:1}.vxe-form.is--border .vxe-form--item{position:relative;padding:0}.vxe-form.is--border .vxe-form--item::before{content:"";position:absolute;top:-1px;left:-1px;width:calc(100% + 1px);height:calc(100% + 1px);border:1px solid var(--vxe-ui-form-border-color);pointer-events:none}.vxe-form.is--border .vxe-form--item.is--padding.is--vertical>.vxe-form--item-title{border-bottom:1px solid var(--vxe-ui-form-border-color)}.vxe-form.is--border .vxe-form--item.is--padding:not(.is--vertical)>.vxe-form--item-title{border-right:1px solid var(--vxe-ui-form-border-color)}.vxe-form.is--border .vxe-form--item.is--tbg>.vxe-form--item-title{background-color:var(--vxe-ui-form-title-background-color)}.vxe-form .vxe-form--item.hide--content>.vxe-form--item-title{max-width:none;flex-shrink:unset;flex-grow:1}.vxe-form .vxe-form--item-title.align--center{text-align:center}.vxe-form .vxe-form--item-title.align--left{text-align:left}.vxe-form .vxe-form--item-title.align--right{text-align:right}.vxe-form .vxe-form--item-content.align--center>.vxe-form--item-inner{text-align:center}.vxe-form .vxe-form--item-content.align--left>.vxe-form--item-inner{text-align:left}.vxe-form .vxe-form--item-content.align--right>.vxe-form--item-inner{text-align:right}.vxe-form .vxe-form--item-content.vertical-align--center{align-items:center}.vxe-form .vxe-form--item:not(.is--vertical) .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-default) + .6em)}.vxe-form .vxe-form--item .vxe-form--item-content{min-height:calc(var(--vxe-ui-form-item-min-height-default) + .6em)}.vxe-form.is--border .vxe-form--item .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-default) + .6em)}.vxe-form.is--border.size--medium .vxe-form--item .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-medium) + .6em)}.vxe-form.is--border.size--small .vxe-form--item .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-small) + .6em)}.vxe-form.is--border.size--mini .vxe-form--item .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-mini) + .6em)}.vxe-form.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-form.size--medium .vxe-default-input[type=reset],.vxe-form.size--medium .vxe-default-input[type=submit]{line-height:calc(var(--vxe-ui-button-height-medium) - 2px)}.vxe-form.size--medium .vxe-default-input,.vxe-form.size--medium .vxe-default-select{height:var(--vxe-ui-button-height-medium)}.vxe-form.size--medium .vxe-default-textarea{height:calc(var(--vxe-ui-button-height-medium) * 2)}.vxe-form.size--medium .vxe-form--item:not(.is--vertical) .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-medium) + .6em)}.vxe-form.size--medium .vxe-form--item .vxe-form--item-content{min-height:calc(var(--vxe-ui-form-item-min-height-medium) + .6em)}.vxe-form.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-form.size--small .vxe-default-input[type=reset],.vxe-form.size--small .vxe-default-input[type=submit]{line-height:calc(var(--vxe-ui-button-height-small) - 2px)}.vxe-form.size--small .vxe-default-input,.vxe-form.size--small .vxe-default-select{height:var(--vxe-ui-button-height-small)}.vxe-form.size--small .vxe-default-textarea{height:calc(var(--vxe-ui-button-height-small) * 2)}.vxe-form.size--small .vxe-form--item:not(.is--vertical) .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-small) + .6em)}.vxe-form.size--small .vxe-form--item .vxe-form--item-content{min-height:calc(var(--vxe-ui-form-item-min-height-small) + .6em)}.vxe-form.size--mini{font-size:var(--vxe-ui-font-size-mini)}.vxe-form.size--mini .vxe-default-input[type=reset],.vxe-form.size--mini .vxe-default-input[type=submit]{line-height:calc(var(--vxe-ui-button-height-mini) - 2px)}.vxe-form.size--mini .vxe-default-input,.vxe-form.size--mini .vxe-default-select{height:var(--vxe-ui-button-height-mini)}.vxe-form.size--mini .vxe-default-textarea{height:calc(var(--vxe-ui-button-height-mini) * 2)}.vxe-form.size--mini .vxe-form--item:not(.is--vertical) .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-mini) + .6em)}.vxe-form.size--mini .vxe-form--item .vxe-form--item-content{min-height:calc(var(--vxe-ui-form-item-min-height-mini) + .6em)}
+.vxe-form--item .vxe-default-input[type=reset]:hover,.vxe-form--item .vxe-default-input[type=submit]:hover{color:var(--vxe-ui-font-primary-lighten-color);border-color:var(--vxe-ui-font-primary-lighten-color)}.vxe-form{position:relative;font-size:var(--vxe-ui-font-size-default);color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color);text-align:left}.vxe-form .vxe-row{flex-shrink:0}.vxe-form--item-row{display:flex;flex-direction:row;flex-wrap:wrap}.vxe-form--item-row>.vxe-form--item-col_1{width:4.16667%}.vxe-form--item-row>.vxe-form--item-col_2{width:8.33333%}.vxe-form--item-row>.vxe-form--item-col_3{width:12.5%}.vxe-form--item-row>.vxe-form--item-col_4{width:16.66667%}.vxe-form--item-row>.vxe-form--item-col_5{width:20.83333%}.vxe-form--item-row>.vxe-form--item-col_6{width:25%}.vxe-form--item-row>.vxe-form--item-col_7{width:29.16667%}.vxe-form--item-row>.vxe-form--item-col_8{width:33.33333%}.vxe-form--item-row>.vxe-form--item-col_9{width:37.5%}.vxe-form--item-row>.vxe-form--item-col_10{width:41.66667%}.vxe-form--item-row>.vxe-form--item-col_11{width:45.83333%}.vxe-form--item-row>.vxe-form--item-col_12{width:50%}.vxe-form--item-row>.vxe-form--item-col_13{width:54.16667%}.vxe-form--item-row>.vxe-form--item-col_14{width:58.33333%}.vxe-form--item-row>.vxe-form--item-col_15{width:62.5%}.vxe-form--item-row>.vxe-form--item-col_16{width:66.66667%}.vxe-form--item-row>.vxe-form--item-col_17{width:70.83333%}.vxe-form--item-row>.vxe-form--item-col_18{width:75%}.vxe-form--item-row>.vxe-form--item-col_19{width:79.16667%}.vxe-form--item-row>.vxe-form--item-col_20{width:83.33333%}.vxe-form--item-row>.vxe-form--item-col_21{width:87.5%}.vxe-form--item-row>.vxe-form--item-col_22{width:91.66667%}.vxe-form--item-row>.vxe-form--item-col_23{width:95.83333%}.vxe-form--item-row>.vxe-form--item-col_24{width:100%}.vxe-form-slots{display:none}.vxe-form--item-inner,.vxe-form--item-trigger-node{display:inline-block;vertical-align:middle}.vxe-form--item-title{display:flex;flex-direction:row;align-items:center;max-width:320px;padding-right:.8em}.vxe-form--item-title.is--ellipsis .vxe-form--item-title-content{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-form--item-title .vxe-form--item-title-postfix,.vxe-form--item-title .vxe-form--item-title-prefix,.vxe-form--item-title .vxe-form--item-title-suffix{flex-shrink:0}.vxe-form--item-title .vxe-form--item-title-prefix,.vxe-form--item-title .vxe-form--item-title-suffix{cursor:help;vertical-align:middle}.vxe-form--item-title .vxe-form--item-title-prefix{margin-right:.25em}.vxe-form--item-title .vxe-form--item-title-suffix{margin-left:.2em}.vxe-form--item-title .vxe-form--item-title-postfix{display:flex;align-items:center}.vxe-form--item-title .vxe-form--item-title-content{flex-grow:1}.vxe-form--item-title .vxe-form--item-title-label{vertical-align:middle}.vxe-form--item-title .vxe-form--item-title-extra{display:flex;flex-direction:row;align-items:center;justify-content:right;flex-grow:1}.vxe-form--item-title{flex-shrink:0}.vxe-form--item-content{display:flex;flex-direction:row;align-items:center;position:relative;flex-grow:1;word-break:break-all}.vxe-form--group-content{align-items:flex-start}.vxe-form--item-trigger-node{font-size:12px;min-width:100px;color:#909399;text-align:center;-webkit-user-select:none;-moz-user-select:none;user-select:none;cursor:pointer}.vxe-form--item-trigger-node .vxe-form--item-trigger-icon{display:inline-block;margin:0 .25em;transition:all .1s}.vxe-form--item-valid{position:absolute;width:100%;font-size:12px;color:var(--vxe-ui-form-validate-error-color);background-color:var(--vxe-ui-form-validate-error-background-color);z-index:1;opacity:0;transform-origin:center top;transform:scaleY(0);transition:all .2s ease-in-out}.vxe-form--item-valid .vxe-form--item-valid-msg{line-height:1.2em;background-color:var(--vxe-ui-layout-background-color)}.vxe-form .vxe-form--wrapper{display:flex;flex-direction:row;flex-wrap:wrap}.vxe-form .vxe-form--item{display:none}.vxe-form .vxe-form--item.is--active:not(.is--hidden){display:inline-flex}.vxe-form--item-inner{position:relative;width:100%}.vxe-form--item.is--padding.is--vertical>.vxe-form--item-title{padding:0 .6em}.vxe-form--item.is--padding:not(.is--vertical)>.vxe-form--item-title{height:100%;padding:.6em}.vxe-form--item.is--padding>.vxe-form--item-content{padding:.6em}.vxe-form--item.is--padding>.vxe-form--group-content{padding:0}.vxe-form--item.is--bold>.vxe-form--item-title{font-weight:700}.vxe-form--item.is--colon>.vxe-form--item-title .vxe-form--item-title-postfix:after{content:":";font-weight:400;margin-left:.2em}.vxe-form--item.is--asterisk.is--required>.vxe-form--item-title .vxe-form--item-title-content:before{content:"*";color:var(--vxe-ui-form-validate-error-color);font-family:Verdana,Arial,Tahoma;margin-right:.2em;font-weight:400;vertical-align:middle}.vxe-form--item.is--tbg>.vxe-form--item-title{background-color:var(--vxe-ui-form-title-background-color)}.vxe-form--item.is--vertical{flex-direction:column;align-items:initial}.vxe-form--item.is--vertical>.vxe-form--item-title{height:2.5em;line-height:2.3em;padding-right:0;max-width:none}.vxe-form--item.is--vertical>.vxe-form--item-title .vxe-form--item-title-content{flex-grow:initial}.vxe-form--item.is--span .vxe-date-picker,.vxe-form--item.is--span .vxe-default-input:not([type=submit]):not([type=reset]),.vxe-form--item.is--span .vxe-default-select,.vxe-form--item.is--span .vxe-default-textarea,.vxe-form--item.is--span .vxe-ico-picker,.vxe-form--item.is--span .vxe-input,.vxe-form--item.is--span .vxe-number-input,.vxe-form--item.is--span .vxe-password-input,.vxe-form--item.is--span .vxe-select,.vxe-form--item.is--span .vxe-textarea,.vxe-form--item.is--span .vxe-tree-select{width:100%}.vxe-form--item.is--error .vxe-date-picker,.vxe-form--item.is--error .vxe-default-input,.vxe-form--item.is--error .vxe-default-select,.vxe-form--item.is--error .vxe-default-textarea,.vxe-form--item.is--error .vxe-ico-picker,.vxe-form--item.is--error .vxe-input,.vxe-form--item.is--error .vxe-number-input,.vxe-form--item.is--error .vxe-password-input,.vxe-form--item.is--error .vxe-select,.vxe-form--item.is--error .vxe-textarea>.vxe-textarea--inner,.vxe-form--item.is--error .vxe-tree-select,.vxe-form--item.is--error .vxe-upload .vxe-upload--file-action-btn>.vxe-button,.vxe-form--item.is--error .vxe-upload .vxe-upload--image-action-box{border-color:var(--vxe-ui-form-validate-error-color)}.vxe-form--item.is--error .vxe-date-picker:focus,.vxe-form--item.is--error .vxe-default-input[type=search]:focus,.vxe-form--item.is--error .vxe-default-input[type=text]:focus,.vxe-form--item.is--error .vxe-default-select:focus,.vxe-form--item.is--error .vxe-default-textarea:focus,.vxe-form--item.is--error .vxe-input:focus,.vxe-form--item.is--error .vxe-number-input:focus,.vxe-form--item.is--error .vxe-password-input:focus,.vxe-form--item.is--error .vxe-textarea>.vxe-textarea--inner:focus{border-color:var(--vxe-ui-form-validate-error-color)}.vxe-form--item.is--error .vxe-form--item-valid{opacity:1;transform:scaleY(1)}.vxe-form--item .vxe-default-input,.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{outline:0;border:1px solid var(--vxe-ui-input-border-color);border-radius:var(--vxe-ui-base-border-radius)}.vxe-form--item .vxe-default-input,.vxe-form--item .vxe-default-select{height:var(--vxe-ui-button-height-default)}.vxe-form--item .vxe-default-input{padding:0 .8em}.vxe-form--item .vxe-default-textarea{height:calc(var(--vxe-ui-button-height-default) * 2);padding:.3em .6em}.vxe-form--item .vxe-default-input[type=number]{padding-right:.2em}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text]{padding:0 1em}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text],.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{color:var(--vxe-ui-font-color)}.vxe-form--item .vxe-default-input[type=search]:focus,.vxe-form--item .vxe-default-input[type=text]:focus,.vxe-form--item .vxe-default-select:focus,.vxe-form--item .vxe-default-textarea:focus{border:1px solid var(--vxe-ui-font-primary-color)}.vxe-form--item .vxe-default-input[type=search][disabled],.vxe-form--item .vxe-default-input[type=text][disabled],.vxe-form--item .vxe-default-select[disabled],.vxe-form--item .vxe-default-textarea[disabled]{cursor:not-allowed;background-color:var(--vxe-ui-input-disabled-background-color)}.vxe-form--item .vxe-default-input[type=reset],.vxe-form--item .vxe-default-input[type=submit]{line-height:calc(var(--vxe-ui-button-height-default) - 2px);background-color:#fff;cursor:pointer}.vxe-form--item .vxe-default-input[type=reset]:active,.vxe-form--item .vxe-default-input[type=submit]:active{color:var(--vxe-ui-font-primary-darken-color);border-color:var(--vxe-ui-font-primary-darken-color)}.vxe-form--item .vxe-default-input[type=date]::-webkit-inner-spin-button{margin-top:6px}.vxe-form--item .vxe-default-input[type=date]::-webkit-inner-spin-button,.vxe-form--item .vxe-default-input[type=number]::-webkit-inner-spin-button{height:24px}.vxe-form--item .vxe-default-input::-moz-placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-form--item .vxe-default-input::placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text],.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{width:180px}.vxe-form--item .vxe-default-textarea{resize:none;vertical-align:middle}.vxe-form--item .vxe-default-textarea::-moz-placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-form--item .vxe-default-textarea::placeholder{color:var(--vxe-ui-input-placeholder-color)}.vxe-form.is--border{position:relative;overflow:hidden}.vxe-form.is--border::before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;border:1px solid var(--vxe-ui-form-border-color);pointer-events:none;z-index:1}.vxe-form.is--border .vxe-form--item{position:relative;padding:0}.vxe-form.is--border .vxe-form--item::before{content:"";position:absolute;top:-1px;left:-1px;width:calc(100% + 1px);height:calc(100% + 1px);border:1px solid var(--vxe-ui-form-border-color);pointer-events:none}.vxe-form.is--border .vxe-form--item.is--padding.is--vertical>.vxe-form--item-title{border-bottom:1px solid var(--vxe-ui-form-border-color)}.vxe-form.is--border .vxe-form--item.is--padding:not(.is--vertical)>.vxe-form--item-title{border-right:1px solid var(--vxe-ui-form-border-color)}.vxe-form .vxe-form--item.hide--content>.vxe-form--item-title{max-width:none;flex-shrink:unset;flex-grow:1}.vxe-form .vxe-form--item-title.align--center{text-align:center}.vxe-form .vxe-form--item-title.align--left{text-align:left}.vxe-form .vxe-form--item-title.align--right{text-align:right}.vxe-form .vxe-form--item-content.align--center>.vxe-form--item-inner{text-align:center}.vxe-form .vxe-form--item-content.align--left>.vxe-form--item-inner{text-align:left}.vxe-form .vxe-form--item-content.align--right>.vxe-form--item-inner{text-align:right}.vxe-form .vxe-form--item-content.vertical-align--center{align-items:center}.vxe-form .vxe-form--item:not(.is--vertical) .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-default) + .6em)}.vxe-form .vxe-form--item .vxe-form--item-content{min-height:calc(var(--vxe-ui-form-item-min-height-default) + .6em)}.vxe-form.is--border .vxe-form--item .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-default) + .6em)}.vxe-form.is--border.size--medium .vxe-form--item .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-medium) + .6em)}.vxe-form.is--border.size--small .vxe-form--item .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-small) + .6em)}.vxe-form.is--border.size--mini .vxe-form--item .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-mini) + .6em)}.vxe-form.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-form.size--medium .vxe-default-input[type=reset],.vxe-form.size--medium .vxe-default-input[type=submit]{line-height:calc(var(--vxe-ui-button-height-medium) - 2px)}.vxe-form.size--medium .vxe-default-input,.vxe-form.size--medium .vxe-default-select{height:var(--vxe-ui-button-height-medium)}.vxe-form.size--medium .vxe-default-textarea{height:calc(var(--vxe-ui-button-height-medium) * 2)}.vxe-form.size--medium .vxe-form--item:not(.is--vertical) .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-medium) + .6em)}.vxe-form.size--medium .vxe-form--item .vxe-form--item-content{min-height:calc(var(--vxe-ui-form-item-min-height-medium) + .6em)}.vxe-form.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-form.size--small .vxe-default-input[type=reset],.vxe-form.size--small .vxe-default-input[type=submit]{line-height:calc(var(--vxe-ui-button-height-small) - 2px)}.vxe-form.size--small .vxe-default-input,.vxe-form.size--small .vxe-default-select{height:var(--vxe-ui-button-height-small)}.vxe-form.size--small .vxe-default-textarea{height:calc(var(--vxe-ui-button-height-small) * 2)}.vxe-form.size--small .vxe-form--item:not(.is--vertical) .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-small) + .6em)}.vxe-form.size--small .vxe-form--item .vxe-form--item-content{min-height:calc(var(--vxe-ui-form-item-min-height-small) + .6em)}.vxe-form.size--mini{font-size:var(--vxe-ui-font-size-mini)}.vxe-form.size--mini .vxe-default-input[type=reset],.vxe-form.size--mini .vxe-default-input[type=submit]{line-height:calc(var(--vxe-ui-button-height-mini) - 2px)}.vxe-form.size--mini .vxe-default-input,.vxe-form.size--mini .vxe-default-select{height:var(--vxe-ui-button-height-mini)}.vxe-form.size--mini .vxe-default-textarea{height:calc(var(--vxe-ui-button-height-mini) * 2)}.vxe-form.size--mini .vxe-form--item:not(.is--vertical) .vxe-form--item-title{min-height:calc(var(--vxe-ui-form-item-min-height-mini) + .6em)}.vxe-form.size--mini .vxe-form--item .vxe-form--item-content{min-height:calc(var(--vxe-ui-form-item-min-height-mini) + .6em)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "A vue based PC component library",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -57,7 +57,7 @@
     "gulp-typescript": "^5.0.1",
     "gulp-uglify": "^3.0.2",
     "postcss": "^8.4.38",
-    "sass": "^1.77.8",
+    "sass": "^1.79.3",
     "sass-loader": "^14.2.1",
     "typescript": "~4.9.5",
     "vue": "3.5.5",

package/packages/drawer/src/drawer.ts

@@ -43,6 +43,14 @@ export default defineComponent({
       type: Boolean as PropType<VxeDrawerPropTypes.EscClosable>,
       default: () => getConfig().drawer.escClosable
     },
+    cancelClosable: {
+      type: Boolean as PropType<VxeDrawerPropTypes.CancelClosable>,
+      default: () => getConfig().drawer.cancelClosable
+    },
+    confirmClosable: {
+      type: Boolean as PropType<VxeDrawerPropTypes.ConfirmClosable>,
+      default: () => getConfig().drawer.confirmClosable
+    },
     showHeader: {
       type: Boolean as PropType<VxeDrawerPropTypes.ShowHeader>,
       default: () => getConfig().drawer.showHeader
@@ -199,15 +207,21 @@ export default defineComponent({
     }
 
     const confirmEvent = (evnt: Event) => {
+      const { confirmClosable } = props
       const type = 'confirm'
       dispatchEvent(type, { type }, evnt)
-      closeDrawer(type)
+      if (confirmClosable) {
+        closeDrawer(type)
+      }
     }
 
     const cancelEvent = (evnt: Event) => {
+      const { cancelClosable } = props
       const type = 'cancel'
       dispatchEvent(type, { type }, evnt)
-      closeDrawer(type)
+      if (cancelClosable) {
+        closeDrawer(type)
+      }
     }
 
     const openDrawer = () => {

package/packages/modal/src/modal.ts

@@ -77,6 +77,14 @@ export default defineComponent({
       type: Boolean as PropType<VxeModalPropTypes.EscClosable>,
       default: () => getConfig().modal.escClosable
     },
+    cancelClosable: {
+      type: Boolean as PropType<VxeModalPropTypes.CancelClosable>,
+      default: () => getConfig().modal.cancelClosable
+    },
+    confirmClosable: {
+      type: Boolean as PropType<VxeModalPropTypes.ConfirmClosable>,
+      default: () => getConfig().modal.confirmClosable
+    },
     resize: Boolean as PropType<VxeModalPropTypes.Resize>,
     showHeader: {
       type: Boolean as PropType<VxeModalPropTypes.ShowHeader>,
@@ -367,15 +375,21 @@ export default defineComponent({
     }
 
     const confirmEvent = (evnt: Event) => {
+      const { confirmClosable } = props
       const type = 'confirm'
       dispatchEvent(type, { type }, evnt)
-      closeModal(type)
+      if (confirmClosable) {
+        closeModal(type)
+      }
     }
 
     const cancelEvent = (evnt: Event) => {
+      const { cancelClosable } = props
       const type = 'cancel'
       dispatchEvent(type, { type }, evnt)
-      closeModal(type)
+      if (cancelClosable) {
+        closeModal(type)
+      }
     }
 
     const getStorageMap = (key: string) => {

package/packages/row/src/col.ts

@@ -117,7 +117,11 @@ export default defineComponent({
           'is--ellipsis': ellipsis
         }],
         style: colStyle
-      }, defaultSlot ? defaultSlot({}) : [])
+      }, [
+        h('div', {
+          class: 'vxe-col--inner'
+        }, defaultSlot ? defaultSlot({}) : [])
+      ])
     }
 
     $xeCol.renderVN = renderVN

package/packages/ui/index.ts

@@ -85,7 +85,9 @@ setConfig({
     mask: true,
     showTitleOverflow: true,
     showClose: true,
-    padding: true
+    padding: true,
+    cancelClosable: true,
+    confirmClosable: true
   },
   form: {
     // preventSubmit: false,
@@ -181,6 +183,8 @@ setConfig({
     padding: true,
     draggable: true,
     showConfirmButton: null,
+    cancelClosable: true,
+    confirmClosable: true,
     zoomConfig: {
       minimizeMaxSize: 10,
       minimizeVerticalOffset: {

package/styles/components/card.scss

@@ -1,4 +1,5 @@
 .vxe-card {
+  position: relative;
   display: inline-flex;
   flex-direction: column;
   font-size: var(--vxe-ui-font-size-default);
@@ -10,8 +11,6 @@
     box-shadow: var(--vxe-ui-base-popup-box-shadow);
   }
   &.is--padding {
-    .vxe-card--header,
-    .vxe-card--footer,
     .vxe-card--body-content,
     .vxe-card--body-left,
     .vxe-card--body-right {
@@ -36,6 +35,10 @@
 .vxe-card--header {
   flex-shrink: 0;
 }
+.vxe-card--header,
+.vxe-card--footer {
+  padding: var(--vxe-ui-card-padding);
+}
 .vxe-card--body {
   overflow: hidden;
   flex-grow: 1;

package/styles/components/col.scss

@@ -30,3 +30,7 @@ $colSpanList: 4.16667%, 8.33333%, 12.5%, 16.66667%, 20.83333%, 25%, 29.16667%, 3
     }
   }
 }
+.vxe-col--inner {
+  display: flex;
+  flex-direction: column;
+}

package/styles/components/form.scss

@@ -93,11 +93,14 @@
 .vxe-form--item-content {
   display: flex;
   flex-direction: row;
-  align-items: flex-start;
+  align-items: center;
   position: relative;
   flex-grow: 1;
   word-break: break-all;
 }
+.vxe-form--group-content {
+  align-items: flex-start;
+}
 
 .vxe-form--item-trigger-node {
   font-size: 12px;
@@ -203,6 +206,11 @@
       }
     }
   }
+  &.is--tbg { 
+    & > .vxe-form--item-title {
+      background-color: var(--vxe-ui-form-title-background-color);
+    }
+  }
   &.is--vertical {
     flex-direction: column;
     align-items: initial;
@@ -382,11 +390,6 @@
           }
         }
       }
-      &.is--tbg { 
-        & > .vxe-form--item-title {
-          background-color: var(--vxe-ui-form-title-background-color);
-        }
-      }
     }
   }
 }

package/types/components/drawer.d.ts

@@ -50,6 +50,8 @@ export namespace VxeDrawerPropTypes {
   export type Mask = boolean
   export type MaskClosable = boolean
   export type EscClosable = boolean
+  export type CancelClosable = boolean
+  export type ConfirmClosable = boolean
   export type ShowHeader = boolean
   export type ShowFooter = boolean
   export type ShowClose = boolean
@@ -82,6 +84,8 @@ export interface VxeDrawerProps {
   mask?: VxeDrawerPropTypes.Mask
   maskClosable?: VxeDrawerPropTypes.MaskClosable
   escClosable?: VxeDrawerPropTypes.EscClosable
+  cancelClosable?: VxeDrawerPropTypes.CancelClosable
+  confirmClosable?: VxeDrawerPropTypes.ConfirmClosable
   showHeader?: VxeDrawerPropTypes.ShowHeader
   showFooter?: VxeDrawerPropTypes.ShowFooter
   showClose?: VxeDrawerPropTypes.ShowClose

package/types/components/modal.d.ts

@@ -70,6 +70,8 @@ export namespace VxeModalPropTypes {
   export type Mask = boolean
   export type MaskClosable = boolean
   export type EscClosable = boolean
+  export type CancelClosable = boolean
+  export type ConfirmClosable = boolean
   export type Resize = boolean
   export type ShowHeader = boolean
   export type ShowFooter = boolean
@@ -143,6 +145,8 @@ export interface VxeModalProps {
   mask?: VxeModalPropTypes.Mask
   maskClosable?: VxeModalPropTypes.MaskClosable
   escClosable?: VxeModalPropTypes.EscClosable
+  cancelClosable?: VxeModalPropTypes.CancelClosable
+  confirmClosable?: VxeModalPropTypes.ConfirmClosable
   resize?: VxeModalPropTypes.Resize
   showHeader?: VxeModalPropTypes.ShowHeader
   showFooter?: VxeModalPropTypes.ShowFooter