savor-ui 0.16.0 → 0.18.0

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 
 
+# [0.18.0](https://gitee.com/mach552/savor-ui/compare/v0.17.0...v0.18.0) (2026-08-08)
+
+
+### Features
+
+* **menu:** 新增样式颜色属性 ([a2dd967](https://gitee.com/mach552/savor-ui/commits/a2dd9678707ac3c9eb3631ecf0ac92c42f5d8a3f))
+* **modal:** 新增类型和图标 ([7973598](https://gitee.com/mach552/savor-ui/commits/797359852caed0d019a3f86ed24379104030ccd3))
+* **tree:** 新增节点图标和额外内容插槽 ([b3f7953](https://gitee.com/mach552/savor-ui/commits/b3f79533fbeb4c589c74dbc4e240b1bb336489cb))
+
+# [0.17.0](https://gitee.com/mach552/savor-ui/compare/v0.16.0...v0.17.0) (2026-08-07)
+
+
+### Bug Fixes
+
+* **cascader:** 修复选项列表更新时不刷新值的问题 ([a31af18](https://gitee.com/mach552/savor-ui/commits/a31af1880ec72b9445b411751f5e628aa992bd42))
+* **grid:** 修复换行会残留间隔的问题 ([9dace33](https://gitee.com/mach552/savor-ui/commits/9dace337a3c5ff6c25d13d49e5ee0554b5a26fc6))
+
+
+### Features
+
+* **modal:** 添加按钮相关属性 ([3c46e27](https://gitee.com/mach552/savor-ui/commits/3c46e278714fe20280d139879ead9cedd690df37))
+
 # [0.16.0](https://gitee.com/mach552/savor-ui/compare/v0.15.7...v0.16.0) (2026-08-06)
 
 

package/dist/es/components/src/cascader/cascader.vue_vue_type_script_setup_true_vapor_true_lang.mjs

@@ -7,11 +7,11 @@ import { SPopover as r } from "../popover/index.mjs";
 import { SInput as i } from "../input/index.mjs";
 import { SEmpty as a } from "../empty/index.mjs";
 import ee from "./cascader-column.vue.mjs";
-import { computed as o, createComponent as s, createComponentWithFallback as c, createIf as te, createInvoker as l, createTemplateRefSetter as u, defineVaporComponent as d, delegateEvents as f, mergeModels as p, on as m, onMounted as h, ref as g, renderEffect as _, resolveComponent as ne, setClass as v, setInsertionState as y, template as b, toRefs as x, unref as S, useModel as C, useTemplateRef as w, watch as T, withModifiers as E, withVaporModifiers as D } from "vue";
+import { computed as o, createComponent as s, createComponentWithFallback as c, createIf as l, createInvoker as u, createTemplateRefSetter as te, defineVaporComponent as d, delegateEvents as f, mergeModels as p, on as m, onMounted as h, ref as g, renderEffect as _, resolveComponent as ne, setClass as v, setInsertionState as y, template as b, toRefs as x, unref as S, useModel as C, useTemplateRef as w, watch as T, withModifiers as E, withVaporModifiers as D } from "vue";
 //#region ../components/src/cascader/cascader.vue?vue&type=script&setup=true&vapor=true&lang.ts
-var re = b("<div style=\"padding: 12px\">"), ie = b("<div>"), ae = b("<div data-skip-blur-validation>"), oe = b("<div>", 1);
+var O = b("<div style=\"padding: 12px\">"), re = b("<div>"), ie = b("<div data-skip-blur-validation>"), ae = b("<div>", 1);
 f("mousedown", "focusin", "click");
-var O = /*@__PURE__*/ d({
+var k = /*@__PURE__*/ d({
 	name: "SCascader",
 	__name: "cascader",
 	props: /*@__PURE__*/ p({
@@ -52,8 +52,8 @@ var O = /*@__PURE__*/ d({
 		"update:expanded"
 	]),
 	setup(d, { emit: f }) {
-		let p = d, b = e("cascader"), O = f, k = w("inputRef"), A = C(d, "modelValue"), { size: j, error: M } = x(p), { mergedSize: N, mergedError: P } = n({
-			size: j,
+		let p = d, b = e("cascader"), k = f, A = w("inputRef"), j = C(d, "modelValue"), { size: oe, error: M } = x(p), { mergedSize: N, mergedError: P } = n({
+			size: oe,
 			error: M
 		}), F = C(d, "expandedKeys"), I = C(d, "expanded"), L = o(() => ({
 			label: "label",
@@ -63,18 +63,18 @@ var O = /*@__PURE__*/ d({
 		})), R = g(""), z = g([]), B = (e) => p.pathMode ? e.map((e) => e[L.value.key]).join(p.pathSeparator) : e[e.length - 1][L.value.key], V = (e) => e.map((e) => e[L.value.label]).join(p.pathSeparator), H = ({ item: e, expandeds: t, unchecked: n }) => {
 			if (p.multiple) {
 				let r = e[L.value.key], i = z.value.findIndex((e) => e[e.length - 1][L.value.key] === r);
-				n ? i !== -1 && (z.value = z.value.toSpliced(i, 1)) : i === -1 && (z.value = [...z.value, t]), A.value = z.value.map(B), R.value = z.value.map(V).join(", "), O("selectItem", {
+				n ? i !== -1 && (z.value = z.value.toSpliced(i, 1)) : i === -1 && (z.value = [...z.value, t]), j.value = z.value.map(B), R.value = z.value.map(V).join(", "), k("selectItem", {
 					item: e,
 					expandeds: t
 				});
 				return;
 			}
-			R.value = V(t), A.value = B(t), O("selectItem", {
+			R.value = V(t), j.value = B(t), k("selectItem", {
 				item: e,
 				expandeds: t
 			}), K(!1);
 		}, U = () => {
-			O("expand", F.value);
+			k("expand", F.value);
 		}, W = w("popoverRef"), G = g(!1), K = (e) => {
 			G.value = e, e ? W.value?.show() : W.value?.hide();
 		}, se = () => {
@@ -83,7 +83,7 @@ var O = /*@__PURE__*/ d({
 		}, ce = () => {
 			K(!1);
 		}, le = (e) => {
-			e.target && k.value?.focus();
+			e.target && A.value?.focus();
 		}, q = (e, t, n = []) => {
 			for (let r of e) {
 				let e = [...n, r];
@@ -103,12 +103,12 @@ var O = /*@__PURE__*/ d({
 			}
 			return n;
 		}, Y = () => {
-			if (A.value === void 0 || A.value === "") {
+			if (j.value === void 0 || j.value === "") {
 				R.value = "", F.value = [], I.value = [], z.value = [];
 				return;
 			}
 			if (p.multiple) {
-				z.value = (Array.isArray(A.value) ? A.value : []).map((e) => {
+				z.value = (Array.isArray(j.value) ? j.value : []).map((e) => {
 					if (p.pathMode && typeof e == "string") {
 						let t = e.split(p.pathSeparator);
 						return J(p.options, t);
@@ -118,24 +118,26 @@ var O = /*@__PURE__*/ d({
 				return;
 			}
 			let e = null;
-			if (p.pathMode && typeof A.value == "string") {
-				let t = A.value.split(p.pathSeparator);
+			if (p.pathMode && typeof j.value == "string") {
+				let t = j.value.split(p.pathSeparator);
 				e = J(p.options, t);
-			} else Array.isArray(A.value) || (e = q(p.options, A.value));
+			} else Array.isArray(j.value) || (e = q(p.options, j.value));
 			e && (F.value = e.map((e) => e[L.value.key]), I.value = e, R.value = V(e));
 		}, X = (e) => {
-			A.value === void 0 ? e.forEach((e) => {
+			j.value === void 0 ? e.forEach((e) => {
 				F.value.includes(e[L.value.key]) && (R.value = R.value ? `${R.value}${p.pathSeparator}${e[L.value.label]}` : e[L.value.label], e[L.value.children] && X(e[L.value.children]));
 			}) : Y();
 		}, ue = () => {
-			A.value = p.multiple ? [] : "", F.value = [], I.value = [], z.value = [], R.value = "", O("clear");
+			j.value = p.multiple ? [] : "", F.value = [], I.value = [], z.value = [], R.value = "", k("clear");
 		};
-		T(A, () => {
+		T(j, () => {
 			Y();
+		}), T(() => p.options, () => {
+			j.value !== void 0 && j.value !== "" && Y();
 		}), h(() => {
 			X(p.options);
 		});
-		let Z = u(), Q = ne("SIcon"), $ = oe();
+		let Z = te(), Q = ne("SIcon"), $ = ae();
 		return _(() => v($, [S(b).b()])), y($, null, 0), Z(s(S(r), { $: [() => ({
 			offset: [0, 4],
 			placement: "bottom-start",
@@ -143,12 +145,12 @@ var O = /*@__PURE__*/ d({
 			...d.popoverProps
 		}), { onClickOutside: () => ce }] }, {
 			content: () => {
-				let e = ae();
-				return _(() => v(e, [S(b).e("wrapper")])), y(e, null, 0), te(() => !d.options.length, () => {
-					let e = re();
+				let e = ie();
+				return _(() => v(e, [S(b).e("wrapper")])), y(e, null, 0), l(() => !d.options.length, () => {
+					let e = O();
 					return y(e, null, 0), s(S(a)), e;
 				}, () => {
-					let e = ie();
+					let e = re();
 					return _(() => v(e, [S(b).e("panel")])), y(e, null, 0), s(ee, {
 						expandTrigger: () => d.expandTrigger,
 						fieldNames: () => d.fieldNames,
@@ -159,14 +161,14 @@ var O = /*@__PURE__*/ d({
 						pathSeparator: () => d.pathSeparator,
 						onClickItem: () => H,
 						onExpand: () => U,
-						modelValue: () => A.value,
-						"onUpdate:modelValue": () => (e) => A.value = e,
+						modelValue: () => j.value,
+						"onUpdate:modelValue": () => (e) => j.value = e,
 						expanded: () => I.value,
 						"onUpdate:expanded": () => (e) => I.value = e,
 						expandedKeys: () => F.value,
 						"onUpdate:expandedKeys": () => (e) => F.value = e
 					}), e;
-				}, 261), m(e, "click", E(() => {}, ["stop"])), e.$evtmousedown = D(() => {}, ["prevent"]), e.$evtfocusin = l(le), e;
+				}, 261), m(e, "click", E(() => {}, ["stop"])), e.$evtmousedown = D(() => {}, ["prevent"]), e.$evtfocusin = u(le), e;
 			},
 			default: () => {
 				let e = s(S(i), {
@@ -185,10 +187,10 @@ var O = /*@__PURE__*/ d({
 					class: () => [S(b).e("suffix-icon")],
 					style: () => ({ transform: G.value ? "rotate(180deg)" : "" })
 				}, () => s(S(t))) });
-				return Z(e, k, null, "inputRef"), e;
+				return Z(e, A, null, "inputRef"), e;
 			}
-		}), W, null, "popoverRef"), $.$evtclick = l(se), $;
+		}), W, null, "popoverRef"), $.$evtclick = u(se), $;
 	}
 });
 //#endregion
-export { O as default };
+export { k as default };

package/dist/es/components/src/grid/grid-item.vue_vue_type_script_setup_true_vapor_true_lang.mjs

@@ -12,9 +12,12 @@ var v = p("<div>", 1), y = /*@__PURE__*/ i({
 	},
 	setup(i) {
 		let p = i, y = g("gridItemRef"), b = e("grid"), x = "grid-item-" + h(), S = a(t, {}), C = n(() => {
-			if (!S?.positionList) return {};
-			let e = S?.positionList.value[x];
-			return e ? { gridColumn: `${e.start} / ${e.end}` } : {};
+			let e = S?.positionList?.value[x];
+			return {
+				...e ? { gridColumn: `${e.start} / ${e.end}` } : {},
+				paddingLeft: e?.isFirst ? "0px" : "var(--s-grid-gutter-x, 0px)",
+				paddingRight: e?.isLast ? "0px" : "var(--s-grid-gutter-x, 0px)"
+			};
 		}), w = () => {
 			S?.addGridItem?.({
 				...p,

package/dist/es/components/src/grid/grid.vue_vue_type_script_setup_true_vapor_true_lang.mjs

@@ -13,10 +13,12 @@ var m = f("<div>", 1), h = /*@__PURE__*/ a({
 	},
 	setup(a) {
 		let f = a, h = t("grid"), { current: g } = e(), _ = s([]), v = (e, t) => e ? e?.[t] ?? 24 : 24, y = r(() => v(f.cols, g.value)), b = r(() => `repeat(${v(f.cols, g.value)}, 1fr)`), x = r(() => {
-			let e;
-			return e = Array.isArray(f.gutter) ? `${f.gutter[1]}px ${f.gutter[0]}px` : `${f.gutter}px`, {
-				gap: e,
-				gridTemplateColumns: b.value
+			let e = 0, t = 0;
+			return Array.isArray(f.gutter) ? (e = f.gutter[0], t = f.gutter[1]) : (e = f.gutter, t = f.gutter), {
+				"--s-grid-gutter-x": `${e / 2}px`,
+				gridTemplateColumns: b.value,
+				rowGap: `${t}px`,
+				columnGap: "0px"
 			};
 		});
 		o(n, {
@@ -32,12 +34,16 @@ var m = f("<div>", 1), h = /*@__PURE__*/ a({
 			},
 			positionList: r(() => {
 				let e = 1, t = {}, n = y.value, r = [..._.value].sort((e, t) => e.el && t.el ? e.el.compareDocumentPosition(t.el) & Node.DOCUMENT_POSITION_FOLLOWING ? -1 : 1 : 0);
-				for (let i of r) {
-					let { uid: r, span: a = 1, offset: o = 0 } = i, s = e + o, c = s + a;
-					t[r] = {
-						start: s,
-						end: c
-					}, e = c, e > n && (e = 1);
+				for (let i = 0; i < r.length; i++) {
+					let { uid: a, span: o = 1, offset: s = 0 } = r[i], c = e + s, l = c + o;
+					l > n + 1 && (e = 1, c = e + s, l = c + o);
+					let u = c - s === 1, d = r[i + 1], f = !d || l + (d.offset || 0) + (d.span || 1) > n + 1;
+					t[a] = {
+						start: c,
+						end: l,
+						isFirst: u,
+						isLast: f
+					}, e = l;
 				}
 				return t;
 			})

package/dist/es/components/src/grid/types.d.ts

@@ -43,6 +43,8 @@ export interface GridContext {
     positionList?: ComputedRef<Record<string, {
         start: number;
         end: number;
+        isFirst: boolean;
+        isLast: boolean;
     }>>;
 }
 export declare const gridContextKey: InjectionKey<GridContext>;

package/dist/es/components/src/menu/index.d.ts

@@ -55,6 +55,11 @@ export declare const SMenu: ((__VLS_props: NonNullable<Awaited<typeof __VLS_setu
         selectedKey?: string | undefined;
         accordion?: boolean | undefined;
         scrollbarProps?: ScrollbarProps | undefined;
+        bgColor?: string | undefined;
+        textColor?: string | undefined;
+        activeTextColor?: string | undefined;
+        activeBgColor?: string | undefined;
+        hoverBgColor?: string | undefined;
         activeKey?: string | number | undefined;
         onItemClick?: ((name: string | number, item: any) => any) | undefined;
         onOpenChange?: ((keys: string[]) => any) | undefined;

package/dist/es/components/src/menu/menu.vue_vue_type_script_setup_true_vapor_true_lang.mjs

@@ -17,7 +17,12 @@ var S = _("<div>"), C = _("<div>", 1), w = /*@__PURE__*/ c({
 		openKeys: {},
 		selectedKey: {},
 		accordion: { type: Boolean },
-		scrollbarProps: {}
+		scrollbarProps: {},
+		bgColor: { default: "transparent" },
+		textColor: { default: "var(--s-color-text-1)" },
+		activeTextColor: { default: "var(--s-color-primary-6)" },
+		activeBgColor: { default: "var(--s-color-primary-1)" },
+		hoverBgColor: { default: "var(--s-color-fill-2)" }
 	}, {
 		activeKey: {},
 		activeKeyModifiers: {},
@@ -26,7 +31,14 @@ var S = _("<div>"), C = _("<div>", 1), w = /*@__PURE__*/ c({
 	}),
 	emits: /*@__PURE__*/ l(["itemClick", "openChange"], ["update:activeKey", "update:openKeys"]),
 	setup(c, { emit: l }) {
-		let _ = c, w = l, T = t("menu"), E = a(() => ({ width: _.collapsed ? e(_.collapsedWidth) : e(_.width) })), D = b(c, "activeKey"), O = b(c, "openKeys"), k = (e, t) => {
+		let _ = c, w = l, T = t("menu"), E = a(() => ({
+			"--s-menu-bg-color": _.bgColor,
+			"--s-menu-text-color": _.textColor,
+			"--s-menu-active-text-color": _.activeTextColor,
+			"--s-menu-active-bg-color": _.activeBgColor,
+			"--s-menu-hover-bg-color": _.hoverBgColor,
+			width: _.collapsed ? e(_.collapsedWidth) : e(_.width)
+		})), D = b(c, "activeKey"), O = b(c, "openKeys"), k = (e, t) => {
 			D.value = e, w("itemClick", e, t);
 		}, A = (e) => {
 			if (_.accordion) {

package/dist/es/components/src/menu/types.d.ts

@@ -15,6 +15,16 @@ export interface MenuProps {
     accordion?: boolean;
     /** 滚动条属性 */
     scrollbarProps?: ScrollbarProps;
+    /** 背景颜色 */
+    bgColor?: string;
+    /** 文本颜色 */
+    textColor?: string;
+    /** 选中文本颜色 */
+    activeTextColor?: string;
+    /** 选中背景颜色 */
+    activeBgColor?: string;
+    /** 鼠标悬停背景颜色 */
+    hoverBgColor?: string;
 }
 export interface MenuSlots {
     /** 默认 */

package/dist/es/components/src/modal/index.d.ts

@@ -2,6 +2,7 @@ import { useModal } from './method';
 import { ModalSlots } from './types';
 import { PublicProps, VNode, ShallowUnwrapRef, Plugin } from 'vue';
 import { ScrollbarProps } from '../scrollbar';
+import { ButtonProps } from '../button';
 export declare const SModal: ((__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: {
     attrs: any;
     slots: ModalSlots;
@@ -26,6 +27,7 @@ export declare const SModal: ((__VLS_props: NonNullable<Awaited<typeof __VLS_set
         mask?: boolean | undefined;
         to?: (string | HTMLElement) | undefined;
         draggable?: boolean | undefined;
+        type?: "default" | "warning" | "primary" | "info" | "success" | "danger" | undefined;
         className?: string | undefined;
         modalStyle?: Record<string, string> | undefined;
         maskStyle?: Record<string, string> | undefined;
@@ -34,6 +36,10 @@ export declare const SModal: ((__VLS_props: NonNullable<Awaited<typeof __VLS_set
         offset?: number | undefined;
         scrollContent?: boolean | undefined;
         scrollbarProps?: ScrollbarProps | undefined;
+        confirmBtn?: boolean | undefined;
+        confirmProps?: ButtonProps | undefined;
+        cancelBtn?: boolean | undefined;
+        cancelProps?: ButtonProps | undefined;
         confirm?: ((done: (status: boolean) => void) => void) | undefined;
         close?: (() => void) | undefined;
         closed?: (() => void) | undefined;

package/dist/es/components/src/modal/modal.vue_vue_type_script_setup_true_vapor_true_lang.mjs

@@ -6,21 +6,25 @@ import { useResizeObserver as r } from "../../../hooks/src/use-resize-observer.m
 import { useScrollHidden as ee } from "../../../hooks/src/use-scroll-hidden.mjs";
 import { useZIndex as te } from "../../../hooks/src/use-zIndex.mjs";
 import "../../../hooks/index.mjs";
-import ne from "../../../icons/src/close.vue.mjs";
-import re from "../../../icons/src/fullscreen-exit.vue.mjs";
-import ie from "../../../icons/src/fullscreen.vue.mjs";
+import ne from "../../../icons/src/check-circle-fill.vue.mjs";
+import re from "../../../icons/src/close-circle-fill.vue.mjs";
+import ie from "../../../icons/src/close.vue.mjs";
+import ae from "../../../icons/src/fullscreen-exit.vue.mjs";
+import oe from "../../../icons/src/fullscreen.vue.mjs";
+import i from "../../../icons/src/info-circle-fill.vue.mjs";
+import se from "../../../icons/src/warning-circle-fill.vue.mjs";
 import "../../../icons/index.mjs";
-import { SScrollbar as ae } from "../scrollbar/index.mjs";
-import { SButton as i } from "../button/index.mjs";
-import { STransition as a } from "../transition/index.mjs";
-import { VaporTeleport as oe, applyVShow as o, child as s, computed as c, createComponent as l, createIf as u, createInvoker as se, createSlot as d, createTemplateRefSetter as ce, defineVaporComponent as f, delegateEvents as p, mergeModels as m, next as h, nextTick as g, onUnmounted as le, ref as _, renderEffect as v, setClass as y, setInsertionState as b, setStyle as x, setText as S, template as C, toDisplayString as w, unref as T, useModel as E, useTemplateRef as D, watch as O, watchEffect as ue } from "vue";
+import { SScrollbar as ce } from "../scrollbar/index.mjs";
+import { SButton as a } from "../button/index.mjs";
+import { STransition as o } from "../transition/index.mjs";
+import { VaporTeleport as le, applyVShow as s, child as c, computed as l, createComponent as u, createIf as d, createInvoker as ue, createSlot as f, createTemplateRefSetter as de, defineVaporComponent as p, delegateEvents as m, mergeModels as h, next as fe, nextTick as g, onUnmounted as pe, ref as _, renderEffect as v, setClass as y, setInsertionState as b, setStyle as x, setText as S, template as C, toDisplayString as w, unref as T, useModel as me, useTemplateRef as E, watch as D, watchEffect as he } from "vue";
 //#region ../components/src/modal/modal.vue?vue&type=script&setup=true&vapor=true&lang.ts
-var k = C("<div>"), A = C(" "), de = C("<div><div></div><div></div>"), j = C("<div style=\"flex: 1; overflow: hidden; display: flex; flex-direction: column\">"), fe = C("<div><div>");
-p("click");
-var M = /*@__PURE__*/ f({
+var O = C("<div>"), k = C(" "), ge = C("<div><div></div><div></div>"), A = C("<div style=\"flex: 1; overflow: hidden; display: flex; flex-direction: column\">"), _e = C("<div><div>");
+m("click");
+var j = /*@__PURE__*/ p({
 	name: "SModal",
 	__name: "modal",
-	props: /*@__PURE__*/ m({
+	props: /*@__PURE__*/ h({
 		modalValue: { type: Boolean },
 		width: { default: "0px" },
 		height: {},
@@ -60,6 +64,7 @@ var M = /*@__PURE__*/ f({
 		},
 		to: { default: "body" },
 		draggable: { type: Boolean },
+		type: { default: "default" },
 		className: {},
 		modalStyle: {},
 		maskStyle: {},
@@ -71,6 +76,16 @@ var M = /*@__PURE__*/ f({
 		offset: { default: 120 },
 		scrollContent: { type: Boolean },
 		scrollbarProps: {},
+		confirmBtn: {
+			type: Boolean,
+			default: !0
+		},
+		confirmProps: {},
+		cancelBtn: {
+			type: Boolean,
+			default: !0
+		},
+		cancelProps: {},
 		confirm: {},
 		close: {},
 		closed: {},
@@ -82,45 +97,45 @@ var M = /*@__PURE__*/ f({
 		},
 		modelModifiers: {}
 	}),
-	emits: /*@__PURE__*/ m([
+	emits: /*@__PURE__*/ h([
 		"close",
 		"closed",
 		"opened",
 		"confirm"
 	], ["update:modelValue"]),
-	setup(f, { expose: p, emit: m }) {
-		let C = f, M = m, N = n("modal"), { lockScroll: pe, unlockScroll: P } = ee(), { nextZIndex: me } = te(), F = _(0), I = D("modalRef"), L = D("headerRef"), R = E(f, "modelValue"), z = _(!1), B = _(!1), V = _(!1), H = _(!1), U = _(0), W = _(0), G = _(!1), K = _(0), q = _(0), J = c(() => typeof C.to == "string" ? document.querySelector(C.to) || document.body : C.to);
+	setup(p, { expose: m, emit: h }) {
+		let C = p, j = h, M = n("modal"), { lockScroll: ve, unlockScroll: N } = ee(), { nextZIndex: P } = te(), F = _(0), I = E("modalRef"), L = E("headerRef"), R = me(p, "modelValue"), z = _(!1), B = _(!1), V = _(!1), H = _(!1), U = _(0), W = _(0), G = _(!1), K = _(0), q = _(0), J = l(() => typeof C.to == "string" ? document.querySelector(C.to) || document.body : C.to);
 		r(J, () => {
 			let e = J.value;
 			K.value = e.clientHeight, q.value = e.clientWidth, Q();
 		}), r(I, () => {
 			z.value && Q();
 		});
-		let he = c(() => ({
+		let ye = l(() => ({
 			zIndex: F.value,
 			position: C.to === "body" ? "fixed" : "absolute"
-		})), ge = c(() => V.value ? {} : {
+		})), be = l(() => V.value ? {} : {
 			width: e(C.width),
 			height: e(C.height),
 			top: `${U.value}px`,
 			left: `${W.value}px`,
 			...C.modalStyle
-		}), _e = () => {
-			M("opened");
-		}, ve = () => {
-			B.value = !1, H.value = !1, G.value = !1, M("closed"), g(P);
-		}, ye = () => {
+		}), xe = () => {
+			j("opened");
+		}, Se = () => {
+			B.value = !1, H.value = !1, G.value = !1, j("closed"), g(N);
+		}, Ce = () => {
 			C.closeOnOverlayClick && X();
-		}, be = (e) => {
+		}, we = (e) => {
 			e ? R.value = !1 : H.value = !1;
 		}, Y = () => {
-			H.value = !0, M("confirm", be);
+			H.value = !0, j("confirm", we);
 		}, X = () => {
-			R.value = !1, M("close");
-		}, xe = () => {
+			R.value = !1, j("close");
+		}, Te = () => {
 			V.value = !V.value;
 		};
-		O(() => C.fullscreen, (e) => V.value = e, { immediate: !0 });
+		D(() => C.fullscreen, (e) => V.value = e, { immediate: !0 });
 		let Z = (e) => {
 			e.key === "Escape" && C.closeOnEsc && z.value && X();
 		}, Q = async () => {
@@ -128,111 +143,112 @@ var M = /*@__PURE__*/ f({
 			let e = I.value;
 			C.center ? U.value = Math.max(0, (K.value - e.offsetHeight) / 2) : U.value = C.offset, W.value = Math.max(0, (q.value - e.offsetWidth) / 2);
 		};
-		O(() => R.value, async (e) => {
-			e ? (F.value = me(), pe(), B.value = !0, await g(), z.value = !0, Q()) : z.value = !1;
-		}, { immediate: !0 }), ue((e) => {
+		D(() => R.value, async (e) => {
+			e ? (F.value = P(), ve(), B.value = !0, await g(), z.value = !0, Q()) : z.value = !1;
+		}, { immediate: !0 }), he((e) => {
 			z.value && (document.addEventListener("keydown", Z), e(() => document.removeEventListener("keydown", Z)));
 		}), t({
 			container: I,
 			target: L,
 			parent: J,
-			enable: c(() => C.draggable && !V.value),
+			enable: l(() => C.draggable && !V.value),
 			divLeft: W,
 			divTop: U,
 			hasDragged: G
-		}), le(() => {
-			P();
-		}), p({ handleClose: X });
-		let $ = ce();
-		return l(oe, {
-			to: () => f.to,
+		}), pe(() => {
+			N();
+		}), m({ handleClose: X });
+		let $ = de();
+		return u(le, {
+			to: () => p.to,
 			defer: ""
 		}, () => {
-			let e = fe(), t = s(e, 1);
+			let e = _e(), t = c(e, 1);
 			return v(() => {
-				y(e, [T(N).e("container")]), x(e, he.value);
-			}), b(e, 0, 0), l(T(a), { type: "opacity" }, () => u(() => f.mask, () => {
-				let e = k();
-				return o(e, () => z.value), e.$evtclick = se(ye), v(() => {
-					x(e, f.maskStyle), y(e, [T(N).e("mask")]);
+				y(e, [T(M).e("container")]), x(e, ye.value);
+			}), b(e, 0, 0), u(T(o), { type: "opacity" }, () => d(() => p.mask, () => {
+				let e = O();
+				return s(e, () => z.value), e.$evtclick = ue(Ce), v(() => {
+					x(e, p.maskStyle), y(e, [T(M).e("mask")]);
 				}), e;
-			}, null, 129)), v(() => y(t, [T(N).e("wrapper")])), b(t, null, 0), l(T(a), {
+			}, null, 129)), v(() => y(t, [T(M).e("wrapper")])), b(t, null, 0), u(T(o), {
 				type: "scale",
-				onAfterLeave: () => ve,
-				onAfterEnter: () => _e
+				onAfterLeave: () => Se,
+				onAfterEnter: () => xe
 			}, () => {
-				let e = k();
+				let e = O();
 				return v(() => {
-					let t = T(N);
+					let t = T(M);
 					y(e, [
 						t.b(),
-						t.is("drag", f.draggable),
+						t.is("drag", p.draggable),
 						t.is("fullscreen", V.value),
-						f.className
-					]), x(e, ge.value);
-				}), b(e, null, 0), u(() => f.header, () => {
-					let e = de(), t = s(e), n = h(t, 1);
-					return v(() => {
-						let n = T(N);
-						y(e, [n.e("header")]), y(t, [n.e("title")]);
-					}), b(t, null, 0), d("header", null, () => {
-						let e = A();
-						return v(() => S(e, w(f.title))), e;
-					}), v(() => y(n, [T(N).e("header-icon")])), b(n, null, 0), u(() => f.fullable, () => l(T(i), {
+						t.m(p.type),
+						p.className
+					]), x(e, be.value);
+				}), b(e, null, 0), d(() => p.header, () => {
+					let e = ge(), t = c(e, 1), n = fe(t, 2);
+					return v(() => y(e, [T(M).e("header")])), b(e, 0, 0), d(() => p.type !== "default", () => {
+						let e = O();
+						return v(() => y(e, [T(M).e("icon")])), b(e, null, 0), d(() => p.type === "warning", () => u(T(se)), () => d(() => p.type === "primary", () => u(T(i)), () => d(() => p.type === "info", () => u(T(i)), () => d(() => p.type === "success", () => u(T(ne)), () => d(() => p.type === "danger", () => u(T(re))), 1285), 1029), 773), 517), e;
+					}), v(() => y(t, [T(M).e("title")])), b(t, null, 0), f("header", null, () => {
+						let e = k();
+						return v(() => S(e, w(p.title))), e;
+					}), v(() => y(n, [T(M).e("header-icon")])), b(n, null, 0), d(() => p.fullable, () => u(T(a), {
 						text: "",
 						size: "small",
-						onClick: () => xe
-					}, { icon: () => u(() => V.value, () => l(T(re)), () => l(T(ie)), 645) })), b(n, null, 1), u(() => f.closable, () => l(T(i), {
+						onClick: () => Te
+					}, { icon: () => d(() => V.value, () => u(T(ae)), () => u(T(oe)), 2181) })), b(n, null, 1), d(() => p.closable, () => u(T(a), {
 						text: "",
 						size: "small",
 						circle: "",
 						onClick: () => X
-					}, { icon: () => l(T(ne)) })), $(e, L, null, "headerRef"), e;
-				}), b(e, null, 1), u(() => !f.scrollContent, () => {
-					let e = k();
+					}, { icon: () => u(T(ie)) })), $(e, L, null, "headerRef"), e;
+				}), b(e, null, 1), d(() => !p.scrollContent, () => {
+					let e = O();
 					return v(() => {
-						y(e, [T(N).e("body")]), x(e, {
+						y(e, [T(M).e("body")]), x(e, {
 							padding: "16px",
-							...f.bodyStyle
+							...p.bodyStyle
 						});
-					}), b(e, null, 0), d("default", null, () => {
-						let e = A();
-						return v(() => S(e, w(f.content))), e;
+					}), b(e, null, 0), f("default", null, () => {
+						let e = k();
+						return v(() => S(e, w(p.content))), e;
 					}), e;
 				}, () => {
-					let e = j();
-					return b(e, null, 0), l(T(ae), { $: [() => ({
+					let e = A();
+					return b(e, null, 0), u(T(ce), { $: [() => ({
 						padding: "16px",
-						...f.scrollbarProps
-					})] }, () => d("default", null, () => {
-						let e = A();
-						return v(() => S(e, w(f.content))), e;
+						...p.scrollbarProps
+					})] }, () => f("default", null, () => {
+						let e = k();
+						return v(() => S(e, w(p.content))), e;
 					}, 4)), e;
-				}, 1541), b(e, null, 2), u(() => f.footer, () => {
-					let e = k();
-					return v(() => y(e, [T(N).e("footer")])), b(e, null, 0), d("footer", null, () => u(() => f.btnReverse, () => [l(T(i), {
+				}, 3077), b(e, null, 2), d(() => p.footer, () => {
+					let e = O();
+					return v(() => y(e, [T(M).e("footer")])), b(e, null, 0), f("footer", null, () => d(() => p.btnReverse, () => [d(() => p.confirmBtn, () => u(T(a), { $: [() => ({
 						label: "确定",
-						loading: () => H.value,
+						loading: H.value,
 						type: "primary",
-						onClick: () => Y
-					}), l(T(i), {
+						...p.confirmProps
+					}), { onClick: () => Y }] }), null, 129), d(() => p.cancelBtn, () => u(T(a), { $: [() => ({
 						label: "取消",
-						secondary: "",
-						onClick: () => X
-					})], () => [l(T(i), {
+						secondary: !0,
+						...p.cancelProps
+					}), { onClick: () => X }] }), null, 129)], () => [d(() => p.cancelBtn, () => u(T(a), { $: [() => ({
 						label: "取消",
-						secondary: "",
-						onClick: () => X
-					}), l(T(i), {
+						secondary: !0,
+						...p.cancelProps
+					}), { onClick: () => X }] }), null, 129), d(() => p.confirmBtn, () => u(T(a), { $: [() => ({
 						label: "确定",
-						loading: () => H.value,
+						loading: H.value,
 						type: "primary",
-						onClick: () => Y
-					})], 1930)), e;
-				}), o(e, () => z.value), $(e, I, null, "modalRef"), e;
-			}), o(e, () => B.value), e;
+						...p.confirmProps
+					}), { onClick: () => Y }] }), null, 129)], 3978)), e;
+				}), s(e, () => z.value), $(e, I, null, "modalRef"), e;
+			}), s(e, () => B.value), e;
 		}, !0);
 	}
 });
 //#endregion
-export { M as default };
+export { j as default };