@guodun/antdv 1.7.9 → 1.7.11

package/dist/es/components/pro-contract-template-designer/src/ProContractTemplateDesigner.vue.mjs

@@ -818,8 +818,7 @@ var Gt = {
 			K.value && Va({
 				multiline: e,
 				rows: K.value.rows || 3,
-				lineHeight: K.value.lineHeight || 28,
-				style: e ? { underline: !0 } : void 0
+				lineHeight: K.value.lineHeight || 28
 			});
 		}
 		function Za(e) {

package/dist/es/components/pro-contract-template-designer/src/composables/use-template-designer.mjs

@@ -327,7 +327,7 @@ function me(e) {
 	} : e === "number" ? {
 		placeholder: "0",
 		format: "decimal",
-		useGrouping: !0,
+		useGrouping: !1,
 		style: {
 			border: !1,
 			underline: !0,

package/dist/es/components/pro-contract-template-designer/src/utils/contract-print-document.mjs

@@ -244,7 +244,13 @@ ${e.decorationsHtml}
     if (document.fonts)
       await withTimeout(document.fonts.ready)
     const metrics = measure()
-    assertMetrics(metrics)
+    try {
+      assertMetrics(metrics)
+    }
+    catch (error) {
+      // 样本宽度跟系统字体、浏览器缩放走，业务用户无法消除。偏差只记日志，底图和签署继续。
+      console.warn('[GD-SIGN-COORD]', error instanceof Error ? error.message : String(error))
+    }
     ready = true
     post('ready', { metrics })
     observer = new ResizeObserver(() => {

package/dist/es/components/pro-contract-template-designer/src/utils/template-renderer.mjs

@@ -3,11 +3,11 @@ import { resolveTemplateVariablePresentation as c } from "./template-variable-re
 import { buildPageDecorationClassNames as l, buildPageDecorationsHtml as u, collectPageDecorationVariableKeys as d, normalizePageDecorations as f, validatePageDecorations as p } from "./page-decorations.mjs";
 import { isContractTemplateFieldType as m } from "../types.mjs";
 import { buildRadioOptionsHtml as h, formatContractTemplateRenderValue as g, isContractTemplateSelectionValue as _ } from "./advanced-controls.mjs";
-import { CONTRACT_TEMPLATE_RESERVED_VARIABLE_KEYS as v, CONTRACT_TEMPLATE_VARIABLE_KEY_PATTERN as ee, DEFAULT_PAGE_SIZE as y, resolvePageSize as b, validateContractTemplateVariableKey as x } from "../composables/use-template-designer.mjs";
-import { isSafeContractImageUrl as S } from "./image-url.mjs";
+import { CONTRACT_TEMPLATE_RESERVED_VARIABLE_KEYS as v, CONTRACT_TEMPLATE_VARIABLE_KEY_PATTERN as y, DEFAULT_PAGE_SIZE as ee, resolvePageSize as te, validateContractTemplateVariableKey as ne } from "../composables/use-template-designer.mjs";
+import { isSafeContractImageUrl as re } from "./image-url.mjs";
 //#region src/components/pro-contract-template-designer/src/utils/template-renderer.ts
-function te(e) {
-	let t = Array.isArray(e?.variables) ? e.variables : [], n = t.map((e) => C(e)), r = {};
+function ie(e) {
+	let t = Array.isArray(e?.variables) ? e.variables : [], n = t.map((e) => b(e)), r = {};
 	return t.forEach((e) => {
 		let t = typeof e?.key == "string" ? e.key : "";
 		if (t) {
@@ -27,30 +27,30 @@ function te(e) {
 		variables: n
 	};
 }
-function C(e) {
+function b(e) {
 	return JSON.parse(JSON.stringify(e));
 }
-var w = new Set([
+var x = new Set([
 	"action",
 	"formaction",
 	"href",
 	"src",
 	"xlink:href"
-]), T = /<[^>]+data-template-variable=["']true["'][^>]*>/gi, E = 100, D = 6e3, O = 6, k = /^data:image\/(?:png|jpe?g|webp|gif);base64,[A-Za-z0-9+/=]+$/i;
-function A(e) {
+]), S = /<[^>]+data-template-variable=["']true["'][^>]*>/gi, C = 100, w = 6e3, T = 6, E = /^data:image\/(?:png|jpe?g|webp|gif);base64,[A-Za-z0-9+/=]+$/i;
+function D(e) {
 	let t = {};
 	return (Array.isArray(e?.variables) ? e.variables : []).forEach((e) => {
-		e?.key && (t[e.key] = U(e));
+		e?.key && (t[e.key] = B(e));
 	}), t;
 }
-function j(e, t) {
+function ae(e, t) {
 	return {
-		...A(e),
+		...D(e),
 		...t ?? {}
 	};
 }
-function M(e, t) {
-	let n = N(e);
+function O(e, t) {
+	let n = A(e);
 	if (!e) return n;
 	let r = Array.isArray(e.variables) ? e.variables : [], i = new Set(r.map((e) => e?.key).filter(Boolean));
 	return Object.keys(t).forEach((e) => {
@@ -63,8 +63,8 @@ function M(e, t) {
 		});
 	}), r.forEach((e) => {
 		if (!e?.key) return;
-		let r = se(e, t[e.key]), i = e.label || e.key;
-		if (e.required && I(r)) {
+		let r = Z(e, t[e.key]), i = e.label || e.key;
+		if (e.required && N(r)) {
 			n.push({
 				type: "variable",
 				id: e.id,
@@ -74,39 +74,33 @@ function M(e, t) {
 			});
 			return;
 		}
-		if (I(r)) return;
+		if (N(r)) return;
 		let a = e.type ?? "text";
-		a === "number" && !ce(r, e.precision) && n.push({
+		a === "number" && !ue(r, e.precision, e.format) && n.push({
 			type: "variable",
 			id: e.id,
 			variableKey: e.key,
 			message: `${i} 不是合法数字或超出精度`,
 			code: "VARIABLE_TYPE_INVALID"
-		}), a === "checkbox" && !ue(r) && n.push({
+		}), a === "checkbox" && !de(r) && n.push({
 			type: "variable",
 			id: e.id,
 			variableKey: e.key,
 			message: `${i} 不是合法勾选值`,
 			code: "VARIABLE_TYPE_INVALID"
-		}), a === "date" && !le(r) && n.push({
+		}), a === "date" && !Q(r) && n.push({
 			type: "variable",
 			id: e.id,
 			variableKey: e.key,
 			message: `${i} 不是合法日期`,
 			code: "VARIABLE_TYPE_INVALID"
-		}), a === "image" && !de(String(r).trim()) && n.push({
+		}), a === "image" && !fe(String(r).trim()) && n.push({
 			type: "security",
 			id: e.id,
 			variableKey: e.key,
 			message: `${i} 必须使用安全的图片 data URL`,
 			code: "UNSAFE_IMAGE_URL"
-		}), a === "text" && me(e, String(r)) && n.push({
-			type: "variable",
-			id: e.id,
-			variableKey: e.key,
-			message: `${i} 内容超出变量范围`,
-			code: "VARIABLE_OVERFLOW"
-		}), fe(a) && (pe(r, a !== "radio" && !!e.multiple) ? K(e) && !q(e, r) && n.push({
+		}), n.push(...k(e, r)), pe(a) && (me(r, a !== "radio" && !!e.multiple) ? U(e) && !W(e, r) && n.push({
 			type: "variable",
 			id: e.id,
 			variableKey: e.key,
@@ -121,10 +115,23 @@ function M(e, t) {
 		}));
 	}), n;
 }
-function ne(e, t, n) {
-	return M(e, t);
+function k(e, t) {
+	if ((e.type ?? "text") !== "text") return [];
+	let n = Z(e, t);
+	if (N(n) || !he(e, String(n))) return [];
+	let r = e.label || e.key;
+	return [{
+		type: "variable",
+		id: e.id,
+		variableKey: e.key,
+		message: e.multiline ? `${r} 内容超出正文预留的${e.rows ?? 3}行，请缩短内容或调整模板行数` : `${r} 内容超出变量范围`,
+		code: "VARIABLE_OVERFLOW"
+	}];
 }
-function N(e) {
+function oe(e, t, n) {
+	return O(e, t);
+}
+function A(e) {
 	if (!e) return [{
 		type: "page",
 		id: "template",
@@ -145,7 +152,7 @@ function N(e) {
 	}), $(e.pageSize) || t.push({
 		type: "page",
 		id: "template-page-size",
-		message: `模板默认页面尺寸必须在 ${E} ~ ${D} CSS px 之间`,
+		message: `模板默认页面尺寸必须在 ${C} ~ ${w} CSS px 之间`,
 		code: "TEMPLATE_PAGE_SIZE_INVALID"
 	});
 	let i = /* @__PURE__ */ new Map();
@@ -159,7 +166,7 @@ function N(e) {
 			});
 			return;
 		}
-		let a = e.key.trim(), o = r.some((t) => t?.id !== e.id && typeof t?.key == "string" && t.key.trim() === a), s = x(e.key, r, e.id), c = !ee.test(a) || v.has(a);
+		let a = e.key.trim(), o = r.some((t) => t?.id !== e.id && typeof t?.key == "string" && t.key.trim() === a), s = ne(e.key, r, e.id), c = !y.test(a) || v.has(a);
 		s && (c || !o || e.key !== a) && t.push({
 			type: "variable",
 			id: e.id || `variable-${n}`,
@@ -198,9 +205,9 @@ function N(e) {
 			type: "page",
 			id: `${e.id}-page-size`,
 			pageId: e.id,
-			message: `${e.title || `第 ${n + 1} 页`}：页面尺寸必须在 ${E} ~ ${D} CSS px 之间`,
+			message: `${e.title || `第 ${n + 1} 页`}：页面尺寸必须在 ${C} ~ ${w} CSS px 之间`,
 			code: "PAGE_SIZE_INVALID"
-		}), ie(e.contentHtml).forEach((e) => a.add(e)), ae(e.contentHtml).forEach((r, i) => {
+		}), se(e.contentHtml).forEach((e) => a.add(e)), ce(e.contentHtml).forEach((r, i) => {
 			t.push({
 				type: "security",
 				id: `${e.id}-security-${i}`,
@@ -229,59 +236,59 @@ function N(e) {
 		});
 	}), t.push(...p(e.pageDecorations, r)), t;
 }
-function P(e, t, n = {}) {
+function j(e, t, n = {}) {
 	if (!e || !Array.isArray(e.pages)) return [];
-	let r = Array.isArray(e.variables) ? e.variables : [], i = new Map(r.filter((e) => e?.key).map((e) => [e.key, e])), a = o(e.pageSize) ? e.pageSize : y;
+	let r = Array.isArray(e.variables) ? e.variables : [], i = new Map(r.filter((e) => e?.key).map((e) => [e.key, e])), a = o(e.pageSize) ? e.pageSize : ee;
 	return e.pages.flatMap((o) => {
 		if (!o || typeof o.id != "string" || !o.id.trim() || typeof o.contentHtml != "string") return [];
-		let s = b(o.pageSize, a);
+		let s = te(o.pageSize, a);
 		return [{
 			id: o.id,
 			title: o.title || "未命名页面",
 			format: s.format ?? "Custom",
 			width: s.width,
 			height: s.height,
-			contentHtml: L(o.contentHtml, i, t, n),
+			contentHtml: P(o.contentHtml, i, t, n),
 			...e.pageDecorations ? { pageDecorations: f(e.pageDecorations) } : {},
 			decorationVariables: r,
 			decorationValues: t
 		}];
 	});
 }
-function F(e, t, n = {}) {
-	return P(e, t, n).map((e, t, n) => {
+function M(e, t, n = {}) {
+	return j(e, t, n).map((e, t, n) => {
 		let i = u(e.pageDecorations, t + 1, n.length, e.decorationVariables, e.decorationValues);
 		return `<section class="${l(e.pageDecorations, t + 1)}" data-page-id="${r(e.id)}" data-page-format="${r(e.format)}" data-page-width="${e.width}" data-page-height="${e.height}" style="width:${e.width}px;min-height:${e.height}px">${i}<div class="gd-contract-template-page__content">${e.contentHtml}</div></section>`;
 	}).join("\n");
 }
-function I(e) {
+function N(e) {
 	return e == null || e === "" || Array.isArray(e) && e.length === 0;
 }
-function L(e, n, r, i) {
+function P(e, n, r, i) {
 	if (!e) return e;
-	let o = X(e);
+	let o = J(e);
 	if (t()) {
 		let e = new DOMParser().parseFromString(o, "text/html");
 		return e.querySelectorAll("[data-template-variable]").forEach((e) => {
-			R(e, n, r, i);
-		}), e.body.innerHTML;
+			F(e, n, r, i);
+		}), e.body.innerHTML.replace(/(<textarea\b[^>]*data-contract-render-control="true"[^>]*>)(?=[\r\n])/gi, "$1\n");
 	}
 	return s(o, (e, t) => {
 		let o = a(t, "data-key");
-		return o ? z(n.get(o), o, r[o], i) : e;
+		return o ? I(n.get(o), o, r[o], i) : e;
 	});
 }
-function R(e, t, n, r) {
+function F(e, t, n, r) {
 	let i = e.dataset.key || "", a = t.get(i);
 	if (!i || !a) return;
-	let o = new DOMParser().parseFromString(z(a, i, n[i], r), "text/html").body.firstElementChild;
-	o && e.replaceWith(o);
+	let o = new DOMParser().parseFromString(I(a, i, n[i], r), "text/html").body.firstElementChild;
+	o && (o.tagName === "TEXTAREA" && (o.textContent = G(z(a, n[i]))), e.replaceWith(o));
 }
-function z(e, t, n, r) {
-	return r.mode === "display" ? B(e, t, n, r) : V(e, t, n, r);
+function I(e, t, n, r) {
+	return r.mode === "display" ? L(e, t, n, r) : R(e, t, n, r);
 }
-function B(e, t, n, a) {
-	let o = e?.type ?? "text", s = H(e, n), l = o === "image" && !I(s) && !S(String(s)) ? "" : s, u = re(l), d = c({
+function L(e, t, n, a) {
+	let o = e?.type ?? "text", s = z(e, n), l = o === "image" && !N(s) && !re(String(s)) ? "" : s, u = K(l), d = c({
 		type: o,
 		width: e?.width,
 		height: e?.height,
@@ -302,7 +309,7 @@ function B(e, t, n, a) {
 			"gd-contract-template-renderer__preview-control",
 			...d.classes,
 			a.activeKey === t ? "is-active" : "",
-			I(l) ? "is-empty" : ""
+			N(l) ? "is-empty" : ""
 		].filter(Boolean).join(" "))}"`,
 		`style="${r(d.styleText)}"`,
 		"data-contract-render-wrapper=\"true\"",
@@ -313,10 +320,10 @@ function B(e, t, n, a) {
 		a.disabled ? "" : "role=\"button\"",
 		a.disabled ? "" : "tabindex=\"0\""
 	].filter(Boolean).join(" ");
-	return o === "checkbox" ? `<span ${p}><span class="gd-contract-template-renderer__checkbox-mark" aria-hidden="true">${Y(l) ? "✓" : ""}</span>${i(f)}</span>` : o === "radio" ? `<span ${p}>${h(e?.options, W(l)) || i(e?.placeholder || f)}</span>` : o === "select" ? `<span ${p}>${i(G(e, l) || f)}</span>` : o === "image" && !I(l) ? `<span ${p}></span>` : `<span ${p}>${i(f)}</span>`;
+	return o === "checkbox" ? `<span ${p}><span class="gd-contract-template-renderer__checkbox-mark" aria-hidden="true">${q(l) ? "✓" : ""}</span>${i(f)}</span>` : o === "radio" ? `<span ${p}>${h(e?.options, V(l)) || i(e?.placeholder || f)}</span>` : o === "select" ? `<span ${p}>${i(H(e, l) || f)}</span>` : o === "image" && !N(l) ? `<span ${p}></span>` : `<span ${p}>${i(f)}</span>`;
 }
-function V(e, t, n, a) {
-	let o = e?.type ?? "text", s = !!a.readonly, l = J(H(e, n)), u = c({
+function R(e, t, n, a) {
+	let o = e?.type ?? "text", s = !!a.readonly, l = G(z(e, n)), u = c({
 		type: o,
 		width: e?.width,
 		height: e?.height,
@@ -339,26 +346,30 @@ function V(e, t, n, a) {
 		d ? "disabled" : "",
 		s ? "readonly" : ""
 	].filter(Boolean).join(" "), p = `style="${r(u.styleText)}"`, m = r(["gd-contract-template-renderer__control", ...u.classes].join(" "));
-	if (o === "checkbox") return `<label class="${m}" ${p} data-contract-render-wrapper="true" data-key="${r(t)}"><input type="checkbox" ${f} ${Y(l) ? "checked" : ""}>${i(e?.checkedText || e?.label || t)}</label>`;
+	if (o === "checkbox") return `<label class="${m}" ${p} data-contract-render-wrapper="true" data-key="${r(t)}"><input type="checkbox" ${f} ${q(l) ? "checked" : ""}>${i(e?.checkedText || e?.label || t)}</label>`;
 	if (o === "radio") {
-		let a = H(e, n), o = h(e?.options, W(a)) || i(u.displayText || e?.placeholder || "");
+		let a = z(e, n), o = h(e?.options, V(a)) || i(u.displayText || e?.placeholder || "");
 		return `<span class="${m}" ${p} data-contract-render-wrapper="true" data-key="${r(t)}">${o}</span>`;
 	}
 	if (s) return `<span class="${m}" ${p} data-contract-render-wrapper="true" data-key="${r(t)}">${i(u.displayText || l)}</span>`;
 	if (o === "number") return `<input class="${m}" ${p} type="number" ${f} value="${r(l)}" placeholder="${r(e?.placeholder || "")}">`;
 	if (o === "date") return `<input class="${m}" ${p} type="date" ${f} value="${r(l)}" placeholder="${r(e?.placeholder || "")}">`;
 	if (o === "select" || o.endsWith("-selector") || o === "custom") {
-		let a = H(e, n), s = o === "select" ? G(e, a) : g(a);
+		let a = z(e, n), s = o === "select" ? H(e, a) : g(a);
 		return `<span class="${m}" ${p} data-contract-render-wrapper="true" data-key="${r(t)}">${i(s)}</span>`;
 	}
-	return e?.multiline ? `<textarea class="${m}" ${p} ${f} placeholder="${r(e.placeholder || "")}">${i(l)}</textarea>` : `<input class="${m}" ${p} type="text" ${f} value="${r(l)}" placeholder="${r(e?.placeholder || "")}">`;
+	if (e?.multiline) {
+		let t = /^[\r\n]/.test(l) ? "\n" : "";
+		return `<textarea class="${m}" ${p} ${f} placeholder="${r(e.placeholder || "")}">${t}${i(l)}</textarea>`;
+	}
+	return `<input class="${m}" ${p} type="text" ${f} value="${r(l)}" placeholder="${r(e?.placeholder || "")}">`;
 }
-function H(e, t) {
-	if (!(e?.type === "select" && e.multiple && I(t))) return t ?? U(e);
+function z(e, t) {
+	if (!(e?.type === "select" && e.multiple && N(t))) return t ?? B(e);
 }
-function U(e) {
+function B(e) {
 	if (!e) return "";
-	if (e.type === "checkbox") return Y(e.defaultValue);
+	if (e.type === "checkbox") return q(e.defaultValue);
 	if (e.type === "number" && e.defaultValue !== void 0) {
 		let t = Number(e.defaultValue);
 		return Number.isFinite(t) ? t : e.defaultValue;
@@ -374,13 +385,13 @@ function U(e) {
 	}
 	if (!e.type?.endsWith("-selector")) return e.defaultValue ?? "";
 }
-function W(e) {
+function V(e) {
 	if (!Array.isArray(e)) {
 		if (_(e)) return e.value;
 		if (typeof e == "string" || typeof e == "number") return e;
 	}
 }
-function G(e, t) {
+function H(e, t) {
 	let n = Array.isArray(t) ? t : [t];
 	if (n.length && n.every((e) => _(e))) return g(t);
 	let r = n.flatMap((t) => {
@@ -391,45 +402,45 @@ function G(e, t) {
 	});
 	return r.length ? r.join("、") : g(t);
 }
-function K(e) {
+function U(e) {
 	return (e.type === "select" || e.type === "radio") && !e.dataSource && Array.isArray(e.options) && e.options.length > 0;
 }
-function q(e, t) {
+function W(e, t) {
 	let n = Array.isArray(t) ? t : [t];
 	return n.length > 0 && n.every((t) => _(t) && (e.options ?? []).some((e) => String(e.value) === String(t.value)));
 }
-function J(e) {
+function G(e) {
 	return typeof e == "boolean" ? e ? "true" : "" : e == null ? "" : g(e);
 }
-function re(e) {
+function K(e) {
 	return typeof e == "boolean" ? e ? "true" : "false" : e == null ? "" : g(e);
 }
-function Y(e) {
+function q(e) {
 	return e === !0 || e === "true" || e === "1" || e === "yes" || e === "是" || e === "已选";
 }
-function X(t) {
+function J(t) {
 	if (e()) {
 		let e = new DOMParser().parseFromString(t, "text/html");
 		return e.querySelectorAll("script,style,meta,link,iframe,object,embed").forEach((e) => e.remove()), e.querySelectorAll("*").forEach((e) => {
 			Array.from(e.attributes).forEach((t) => {
 				let n = t.name.toLowerCase();
-				(n.startsWith("on") || n === "srcdoc" || w.has(n) && Z(t.value) || n === "style" && Q(t.value)) && e.removeAttribute(t.name);
+				(n.startsWith("on") || n === "srcdoc" || x.has(n) && Y(t.value) || n === "style" && X(t.value)) && e.removeAttribute(t.name);
 			});
 		}), e.body.innerHTML;
 	}
 	return t.replace(/<\s*(script|style|iframe|object|embed)\b[^>]*>[\s\S]*?<\s*\/\s*\1\s*>/gi, "").replace(/<\s*\/?\s*(?:script|style|meta|link|iframe|object|embed)\b[^>]*>/gi, "").replace(/\s+on[a-z]+\s*=\s*(?:"[^"]*"|'[^']*'|[^\s>]+)/gi, "").replace(/\s+srcdoc\s*=\s*(?:"[^"]*"|'[^']*'|[^\s>]+)/gi, "").replace(/\s+(action|formaction|href|src|xlink:href)\s*=\s*(?:(["'])(.*?)\2|([^\s>]+))/gi, (e, t, n, r, i) => {
 		let a = r ?? i ?? "";
-		return Z(a) ? "" : n ? ` ${t}=${n}${a}${n}` : ` ${t}=${a}`;
-	}).replace(/\s+style\s*=\s*(["'])(.*?)\1/gi, (e, t, n) => Q(n) ? "" : ` style=${t}${n}${t}`);
+		return Y(a) ? "" : n ? ` ${t}=${n}${a}${n}` : ` ${t}=${a}`;
+	}).replace(/\s+style\s*=\s*(["'])(.*?)\1/gi, (e, t, n) => X(n) ? "" : ` style=${t}${n}${t}`);
 }
-function ie(e) {
-	return n(e, T, (e) => a(e, "data-key"));
+function se(e) {
+	return n(e, S, (e) => a(e, "data-key"));
 }
-function ae(e) {
+function ce(e) {
 	let t = [];
-	return /<\s*(script|style|meta|link|iframe|object|embed)\b/i.test(e) && t.push("正文包含已移除的危险标签"), /\s(?:on[a-z]+|srcdoc)\s*=/i.test(e) && t.push("正文包含已移除的事件或嵌入属性"), (oe(e) || /style\s*=\s*["'][^"']*(?:expression\s*\(|url\s*\(\s*["']?\s*(?:javascript|vbscript|data:text\/html))/i.test(e)) && t.push("正文包含已移除的危险 URL 或样式"), t;
+	return /<\s*(script|style|meta|link|iframe|object|embed)\b/i.test(e) && t.push("正文包含已移除的危险标签"), /\s(?:on[a-z]+|srcdoc)\s*=/i.test(e) && t.push("正文包含已移除的事件或嵌入属性"), (le(e) || /style\s*=\s*["'][^"']*(?:expression\s*\(|url\s*\(\s*["']?\s*(?:javascript|vbscript|data:text\/html))/i.test(e)) && t.push("正文包含已移除的危险 URL 或样式"), t;
 }
-function Z(e) {
+function Y(e) {
 	let t = e.replace(/&#(?:x([\da-f]+)|(\d+));?/gi, (e, t, n) => {
 		let r = Number.parseInt(t ?? n ?? "", t ? 16 : 10);
 		try {
@@ -444,40 +455,40 @@ function Z(e) {
 	})[t.toLowerCase()] ?? "").trim().replace(/[\u0000-\u0020\u007F]+/g, "");
 	return /^(?:javascript|vbscript|data:text\/html)/i.test(t);
 }
-function oe(e) {
+function le(e) {
 	let t = /\s+(?:action|formaction|href|src|xlink:href)\s*=\s*(?:(["'])(.*?)\1|([^\s>]+))/gi, n = t.exec(e);
 	for (; n;) {
-		if (Z(n[2] ?? n[3] ?? "")) return !0;
+		if (Y(n[2] ?? n[3] ?? "")) return !0;
 		n = t.exec(e);
 	}
 	return !1;
 }
-function Q(e) {
+function X(e) {
 	return /expression\s*\(|url\s*\(\s*["']?\s*(?:javascript|vbscript|data:text\/html)/i.test(e);
 }
-function se(e, t) {
-	return I(t) ? e.type === "select" || e.type === "radio" ? U(e) : I(e.defaultValue) ? t : e.defaultValue : t;
+function Z(e, t) {
+	return N(t) ? e.type === "select" || e.type === "radio" ? B(e) : N(e.defaultValue) ? t : e.defaultValue : t;
 }
-function ce(e, t) {
+function ue(e, t, n) {
 	if (typeof e == "boolean" || typeof e != "number" && typeof e != "string") return !1;
-	let n = String(e).trim();
-	if (!/^-?(?:\d+)(?:\.\d+)?$/.test(n)) return !1;
-	let r = Number(n);
-	if (!Number.isFinite(r)) return !1;
+	let r = String(e).trim();
+	if (!/^-?(?:\d+)(?:\.\d+)?$/.test(r)) return !1;
+	let i = Number(r);
+	if (!Number.isFinite(i)) return !1;
 	if (t !== void 0) {
-		let e = n.split(".")[1]?.length ?? 0;
-		if (!Number.isInteger(t) || t < 0 || t > O || e > t) return !1;
+		let e = r.split(".")[1]?.length ?? 0, i = t + (n === "percent" ? 2 : 0);
+		if (!Number.isInteger(t) || t < 0 || t > T || e > i) return !1;
 	}
 	return !0;
 }
-function le(e) {
+function Q(e) {
 	if (typeof e != "string" && typeof e != "number") return !1;
 	let t = String(e).trim(), n = /^(\d{4})[-/年](\d{1,2})[-/月](\d{1,2})(?:日)?(?:[T\s].*)?$/.exec(t);
 	if (!n) return !1;
 	let r = Number(n[1]), i = Number(n[2]), a = Number(n[3]), o = new Date(Date.UTC(r, i - 1, a));
 	return o.getUTCFullYear() === r && o.getUTCMonth() === i - 1 && o.getUTCDate() === a;
 }
-function ue(e) {
+function de(e) {
 	return typeof e == "boolean" ? !0 : [
 		"1",
 		"true",
@@ -493,16 +504,16 @@ function ue(e) {
 		"未选"
 	].includes(String(e).trim().toLowerCase());
 }
-function de(e) {
-	return k.test(e);
-}
 function fe(e) {
+	return E.test(e);
+}
+function pe(e) {
 	return e === "select" || e === "radio" || e === "user-selector" || e === "dept-selector" || e === "role-selector" || e === "org-selector";
 }
-function pe(e, t) {
+function me(e, t) {
 	return t ? Array.isArray(e) && e.every(_) : _(e);
 }
-function me(e, t) {
+function he(e, t) {
 	let n = e.width;
 	if (!Number.isFinite(n) || n <= 0) return !1;
 	let r = Math.max(10, Number.isFinite(e.style?.fontSize) && (e.style?.fontSize ?? 0) > 0 ? e.style.fontSize : 14), i = Math.max(1, n - 12) / r, a = (e) => Array.from(e).reduce((e, t) => e + (/[^\x00-\x7f]/.test(t) ? 1 : .55), 0);
@@ -511,7 +522,7 @@ function me(e, t) {
 function $(e) {
 	if (!e || typeof e != "object") return !1;
 	let { width: t, height: n } = e;
-	return typeof t == "number" && typeof n == "number" && Number.isFinite(t) && Number.isFinite(n) && t >= E && n >= E && t <= D && n <= D;
+	return typeof t == "number" && typeof n == "number" && Number.isFinite(t) && Number.isFinite(n) && t >= C && n >= C && t <= w && n <= w;
 }
 //#endregion
-export { A as buildInitialRenderValues, F as buildTemplateRenderHtml, P as buildTemplateRenderPages, te as buildTemplateVariableData, I as isEmptyRenderValue, j as normalizeRenderValues, ne as resolveTemplateRenderSubmitErrors, X as sanitizeContractRendererHtml, N as validateTemplateRenderStructure, M as validateTemplateRenderValues };
+export { D as buildInitialRenderValues, M as buildTemplateRenderHtml, j as buildTemplateRenderPages, ie as buildTemplateVariableData, N as isEmptyRenderValue, ae as normalizeRenderValues, oe as resolveTemplateRenderSubmitErrors, J as sanitizeContractRendererHtml, A as validateTemplateRenderStructure, O as validateTemplateRenderValues, k as validateTemplateTextOverflow };

package/dist/es/components/pro-contract-template-designer/src/utils/template-variable-render.mjs

@@ -1,7 +1,7 @@
 import { DEFAULT_CONTRACT_FONT_FAMILY as e } from "../constants.mjs";
 //#region src/components/pro-contract-template-designer/src/utils/template-variable-render.ts
 function t(t) {
-	let r = t.type === void 0 ? "text" : String(t.type), i = Math.max(24, o(t.width, 160)), s = Math.max(24, o(t.height, 32)), c = t.style?.border ?? t.border ?? r === "image", l = t.style?.underline ?? t.underline ?? (r !== "image" && r !== "checkbox"), u = t.style?.color || t.color || "#1f2937", d = t.style?.background || t.background || "transparent", f = Math.max(10, o(t.style?.fontSize ?? t.fontSize, 14)), p = t.style?.fontFamily || t.fontFamily || e, m = t.style?.placeholderColor || t.placeholderColor || "#7a818b", h = t.style?.lineColor || t.lineColor || "#565b66", g = t.style?.textAlign || t.textAlign || "left", _ = t.style?.borderStyle || t.borderStyle || "solid", v = t.style?.objectFit || t.objectFit || "contain", y = !!t.multiline, b = Math.max(1, o(t.rows, 3)), x = Math.max(18, o(t.lineHeight, 28)), S = b * x, C = v === "fill" ? "100% 100%" : v, w = g === "right" ? "flex-end" : g === "center" ? "center" : "flex-start", T = r === "select" && t.multiple ? "" : String(t.defaultValue || ""), E = n({
+	let r = t.type === void 0 ? "text" : String(t.type), i = Math.max(24, s(t.width, 160)), a = Math.max(24, s(t.height, 32)), c = t.style?.border ?? t.border ?? r === "image", l = t.style?.underline ?? t.underline ?? (r !== "image" && r !== "checkbox"), u = t.style?.color || t.color || "#1f2937", d = t.style?.background || t.background || "transparent", f = Math.max(10, s(t.style?.fontSize ?? t.fontSize, 14)), p = t.style?.fontFamily || t.fontFamily || e, m = t.style?.placeholderColor || t.placeholderColor || "#7a818b", h = t.style?.lineColor || t.lineColor || "#565b66", g = t.style?.textAlign || t.textAlign || "left", _ = t.style?.borderStyle || t.borderStyle || "solid", v = t.style?.objectFit || t.objectFit || "contain", y = !!t.multiline, b = Math.max(1, s(t.rows, 3)), x = Math.max(18, s(t.lineHeight, 28)), S = b * x, C = v === "fill" ? "100% 100%" : v, w = g === "right" ? "flex-end" : g === "center" ? "center" : "flex-start", T = r === "select" && t.multiple ? "" : String(t.defaultValue || ""), E = n({
 		type: r,
 		defaultValue: T,
 		placeholder: t.placeholder || "",
@@ -12,11 +12,11 @@ function t(t) {
 		uncheckedText: t.uncheckedText || "",
 		options: t.options,
 		multiple: t.multiple
-	}), D = T.trim().length > 0, O = !D && E.trim().length > 0, k = r === "checkbox" && a(T), A = r === "image" && D ? `;--gd-contract-variable-image:url('${T.replaceAll("'", "%27")}')` : "";
+	}), D = T.trim().length > 0, O = !D && E.trim().length > 0, k = r === "checkbox" && o(T), A = r === "image" && D ? `;--gd-contract-variable-image:url('${T.replaceAll("'", "%27")}')` : "";
 	return {
 		type: r,
 		width: i,
-		height: s,
+		height: a,
 		border: c,
 		underline: l,
 		color: u,
@@ -42,24 +42,24 @@ function t(t) {
 			D ? "has-value" : "",
 			k ? "is-checked" : ""
 		].filter(Boolean),
-		styleText: `--gd-contract-variable-width:${i}px;--gd-contract-variable-height:${s}px;--gd-contract-variable-rows:${b};--gd-contract-variable-line-height:${x}px;--gd-contract-variable-multiline-height:${S}px;--gd-contract-variable-color:${u};--gd-contract-variable-background:${d};--gd-contract-variable-font-size:${f}px;--gd-contract-variable-font-family:${p};--gd-contract-variable-placeholder-color:${m};--gd-contract-variable-line-color:${h};--gd-contract-variable-text-align:${g};--gd-contract-variable-justify-content:${w};--gd-contract-variable-border-style:${_};--gd-contract-variable-object-fit:${C}${A}`
+		styleText: `--gd-contract-variable-width:${i}px;--gd-contract-variable-height:${a}px;--gd-contract-variable-rows:${b};--gd-contract-variable-line-height:${x}px;--gd-contract-variable-multiline-height:${S}px;--gd-contract-variable-color:${u};--gd-contract-variable-background:${d};--gd-contract-variable-font-size:${f}px;--gd-contract-variable-font-family:${p};--gd-contract-variable-placeholder-color:${m};--gd-contract-variable-line-color:${h};--gd-contract-variable-text-align:${g};--gd-contract-variable-justify-content:${w};--gd-contract-variable-border-style:${_};--gd-contract-variable-object-fit:${C}${A}`
 	};
 }
 function n(e) {
-	let t = e.type || "text", n = t === "select" && e.multiple ? "" : e.defaultValue || "", o = e.placeholder || "";
-	if (t === "checkbox") return n ? a(n) ? e.checkedText || o : e.uncheckedText || o : o;
-	if (!n) return o;
+	let t = e.type || "text", n = t === "select" && e.multiple ? "" : e.defaultValue || "", i = e.placeholder || "";
+	if (t === "checkbox") return n ? o(n) ? e.checkedText || i : e.uncheckedText || i : i;
+	if (!n) return i;
 	if (t === "date") return r(n, e.format || "");
-	if (t === "number") return i(n, {
+	if (t === "number") return a(n, {
 		format: e.format || "",
 		precision: e.precision,
 		useGrouping: e.useGrouping
 	});
-	if (t === "image") return o;
+	if (t === "image") return i;
 	if (t === "select") {
 		let t = e.options?.find((e) => String(e.value ?? "") === n);
 		if (t?.label) return t.label;
-		if (e.options?.length) return o;
+		if (e.options?.length) return i;
 	}
 	return n;
 }
@@ -70,17 +70,32 @@ function r(e, t) {
 	let [, r, i, a] = n;
 	return t.replace("YYYY", r).replace("MM", i.padStart(2, "0")).replace("DD", a.padStart(2, "0"));
 }
-function i(e, t) {
+var i = [
+	{
+		value: "decimal",
+		label: "常规数字"
+	},
+	{
+		value: "percent",
+		label: "百分比"
+	},
+	{
+		value: "currency",
+		label: "人民币金额"
+	}
+];
+function a(e, t) {
 	let n = Number(e);
-	if (!Number.isFinite(n)) return e;
-	let r = n.toLocaleString("zh-CN", {
-		useGrouping: t.useGrouping !== !1,
-		minimumFractionDigits: t.precision,
-		maximumFractionDigits: t.precision
+	if (!e.trim() || !Number.isFinite(n)) return e;
+	let r = typeof t.precision == "number" && Number.isInteger(t.precision) && t.precision >= 0 && t.precision <= 20 ? t.precision : void 0, i = n.toLocaleString("zh-CN", {
+		style: t.format === "percent" ? "percent" : "decimal",
+		useGrouping: t.useGrouping === !0,
+		minimumFractionDigits: r ?? 0,
+		maximumFractionDigits: r ?? 20
 	});
-	return t.format === "currency" ? `¥${r}` : r;
+	return t.format === "currency" ? `¥${i}` : i;
 }
-function a(e) {
+function o(e) {
 	return [
 		"1",
 		"true",
@@ -90,10 +105,10 @@ function a(e) {
 		"已选"
 	].includes(e.trim().toLowerCase());
 }
-function o(e, t) {
+function s(e, t) {
 	if (e == null || e === "") return t;
 	let n = Number(e);
 	return Number.isFinite(n) ? n : t;
 }
 //#endregion
-export { t as resolveTemplateVariablePresentation };
+export { i as TEMPLATE_NUMBER_FORMAT_OPTIONS, t as resolveTemplateVariablePresentation };