Merge pull request 'Update default item per page by 10' (#95) from dev-nghiantt-fix-bugs into dev

Reviewed-on: #95

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;
 }

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 {

components/Pagination.vue

@@ -69,7 +69,7 @@ export default {
 		},
 		limit: {
 			type: Number,
-			default: 0,
+			default: 10,
 		},
 		itemsPerPageArray: {
 			type: Array,

components/common/Pagination.vue

@@ -34,7 +34,7 @@ export default {
 		},
 		itemsPerPageArray: {
 			type: Array,
-			default: () => [20, 50, 100],
+			default: () => [10, 20, 50],
 		},
 	},
 	data() {

pages/comm/base/BatchLogMngPage.vue

@@ -117,8 +117,8 @@ export default {
 			// rowGridOrigin: [],
 			detailList: myDetail,
 			itemsPerPage: 20,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
-			limit: 20,
+			limit: 10,
 			page: 1,
 			totalCount: 0,
 		};

pages/comm/base/NoticeMngPage.vue

@@ -295,8 +295,8 @@ export default {
 			selectedRowKey: null,
 			selectedRowData: null,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
-			limit: 20,
+			limit: 10,
 			page: 1,
 			totalCount: 0,
 			writeActionData: {

pages/comm/base/PrgmMngPage_Pagination.vue

@@ -134,8 +134,8 @@ export default {
 			// rowGridOrigin: [],
 			detailList: myDetail,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
-			limit: 20,
+			limit: 10,
 			page: 1,
 			totalCount: 0,
 		};

pages/ems/base/EnrgReadPlaceMngPage.vue

@@ -63,7 +63,7 @@
 						<v-tabs-items v-model="tab" style="height: calc(100% - 65px);" class="pt-6 py-2">
 							<v-tab-item v-for="(item, idx) in items" :key="item.id">
 								<component v-if="item.id == 'readPlcBaseInfoTab'" :is="'Form'" :parentPrgmId="myPrgmId"
-									:detailList="f" :bindingData="gridName"
+									:detailList="detailList" :bindingData="gridName"
 									@gridEditingFinish="gridEditingFinish" />
 								<ReadPlcAddInfoTab v-if="item.id == 'readPlcAddInfoTab'" :parentPrgmId="myPrgmId"
 									:innerTabGridInfo="{ tab, idx }" />
@@ -923,51 +923,6 @@ const defaultData = {
 	},
 };
 
-const sampleData = [
-	{
-		readPlcNm: '서울 본사',
-		plcKind: '본사',
-		useFg: '사용',
-		_children: [
-			{
-				readPlcNm: '서울 본사 - 1층',
-				plcKind: '층',
-				useFg: '사용',
-			},
-			{
-				readPlcNm: '서울 본사 - 2층',
-				plcKind: '층',
-				useFg: '미사용',
-			},
-		],
-	},
-	{
-		readPlcNm: '부산 지사',
-		plcKind: '지사',
-		useFg: '사용',
-		_children: [
-			{
-				readPlcNm: '부산 지사 - A동',
-				plcKind: '건물',
-				useFg: '사용',
-				_children: [
-					{
-						readPlcNm: '부산 지사 - A동 1층',
-						plcKind: '층',
-						useFg: '사용',
-					},
-				],
-			},
-		],
-	},
-	{
-		readPlcNm: '대전 창고',
-		plcKind: '창고',
-		useFg: '미사용',
-	},
-];
-
-
 const myDetail = [
 	{
 		type: 'InputText',

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">
+				<v-card class="pa-5 pb-0">
-					<div ref="gridParent" class="px-5" style="height:calc(100% - 40px)">
+					<div ref="gridParent" class="px-5" style="height:calc(100% - 70px)">
 						<component ref="myGrid" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
 							:parentPrgmId="myPrgmId" />
 					</div>
@@ -117,8 +117,8 @@ export default {
 				formFg: false,
 			},
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
-			limit: 20,
+			limit: 10,
 			page: 1,
 			totalCount: 0,
 		};

pages/ems/base/ReadResultCloseMngPage.vue

@@ -167,8 +167,8 @@ export default {
       gridName: "rowGrid",
       loadGrid: false,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
-			limit: 20,
+			limit: 10,
 			page: 1,
 			totalCount: 0,
     };

pages/ems/base/TagMngPage_Pagination.vue

@@ -153,8 +153,8 @@ export default {
 			detailList: myDetail,
 			alrmFg: null,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
-			limit: 20,
+			limit: 10,
 			page: 1,
 			totalCount: 0,
 		};

pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue

@@ -159,8 +159,8 @@ export default {
 			eqpmGdIdxFlag: false,
 			fabFlag: false,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
-			limit: 20,
+			limit: 10,
 			page: 1,
 			routeData: {},
 			totalCount: 0,

pages/ems/effc/EnrgUsePlanPage.vue

@@ -110,8 +110,8 @@ export default {
 			rowKey: null,
 			edtingFinishFlag: 'Y',
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
+			itemsPerPageArray: [10, 20, 50],
-			limit: 20,
+			limit: 10,
 			page: 1,
 			totalCount: 0,
 		};