From 82c9f51bcdf05c6d65911d552e0968b2d8d9520d Mon Sep 17 00:00:00 2001
From: minom <minomdu@gmail.com>
Date: Wed, 1 Jul 2026 09:09:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E9=9D=A2=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/admin/item/TabletDesigner.aspx     | 2 ++
 web/admin/print/html/tablet-1B_new.svg | 8 ++++----
 web/admin/print/html/tablet-1_new.svg  | 8 ++++----
 web/admin/print/print_multi_new.aspx   | 8 ++++----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/web/admin/item/TabletDesigner.aspx b/web/admin/item/TabletDesigner.aspx
index 3e29097..84f3e43 100644
--- a/web/admin/item/TabletDesigner.aspx
+++ b/web/admin/item/TabletDesigner.aspx
@@ -1074,6 +1074,8 @@
             displayItem(id) {
                 let el = this.elements.find(x => x.id === id);
                 el.style.visibility = el.style.visibility === "hidden" ? "" : "hidden";
+                //要判斷如果所在位置超出範圍，要拉回來放
+                console.log("displayItem:", this.paper)
                 $("#" + id).css({
                     position: "absolute", left: el.x + "mm", top: el.y + "mm", fontSize: el.style.fontSize + 'pt', fontFamily: el.style.fontFamily, "z-index": 9999, visibility: el.style.visibility
                 })
diff --git a/web/admin/print/html/tablet-1B_new.svg b/web/admin/print/html/tablet-1B_new.svg
index a2a9650..c5761b3 100644
--- a/web/admin/print/html/tablet-1B_new.svg
+++ b/web/admin/print/html/tablet-1B_new.svg
@@ -138,9 +138,9 @@
   <rect class="st0" height="510.2" id="TXT_x5F_L" width="98.8" x="8.6" y="483.5"/>
   <rect class="st0" height="45.4" id="TXT_x5F_T1" width="283.5" x="141.7" y="8.5"/>
   <rect class="st0" height="34" id="TXT_x5F_T2" width="70.9" x="484.5" y="62.1"/>
-  <text fill="#000000" font-family="DFKai-SB" font-size="8" font-weight="bold" id="svg_119" stroke="#000000" stroke-width="0" text-anchor="middle" transform="matrix(3.87205 0 0 4.99075 -145.896 -1658.19)" x="54.95" xml:space="preserve" y="420.1">陽</text>
-  <text fill="#000000" font-family="DFKai-SB" font-size="8" font-weight="bold" id="svg_120" stroke="#000000" stroke-width="0" text-anchor="middle" transform="matrix(3.87205 0 0 4.99075 -145.896 -1658.19)" x="54.95" xml:space="preserve" y="430.1">上</text>
-  <text fill="#000000" font-family="DFKai-SB" font-size="8" font-weight="bold" id="svg_121" stroke="#000000" stroke-width="0" text-anchor="middle" transform="matrix(3.87205 0 0 4.99075 -145.896 -1658.19)" x="54.95" xml:space="preserve" y="520.1">拜</text>
-  <text fill="#000000" font-family="DFKai-SB" font-size="8" font-weight="bold" id="svg_122" stroke="#000000" stroke-width="0" text-anchor="middle" transform="matrix(3.87205 0 0 4.99075 -145.896 -1658.19)" x="54.95" xml:space="preserve" y="530.1">薦</text>
+  <text fill="#000000" font-family="DFKai-SB" font-size="8" font-weight="bold" id="svg_119" stroke="#000000" stroke-width="0" text-anchor="middle" transform="matrix(3.87205 0 0 4.99075 -145.896 -1658.19)" x="50.95" xml:space="preserve" y="420.1">陽</text>
+  <text fill="#000000" font-family="DFKai-SB" font-size="8" font-weight="bold" id="svg_120" stroke="#000000" stroke-width="0" text-anchor="middle" transform="matrix(3.87205 0 0 4.99075 -145.896 -1658.19)" x="50.95" xml:space="preserve" y="430.1">上</text>
+  <text fill="#000000" font-family="DFKai-SB" font-size="8" font-weight="bold" id="svg_121" stroke="#000000" stroke-width="0" text-anchor="middle" transform="matrix(3.87205 0 0 4.99075 -145.896 -1658.19)" x="50.95" xml:space="preserve" y="520.1">拜</text>
+  <text fill="#000000" font-family="DFKai-SB" font-size="8" font-weight="bold" id="svg_122" stroke="#000000" stroke-width="0" text-anchor="middle" transform="matrix(3.87205 0 0 4.99075 -145.896 -1658.19)" x="50.95" xml:space="preserve" y="530.1">薦</text>
  </g>
 </svg>
\ No newline at end of file
diff --git a/web/admin/print/html/tablet-1_new.svg b/web/admin/print/html/tablet-1_new.svg
index 95d6d11..7c52425 100644
--- a/web/admin/print/html/tablet-1_new.svg
+++ b/web/admin/print/html/tablet-1_new.svg
@@ -147,9 +147,9 @@
   <rect fill="none" height="510.24" id="TXT_x5F_L" width="51.02" x="16.06" y="479.15"/>
   <rect fill="none" height="45.35" id="TXT_x5F_T1" width="283.46" x="39.43" y="4.16"/>
   <rect fill="none" height="34.02" id="TXT_x5F_T2" width="70.87" x="274.24" y="57.72"/>
-  <text fill="#000000" font-family="DFKai-SB" font-size="24" font-weight="bold" id="svg_129" stroke="#000000" stroke-width="0" text-anchor="middle" x="50.58" xml:space="preserve" y="491.14">陽</text>
-  <text fill="#000000" font-family="DFKai-SB" font-size="24" font-weight="bold" id="svg_130" stroke="#000000" stroke-width="0" text-anchor="middle" x="50.58" xml:space="preserve" y="521.14">上</text>
-  <text fill="#000000" font-family="DFKai-SB" font-size="24" font-weight="bold" id="svg_131" stroke="#000000" stroke-width="0" text-anchor="middle" x="50.58" xml:space="preserve" y="920.14">拜</text>
-  <text fill="#000000" font-family="DFKai-SB" font-size="24" font-weight="bold" id="svg_132" stroke="#000000" stroke-width="0" text-anchor="middle" x="50.58" xml:space="preserve" y="950.14">薦</text>
+  <text fill="#000000" font-family="DFKai-SB" font-size="24" font-weight="bold" id="svg_129" stroke="#000000" stroke-width="0" text-anchor="middle" x="46.58" xml:space="preserve" y="491.14">陽</text>
+  <text fill="#000000" font-family="DFKai-SB" font-size="24" font-weight="bold" id="svg_130" stroke="#000000" stroke-width="0" text-anchor="middle" x="46.58" xml:space="preserve" y="521.14">上</text>
+  <text fill="#000000" font-family="DFKai-SB" font-size="24" font-weight="bold" id="svg_131" stroke="#000000" stroke-width="0" text-anchor="middle" x="46.58" xml:space="preserve" y="920.14">拜</text>
+  <text fill="#000000" font-family="DFKai-SB" font-size="24" font-weight="bold" id="svg_132" stroke="#000000" stroke-width="0" text-anchor="middle" x="46.58" xml:space="preserve" y="950.14">薦</text>
  </g>
 </svg>
\ No newline at end of file
diff --git a/web/admin/print/print_multi_new.aspx b/web/admin/print/print_multi_new.aspx
index 497b737..15ff2a3 100644
--- a/web/admin/print/print_multi_new.aspx
+++ b/web/admin/print/print_multi_new.aspx
@@ -129,10 +129,10 @@
         isInit: true,
         toast: null,
         bg: [
-            { name: "黃1", path: "../../admin/print/html/tablet-1_new.svg" },
-            { name: "黃2", path: "../../admin/print/html/tablet-1B_new.svg" },
-            { name: "紅1", path: "../../admin/print/html/tablet-2.svg" },
-            { name: "紅2", path: "../../admin/print/html/tablet-2B.svg" }
+            { name: "超薦1", path: "../../../admin/print/html/tablet-1_new.svg" },
+            { name: "超薦2", path: "../../../admin/print/html/tablet-1B_new.svg" },
+            { name: "消災1", path: "../../../admin/print/html/tablet-2.svg" },
+            { name: "消災2", path: "../../../admin/print/html/tablet-2B.svg" }
         ],
         async init() {
             this.toast = new bootstrap.Toast($('#liveToast'));