@guodun/antdv 1.4.1 → 1.4.3

package/dist/es/components/contract-signing-location/src/coordinates.mjs

@@ -100,47 +100,47 @@ function h(e, t = .5, n = 1.5) {
 function g(e, t, n = !1) {
 	return !e || n ? !1 : e.signType === "seal" ? !0 : !!t;
 }
-function _(e, t, n, r = 4) {
-	let i = s(e), a = Math.max(0, S(r, 4)) / Math.max(.01, S(n, 1)), o = i.signWidth, c = i.signHeight, l = y([
+function _(e, t, n, r = 4, i) {
+	let a = s(e), o = Math.max(0, S(r, 4)), c = Math.max(.01, S(n, 1)), l = Math.max(1, S(i?.width, 1)), u = Math.max(1, S(i?.height, 1)), d = Math.max(1, S(i?.displayWidth, l)), f = Math.max(1, S(i?.displayHeight, u)), p = o / c * l / d, m = o / c * u / f, h = a.signWidth, g = a.signHeight, _ = y([
 		{
-			value: i.signLeft,
+			value: a.signLeft,
 			toOrigin: (e) => e
 		},
 		{
-			value: i.signLeft + o,
-			toOrigin: (e) => e - o
+			value: a.signLeft + h,
+			toOrigin: (e) => e - h
 		},
 		{
-			value: i.signLeft + o / 2,
-			toOrigin: (e) => e - o / 2
+			value: a.signLeft + h / 2,
+			toOrigin: (e) => e - h / 2
 		}
-	], v(t, e, "x"), a), u = y([
+	], v(t, e, "x"), p), b = y([
 		{
-			value: i.signTop,
+			value: a.signTop,
 			toOrigin: (e) => e
 		},
 		{
-			value: i.signTop + c,
-			toOrigin: (e) => e - c
+			value: a.signTop + g,
+			toOrigin: (e) => e - g
 		},
 		{
-			value: i.signTop + c / 2,
-			toOrigin: (e) => e - c / 2
+			value: a.signTop + g / 2,
+			toOrigin: (e) => e - g / 2
 		}
-	], v(t, e, "y"), a), d = {
+	], v(t, e, "y"), m), x = {
 		...e,
-		signLeft: T(l?.origin ?? i.signLeft),
-		signTop: T(u?.origin ?? i.signTop)
-	}, f = [];
-	return l && f.push({
+		signLeft: T(_?.origin ?? a.signLeft),
+		signTop: T(b?.origin ?? a.signTop)
+	}, C = [];
+	return _ && C.push({
 		axis: "x",
-		position: T(l.guide)
-	}), u && f.push({
+		position: T(_.guide)
+	}), b && C.push({
 		axis: "y",
-		position: T(u.guide)
+		position: T(b.guide)
 	}), {
-		placement: d,
-		guides: f
+		placement: x,
+		guides: C
 	};
 }
 function v(e, t, n) {

package/dist/es/components/contract-signing-location/src/location-rules.mjs

@@ -260,7 +260,7 @@ var w = class extends Error {
 };
 function T(e) {
 	return Array.isArray(e) ? e.map((e, t) => {
-		let n = e && typeof e == "object" ? e : {}, r = String(n.fileId ?? "").trim(), i = E(n.source), a = i?.type === "template" ? D(i.template, i.values) : Array.isArray(n.pages) ? n.pages.map((e, t) => O(e, t)) : [];
+		let n = e && typeof e == "object" ? e : {}, r = String(n.fileId ?? "").trim(), i = E(n.source), a = i?.type === "template" ? D(i.template, i.values, n.pages) : Array.isArray(n.pages) ? n.pages.map((e, t) => O(e, t)) : [];
 		return {
 			fileId: r,
 			fileName: String(n.fileName ?? `合同文件 ${t + 1}`),
@@ -278,18 +278,26 @@ function E(e) {
 		...t.values && typeof t.values == "object" && !Array.isArray(t.values) ? { values: { ...t.values } } : {}
 	} : t.type === "preview" ? { type: "preview" } : void 0;
 }
-function D(e, t) {
-	return s({
+function D(e, t, n) {
+	let r = s({
 		type: "template",
 		template: e,
 		...t ? { values: t } : {}
-	}).map((e) => ({
-		pageIndex: e.pageIndex,
-		displayPageNumber: e.pageIndex + 1,
-		pageId: e.pageId,
-		width: F(e.width, 0),
-		height: F(e.height, 0)
-	}));
+	}), i = Array.isArray(n) ? n : [];
+	return r.map((e) => {
+		let t = i.find((t) => I((t && typeof t == "object" ? t : {}).pageIndex, -1) === e.pageIndex), n = t && typeof t == "object" ? t : {}, r = F(e.displayWidth || e.width, 0), a = F(e.displayHeight || e.height, 0);
+		return {
+			pageIndex: e.pageIndex,
+			displayPageNumber: e.pageIndex + 1,
+			pageId: e.pageId,
+			width: F(n.width, r),
+			height: F(n.height, a),
+			displayWidth: r,
+			displayHeight: a,
+			...n.previewUrl ? { previewUrl: String(n.previewUrl) } : {},
+			...n.thumbnailUrl ? { thumbnailUrl: String(n.thumbnailUrl) } : {}
+		};
+	});
 }
 function O(e, t) {
 	let n = e && typeof e == "object" ? e : {}, r = I(n.pageIndex, t);
@@ -298,6 +306,8 @@ function O(e, t) {
 		displayPageNumber: L(n.displayPageNumber, r + 1),
 		width: F(n.width, 0),
 		height: F(n.height, 0),
+		...F(n.displayWidth, 0) > 0 ? { displayWidth: F(n.displayWidth, 0) } : {},
+		...F(n.displayHeight, 0) > 0 ? { displayHeight: F(n.displayHeight, 0) } : {},
 		...n.pageId ? { pageId: String(n.pageId) } : {},
 		...n.previewUrl ? { previewUrl: String(n.previewUrl) } : {},
 		...n.thumbnailUrl ? { thumbnailUrl: String(n.thumbnailUrl) } : {}

package/dist/es/components/contract-signing-location/src/page-layout.mjs

@@ -81,14 +81,17 @@ function c(e, t, n, r = 1) {
 		end: Math.min(e.length - 1, s + c)
 	};
 }
-function l(e, t, n, r, i = 0) {
-	let a = s(e, r);
-	if (!a) return;
-	let o = d(t.find((e) => e.pageIndex === a.pageIndex)), c = f(i, 0);
+function l(t, r, i, a, o = 0) {
+	let c = s(t, a);
+	if (!c) return;
+	let l = r.find((e) => e.pageIndex === c.pageIndex), u = e(l) && l ? {
+		width: l.width,
+		height: l.height
+	} : { ...n }, d = f(o, 0);
 	return {
-		pageIndex: a.pageIndex,
-		x: m((n - a.left) * o.width / Math.max(1, a.width) - c),
-		y: m((r - a.top) * o.height / Math.max(1, a.height) - c)
+		pageIndex: c.pageIndex,
+		x: m((i - c.left) * u.width / Math.max(1, c.width) - d),
+		y: m((a - c.top) * u.height / Math.max(1, c.height) - d)
 	};
 }
 function u(e, t) {
@@ -96,8 +99,8 @@ function u(e, t) {
 }
 function d(t) {
 	return e(t) && t ? {
-		width: t.width,
-		height: t.height
+		width: p(t.displayWidth, t.width),
+		height: p(t.displayHeight, t.height)
 	} : { ...n };
 }
 function f(e, t) {

package/dist/es/components/contract-signing-location/src/template-source.mjs

@@ -27,6 +27,8 @@ function a(n) {
 				title: i.title,
 				width: s.width,
 				height: s.height,
+				displayWidth: s.width,
+				displayHeight: s.height,
 				contentHtml: i.contentHtml,
 				errors: o.filter((e) => !e.pageId || e.pageId === i.id).map((e) => e.message)
 			}];