savor-ui 0.16.0 → 0.17.0

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 
 
+# [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/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;
@@ -34,6 +35,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

@@ -71,6 +71,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: {},
@@ -210,25 +220,25 @@ var M = /*@__PURE__*/ f({
 					}, 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), {
+					return v(() => y(e, [T(N).e("footer")])), b(e, null, 0), d("footer", null, () => u(() => f.btnReverse, () => [u(() => f.confirmBtn, () => l(T(i), { $: [() => ({
 						label: "确定",
-						loading: () => H.value,
+						loading: H.value,
 						type: "primary",
-						onClick: () => Y
-					}), l(T(i), {
+						...f.confirmProps
+					}), { onClick: () => Y }] }), null, 129), u(() => f.cancelBtn, () => l(T(i), { $: [() => ({
 						label: "取消",
-						secondary: "",
-						onClick: () => X
-					})], () => [l(T(i), {
+						secondary: !0,
+						...f.cancelProps
+					}), { onClick: () => X }] }), null, 129)], () => [u(() => f.cancelBtn, () => l(T(i), { $: [() => ({
 						label: "取消",
-						secondary: "",
-						onClick: () => X
-					}), l(T(i), {
+						secondary: !0,
+						...f.cancelProps
+					}), { onClick: () => X }] }), null, 129), u(() => f.confirmBtn, () => l(T(i), { $: [() => ({
 						label: "确定",
-						loading: () => H.value,
+						loading: H.value,
 						type: "primary",
-						onClick: () => Y
-					})], 1930)), e;
+						...f.confirmProps
+					}), { onClick: () => Y }] }), null, 129)], 2442)), e;
 				}), o(e, () => z.value), $(e, I, null, "modalRef"), e;
 			}), o(e, () => B.value), e;
 		}, !0);

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

@@ -1,4 +1,5 @@
 import { VNode } from 'vue';
+import { ButtonProps } from '../button';
 import { ScrollbarProps } from '../scrollbar';
 export interface ModalProps {
     /** 弹窗是否可见(v-model) */
@@ -57,6 +58,14 @@ export interface ModalProps {
     scrollContent?: boolean;
     /** 滚动容器属性 */
     scrollbarProps?: ScrollbarProps;
+    /** 是否显示确认按钮 */
+    confirmBtn?: boolean;
+    /** 确认按钮属性 */
+    confirmProps?: ButtonProps;
+    /** 是否显示取消按钮 */
+    cancelBtn?: boolean;
+    /** 取消按钮属性 */
+    cancelProps?: ButtonProps;
     /** 弹窗确认事件,需调用 done 函数关闭弹窗 */
     confirm?: (done: (status: boolean) => void) => void;
     /** 弹窗关闭事件 */

package/dist/es/theme/components/avatar.scss

@@ -18,6 +18,8 @@
     border-radius: getCssVar("radius", "circle");
   }
   @include e(content) {
+    height: 100%;
+    width: 100%;
     line-height: 1.5715;
     font-weight: 500;
     display: flex;

package/dist/es/theme/components/grid.scss

@@ -8,5 +8,6 @@
   grid-template-rows: auto;
   @include e(item) {
     display: flex;
+    min-width: 0;
   }
 }

package/dist/es/theme/components/statistic.scss

@@ -1,33 +1,33 @@
-@use '../mixins/function.scss' as *;
-@use '../mixins/mixins.scss' as *;
+@use "../mixins/function.scss" as *;
+@use "../mixins/mixins.scss" as *;
 
 @include b(statistic) {
   display: inline-flex;
   flex-direction: column;
 
   @include e(title) {
-    font-size: getCssVar('font-size', 'medium');
-    color: getCssVar('color', 'text-2');
-    margin-bottom: 8px;
+    font-size: getCssVar("font-size", "medium");
+    color: getCssVar("color", "text-2");
+    margin-bottom: 4px;
   }
   @include e(content) {
     display: flex;
     align-items: flex-end;
-    color: getCssVar('color', 'text-1');
+    color: getCssVar("color", "text-1");
   }
   @include e(value) {
     font-size: 24px;
     white-space: nowrap;
   }
   @include e(prefix) {
-    font-size: getCssVar('font-size', 'medium');
+    font-size: getCssVar("font-size", "medium");
   }
   @include e(suffix) {
-    font-size: getCssVar('font-size', 'medium');
+    font-size: getCssVar("font-size", "medium");
   }
   @include e(extra) {
-    font-size: getCssVar('font-size', 'medium');
-    color: getCssVar('color', 'text-2');
-    margin-top: 8px;
+    font-size: getCssVar("font-size", "medium");
+    color: getCssVar("color", "text-2");
+    margin-top: 4px;
   }
 }

package/dist/json/vetur-attributes.json

@@ -1592,6 +1592,20 @@
   "s-modal/scrollbarProps": {
     "description": "滚动容器属性"
   },
+  "s-modal/confirmBtn": {
+    "description": "是否显示确认按钮",
+    "type": "boolean"
+  },
+  "s-modal/confirmProps": {
+    "description": "确认按钮属性"
+  },
+  "s-modal/cancelBtn": {
+    "description": "是否显示取消按钮",
+    "type": "boolean"
+  },
+  "s-modal/cancelProps": {
+    "description": "取消按钮属性"
+  },
   "s-modal/close": {
     "description": "弹窗关闭事件"
   },

package/dist/json/vetur-tags.json

@@ -677,6 +677,10 @@
       "offset",
       "scrollContent",
       "scrollbarProps",
+      "confirmBtn",
+      "confirmProps",
+      "cancelBtn",
+      "cancelProps",
       "close",
       "closed",
       "opened"

package/dist/json/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
   "name": "savor-ui",
-  "version": "0.15.7",
+  "version": "0.16.0",
   "contributions": {
     "html": {
       "types-syntax": "typescript",
@@ -4159,6 +4159,38 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "confirmBtn",
+              "description": "是否显示确认按钮",
+              "value": {
+                "type": "boolean",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "confirmProps",
+              "description": "确认按钮属性",
+              "value": {
+                "type": "ButtonProps",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "cancelBtn",
+              "description": "是否显示取消按钮",
+              "value": {
+                "type": "boolean",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "cancelProps",
+              "description": "取消按钮属性",
+              "value": {
+                "type": "ButtonProps",
+                "kind": "expression"
+              }
+            },
             {
               "name": "confirm",
               "description": "弹窗确认事件,需调用 done 函数关闭弹窗",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "savor-ui",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "A Vue3 Components Library",
   "keywords": [
     "component library",