vxe-pc-ui 4.17.27 → 4.17.29

package/dist/all.esm.js

@@ -101,7 +101,7 @@ function checkDynamic() {
 }
 
 const { log } = VxeUI;
-const uiVersion = `ui v${"4.17.27"}`;
+const uiVersion = `ui v${"4.17.29"}`;
 function createComponentLog(name) {
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -115,7 +115,7 @@ function createComponentLog(name) {
 const warnLog$i = log.create('warn', uiVersion);
 log.create('error', uiVersion);
 
-const version = "4.17.27";
+const version = "4.17.29";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -251,8 +251,12 @@ setConfig$1({
     drawer: {
         // size: null,
         // useHtml: false,
+        minWidth: 40,
+        minHeight: 40,
         position: 'right',
         showHeader: true,
+        // showTitleBackground: false,
+        border: true,
         lockView: true,
         mask: true,
         showTitleOverflow: true,
@@ -362,6 +366,8 @@ setConfig$1({
         // size: null,
         top: 16,
         showHeader: true,
+        // showTitleBackground: false,
+        border: true,
         // useHtml: false,
         // width: null,
         // height: null,
@@ -2669,7 +2675,7 @@ function deModelValue(nodeid) {
     return nodeid ? decodeURIComponent(`${nodeid}`) : nodeid;
 }
 
-function createReactData$n() {
+function createReactData$o() {
     return {
         target: null,
         isUpdate: false,
@@ -2686,7 +2692,7 @@ function createReactData$n() {
         }
     };
 }
-function createInternalData$m() {
+function createInternalData$n() {
     return {
     // showDelayTip: undefined
     };
@@ -2785,8 +2791,8 @@ var VxeTooltipComponent = defineVxeComponent({
         const { slots, emit } = context;
         const xID = XEUtils.uniqueId();
         const { computeSize } = useSize(props);
-        const reactData = reactive(createReactData$n());
-        const internalData = createInternalData$m();
+        const reactData = reactive(createReactData$o());
+        const internalData = createInternalData$n();
         const refElem = ref();
         const contentWrapperfElem = ref();
         const computeWrapperStyle = computed(() => {
@@ -3189,8 +3195,8 @@ var VxeTooltipComponent = defineVxeComponent({
             }
             globalEvents.off($xeTooltip, 'blur');
             globalEvents.off($xeTooltip, 'scroll');
-            XEUtils.assign(reactData, createReactData$n());
-            XEUtils.assign(internalData, createInternalData$m());
+            XEUtils.assign(reactData, createReactData$o());
+            XEUtils.assign(internalData, createInternalData$n());
         });
         $xeTooltip.renderVN = renderVN;
         return $xeTooltip;
@@ -4012,12 +4018,12 @@ VxeUI.component(VxeButtonComponent);
 const Button = VxeButton;
 
 const { errLog: errLog$k } = createComponentLog('backtop');
-function createInternalData$l() {
+function createInternalData$m() {
     return {
         targetEl: null
     };
 }
-function createReactData$m() {
+function createReactData$n() {
     return {
         showBtn: false,
         backtopZindex: 0
@@ -4096,8 +4102,8 @@ var VxeBacktopComponent = defineVxeComponent({
         const xID = XEUtils.uniqueId();
         const refElem = ref();
         const { computeSize } = useSize(props);
-        const internalData = createInternalData$l();
-        const reactData = reactive(createReactData$m());
+        const internalData = createInternalData$m();
+        const reactData = reactive(createReactData$n());
         const refMaps = {
             refElem
         };
@@ -4271,8 +4277,8 @@ var VxeBacktopComponent = defineVxeComponent({
         });
         onBeforeUnmount(() => {
             removeScrollEvent();
-            XEUtils.assign(reactData, createReactData$m());
-            XEUtils.assign(internalData, createInternalData$l());
+            XEUtils.assign(reactData, createReactData$n());
+            XEUtils.assign(internalData, createInternalData$m());
         });
         $xeBacktop.renderVN = renderVN;
         return $xeBacktop;
@@ -7031,7 +7037,7 @@ function getRowIdByField(row, keyField) {
     const rowKey = getRowKeyByField(row, keyField);
     return enModelValue(rowKey);
 }
-function createReactData$l() {
+function createReactData$m() {
     return {
         scrollYLoad: false,
         bodyHeight: 0,
@@ -7054,7 +7060,7 @@ function createReactData$l() {
         isCrossDragRow: false
     };
 }
-function createInternalData$k() {
+function createInternalData$l() {
     return {
         resizeObserver: undefined,
         fullData: [],
@@ -7141,8 +7147,8 @@ var VxeListComponent = defineVxeComponent({
         const xID = XEUtils.uniqueId();
         const browseObj = XEUtils.browse();
         const { computeSize } = useSize(props);
-        const reactData = reactive(createReactData$l());
-        const internalData = createInternalData$k();
+        const reactData = reactive(createReactData$m());
+        const internalData = createInternalData$l();
         const crossListDragRowInfo = getCrossListDragRowInfo();
         const refElem = ref();
         const refHeaderElem = ref();
@@ -9105,8 +9111,8 @@ var VxeListComponent = defineVxeComponent({
                 resizeObserver.disconnect();
             }
             globalEvents.off($xeList, 'resize');
-            XEUtils.assign(reactData, createReactData$l());
-            XEUtils.assign(internalData, createInternalData$k());
+            XEUtils.assign(reactData, createReactData$m());
+            XEUtils.assign(internalData, createInternalData$l());
         });
         $xeList.renderVN = renderVN;
         return $xeList;
@@ -11897,7 +11903,7 @@ const Input = VxeInput;
 function getNodeUniqueId$1() {
     return XEUtils.uniqueId('node_');
 }
-function createReactData$k() {
+function createReactData$l() {
     return {
         initialized: false,
         searchValue: '',
@@ -11920,7 +11926,7 @@ function createReactData$k() {
         lazyOptFlag: 1
     };
 }
-function createInternalData$j() {
+function createInternalData$k() {
     return {
         // hpTimeout: undefined,
         listVirtualYOpts: {
@@ -12048,8 +12054,8 @@ var VxeCascaderComponent = defineVxeComponent({
         const refInpSearch = ref();
         const refChunkWrapper = ref();
         const refOptionPanel = ref();
-        const reactData = reactive(createReactData$k());
-        const internalData = createInternalData$j();
+        const reactData = reactive(createReactData$l());
+        const internalData = createInternalData$k();
         const refMaps = {
             refElem
         };
@@ -13659,8 +13665,8 @@ var VxeCascaderComponent = defineVxeComponent({
             globalEvents.off($xeCascader, 'mousedown');
             globalEvents.off($xeCascader, 'blur');
             globalEvents.off($xeCascader, 'resize');
-            XEUtils.assign(reactData, createReactData$k());
-            XEUtils.assign(internalData, createInternalData$j());
+            XEUtils.assign(reactData, createReactData$l());
+            XEUtils.assign(internalData, createInternalData$k());
         });
         provide('$xeCascader', $xeCascader);
         $xeCascader.renderVN = renderVN;
@@ -14064,10 +14070,10 @@ dynamicApp.use(VxeCheckboxButton);
 VxeUI.component(VxeCheckboxButtonComponent);
 const CheckboxButton = VxeCheckboxButton;
 
-function createReactData$j() {
+function createReactData$k() {
     return {};
 }
-function createInternalData$i() {
+function createInternalData$j() {
     return {
     // isLoaded: false
     };
@@ -14111,8 +14117,8 @@ var VxeCheckboxGroupComponent = defineVxeComponent({
         const $xeForm = inject('$xeForm', null);
         const formItemInfo = inject('xeFormItemInfo', null);
         const xID = XEUtils.uniqueId();
-        const reactData = reactive(createReactData$j());
-        const internalData = createInternalData$i();
+        const reactData = reactive(createReactData$k());
+        const internalData = createInternalData$j();
         const computeIsReadonly = computed(() => {
             const { readonly } = props;
             if (readonly === null) {
@@ -14285,8 +14291,8 @@ var VxeCheckboxGroupComponent = defineVxeComponent({
             });
         });
         onUnmounted(() => {
-            XEUtils.assign(reactData, createReactData$j());
-            XEUtils.assign(internalData, createInternalData$i());
+            XEUtils.assign(reactData, createReactData$k());
+            XEUtils.assign(internalData, createInternalData$j());
         });
         provide('$xeCheckboxGroup', $xeCheckboxGroup);
         $xeCheckboxGroup.renderVN = renderVN;
@@ -14419,7 +14425,7 @@ dynamicApp.use(VxeCol);
 VxeUI.component(VxeColComponent);
 const Col = VxeCol;
 
-function createReactData$i() {
+function createReactData$j() {
     return {
         staticPanes: [],
         cachePaneMaps: {},
@@ -14427,7 +14433,7 @@ function createReactData$i() {
         openKeyFlag: 0
     };
 }
-function createInternalData$h() {
+function createInternalData$i() {
     return {
         // esTime: null,
         activeKeyMaps: {},
@@ -14464,8 +14470,8 @@ var VxeCollapseComponent = defineVxeComponent({
         const xID = XEUtils.uniqueId();
         const { computeSize } = useSize(props);
         const refElem = ref();
-        const reactData = reactive(createReactData$i());
-        const internalData = createInternalData$h();
+        const reactData = reactive(createReactData$j());
+        const internalData = createInternalData$i();
         const refMaps = {
             refElem
         };
@@ -14744,8 +14750,8 @@ var VxeCollapseComponent = defineVxeComponent({
             if (esTime) {
                 clearTimeout(esTime);
             }
-            XEUtils.assign(reactData, createReactData$i());
-            XEUtils.assign(internalData, createInternalData$h());
+            XEUtils.assign(reactData, createReactData$j());
+            XEUtils.assign(internalData, createInternalData$i());
         });
         provide('$xeCollapse', $xeCollapse);
         $xeCollapse.renderVN = renderVN;
@@ -17367,13 +17373,19 @@ var VxeColorPickerComponent = defineVxeComponent({
             if (formReadonly) {
                 return h('div', {
                     ref: refElem,
-                    class: ['vxe-color-picker--readonly', className]
+                    class: ['vxe-color-picker--readonly', className, {
+                            [`size--${vSize}`]: vSize
+                        }]
                 }, [
                     h('div', {
-                        class: 'vxe-color-picker--readonly-color',
-                        style: {
-                            backgroundColor: modelValue
-                        }
+                        class: ['vxe-color-picker--readonly-color', {
+                                'is--empty': !modelValue
+                            }],
+                        style: modelValue
+                            ? {
+                                backgroundColor: modelValue
+                            }
+                            : undefined
                     })
                 ]);
             }
@@ -17500,12 +17512,12 @@ VxeUI.color = {
 };
 const ColorPicker = VxeColorPicker;
 
-function createInternalData$g() {
+function createInternalData$h() {
     return {
     // leaveTime: null
     };
 }
-function createReactData$h() {
+function createReactData$i() {
     return {
         visible: false,
         activeOption: null,
@@ -17560,8 +17572,8 @@ var VxeContextMenuComponent = defineVxeComponent({
         const xID = XEUtils.uniqueId();
         const refElem = ref();
         const { computeSize } = useSize(props);
-        const internalData = createInternalData$g();
-        const reactData = reactive(createReactData$h());
+        const internalData = createInternalData$h();
+        const reactData = reactive(createReactData$i());
         const refMaps = {
             refElem
         };
@@ -18116,8 +18128,8 @@ var VxeContextMenuComponent = defineVxeComponent({
             globalEvents.off($xeContextMenu, 'keydown');
             globalEvents.off($xeContextMenu, 'mousedown');
             globalEvents.off($xeContextMenu, 'blur');
-            XEUtils.assign(reactData, createReactData$h());
-            XEUtils.assign(internalData, createInternalData$g());
+            XEUtils.assign(reactData, createReactData$i());
+            XEUtils.assign(internalData, createInternalData$h());
         });
         $xeContextMenu.renderVN = renderVN;
         return $xeContextMenu;
@@ -20435,7 +20447,7 @@ const parseInputKayMaps = {};
 inputMaskedKeys.forEach(key => {
     parseInputKayMaps[key] = true;
 });
-function createReactData$g() {
+function createReactData$h() {
     return {
         initialized: false,
         panelIndex: 0,
@@ -20448,7 +20460,7 @@ function createReactData$g() {
         labelFlag: 0
     };
 }
-function createInternalData$f() {
+function createInternalData$g() {
     return {
         // hpTimeout: undefined,
         // fsTimeout: undefined,
@@ -20593,8 +20605,8 @@ var VxeDatePickerComponent = defineVxeComponent({
         const formItemInfo = inject('xeFormItemInfo', null);
         const xID = XEUtils.uniqueId();
         const { computeSize } = useSize(props);
-        const reactData = reactive(createReactData$g());
-        const internalData = createInternalData$f();
+        const reactData = reactive(createReactData$h());
+        const internalData = createInternalData$g();
         const refElem = ref();
         const refInputTarget = ref();
         const refInputPanel = ref();
@@ -22030,8 +22042,8 @@ var VxeDatePickerComponent = defineVxeComponent({
             globalEvents.off($xeDatePicker, 'keydown');
             globalEvents.off($xeDatePicker, 'blur');
             globalEvents.off($xeDatePicker, 'resize');
-            XEUtils.assign(reactData, createReactData$g());
-            XEUtils.assign(internalData, createInternalData$f());
+            XEUtils.assign(reactData, createReactData$h());
+            XEUtils.assign(internalData, createInternalData$g());
         });
         provide('$xeDatePicker', $xeDatePicker);
         $xeDatePicker.renderVN = renderVN;
@@ -22052,7 +22064,7 @@ VxeUI.component(VxeDatePickerComponent);
 const DatePicker = VxeDatePicker;
 
 const { errLog: errLog$e } = createComponentLog('date-range-picker');
-function createReactData$f() {
+function createReactData$g() {
     return {
         initialized: false,
         panelIndex: 0,
@@ -22067,7 +22079,7 @@ function createReactData$f() {
         paneEndVal: []
     };
 }
-function createInternalData$e() {
+function createInternalData$f() {
     return {
     // selectStatus: false
     // hpTimeout: undefined
@@ -22214,8 +22226,8 @@ var VxeDateRangePickerComponent = defineVxeComponent({
         const formItemInfo = inject('xeFormItemInfo', null);
         const xID = XEUtils.uniqueId();
         const { computeSize } = useSize(props);
-        const reactData = reactive(createReactData$f());
-        const internalData = createInternalData$e();
+        const reactData = reactive(createReactData$g());
+        const internalData = createInternalData$f();
         const refElem = ref();
         const refInputTarget = ref();
         const refInputPanel = ref();
@@ -23541,8 +23553,8 @@ var VxeDateRangePickerComponent = defineVxeComponent({
             globalEvents.off($xeDateRangePicker, 'mousedown');
             globalEvents.off($xeDateRangePicker, 'blur');
             globalEvents.off($xeDateRangePicker, 'resize');
-            XEUtils.assign(reactData, createReactData$f());
-            XEUtils.assign(internalData, createInternalData$e());
+            XEUtils.assign(reactData, createReactData$g());
+            XEUtils.assign(internalData, createInternalData$f());
         });
         provide('$xeDateRangePicker', $xeDateRangePicker);
         $xeDateRangePicker.renderVN = renderVN;
@@ -23562,6 +23574,8 @@ dynamicApp.use(VxeDateRangePicker);
 VxeUI.component(VxeDateRangePickerComponent);
 const DateRangePicker = VxeDateRangePicker;
 
+const allActiveDrawers = [];
+
 const VxeLoading = Object.assign({}, VxeLoadingComponent, {
     install(app) {
         app.component(VxeLoadingComponent.name, VxeLoadingComponent);
@@ -23588,7 +23602,6 @@ VxeUI.component(VxeLoadingComponent);
 VxeUI.loading = LoadingController;
 const Loading = VxeLoading;
 
-const allActiveDrawers = [];
 var VxeDrawerComponent = defineVxeComponent({
     name: 'VxeDrawer',
     props: {
@@ -23671,12 +23684,34 @@ var VxeDrawerComponent = defineVxeComponent({
             default: () => getConfig$3().drawer.showTitleOverflow
         },
         preload: Boolean,
-        width: [Number, String],
-        height: [Number, String],
+        width: {
+            type: [Number, String],
+            default: () => getConfig$3().drawer.width
+        },
+        height: {
+            type: [Number, String],
+            default: () => getConfig$3().drawer.height
+        },
+        minWidth: {
+            type: [Number, String],
+            default: () => getConfig$3().drawer.minWidth
+        },
+        minHeight: {
+            type: [Number, String],
+            default: () => getConfig$3().drawer.minHeight
+        },
         resize: {
             type: Boolean,
             default: () => getConfig$3().drawer.resize
         },
+        border: {
+            type: Boolean,
+            default: () => getConfig$3().drawer.border
+        },
+        showTitleBackground: {
+            type: Boolean,
+            default: () => getConfig$3().drawer.showTitleBackground
+        },
         zIndex: Number,
         transfer: {
             type: Boolean,
@@ -23686,6 +23721,10 @@ var VxeDrawerComponent = defineVxeComponent({
             type: [String, Function],
             default: () => getConfig$3().drawer.appendTo
         },
+        isWithinAppendTo: {
+            type: Boolean,
+            default: () => getConfig$3().drawer.isWithinAppendTo
+        },
         padding: {
             type: Boolean,
             default: () => getConfig$3().drawer.padding
@@ -23770,11 +23809,12 @@ var VxeDrawerComponent = defineVxeComponent({
             return boxElem;
         };
         const recalculate = () => {
-            const { width, height } = props;
+            const { position, width, height } = props;
             const boxElem = getBox();
             if (boxElem) {
-                boxElem.style.width = toCssUnit(width);
-                boxElem.style.height = toCssUnit(height);
+                const isTb = position === 'top' || position === 'bottom';
+                boxElem.style.height = isTb ? toCssUnit(height) : '';
+                boxElem.style.width = isTb ? '' : toCssUnit(width);
             }
             return nextTick();
         };
@@ -23800,6 +23840,10 @@ var VxeDrawerComponent = defineVxeComponent({
             if (visible) {
                 Promise.resolve(beforeHideMethod ? beforeHideMethod(params) : null).then((rest) => {
                     if (!XEUtils.isError(rest)) {
+                        const el = refElem.value;
+                        if (el) {
+                            el.setAttribute('data-effect', 'y');
+                        }
                         reactData.contentVisible = false;
                         removeActiveQueue();
                         dispatchEvent('before-hide', params, null);
@@ -23808,6 +23852,12 @@ var VxeDrawerComponent = defineVxeComponent({
                             emit('update:modelValue', false);
                             dispatchEvent('hide', params, null);
                         }, 200);
+                        setTimeout(() => {
+                            const el = refElem.value;
+                            if (el) {
+                                el.removeAttribute('data-effect');
+                            }
+                        }, 350);
                     }
                 }).catch(e => e);
             }
@@ -23845,6 +23895,12 @@ var VxeDrawerComponent = defineVxeComponent({
                 reactData.contentVisible = false;
                 updateZindex();
                 allActiveDrawers.push($xeDrawer);
+                nextTick(() => {
+                    const el = refElem.value;
+                    if (el) {
+                        el.setAttribute('data-effect', 'y');
+                    }
+                });
                 setTimeout(() => {
                     recalculate();
                     reactData.contentVisible = true;
@@ -23863,6 +23919,12 @@ var VxeDrawerComponent = defineVxeComponent({
                         dispatchEvent('show', params, null);
                     });
                 }, 10);
+                setTimeout(() => {
+                    const el = refElem.value;
+                    if (el) {
+                        el.removeAttribute('data-effect');
+                    }
+                }, 350);
             }
             return nextTick();
         };
@@ -23908,12 +23970,19 @@ var VxeDrawerComponent = defineVxeComponent({
         };
         const dragEvent = (evnt) => {
             evnt.preventDefault();
-            const { visibleHeight, visibleWidth } = getDomNode();
+            const { resize, isWithinAppendTo } = props;
+            const el = refElem.value;
+            const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo ? el : document.body);
+            if (!parentWrapperEl) {
+                return;
+            }
+            const visibleWidth = parentWrapperEl.clientWidth - (resize && isWithinAppendTo ? 8 : 0);
+            const visibleHeight = parentWrapperEl.clientHeight - (resize && isWithinAppendTo ? 8 : 0);
             const marginSize = 0;
             const targetElem = evnt.target;
             const type = targetElem.getAttribute('type');
-            const minWidth = 0;
-            const minHeight = 0;
+            const minWidth = XEUtils.toNumber(props.minWidth);
+            const minHeight = XEUtils.toNumber(props.minHeight);
             const maxWidth = visibleWidth;
             const maxHeight = visibleHeight;
             const boxElem = getBox();
@@ -24108,7 +24177,7 @@ var VxeDrawerComponent = defineVxeComponent({
             return renderEmptyElement($xeDrawer);
         };
         const renderVN = () => {
-            const { slots: propSlots = {}, className, position, loading, lockScroll, padding, lockView, mask, resize, appendTo, destroyOnClose } = props;
+            const { border, showTitleBackground, slots: propSlots = {}, className, position, loading, lockScroll, padding, lockView, mask, resize, appendTo, destroyOnClose, isWithinAppendTo } = props;
             const { initialized, contentVisible, visible } = reactData;
             const asideSlot = slots.aside || propSlots.aside;
             const vSize = computeSize.value;
@@ -24120,9 +24189,11 @@ var VxeDrawerComponent = defineVxeComponent({
             }, [
                 h('div', {
                     ref: refElem,
-                    class: ['vxe-drawer--wrapper', `pos--${position}`, className || '', {
+                    class: ['vxe-drawer--wrapper', `pos--${position}`, isWithinAppendTo ? 'ctx--within' : 'ctx--free', className || '', {
                             [`size--${vSize}`]: vSize,
                             'is--padding': padding,
+                            'is--border': border,
+                            'is--title-bg': showTitleBackground,
                             'lock--scroll': lockScroll,
                             'lock--view': lockView,
                             'is--resize': resize,
@@ -24170,8 +24241,17 @@ var VxeDrawerComponent = defineVxeComponent({
                 ])
             ]);
         };
-        watch(() => props.width, recalculate);
-        watch(() => props.height, recalculate);
+        const reFlag = ref(0);
+        watch(() => props.width, () => {
+            reFlag.value++;
+        });
+        watch(() => props.height, () => {
+            reFlag.value++;
+        });
+        watch(() => props.position, () => {
+            reFlag.value++;
+        });
+        watch(reFlag, recalculate);
         watch(() => props.modelValue, (value) => {
             if (value) {
                 openDrawer();
@@ -25742,7 +25822,7 @@ function checkRuleStatus(rule, data, val) {
     }
     return true;
 }
-function createReactData$e() {
+function createReactData$f() {
     return {
         collapseAll: false,
         staticItems: [],
@@ -25750,7 +25830,7 @@ function createReactData$e() {
         itemWidth: 0
     };
 }
-function createInternalData$d() {
+function createInternalData$e() {
     return {
         meTimeout: undefined,
         stTimeout: undefined,
@@ -25859,8 +25939,8 @@ var VxeFormComponent = defineVxeComponent({
         const $xeGrid = inject('$xeGrid', null);
         const xID = XEUtils.uniqueId();
         const { computeSize } = useSize(props);
-        const reactData = reactive(createReactData$e());
-        const internalData = createInternalData$d();
+        const reactData = reactive(createReactData$f());
+        const internalData = createInternalData$e();
         const refElem = ref();
         const refTooltip = ref();
         let formMethods = {};
@@ -26569,8 +26649,8 @@ var VxeFormComponent = defineVxeComponent({
         });
         onUnmounted(() => {
             globalEvents.off($xeForm, 'resize');
-            XEUtils.assign(reactData, createReactData$e());
-            XEUtils.assign(internalData, createInternalData$d());
+            XEUtils.assign(reactData, createReactData$f());
+            XEUtils.assign(internalData, createInternalData$e());
         });
         reactData.collapseAll = !!props.collapseStatus;
         if (props.items) {
@@ -26697,7 +26777,7 @@ dynamicApp.use(VxeFormItem);
 VxeUI.component(VxeFormItemComponent);
 const FormItem = VxeFormItem;
 
-function createReactData$d() {
+function createReactData$e() {
     return {
         initialized: false,
         selectIcon: '',
@@ -26711,7 +26791,7 @@ function createReactData$d() {
         iconList: []
     };
 }
-function createInternalData$c() {
+function createInternalData$d() {
     return {
         fullList: []
         // hpTimeout: undefined
@@ -26773,8 +26853,8 @@ var VxeIconPickerComponent = defineVxeComponent({
         const formItemInfo = inject('xeFormItemInfo', null);
         const xID = XEUtils.uniqueId();
         const { computeSize } = useSize(props);
-        const reactData = reactive(createReactData$d());
-        const internalData = createInternalData$c();
+        const reactData = reactive(createReactData$e());
+        const internalData = createInternalData$d();
         const refElem = ref();
         const refInput = ref();
         const refOptionPanel = ref();
@@ -27374,8 +27454,8 @@ var VxeIconPickerComponent = defineVxeComponent({
             globalEvents.off($xeIconPicker, 'mousedown');
             globalEvents.off($xeIconPicker, 'keydown');
             globalEvents.off($xeIconPicker, 'blur');
-            XEUtils.assign(reactData, createReactData$d());
-            XEUtils.assign(internalData, createInternalData$c());
+            XEUtils.assign(reactData, createReactData$e());
+            XEUtils.assign(internalData, createInternalData$d());
         });
         provide('$xeIconPicker', $xeIconPicker);
         $xeIconPicker.renderVN = renderVN;
@@ -28078,13 +28158,13 @@ const openPreviewImage = (options) => {
     return Promise.resolve();
 };
 
-function createInternalData$b() {
+function createInternalData$c() {
     return {
     // dgTime: 0,
     // mdTime: 0
     };
 }
-function createReactData$c() {
+function createReactData$d() {
     return {};
 }
 var VxeImageComponent = defineVxeComponent({
@@ -28143,8 +28223,8 @@ var VxeImageComponent = defineVxeComponent({
         const $xeImageGroup = inject('$xeImageGroup', null);
         const refElem = ref();
         const { computeSize } = useSize(props);
-        const internalData = createInternalData$b();
-        const reactData = reactive(createReactData$c());
+        const internalData = createInternalData$c();
+        const reactData = reactive(createReactData$d());
         const refMaps = {
             refElem
         };
@@ -28330,8 +28410,8 @@ var VxeImageComponent = defineVxeComponent({
             ]);
         };
         onBeforeUnmount(() => {
-            XEUtils.assign(reactData, createReactData$c());
-            XEUtils.assign(internalData, createInternalData$b());
+            XEUtils.assign(reactData, createReactData$d());
+            XEUtils.assign(internalData, createInternalData$c());
         });
         $xeImage.renderVN = renderVN;
         return $xeImage;
@@ -28604,10 +28684,10 @@ dynamicApp.use(VxeLayoutAside);
 VxeUI.component(VxeLayoutAsideComponent);
 const LayoutAside = VxeLayoutAside;
 
-function createInternalData$a() {
+function createInternalData$b() {
     return {};
 }
-function createReactData$b() {
+function createReactData$c() {
     return {};
 }
 var VxeLayoutBodyComponent = defineVxeComponent({
@@ -28632,8 +28712,8 @@ var VxeLayoutBodyComponent = defineVxeComponent({
         const backtopId = `vxe_layout_body_backtop_${xID}`;
         const refElem = ref();
         const { computeSize } = useSize(props);
-        const internalData = createInternalData$a();
-        const reactData = reactive(createReactData$b());
+        const internalData = createInternalData$b();
+        const reactData = reactive(createReactData$c());
         const refMaps = {
             refElem
         };
@@ -29050,7 +29130,7 @@ const Link = VxeLink;
 
 const { errLog: errLog$a } = createComponentLog('menu');
 const { menus: menus$1, getConfig: getConfig$1, getIcon: getIcon$1 } = VxeUI;
-function createInternalData$9() {
+function createInternalData$a() {
     return {
         lastActiveTime: 0,
         menuInitMaps: {},
@@ -29059,7 +29139,7 @@ function createInternalData$9() {
         menuEffectMaps: {}
     };
 }
-function createReactData$a() {
+function createReactData$b() {
     return {
         initialized: false,
         isEnterCollapse: false,
@@ -29122,8 +29202,8 @@ var VxeMenuComponent = defineVxeComponent({
         const refElem = ref();
         const refCollapseElem = ref();
         const { computeSize } = useSize(props);
-        const reactData = reactive(createReactData$a());
-        const internalData = createInternalData$9();
+        const reactData = reactive(createReactData$b());
+        const internalData = createInternalData$a();
         const refMaps = {
             refElem
         };
@@ -29747,8 +29827,8 @@ var VxeMenuComponent = defineVxeComponent({
         });
         onBeforeUnmount(() => {
             globalEvents.off($xeMenu, 'resize');
-            XEUtils.assign(reactData, createReactData$a());
-            XEUtils.assign(internalData, createInternalData$9());
+            XEUtils.assign(reactData, createReactData$b());
+            XEUtils.assign(internalData, createInternalData$a());
         });
         reactData.initialized = !!props.collapsed;
         reactData.activeName = props.modelValue;
@@ -29771,8 +29851,30 @@ dynamicApp.use(VxeMenu);
 VxeUI.component(VxeMenuComponent);
 const Menu = VxeMenu;
 
-const { warnLog: warnLog$a, errLog: errLog$9 } = createComponentLog('modal');
 const allActiveModals = [];
+
+const { warnLog: warnLog$a, errLog: errLog$9 } = createComponentLog('modal');
+function createInternalData$9() {
+    return {
+        // msgTimeout: undefined,
+        isMoveStatus: false
+    };
+}
+function createReactData$a() {
+    return {
+        initialized: false,
+        visible: false,
+        contentVisible: false,
+        modalTop: 0,
+        modalZindex: 0,
+        prevZoomStatus: '',
+        zoomStatus: '',
+        revertLocat: null,
+        prevLocat: null,
+        firstOpen: true,
+        resizeFlag: 1
+    };
+}
 const msgQueue = [];
 const notifyQueue = [];
 const lockScrollAttrKey = 'data-vxe-lock-scroll';
@@ -29850,6 +29952,14 @@ var VxeModalComponent = defineVxeComponent({
             default: () => getConfig$3().modal.confirmClosable
         },
         resize: Boolean,
+        border: {
+            type: Boolean,
+            default: () => getConfig$3().modal.border
+        },
+        showTitleBackground: {
+            type: Boolean,
+            default: () => getConfig$3().modal.showTitleBackground
+        },
         showHeader: {
             type: Boolean,
             default: () => getConfig$3().modal.showHeader
@@ -29979,22 +30089,8 @@ var VxeModalComponent = defineVxeComponent({
         const $xeTable = inject('$xeTable', null);
         const $xeForm = inject('$xeForm', null);
         const { computeSize } = useSize(props);
-        const reactData = reactive({
-            initialized: false,
-            visible: false,
-            contentVisible: false,
-            modalTop: 0,
-            modalZindex: 0,
-            prevZoomStatus: '',
-            zoomStatus: '',
-            revertLocat: null,
-            prevLocat: null,
-            firstOpen: true,
-            resizeFlag: 1
-        });
-        const internalData = {
-            msgTimeout: undefined
-        };
+        const reactData = reactive(createReactData$a());
+        const internalData = createInternalData$9();
         const refElem = ref();
         const refModalBox = ref();
         const refHeaderElem = ref();
@@ -30082,13 +30178,12 @@ var VxeModalComponent = defineVxeComponent({
         const updatePosition = () => {
             return nextTick().then(() => {
                 const { position, isWithinAppendTo } = props;
-                const btnTransfer = computeBtnTransfer.value;
                 const el = refElem.value;
                 const boxElem = getBox();
                 if (!boxElem) {
                     return;
                 }
-                const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+                const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo ? el : document.body);
                 if (!parentWrapperEl) {
                     return;
                 }
@@ -30154,6 +30249,10 @@ var VxeModalComponent = defineVxeComponent({
             if (visible) {
                 Promise.resolve(beforeHideFn ? beforeHideFn(params) : null).then((rest) => {
                     if (!XEUtils.isError(rest)) {
+                        const el = refElem.value;
+                        if (el) {
+                            el.setAttribute('data-effect', 'y');
+                        }
                         if (isMsg) {
                             removeMsgQueue();
                         }
@@ -30169,6 +30268,12 @@ var VxeModalComponent = defineVxeComponent({
                             dispatchEvent('hide', params, null);
                         }, 200);
                         removeBodyLockScroll();
+                        setTimeout(() => {
+                            const el = refElem.value;
+                            if (el) {
+                                el.removeAttribute('data-effect');
+                            }
+                        }, 350);
                     }
                 }).catch(e => e);
             }
@@ -30274,7 +30379,6 @@ var VxeModalComponent = defineVxeComponent({
         };
         const handleMinimize = () => {
             const { isWithinAppendTo } = props;
-            const btnTransfer = computeBtnTransfer.value;
             const zoomOpts = computeZoomOpts.value;
             const { minimizeLayout, minimizeMaxSize, minimizeHorizontalOffset, minimizeVerticalOffset, minimizeOffsetMethod } = zoomOpts;
             const isHorizontalLayout = minimizeLayout === 'horizontal';
@@ -30321,7 +30425,7 @@ var VxeModalComponent = defineVxeComponent({
                         status: false
                     };
                 }
-                const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+                const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo ? el : document.body);
                 if (!parentWrapperEl) {
                     return {
                         status: false
@@ -30384,7 +30488,6 @@ var VxeModalComponent = defineVxeComponent({
         };
         const handleMaximize = () => {
             const { isWithinAppendTo } = props;
-            const btnTransfer = computeBtnTransfer.value;
             const prevZoomStatus = reactData.zoomStatus;
             reactData.prevZoomStatus = prevZoomStatus;
             reactData.zoomStatus = 'maximize';
@@ -30394,7 +30497,7 @@ var VxeModalComponent = defineVxeComponent({
                     // 如果当前处于复原状态
                     if (!prevZoomStatus) {
                         const el = refElem.value;
-                        const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+                        const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo ? el : document.body);
                         if (!parentWrapperEl) {
                             return {
                                 status: false
@@ -30469,6 +30572,7 @@ var VxeModalComponent = defineVxeComponent({
             }
             if (!visible) {
                 addBodyLockScroll();
+                internalData.isMoveStatus = false;
                 reactData.visible = true;
                 reactData.contentVisible = false;
                 updateZindex();
@@ -30500,6 +30604,10 @@ var VxeModalComponent = defineVxeComponent({
                 else {
                     nextTick(() => {
                         const { firstOpen } = reactData;
+                        const el = refElem.value;
+                        if (el) {
+                            el.setAttribute('data-effect', 'y');
+                        }
                         if (firstOpen) {
                             reactData.firstOpen = false;
                             if (hasPosStorage()) {
@@ -30526,6 +30634,12 @@ var VxeModalComponent = defineVxeComponent({
                             }
                         }
                     });
+                    setTimeout(() => {
+                        const el = refElem.value;
+                        if (el) {
+                            el.removeAttribute('data-effect');
+                        }
+                    }, 350);
                 }
             }
             return nextTick();
@@ -30573,6 +30687,11 @@ var VxeModalComponent = defineVxeComponent({
                 }
             }
         };
+        const handleGlobalResizeEvent = () => {
+            if (!internalData.isMoveStatus) {
+                updatePosition();
+            }
+        };
         const isMinimized = () => {
             return reactData.zoomStatus === 'minimize';
         };
@@ -30675,9 +30794,8 @@ var VxeModalComponent = defineVxeComponent({
             }
         };
         const mousedownEvent = (evnt) => {
-            const { resize, storage, isWithinAppendTo } = props;
+            const { storage, isWithinAppendTo } = props;
             const { zoomStatus } = reactData;
-            const btnTransfer = computeBtnTransfer.value;
             const marginSize = XEUtils.toNumber(props.marginSize);
             const boxElem = getBox();
             if (!boxElem) {
@@ -30686,12 +30804,12 @@ var VxeModalComponent = defineVxeComponent({
             if (zoomStatus !== 'maximize' && evnt.button === 0 && !getEventTargetNode(evnt, boxElem, 'trigger--btn').flag) {
                 evnt.preventDefault();
                 const el = refElem.value;
-                const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+                const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo ? el : document.body);
                 if (!parentWrapperEl) {
                     return;
                 }
-                const visibleWidth = parentWrapperEl.clientWidth - (resize && isWithinAppendTo ? 8 : 0);
-                const visibleHeight = parentWrapperEl.clientHeight - (resize && isWithinAppendTo ? 8 : 0);
+                const visibleWidth = parentWrapperEl.clientWidth;
+                const visibleHeight = parentWrapperEl.clientHeight;
                 const disX = evnt.clientX - boxElem.offsetLeft;
                 const disY = evnt.clientY - boxElem.offsetTop;
                 document.onmousemove = evnt => {
@@ -30720,6 +30838,7 @@ var VxeModalComponent = defineVxeComponent({
                     boxElem.style.top = `${top}px`;
                     boxElem.className = boxElem.className.replace(/\s?is--drag/, '') + ' is--drag';
                     dispatchEvent('move', { type: 'move' }, evnt);
+                    internalData.isMoveStatus = true;
                     reactData.resizeFlag++;
                 };
                 document.onmouseup = () => {
@@ -30739,15 +30858,14 @@ var VxeModalComponent = defineVxeComponent({
         };
         const dragEvent = (evnt) => {
             evnt.preventDefault();
-            const { resize, storage, isWithinAppendTo } = props;
-            const btnTransfer = computeBtnTransfer.value;
+            const { storage, isWithinAppendTo } = props;
             const el = refElem.value;
-            const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+            const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo ? el : document.body);
             if (!parentWrapperEl) {
                 return;
             }
-            const visibleWidth = parentWrapperEl.clientWidth - (resize && isWithinAppendTo ? 8 : 0);
-            const visibleHeight = parentWrapperEl.clientHeight - (resize && isWithinAppendTo ? 8 : 0);
+            const visibleWidth = parentWrapperEl.clientWidth;
+            const visibleHeight = parentWrapperEl.clientHeight;
             const marginSize = XEUtils.toNumber(props.marginSize);
             const targetElem = evnt.target;
             const type = targetElem.getAttribute('data-type');
@@ -31112,7 +31230,7 @@ var VxeModalComponent = defineVxeComponent({
             return renderEmptyElement($xeModal);
         };
         const renderVN = () => {
-            const { slots: propSlots = {}, className, type, animat, draggable, iconStatus, position, loading, destroyOnClose, status, lockScroll, padding, lockView, mask, resize, appendTo, isWithinAppendTo } = props;
+            const { border, showTitleBackground, slots: propSlots = {}, className, type, animat, draggable, iconStatus, position, loading, destroyOnClose, status, lockScroll, padding, lockView, mask, resize, appendTo, isWithinAppendTo } = props;
             const { initialized, modalTop, contentVisible, visible, zoomStatus } = reactData;
             const asideSlot = slots.aside || propSlots.aside;
             const vSize = computeSize.value;
@@ -31128,10 +31246,12 @@ var VxeModalComponent = defineVxeComponent({
                 to: getPopupContainer(appendTo),
                 disabled: btnTransfer ? !initialized : true
             }, [
-                h('div', Object.assign({ ref: refElem, class: ['vxe-modal--wrapper', `type--${type}`, `zoom--${zoomStatus || 'revert'}`, className || '', position ? `pos--${position}` : '', isWithinAppendTo ? 'ctx--within' : 'ctx--free', {
+                h('div', Object.assign({ ref: refElem, class: ['vxe-modal--wrapper', `type--${type}`, `zoom--${zoomStatus || 'revert'}`, position ? `pos--${position}` : '', isWithinAppendTo ? 'ctx--within' : 'ctx--free', className || '', {
                             [`size--${vSize}`]: vSize,
                             [`status--${status}`]: status,
                             'is--padding': padding,
+                            'is--border': border,
+                            'is--title-bg': showTitleBackground,
                             'is--animat': animat,
                             'lock--scroll': lockScroll,
                             'lock--view': lockView,
@@ -31219,12 +31339,16 @@ var VxeModalComponent = defineVxeComponent({
             if (props.escClosable) {
                 globalEvents.on($xeModal, 'keydown', handleGlobalKeydownEvent);
             }
+            globalEvents.on($xeModal, 'resize', handleGlobalResizeEvent);
         });
         onUnmounted(() => {
             globalEvents.off($xeModal, 'keydown');
+            globalEvents.off($xeModal, 'resize');
             removeMsgQueue();
             removeActiveQueue();
             removeBodyLockScroll();
+            XEUtils.assign(reactData, createReactData$a());
+            XEUtils.assign(internalData, createInternalData$9());
         });
         provide('$xeModal', $xeModal);
         return $xeModal;