Merge branch 'dev' into deploy-dev-admin

This commit is contained in:
주수현
2025-06-24 09:37:55 +09:00
12 changed files with 51 additions and 16 deletions

View File

@@ -6637,6 +6637,9 @@ input[type=number] {
width: 14rem;
}
.filter-wrap .component-btns {
min-width: -webkit-max-content;
min-width: -moz-max-content;
min-width: max-content;
margin-top: auto;
}
.filter-wrap .btn {
@@ -6704,6 +6707,9 @@ input[type=number] {
.table-group .table-tit-group .bottom-btn-group {
margin-top: 0;
}
.table-group .table-tit-group .component-select {
width: 14rem;
}
table {
table-layout: fixed;
@@ -7192,6 +7198,8 @@ table tbody th {
justify-content: space-between;
}
.dounut-chart-area .chart-group {
-webkit-flex-wrap: wrap;
flex-wrap: wrap;
display: -webkit-box;
display: -webkit-flex;
display: flex;
@@ -7234,16 +7242,18 @@ table tbody th {
margin-top: 3.2rem;
}
.dounut-chart-area .chart-group dl dd .percent {
margin-right: 2rem;
position: relative;
display: block;
font-size: 5.6rem;
font-weight: 700;
letter-spacing: -1px;
}
.dounut-chart-area .chart-group dl dd .percent::after {
position: absolute;
content: "%";
display: block;
right: -1.8rem;
right: -3.5rem;
top: 0;
}
.dounut-chart-area .chart-group dl dd .d-flex {
@@ -7289,8 +7299,8 @@ table tbody th {
left: 50%;
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
width: 4px;
height: 50px;
width: 0.2rem;
height: 3.5rem;
background: #ffffff;
}
@@ -7303,8 +7313,8 @@ table tbody th {
transform: translateX(-50%) rotate(calc(var(--percent) * 3.6deg));
-webkit-transform-origin: center 80px;
transform-origin: center 80px;
width: 4px;
height: 50px;
width: 0.2rem;
height: 3.5rem;
background: #ffffff;
}

View File

@@ -12,7 +12,32 @@
</div>
<div class="modal-content">
<div class="modal-content-inner">
<ul class="allmenu-list" th:if="${topNode != null}">
<li th:each="menu : ${topNode.children}" th:if="${menu.showOnNavi}"
th:with="accoClass=${#strings.containsIgnoreCase(menu.uri, '/record') ? 'acco': ''}
, infoClass=${#strings.containsIgnoreCase(menu.uri, '/info') ? 'info': ''}"
th:class="|${accoClass}${infoClass}|"
th:classappend="${@coreUtil.containsCurrentURI(menuHierarchy, menu.id)}? 'active'">
<!--/* 자식 nodes 가 없는 경우 */-->
<a th:classappend="${currentURI.id == menu.id}? 'active'"
th:href="${menu.uri}" th:if="${#lists.size(menu.children) == 0}"
th:text="${menu.id == 'uri.front.record.calendar'} ? '일계부' : ${#messages.msg(menu.id)}">메뉴명</a>
<!--/* 자식 nodes 가 있는 경우 */-->
<a th:classappend="${@coreUtil.containsCurrentURI(menuHierarchy, menu.id)}? 'active'"
th:href="${menu.uri}"
th:if="${#lists.size(menu.children) > 0}"
th:text="${menu.id == 'uri.front.record.calendar'} ? '일계부' : ${#messages.msg(menu.id)}">메뉴명</a>
<ul class="detail-menu" th:if="${#lists.size(menu.children) > 0}">
<li th:each="child : ${menu.children}" th:if="${child.showOnNavi}"
th:classappend="${@coreUtil.containsCurrentURI(menuHierarchy, child.id)}? 'active'"
>
<a class="dropdown-item"
th:href="${child.uri}" th:text="${#messages.msg(child.id)}">메뉴명</a>
</li>
</ul>
</li>
</ul>
<section class="menu-footer">
<button type="button" class="btn-logout" onclick="kri.menu.logout()">로그아웃</button>
</section>

View File

@@ -35,7 +35,7 @@
</div>
<!--/* //공통으로 사용하는 모달 팝업 */-->
<!--/* 전체 메뉴 모달 팝업 */-->
<th:block th:replace="~{/common/menu-modal}"></th:block>
<th:block th:replace="~{common/menu-modal}"></th:block>
<!--/* //전체 메뉴 모달 팝업 */-->
</div>

View File

@@ -36,7 +36,7 @@
</div>
<!--/* //공통으로 사용하는 모달 팝업 */-->
<!--/* 전체 메뉴 모달 팝업 */-->
<th:block th:replace="~{/common/menu-modal}"></th:block>
<th:block th:replace="~{common/menu-modal}"></th:block>
<!--/* //전체 메뉴 모달 팝업 */-->
</div>

View File

@@ -37,7 +37,7 @@
<!--/* //공통으로 사용하는 모달 팝업 */-->
<!--/* 전체 메뉴 모달 팝업 */-->
<th:block th:replace="~{/common/menu-modal}"></th:block>
<th:block th:replace="~{common/menu-modal}"></th:block>
<!--/* //전체 메뉴 모달 팝업 */-->
</div>

View File

@@ -110,7 +110,7 @@
</div>
<!-- /* 건의사항 모달 팝업 */ -->
<th:block th:replace="~{/record/comment-modal}"></th:block>
<th:block th:replace="~{record/comment-modal}"></th:block>
<!-- /* //건의사항 모달 팝업 */ -->
</div>

View File

@@ -130,7 +130,7 @@
</div>
<!-- //모달 팝업 -->
<!-- /* 건의사항 모달 팝업 */ -->
<th:block th:replace="~{/record/comment-modal}"></th:block>
<th:block th:replace="~{record/comment-modal}"></th:block>
<!-- /* //건의사항 모달 팝업 */ -->
</div>

View File

@@ -133,7 +133,7 @@
</div>
<!-- //모달 팝업 -->
<!-- /* 건의사항 모달 팝업 */ -->
<th:block th:replace="~{/record/comment-modal}"></th:block>
<th:block th:replace="~{record/comment-modal}"></th:block>
<!-- /* //건의사항 모달 팝업 */ -->
</div>

View File

@@ -133,7 +133,7 @@
</div>
<!-- //모달 팝업 -->
<!-- /* 건의사항 모달 팝업 */ -->
<th:block th:replace="~{/record/comment-modal}"></th:block>
<th:block th:replace="~{record/comment-modal}"></th:block>
<!-- /* //건의사항 모달 팝업 */ -->
</div>

View File

@@ -137,7 +137,7 @@
</div>
<!-- //모달 팝업 -->
<!-- /* 건의사항 모달 팝업 */ -->
<th:block th:replace="~{/record/comment-modal}"></th:block>
<th:block th:replace="~{record/comment-modal}"></th:block>
<!-- /* //건의사항 모달 팝업 */ -->
</div>

View File

@@ -118,7 +118,7 @@
</div>
<!-- //모달 팝업 -->
<!-- /* 건의사항 모달 팝업 */ -->
<th:block th:replace="~{/record/comment-modal}"></th:block>
<th:block th:replace="~{record/comment-modal}"></th:block>
<!-- /* //건의사항 모달 팝업 */ -->
</div>

View File

@@ -179,7 +179,7 @@
</div>
<!-- //모달 팝업 -->
<!-- /* 건의사항 모달 팝업 */ -->
<th:block th:replace="~{/record/comment-modal}"></th:block>
<th:block th:replace="~{record/comment-modal}"></th:block>
<!-- /* //건의사항 모달 팝업 */ -->
</div>