From e465fb46fad434562ef4e6a460831eb911f0339b Mon Sep 17 00:00:00 2001 From: Goldman Kim Date: Mon, 24 Jun 2024 18:46:32 +0900 Subject: [PATCH] Working on removing Material Design 2 --- .../static/html/com/app/sample/type0201.html | 12 +++++ .../static/html/com/app/sample/type0301.html | 12 +++++ .../static/html/com/app/sample/type0601.html | 45 +++++++++++++++---- .../static/html/com/app/sample/type0701.html | 14 ++++++ 4 files changed, 74 insertions(+), 9 deletions(-) diff --git a/src/main/resources/static/html/com/app/sample/type0201.html b/src/main/resources/static/html/com/app/sample/type0201.html index 53c7a83..62e6c48 100644 --- a/src/main/resources/static/html/com/app/sample/type0201.html +++ b/src/main/resources/static/html/com/app/sample/type0201.html @@ -139,6 +139,18 @@ }); } }, + "e.gender.change" : { + target : "#search #gender", + handler : function(e) { + cont["e.btnSearch.click"].trigger("click"); + } + }, + "e.eyeColor.change" : { + target : "#search #eyeColor", + handler : function(e) { + cont["e.btnSearch.click"].trigger("click"); + } + }, "e.btnExcel.click" : function(e) { e.preventDefault(); diff --git a/src/main/resources/static/html/com/app/sample/type0301.html b/src/main/resources/static/html/com/app/sample/type0301.html index 0868fc4..eb1e47b 100644 --- a/src/main/resources/static/html/com/app/sample/type0301.html +++ b/src/main/resources/static/html/com/app/sample/type0301.html @@ -123,6 +123,18 @@ }); } }, + "e.gender.change" : { + target : "#search #gender", + handler : function(e) { + cont["e.btnSearch.click"].trigger("click"); + } + }, + "e.eyeColor.change" : { + target : "#search #eyeColor", + handler : function(e) { + cont["e.btnSearch.click"].trigger("click"); + } + }, "e.btnExcel.click" : function(e) { e.preventDefault(); diff --git a/src/main/resources/static/html/com/app/sample/type0601.html b/src/main/resources/static/html/com/app/sample/type0601.html index a318223..832654b 100644 --- a/src/main/resources/static/html/com/app/sample/type0601.html +++ b/src/main/resources/static/html/com/app/sample/type0601.html @@ -4,15 +4,35 @@ min-height: 484px; border-radius: var(--njs-border-radius-l); } + + .type0601 .icon { + padding: 0; + margin: 0; + } + .type0601 .icon a { + display: inline-block; + margin-top: 10px; + } + .type0601 .expand { + display: none; + } + .type0601 .collapse svg, + .type0601 .expand svg { + height: 24px; + width: 24px; + fill: var(--md-sys-color-secondary); + }
-
- - +
@@ -116,13 +136,20 @@ url : "sample/saveSampleList.json" }); }, - "e.btnOpen.click" : function(e) { + "e.expandCollapse.click" : function(e) { e.preventDefault(); - cont["p.tree.master"].expand(); - }, - "e.btnClose.click" : function(e) { - e.preventDefault(); - cont["p.tree.master"].collapse(true); + if (N(this).data("status") === "expand") { + N(".button-panel .expand", cont.view).hide(); + N(".button-panel .collapse", cont.view).show(); + cont["p.tree.master"].collapse(true); + N(this).data("status", "collapse"); + } else { + N(".button-panel .expand", cont.view).show(); + N(".button-panel .collapse", cont.view).hide(); + cont["p.tree.master"].expand(); + N(this).data("status", "expand"); + } + }, "e.btnExcel.click" : function(e) { e.preventDefault(); diff --git a/src/main/resources/static/html/com/app/sample/type0701.html b/src/main/resources/static/html/com/app/sample/type0701.html index 86f4a04..0f25d21 100644 --- a/src/main/resources/static/html/com/app/sample/type0701.html +++ b/src/main/resources/static/html/com/app/sample/type0701.html @@ -8,9 +8,11 @@
+
+
    @@ -41,6 +43,18 @@ "p.tab.master" : { tabScroll: true }, + "e.gender.change" : { + target : "#search #gender", + handler : function(e) { + cont["e.btnSearch.click"].trigger("click"); + } + }, + "e.eyeColor.change" : { + target : "#search #eyeColor", + handler : function(e) { + cont["e.btnSearch.click"].trigger("click"); + } + }, "e.btnSearch.click" : function(e) { e.preventDefault(); // 활성화된 탭 페이지에서 컨트롤러 가져오기