@sdata/web-vue 1.12.0 → 1.14.0

package/es/modal/index.d.ts

@@ -138,6 +138,14 @@ declare const Modal: {
         mergedModalStyle: import("vue").ComputedRef<import("vue").CSSProperties>;
         okDisplayText: import("vue").ComputedRef<string>;
         cancelDisplayText: import("vue").ComputedRef<string>;
+        mergedMask: import("vue").ComputedRef<boolean | undefined>;
+        mergedMaskStyle: import("vue").ComputedRef<import("vue").CSSProperties | undefined>;
+        mergedClosable: import("vue").ComputedRef<boolean | undefined>;
+        mergedTitleAlign: import("vue").ComputedRef<"center" | "start" | undefined>;
+        mergedFooter: import("vue").ComputedRef<boolean | undefined>;
+        mergedHideCancel: import("vue").ComputedRef<boolean | undefined>;
+        mergedOkButtonProps: import("vue").ComputedRef<import("..").ButtonProps | undefined>;
+        mergedCancelButtonProps: import("vue").ComputedRef<import("..").ButtonProps | undefined>;
         zIndex: Readonly<import("vue").Ref<number, number>>;
         handleOk: (e: Event) => Promise<void>;
         handleCancel: (e: Event) => void;
@@ -164,10 +172,10 @@ declare const Modal: {
         beforeOpen: () => true;
         beforeClose: () => true;
     }, import("vue").PublicProps, {
+        visible: boolean;
         footer: boolean;
         mask: boolean;
         popupContainer: string | HTMLElement;
-        visible: boolean;
         unmountOnClose: boolean;
         defaultVisible: boolean;
         maskClosable: boolean;
@@ -659,7 +667,7 @@ declare const Modal: {
                 default: boolean;
             };
         }>> & Readonly<{}>, {
-            size: "mini" | "small" | "medium" | "large";
+            size: "small" | "mini" | "medium" | "large";
             disabled: boolean;
         }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
         IconClose: {
@@ -1410,6 +1418,14 @@ declare const Modal: {
         mergedModalStyle: import("vue").ComputedRef<import("vue").CSSProperties>;
         okDisplayText: import("vue").ComputedRef<string>;
         cancelDisplayText: import("vue").ComputedRef<string>;
+        mergedMask: import("vue").ComputedRef<boolean | undefined>;
+        mergedMaskStyle: import("vue").ComputedRef<import("vue").CSSProperties | undefined>;
+        mergedClosable: import("vue").ComputedRef<boolean | undefined>;
+        mergedTitleAlign: import("vue").ComputedRef<"center" | "start" | undefined>;
+        mergedFooter: import("vue").ComputedRef<boolean | undefined>;
+        mergedHideCancel: import("vue").ComputedRef<boolean | undefined>;
+        mergedOkButtonProps: import("vue").ComputedRef<import("..").ButtonProps | undefined>;
+        mergedCancelButtonProps: import("vue").ComputedRef<import("..").ButtonProps | undefined>;
         zIndex: Readonly<import("vue").Ref<number, number>>;
         handleOk: (e: Event) => Promise<void>;
         handleCancel: (e: Event) => void;
@@ -1428,10 +1444,10 @@ declare const Modal: {
         teleportContainer: import("vue").Ref<string | HTMLElement | null | undefined, string | HTMLElement | null | undefined>;
         handleMoveDown: (ev: MouseEvent) => void;
     }, {}, {}, {}, {
+        visible: boolean;
         footer: boolean;
         mask: boolean;
         popupContainer: string | HTMLElement;
-        visible: boolean;
         unmountOnClose: boolean;
         defaultVisible: boolean;
         maskClosable: boolean;
@@ -1588,6 +1604,14 @@ declare const Modal: {
     mergedModalStyle: import("vue").ComputedRef<import("vue").CSSProperties>;
     okDisplayText: import("vue").ComputedRef<string>;
     cancelDisplayText: import("vue").ComputedRef<string>;
+    mergedMask: import("vue").ComputedRef<boolean | undefined>;
+    mergedMaskStyle: import("vue").ComputedRef<import("vue").CSSProperties | undefined>;
+    mergedClosable: import("vue").ComputedRef<boolean | undefined>;
+    mergedTitleAlign: import("vue").ComputedRef<"center" | "start" | undefined>;
+    mergedFooter: import("vue").ComputedRef<boolean | undefined>;
+    mergedHideCancel: import("vue").ComputedRef<boolean | undefined>;
+    mergedOkButtonProps: import("vue").ComputedRef<import("..").ButtonProps | undefined>;
+    mergedCancelButtonProps: import("vue").ComputedRef<import("..").ButtonProps | undefined>;
     zIndex: Readonly<import("vue").Ref<number, number>>;
     handleOk: (e: Event) => Promise<void>;
     handleCancel: (e: Event) => void;
@@ -1614,10 +1638,10 @@ declare const Modal: {
     beforeOpen: () => true;
     beforeClose: () => true;
 }, string, {
+    visible: boolean;
     footer: boolean;
     mask: boolean;
     popupContainer: string | HTMLElement;
-    visible: boolean;
     unmountOnClose: boolean;
     defaultVisible: boolean;
     maskClosable: boolean;
@@ -2109,7 +2133,7 @@ declare const Modal: {
             default: boolean;
         };
     }>> & Readonly<{}>, {
-        size: "mini" | "small" | "medium" | "large";
+        size: "small" | "mini" | "medium" | "large";
         disabled: boolean;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
     IconClose: {

package/es/modal/modal.js

@@ -23,11 +23,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
 			name: _ctx.maskAnimationName,
 			appear: ""
 		}, {
-			default: withCtx(() => [_ctx.mask ? withDirectives((openBlock(), createElementBlock("div", {
+			default: withCtx(() => [_ctx.mergedMask ? withDirectives((openBlock(), createElementBlock("div", {
 				key: 0,
 				ref: "maskRef",
 				class: normalizeClass(`${_ctx.prefixCls}-mask`),
-				style: normalizeStyle(_ctx.maskStyle)
+				style: normalizeStyle(_ctx.mergedMaskStyle)
 			}, null, 6)), [[vShow, _ctx.computedVisible]]) : createCommentVNode("", true)]),
 			_: 1
 		}, 8, ["name"]), createElementVNode("div", {
@@ -46,13 +46,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
 				class: normalizeClass(_ctx.modalCls),
 				style: normalizeStyle(_ctx.mergedModalStyle)
 			}, [
-				!_ctx.hideTitle && (_ctx.$slots.title || _ctx.title || _ctx.closable) ? (openBlock(), createElementBlock("div", {
+				!_ctx.hideTitle && (_ctx.$slots.title || _ctx.title || _ctx.mergedClosable) ? (openBlock(), createElementBlock("div", {
 					key: 0,
 					class: normalizeClass(`${_ctx.prefixCls}-header`),
 					onMousedown: _cache[1] || (_cache[1] = (...args) => _ctx.handleMoveDown && _ctx.handleMoveDown(...args))
 				}, [_ctx.$slots.title || _ctx.title ? (openBlock(), createElementBlock("div", {
 					key: 0,
-					class: normalizeClass([`${_ctx.prefixCls}-title`, `${_ctx.prefixCls}-title-align-${_ctx.titleAlign}`])
+					class: normalizeClass([`${_ctx.prefixCls}-title`, `${_ctx.prefixCls}-title-align-${_ctx.mergedTitleAlign}`])
 				}, [_ctx.messageType ? (openBlock(), createElementBlock("div", {
 					key: 0,
 					class: normalizeClass(`${_ctx.prefixCls}-title-icon`)
@@ -61,7 +61,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
 					_ctx.messageType === "success" ? (openBlock(), createBlock(_component_icon_check_circle_fill, { key: 1 })) : createCommentVNode("", true),
 					_ctx.messageType === "warning" ? (openBlock(), createBlock(_component_icon_exclamation_circle_fill, { key: 2 })) : createCommentVNode("", true),
 					_ctx.messageType === "error" ? (openBlock(), createBlock(_component_icon_close_circle_fill, { key: 3 })) : createCommentVNode("", true)
-				], 2)) : createCommentVNode("", true), renderSlot(_ctx.$slots, "title", {}, () => [createTextVNode(toDisplayString(_ctx.title), 1)])], 2)) : createCommentVNode("", true), !_ctx.simple && _ctx.closable ? (openBlock(), createElementBlock("div", {
+				], 2)) : createCommentVNode("", true), renderSlot(_ctx.$slots, "title", {}, () => [createTextVNode(toDisplayString(_ctx.title), 1)])], 2)) : createCommentVNode("", true), !_ctx.simple && _ctx.mergedClosable ? (openBlock(), createElementBlock("div", {
 					key: 1,
 					tabindex: "-1",
 					role: "button",
@@ -76,13 +76,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
 					class: normalizeClass([`${_ctx.prefixCls}-body`, _ctx.bodyClass]),
 					style: normalizeStyle(_ctx.bodyStyle)
 				}, [renderSlot(_ctx.$slots, "default")], 6),
-				_ctx.footer ? (openBlock(), createElementBlock("div", {
+				_ctx.mergedFooter ? (openBlock(), createElementBlock("div", {
 					key: 1,
 					class: normalizeClass(`${_ctx.prefixCls}-footer`)
-				}, [renderSlot(_ctx.$slots, "footer", {}, () => [!_ctx.hideCancel ? (openBlock(), createBlock(_component_sd_button, mergeProps({ key: 0 }, _ctx.cancelButtonProps, { onClick: _ctx.handleCancel }), {
+				}, [renderSlot(_ctx.$slots, "footer", {}, () => [!_ctx.mergedHideCancel ? (openBlock(), createBlock(_component_sd_button, mergeProps({ key: 0 }, _ctx.mergedCancelButtonProps, { onClick: _ctx.handleCancel }), {
 					default: withCtx(() => [createTextVNode(toDisplayString(_ctx.cancelDisplayText), 1)]),
 					_: 1
-				}, 16, ["onClick"])) : createCommentVNode("", true), createVNode(_component_sd_button, mergeProps({ type: "primary" }, _ctx.okButtonProps, {
+				}, 16, ["onClick"])) : createCommentVNode("", true), createVNode(_component_sd_button, mergeProps({ type: "primary" }, _ctx.mergedOkButtonProps, {
 					loading: _ctx.mergedOkLoading,
 					onClick: _ctx.handleOk
 				}), {

package/es/modal/modal.vue.d.ts

@@ -131,6 +131,14 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     mergedModalStyle: import("vue").ComputedRef<CSSProperties>;
     okDisplayText: import("vue").ComputedRef<string>;
     cancelDisplayText: import("vue").ComputedRef<string>;
+    mergedMask: import("vue").ComputedRef<boolean | undefined>;
+    mergedMaskStyle: import("vue").ComputedRef<CSSProperties | undefined>;
+    mergedClosable: import("vue").ComputedRef<boolean | undefined>;
+    mergedTitleAlign: import("vue").ComputedRef<"center" | "start" | undefined>;
+    mergedFooter: import("vue").ComputedRef<boolean | undefined>;
+    mergedHideCancel: import("vue").ComputedRef<boolean | undefined>;
+    mergedOkButtonProps: import("vue").ComputedRef<ButtonProps | undefined>;
+    mergedCancelButtonProps: import("vue").ComputedRef<ButtonProps | undefined>;
     zIndex: Readonly<import("vue").Ref<number, number>>;
     handleOk: (e: Event) => Promise<void>;
     handleCancel: (e: Event) => void;
@@ -284,10 +292,10 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     onBeforeOpen?: (() => any) | undefined;
     onBeforeClose?: (() => any) | undefined;
 }>, {
+    visible: boolean;
     footer: boolean;
     mask: boolean;
     popupContainer: string | HTMLElement;
-    visible: boolean;
     unmountOnClose: boolean;
     defaultVisible: boolean;
     maskClosable: boolean;
@@ -779,7 +787,7 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
             default: boolean;
         };
     }>> & Readonly<{}>, {
-        size: "mini" | "small" | "medium" | "large";
+        size: "small" | "mini" | "medium" | "large";
         disabled: boolean;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
     IconClose: {

package/es/modal/modal.vue_vue_type_script_lang.js

@@ -15,6 +15,7 @@ import { useI18n } from "../locale/index.js";
 import client_only_default from "../_components/client-only.js";
 import usePopupManager from "../_hooks/use-popup-manager.js";
 import { useTeleportContainer } from "../_hooks/use-teleport-container.js";
+import { useConfigProviderProp } from "../_hooks/use-config-provider-prop.js";
 import { useOverflow } from "../_hooks/use-overflow.js";
 import { useDraggable } from "./hooks/use-draggable.js";
 import { computed, defineComponent, onBeforeUnmount, onMounted, ref, toRefs, watch } from "vue";
@@ -339,11 +340,123 @@ var modal_vue_vue_type_script_lang_default = /* @__PURE__ */ defineComponent({
 	* @slot footer
 	*/
 	setup(props, { emit }) {
-		const { fullscreen, popupContainer, alignCenter } = toRefs(props);
+		const { fullscreen, popupContainer, alignCenter, mask, maskClosable, maskStyle, closable, titleAlign, top, footer, hideCancel, escToClose, draggable, okText, cancelText, okButtonProps, cancelButtonProps, width } = toRefs(props);
 		const prefixCls = getPrefixCls("modal");
 		const { t } = useI18n();
 		const wrapperRef = ref();
 		const modalRef = ref();
+		const { mergedValue: mergedMask } = useConfigProviderProp(mask, {
+			propNames: ["mask"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo = configProviderCtx.modal) === null || _configProviderCtx$mo === void 0 ? void 0 : _configProviderCtx$mo.mask;
+			}
+		});
+		const { mergedValue: mergedMaskClosable } = useConfigProviderProp(maskClosable, {
+			propNames: ["maskClosable", "mask-closable"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo2;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo2 = configProviderCtx.modal) === null || _configProviderCtx$mo2 === void 0 ? void 0 : _configProviderCtx$mo2.maskClosable;
+			}
+		});
+		const { mergedValue: mergedMaskStyle } = useConfigProviderProp(maskStyle, {
+			propNames: ["maskStyle", "mask-style"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo3;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo3 = configProviderCtx.modal) === null || _configProviderCtx$mo3 === void 0 ? void 0 : _configProviderCtx$mo3.maskStyle;
+			}
+		});
+		const { mergedValue: mergedAlignCenter } = useConfigProviderProp(alignCenter, {
+			propNames: ["alignCenter", "align-center"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo4;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo4 = configProviderCtx.modal) === null || _configProviderCtx$mo4 === void 0 ? void 0 : _configProviderCtx$mo4.alignCenter;
+			}
+		});
+		const { mergedValue: mergedEscToClose } = useConfigProviderProp(escToClose, {
+			propNames: ["escToClose", "esc-to-close"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo5;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo5 = configProviderCtx.modal) === null || _configProviderCtx$mo5 === void 0 ? void 0 : _configProviderCtx$mo5.escToClose;
+			}
+		});
+		const { mergedValue: mergedDraggableBase } = useConfigProviderProp(draggable, {
+			propNames: ["draggable"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo6;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo6 = configProviderCtx.modal) === null || _configProviderCtx$mo6 === void 0 ? void 0 : _configProviderCtx$mo6.draggable;
+			}
+		});
+		const { mergedValue: mergedClosable } = useConfigProviderProp(closable, {
+			propNames: ["closable"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo7;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo7 = configProviderCtx.modal) === null || _configProviderCtx$mo7 === void 0 ? void 0 : _configProviderCtx$mo7.closable;
+			}
+		});
+		const { mergedValue: mergedTitleAlign } = useConfigProviderProp(titleAlign, {
+			propNames: ["titleAlign", "title-align"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo8;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo8 = configProviderCtx.modal) === null || _configProviderCtx$mo8 === void 0 ? void 0 : _configProviderCtx$mo8.titleAlign;
+			}
+		});
+		const { mergedValue: mergedTop } = useConfigProviderProp(top, {
+			propNames: ["top"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo9;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo9 = configProviderCtx.modal) === null || _configProviderCtx$mo9 === void 0 ? void 0 : _configProviderCtx$mo9.top;
+			}
+		});
+		const { mergedValue: mergedFooter } = useConfigProviderProp(footer, {
+			propNames: ["footer"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo10;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo10 = configProviderCtx.modal) === null || _configProviderCtx$mo10 === void 0 ? void 0 : _configProviderCtx$mo10.footer;
+			}
+		});
+		const { mergedValue: mergedHideCancel } = useConfigProviderProp(hideCancel, {
+			propNames: ["hideCancel", "hide-cancel"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo11;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo11 = configProviderCtx.modal) === null || _configProviderCtx$mo11 === void 0 ? void 0 : _configProviderCtx$mo11.hideCancel;
+			}
+		});
+		const { mergedValue: mergedOkText } = useConfigProviderProp(okText, {
+			propNames: ["okText", "ok-text"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo12;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo12 = configProviderCtx.modal) === null || _configProviderCtx$mo12 === void 0 ? void 0 : _configProviderCtx$mo12.okText;
+			}
+		});
+		const { mergedValue: mergedCancelText } = useConfigProviderProp(cancelText, {
+			propNames: ["cancelText", "cancel-text"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo13;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo13 = configProviderCtx.modal) === null || _configProviderCtx$mo13 === void 0 ? void 0 : _configProviderCtx$mo13.cancelText;
+			}
+		});
+		const { mergedValue: mergedOkButtonProps } = useConfigProviderProp(okButtonProps, {
+			propNames: ["okButtonProps", "ok-button-props"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo14;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo14 = configProviderCtx.modal) === null || _configProviderCtx$mo14 === void 0 ? void 0 : _configProviderCtx$mo14.okButtonProps;
+			}
+		});
+		const { mergedValue: mergedCancelButtonProps } = useConfigProviderProp(cancelButtonProps, {
+			propNames: ["cancelButtonProps", "cancel-button-props"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo15;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo15 = configProviderCtx.modal) === null || _configProviderCtx$mo15 === void 0 ? void 0 : _configProviderCtx$mo15.cancelButtonProps;
+			}
+		});
+		const { mergedValue: mergedWidth } = useConfigProviderProp(width, {
+			propNames: ["width"],
+			getGlobalValue: (configProviderCtx) => {
+				var _configProviderCtx$mo16;
+				return configProviderCtx === null || configProviderCtx === void 0 || (_configProviderCtx$mo16 = configProviderCtx.modal) === null || _configProviderCtx$mo16 === void 0 ? void 0 : _configProviderCtx$mo16.width;
+			}
+		});
 		const _visible = ref(props.defaultVisible);
 		const computedVisible = computed(() => {
 			var _props$visible;
@@ -351,21 +464,22 @@ var modal_vue_vue_type_script_lang_default = /* @__PURE__ */ defineComponent({
 		});
 		const _okLoading = ref(false);
 		const mergedOkLoading = computed(() => props.okLoading || _okLoading.value);
-		const mergedDraggable = computed(() => props.draggable && !props.fullscreen);
+		const mergedDraggable = computed(() => Boolean(mergedDraggableBase.value) && !props.fullscreen);
+		const mergedAlignCenterBoolean = computed(() => Boolean(mergedAlignCenter.value));
 		const { teleportContainer, containerRef } = useTeleportContainer({
 			popupContainer,
 			visible: computedVisible
 		});
 		const mounted = ref(computedVisible.value);
-		const okDisplayText = computed(() => props.okText || t("modal.okText"));
-		const cancelDisplayText = computed(() => props.cancelText || t("modal.cancelText"));
+		const okDisplayText = computed(() => mergedOkText.value || t("modal.okText"));
+		const cancelDisplayText = computed(() => mergedCancelText.value || t("modal.cancelText"));
 		const { zIndex, isLastDialog } = usePopupManager("dialog", { visible: computedVisible });
 		let globalKeyDownListener = false;
 		const handleGlobalKeyDown = (ev) => {
-			if (props.escToClose && ev.key === KEYBOARD_KEY.ESC && isLastDialog()) handleCancel(ev);
+			if (mergedEscToClose.value && ev.key === KEYBOARD_KEY.ESC && isLastDialog()) handleCancel(ev);
 		};
 		const addGlobalKeyDownListener = () => {
-			if (props.escToClose && !globalKeyDownListener) {
+			if (mergedEscToClose.value && !globalKeyDownListener) {
 				globalKeyDownListener = true;
 				on(document.documentElement, "keydown", handleGlobalKeyDown);
 			}
@@ -379,7 +493,7 @@ var modal_vue_vue_type_script_lang_default = /* @__PURE__ */ defineComponent({
 			wrapperRef,
 			modalRef,
 			draggable: mergedDraggable,
-			alignCenter
+			alignCenter: mergedAlignCenterBoolean
 		});
 		const close = () => {
 			promiseNumber++;
@@ -436,7 +550,7 @@ var modal_vue_vue_type_script_lang_default = /* @__PURE__ */ defineComponent({
 			if (ev.target === wrapperRef.value) currentIsMask.value = true;
 		};
 		const handleMaskClick = (e) => {
-			if (props.mask && props.maskClosable && currentIsMask.value) handleCancel(e);
+			if (mergedMask.value && mergedMaskClosable.value && currentIsMask.value) handleCancel(e);
 		};
 		const handleOpen = () => {
 			if (computedVisible.value) {
@@ -457,7 +571,7 @@ var modal_vue_vue_type_script_lang_default = /* @__PURE__ */ defineComponent({
 			containerRef.value = getElement(props.popupContainer);
 			if (computedVisible.value) {
 				setOverflowHidden();
-				if (props.escToClose) addGlobalKeyDownListener();
+				if (mergedEscToClose.value) addGlobalKeyDownListener();
 			}
 		});
 		onBeforeUnmount(() => {
@@ -481,7 +595,7 @@ var modal_vue_vue_type_script_lang_default = /* @__PURE__ */ defineComponent({
 			if (position.value) position.value = void 0;
 		});
 		const wrapperCls = computed(() => [`${prefixCls}-wrapper`, {
-			[`${prefixCls}-wrapper-align-center`]: props.alignCenter && !props.fullscreen,
+			[`${prefixCls}-wrapper-align-center`]: mergedAlignCenterBoolean.value && !props.fullscreen,
 			[`${prefixCls}-wrapper-moved`]: Boolean(position.value)
 		}]);
 		const modalCls = computed(() => [
@@ -501,13 +615,21 @@ var modal_vue_vue_type_script_lang_default = /* @__PURE__ */ defineComponent({
 			wrapperRef,
 			mergedModalStyle: computed(() => {
 				const style = _objectSpread2({}, props.modalStyle);
-				if (props.width && !props.fullscreen) style.width = isNumber(props.width) ? `${props.width}px` : props.width;
-				if (!props.alignCenter && props.top) style.top = isNumber(props.top) ? `${props.top}px` : props.top;
+				if (mergedWidth.value && !props.fullscreen) style.width = isNumber(mergedWidth.value) ? `${mergedWidth.value}px` : mergedWidth.value;
+				if (!mergedAlignCenterBoolean.value && mergedTop.value) style.top = isNumber(mergedTop.value) ? `${mergedTop.value}px` : mergedTop.value;
 				if (position.value) style.transform = `translate(${position.value[0]}px, ${position.value[1]}px)`;
 				return style;
 			}),
 			okDisplayText,
 			cancelDisplayText,
+			mergedMask,
+			mergedMaskStyle,
+			mergedClosable,
+			mergedTitleAlign,
+			mergedFooter,
+			mergedHideCancel,
+			mergedOkButtonProps,
+			mergedCancelButtonProps,
 			zIndex,
 			handleOk,
 			handleCancel,

package/es/notification/notification.vue.d.ts

@@ -83,7 +83,7 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
             default: boolean;
         };
     }>> & Readonly<{}>, {
-        size: "mini" | "small" | "medium" | "large";
+        size: "small" | "mini" | "medium" | "large";
         disabled: boolean;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
     IconInfoCircleFill: {

package/es/overflow-list/index.d.ts

@@ -20,8 +20,8 @@ declare const OverflowList: {
     }>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
         change: (_value: number) => true;
     }, import("vue").PublicProps, {
-        margin: number;
         from: "start" | "end";
+        margin: number;
         min: number;
     }, true, {}, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, {}, any, import("vue").ComponentProvideOptions, {
         P: {};
@@ -46,8 +46,8 @@ declare const OverflowList: {
     }>> & Readonly<{
         onChange?: ((_value: number) => any) | undefined;
     }>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, {
-        margin: number;
         from: "start" | "end";
+        margin: number;
         min: number;
     }>;
     __isFragment?: never;
@@ -71,8 +71,8 @@ declare const OverflowList: {
 }>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (_value: number) => true;
 }, string, {
-    margin: number;
     from: "start" | "end";
+    margin: number;
     min: number;
 }, {}, string, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, import("vue").ComponentProvideOptions> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & {
     install: (app: App, options?: SDOptions) => void;

package/es/overflow-list/overflow-list.d.ts

@@ -30,8 +30,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
 }>> & Readonly<{
     onChange?: ((_value: number) => any) | undefined;
 }>, {
-    margin: number;
     from: "start" | "end";
+    margin: number;
     min: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/page-header/index.d.ts

@@ -47,7 +47,7 @@ declare const PageHeader: {
                 default: boolean;
             };
         }>> & Readonly<{}>, {
-            size: "mini" | "small" | "medium" | "large";
+            size: "small" | "mini" | "medium" | "large";
             disabled: boolean;
         }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
         IconLeft: {
@@ -244,7 +244,7 @@ declare const PageHeader: {
             default: boolean;
         };
     }>> & Readonly<{}>, {
-        size: "mini" | "small" | "medium" | "large";
+        size: "small" | "mini" | "medium" | "large";
         disabled: boolean;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
     IconLeft: {

package/es/page-header/page-header.vue.d.ts

@@ -52,7 +52,7 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
             default: boolean;
         };
     }>> & Readonly<{}>, {
-        size: "mini" | "small" | "medium" | "large";
+        size: "small" | "mini" | "medium" | "large";
         disabled: boolean;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
     IconLeft: {

package/es/pagination/page-jumper.vue.d.ts

@@ -151,7 +151,7 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         }, import("vue").PublicProps, {
             error: boolean;
             disabled: boolean;
-            mode: "button" | "embed";
+            mode: "embed" | "button";
             allowClear: boolean;
             max: number;
             step: number;
@@ -244,7 +244,7 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         }, {
             error: boolean;
             disabled: boolean;
-            mode: "button" | "embed";
+            mode: "embed" | "button";
             allowClear: boolean;
             max: number;
             step: number;
@@ -342,7 +342,7 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     }, string, {
         error: boolean;
         disabled: boolean;
-        mode: "button" | "embed";
+        mode: "embed" | "button";
         allowClear: boolean;
         max: number;
         step: number;