From 1d09b445d3667b09b6a3eee26c6b47740c9d06da Mon Sep 17 00:00:00 2001 From: minom Date: Thu, 2 Jul 2026 16:43:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=8C=E4=BD=8D=E5=88=97=E5=8D=B0=E8=AA=BF?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E6=B4=BB=E5=8B=95=E5=88=AA=E9=99=A4=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=A8=8A=E6=81=AF=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/admin/activity/index.aspx | 2 +- web/admin/activity/item_reg.aspx | 4 +- web/admin/print/print_multi_new.aspx | 112 ++++++++++++++++++++++----- 3 files changed, 97 insertions(+), 21 deletions(-) diff --git a/web/admin/activity/index.aspx b/web/admin/activity/index.aspx index 7921a68..50b67b9 100644 --- a/web/admin/activity/index.aspx +++ b/web/admin/activity/index.aspx @@ -126,7 +126,7 @@ }, deleteItem(item) { - if (confirm('是否確定刪除此筆資料?')) { + if (confirm('是否確定刪除此筆資料，如有報名資料將一併刪除?')) { const index = this.data_table.list.indexOf(item) if (index != -1) { axios diff --git a/web/admin/activity/item_reg.aspx b/web/admin/activity/item_reg.aspx index 4a648fe..1b506e6 100644 --- a/web/admin/activity/item_reg.aspx +++ b/web/admin/activity/item_reg.aspx @@ -645,9 +645,11 @@ - +
+ +
diff --git a/web/admin/print/print_multi_new.aspx b/web/admin/print/print_multi_new.aspx index 15ff2a3..f7ca1f9 100644 --- a/web/admin/print/print_multi_new.aspx +++ b/web/admin/print/print_multi_new.aspx @@ -57,7 +57,7 @@
-
+<%--
@@ -68,7 +68,7 @@
-
+
--%> @@ -433,9 +433,17 @@ yang = ""; bi = ""; } - + }) + let content = $(`
`) + .css({ + position: "absolute", left: "4mm", top: "2mm", fontSize: '12px', + "z-index": 9999, + "align-items": "center" + }) + .html(x.print_id); + tabletpaper.append(content); //console.log("xCount:", Math.floor( xCount)); let xFloor = Math.floor(xCount); @@ -688,13 +696,16 @@ $(".tablet-element span").on("click", function (e) { e.preventDefault(); + console.log(self); self.selected = $(this); let fontSize = $(this).css("font-size"); let fontFamily = $(this).css("font-family"); let textWidth = $(this).css("max-width"); let textHeight = $(this).css("min-height"); - if ($(this).hasClass("liveSpan")) { + if ($(this).hasClass("liveSpan") || $(this).hasClass("nameSpan") || $(this).hasClass("rosterSpan")) { textWidth = $(this).css("width"); + textHeight = $(this).css("height"); + fontSize = $(this).css("font-size"); } else if ($(this).hasClass("main-name") || $(this).hasClass("sub-text")) { textWidth = ""; textHeight = ""; @@ -710,24 +721,31 @@ $("#textWidth").val(textWidth); $("#textHeight").val(textHeight); let parentElement = this.parentElement; - if ($(parentElement).hasClass("nameList") || $(parentElement).hasClass("liveList") || $(parentElement).hasClass("rosterList")) { + if ($(parentElement).hasClass("nameList") || $(parentElement).hasClass("liveList") || + $(parentElement).hasClass("rosterList")) { $("#textX").prop("readonly", true); $("#textY").prop("readonly", true); $("#fontSize").prop("readonly", true); - $("#textBreakCount").prop("readonly", false); - $("#textBreakWord").prop("readonly", false); + //$("#textBreakCount").prop("readonly", false); + //$("#textBreakWord").prop("readonly", false); } else if ($(this).hasClass("main-name") || $(this).hasClass("sub-text")) { $("#textX").prop("readonly", true); $("#textY").prop("readonly", true); $("#fontSize").prop("readonly", true); - $("#textBreakCount").prop("readonly", true); - $("#textBreakWord").prop("readonly", true); + //$("#textBreakCount").prop("readonly", true); + //$("#textBreakWord").prop("readonly", true); $("#textWidth").prop("readonly", true); $("#textHeight").prop("readonly", true); } }); + $(".tablet-element .rosterspan").on("click", function (e) { + $("#toast_body").html("此格式不提供單項物件修改"); + self.toast.show(); + }); + + }, fix2(val) { @@ -904,8 +922,28 @@ if ($("#indivualSetup").prop("checked")) { $(this.selected).css("font-size", $("#fontSize").val()) } else if ($("#allSetup").prop("checked")) { - $("#toast_body").html("字體大小不可在全域中修改"); - this.toast.show(); + if (this.selected.find(".liveList").length >= 1 || this.selected.find(".nameList").length >= 1 || + this.selected.find(".rosterList").length >= 1) { + classList.forEach(w => { + if ($(this.selected.children()).first().hasClass(w)) { + $(`.${w}`).parent().each((index, y) => { + $(y).css("font-size", $("#fontSize").val()) + }) + } + }); + } else if (this.selected.hasClass("nameSpan")) { + $(".nameSpan").css("font-size", $("#fontSize").val()) + + } else if (this.selected.hasClass("liveSpan")) { + $(".liveSpan").css("font-size", $("#fontSize").val()) + } else if (this.selected.hasClass("rosterSpan")) { + $(".rosterSpan").css("font-size", $("#fontSize").val()) + } else { + $("#toast_body").html("字體大小不可在全域中修改"); + this.toast.show(); + } + //$("#toast_body").html("字體大小不可在全域中修改"); + //this.toast.show(); } break; case "width": @@ -920,7 +958,7 @@ } else if (this.selected.hasClass("nameSpan")) { let spans = $(this.selected.parent().first()).find(".nameSpan"); spans.each(function (index, x) { - $(x).css("max-width", $("#textWidth").val()); + $(x).css("width", $("#textWidth").val()); }); } else if (this.selected.hasClass("liveSpan")) { let spans = $(this.selected.parent().first()).find(".liveSpan"); @@ -930,13 +968,31 @@ } else if (this.selected.hasClass("rosterSpan")) { let spans = $(this.selected.parent().first()).find(".rosterSpan"); spans.each(function (index, x) { - $(x).css("max-width", $("#textWidth").val()); + $(x).css("width", $("#textWidth").val()); }); } } else if ($("#allSetup").prop("checked")) { - $("#toast_body").html("寬度不可在全域中修改"); - this.toast.show(); + if (this.selected.find(".liveList").length >= 1 || this.selected.find(".nameList").length >= 1 || + this.selected.find(".rosterList").length >= 1) { + classList.forEach(w => { + if ($(this.selected.children()).first().hasClass(w)) { + $(`.${w}`).parent().each((index, y) => { + $(y).css("width", $("#textWidth").val()) + }) + } + }); + } else if (this.selected.hasClass("nameSpan")) { + $(".nameSpan").css("width", $("#textWidth").val()); + + } else if (this.selected.hasClass("liveSpan")) { + $(".liveSpan").css("width", $("#textWidth").val()); + } else if (this.selected.hasClass("rosterSpan")) { + $(".rosterSpan").css("width", $("#textWidth").val()); + } else { + $("#toast_body").html("寬度不可在全域中修改"); + this.toast.show(); + } } break; case "height": @@ -950,7 +1006,7 @@ } else if (this.selected.hasClass("nameSpan")) { let spans = $(this.selected.parent().first()).find(".nameSpan"); spans.each(function (index, x) { - $(x).css("min-height", $("#textHeight").val()); + $(x).css("height", $("#textHeight").val()); }); } else if (this.selected.hasClass("liveSpan")) { let spans = $(this.selected.parent().first()).find(".liveSpan"); @@ -961,13 +1017,31 @@ } else if (this.selected.hasClass("rosterSpan")) { let spans = $(this.selected.parent().first()).find(".rosterSpan"); spans.each(function (index, x) { - $(x).css("min-height", $("#textHeight").val()); + $(x).css("height", $("#textHeight").val()); }); } } else if ($("#allSetup").prop("checked")) { - $("#toast_body").html("高度不可在全域中修改"); - this.toast.show(); + if (this.selected.find(".liveList").length >= 1 || this.selected.find(".nameList").length >= 1 || + this.selected.find(".rosterList").length >= 1) { + classList.forEach(w => { + if ($(this.selected.children()).first().hasClass(w)) { + $(`.${w}`).parent().each((index, y) => { + $(y).css("height", $("#textHeight").val()) + }) + } + }); + } else if (this.selected.hasClass("nameSpan")) { + $(".nameSpan").css("min-height", $("#textHeight").val()); + + } else if (this.selected.hasClass("liveSpan")) { + $(".liveSpan").css("height", $("#textHeight").val()); + } else if (this.selected.hasClass("rosterSpan")) { + $(".rosterSpan").css("min-height", $("#textHeight").val()); + } else { + $("#toast_body").html("高度不可在全域中修改"); + this.toast.show(); + } } break; case "breakCount":