Merge pull request 'fix bug ui scrren 12 28' (#94 ) from dev-manhph1-figbug into dev

Reviewed-on: #94
fix bug ui scrren 12 28
2025-08-25 18:40:11 +09:00 · 2025-08-25 13:23:49 +09:00 · 2025-08-25 12:42:33 +09:00 · 2025-08-25 12:22:31 +09:00 · 2025-08-25 11:59:01 +09:00 · 2025-08-21 18:24:20 +09:00
11 changed files with 24 additions and 11 deletions
--- a/assets/scss/common/editor.scss
+++ b/assets/scss/common/editor.scss
@ -92,6 +92,15 @@
  background-color: #36383f;
 }

+.toastui-editor-dark .toastui-editor-popup-add-heading h1,
+.toastui-editor-dark .toastui-editor-popup-add-heading h2,
+.toastui-editor-dark .toastui-editor-popup-add-heading h3,
+.toastui-editor-dark .toastui-editor-popup-add-heading h4,
+.toastui-editor-dark .toastui-editor-popup-add-heading h5,
+.toastui-editor-dark .toastui-editor-popup-add-heading h6 {
+  color: #eee;
+}
+
 .toastui-editor-dark .toastui-editor-popup-body label {
  color: #9a9da3;
 }
--- a/assets/scss/common/pagination.scss
+++ b/assets/scss/common/pagination.scss
@ -22,6 +22,10 @@
      background-color: transparent !important;
    }

+    .ant-pagination-item-ellipsis {
+      color: map-deep-get($config, #{$theme}, "paging-text") !important;
+    }
+
    .ant-pagination-item,
    .ant-pagination-prev,
    .ant-pagination-next {
--- a/components/common/Pagination.vue
+++ b/components/common/Pagination.vue
@ -34,7 +34,7 @@ export default {
 		},
 		itemsPerPageArray: {
 			type: Array,
-			default: () => [20, 50, 100],
+			default: () => [10, 20, 50],
 		},
 	},
 	data() {
--- a/pages/comm/base/BatchLogMngPage.vue
+++ b/pages/comm/base/BatchLogMngPage.vue
@ -117,7 +117,7 @@ export default {
 			// rowGridOrigin: [],
 			detailList: myDetail,
 			itemsPerPage: 20,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
 			limit: 20,
 			page: 1,
 			totalCount: 0,
--- a/pages/comm/base/NoticeMngPage.vue
+++ b/pages/comm/base/NoticeMngPage.vue
@ -295,7 +295,7 @@ export default {
 			selectedRowKey: null,
 			selectedRowData: null,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
 			limit: 20,
 			page: 1,
 			totalCount: 0,
--- a/pages/comm/base/PrgmMngPage_Pagination.vue
+++ b/pages/comm/base/PrgmMngPage_Pagination.vue
@ -134,7 +134,7 @@ export default {
 			// rowGridOrigin: [],
 			detailList: myDetail,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
 			limit: 20,
 			page: 1,
 			totalCount: 0,
--- a/pages/ems/base/PastRsltDataReadPage.vue
+++ b/pages/ems/base/PastRsltDataReadPage.vue
@ -30,8 +30,8 @@
 		</v-row>
 		<v-row ref="contents">
 			<v-col :cols="12" class="h100">
-				<v-card class="px-5 py-5">
-					<div ref="gridParent" class="px-5" style="height:calc(100% - 40px)">
+				<v-card class="pa-5 pb-0">
+					<div ref="gridParent" class="px-5" style="height:calc(100% - 70px)">
 						<component ref="myGrid" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
 							:parentPrgmId="myPrgmId" />
 					</div>
@ -117,7 +117,7 @@ export default {
 				formFg: false,
 			},
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
 			limit: 20,
 			page: 1,
 			totalCount: 0,
--- a/pages/ems/base/ReadResultCloseMngPage.vue
+++ b/pages/ems/base/ReadResultCloseMngPage.vue
@ -167,7 +167,7 @@ export default {
      gridName: "rowGrid",
      loadGrid: false,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
 			limit: 20,
 			page: 1,
 			totalCount: 0,
--- a/pages/ems/base/TagMngPage_Pagination.vue
+++ b/pages/ems/base/TagMngPage_Pagination.vue
@ -153,7 +153,7 @@ export default {
 			detailList: myDetail,
 			alrmFg: null,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
 			limit: 20,
 			page: 1,
 			totalCount: 0,
--- a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue
+++ b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue
@ -159,7 +159,7 @@ export default {
 			eqpmGdIdxFlag: false,
 			fabFlag: false,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
 			limit: 20,
 			page: 1,
 			routeData: {},
--- a/pages/ems/effc/EnrgUsePlanPage.vue
+++ b/pages/ems/effc/EnrgUsePlanPage.vue
@ -110,7 +110,7 @@ export default {
 			rowKey: null,
 			edtingFinishFlag: 'Y',
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
 			limit: 20,
 			page: 1,
 			totalCount: 0,
Author	SHA1	Message	Date
dev	70aa21c78d	Merge pull request 'fix bug ui scrren 12 28' (#94 ) from dev-manhph1-figbug into dev Reviewed-on: #94	2025-08-25 18:40:11 +09:00
Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK	39502ae8fb	fix bug ui scrren 12 28	2025-08-25 13:23:49 +09:00
dev	bcea171273	Merge pull request 'Update default pagination' (#93 ) from dev-nghiantt-fix-bugs into dev Reviewed-on: #93	2025-08-25 12:42:33 +09:00
Michael	08d2918a6d	Update color of pagination ellipsis	2025-08-25 12:22:31 +09:00
Michael	2dde396442	Update default pagination	2025-08-25 11:59:01 +09:00
dev	4a20707c62	Merge pull request 'Update 0729' (#92 ) from dev-trungvq7-0729 into dev Reviewed-on: #92	2025-08-21 18:24:20 +09:00