alit-layout 1.1.40 → 1.1.42

package/dist/index.es.js

@@ -2209,7 +2209,7 @@ const ve = /* @__PURE__ */ me(Ao, [["__scopeId", "data-v-ed2907dd"]]), Do = { cl
   },
   emits: ["change"],
   setup(e, { emit: t }) {
-    const o = e, l = W(() => o.data.filter((n) => ![Ce.another, Ce.another_choice, Ce.one_choice].includes(n.problemType)).map((n) => n.totalScore || 0).reduce((n, c) => n + c, 0)), i = W(() => o.data.filter((n) => [Ce.another].includes(n.problemType)).map((n) => n.totalScore || 0).reduce((n, c) => n + c, 0)), a = W(() => o.layout.scoreAddStars === nt.star.code ? o.layout.minusFlag ? "fiveArrowLine" : "fiveArrow" : "");
+    const o = e, l = W(() => o.data.filter((n) => ![Ce.another, Ce.another_choice].includes(n.problemType)).map((n) => n.totalScore || 0).reduce((n, c) => n + c, 0)), i = W(() => o.data.filter((n) => [Ce.another, Ce.another_choice].includes(n.problemType)).map((n) => n.totalScore || 0).reduce((n, c) => n + c, 0)), a = W(() => o.layout.scoreAddStars === nt.star.code ? o.layout.minusFlag ? "fiveArrowLine" : "fiveArrow" : "");
     return (n, c) => (r(), h("div", Ho, [
       k("img", {
         src: n.info.qrCode,
@@ -3694,18 +3694,21 @@ const je = /* @__PURE__ */ me(ts, [["render", ss]]), is = (e, t, o) => {
   paperWidth: Math.round(x[e.layout.paper].width * Pe),
   paperHeight: Math.round(x[e.layout.paper].height * Pe)
 }), us = (e) => {
-  const t = Q(e.pageDom[0]), o = Q(e.pageDom[1]), l = (i, a) => {
-    var c;
-    const n = a > 2 || tt.includes(e.layout.paper) ? {
-      trdLeftTopPos: ce(pe(Q(Me(`${$.point}t`, e.pageDom[i])[1]), Q(e.pageDom[i]))),
-      trdLeftBottomPos: ce(pe(Q(Me(`${$.point}b`, e.pageDom[i])[1]), Q(e.pageDom[i])))
+  const t = Q(e.pageDom[0]), o = Q(e.pageDom[1]), l = (a, n) => {
+    var y;
+    const c = n > 2 || tt.includes(e.layout.paper) ? {
+      trdLeftTopPos: ce(pe(Q(Me(`${$.point}t`, e.pageDom[a])[1]), Q(e.pageDom[a]))),
+      trdLeftBottomPos: ce(pe(Q(Me(`${$.point}b`, e.pageDom[a])[1]), Q(e.pageDom[a])))
     } : {};
-    return (c = qe.find((y) => y.code === e.layout.paper)) != null && c.isMultCol ? {
-      secLeftTopPos: ce(pe(Q(Me(`${$.point}t`, e.pageDom[i])[0]), Q(e.pageDom[i]))),
-      secLeftBottomPos: ce(pe(Q(Me(`${$.point}b`, e.pageDom[i])[0]), Q(e.pageDom[i]))),
-      ...n
+    return (y = qe.find((s) => s.code === e.layout.paper)) != null && y.isMultCol ? {
+      secLeftTopPos: ce(pe(Q(Me(`${$.point}t`, e.pageDom[a])[0]), Q(e.pageDom[a]))),
+      secLeftBottomPos: ce(pe(Q(Me(`${$.point}b`, e.pageDom[a])[0]), Q(e.pageDom[a]))),
+      ...c
     } : null;
-  };
+  }, i = [
+    ce(pe(Q(he(`${$.point}l`, e.pageDom[0])), t)),
+    ce(pe(Q(he(`${$.point}r`, e.pageDom[0])), t))
+  ];
   return {
     // 取第一/二页定位点信息
     leftTopPos: ce(pe(Q(he(`${$.point}lt`, e.pageDom[0])), t)),
@@ -3713,14 +3716,11 @@ const je = /* @__PURE__ */ me(ts, [["render", ss]]), is = (e, t, o) => {
     leftBottomPos: ce(pe(Q(he(`${$.point}lb`, e.pageDom[0])), t)),
     rightBottomPos: ce(pe(Q(he(`${$.point}rb`, e.pageDom[0])), t)),
     // waistAuxAnchorInfo: getAuxInfo(0, true),
-    verticalAuxInfo: [
-      ce(pe(Q(he(`${$.point}l`, e.pageDom[0])), t)),
-      ce(pe(Q(he(`${$.point}r`, e.pageDom[0])), t))
-    ],
-    verticalAuxInfo2: e.bindWidth && e.pageDom[1] ? [
+    verticalAuxInfo: i,
+    verticalAuxInfo2: e.pageDom[1] ? e.bindWidth ? [
       ce(pe(Q(he(`${$.point}l`, e.pageDom[1])), o)),
       ce(pe(Q(he(`${$.point}r`, e.pageDom[1])), o))
-    ] : null,
+    ] : i : null,
     auxAnchorInfo: l(0, e.layout.column),
     auxAnchorInfo2: e.pageDom[1] ? l(1, e.layout.backColumn) : null
   };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "alit-layout",
-    "version": "1.1.40",
+    "version": "1.1.42",
     "main": "dist/index.es.js",
     "module": "dist/index.es.js",
     "devDependencies": {