Merge pull request 'add effect loading when change theme mode' (#90) from dev-dungtv-0821 into dev

Reviewed-on: #90

components/common/Grid.vue

@@ -173,8 +173,9 @@ export default {
 				this.gridScrollTop = e.target.scrollTop;
 				this.gridScrollLeft = e.target.scrollLeft;
 			});
-
-			if (!(this.scrollBody.scrollHeight > this.scrollBody.clientHeight)) {
+			if (this.scrollBody.scrollHeight > this.scrollBody.clientHeight) {
+				this.gridInstance.$el.getElementsByClassName('tui-grid-content-area')[0].classList.remove('tui-grid-no-scroll-y');
+			} else {
 				this.gridInstance.$el.getElementsByClassName('tui-grid-content-area')[0].classList.add('tui-grid-no-scroll-y');
 			}
 		}

components/common/modal/EqpmSelectPop.vue

@@ -2,14 +2,17 @@
 	<v-row class="search-box" align="center" no-gutters>
 		<v-col v-if="label" :cols="labelCols" class="mr-2">
 			<label for="" class="search-box-label">
-				<v-icon v-if="iconShow" small :class="['mr-1', required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</v-icon>
+				<v-icon v-if="iconShow" small
+					:class="['mr-1', required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</v-icon>
 				{{ label }}
 			</label>
 		</v-col>
 		<v-col :cols="textCols">
 			<v-text-field readonly v-model="selectValue" append-icon="" :class="['v-input__custom', customClass]"
 				@click="dialogOpenCloseEvent(dialog)" outlined :hide-details="true" :required="required || false"
-				:disabled="disabled || false" :placeholder="placeholder">
+				:disabled="disabled || false"
+				:placeholder="placeholder"
+				>
 				<template v-slot:append>
 					<!-- Custom SVG icon -->
 					<v-icon>$icoSearch</v-icon>
@@ -28,17 +31,17 @@
 					<v-row align="end">
 						<v-col :cols="3.5">
 							<!-- 설비그룹 -->
-							<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01" :label="'설비그룹'"
-								:disabled="eqpmGrpDisabled" @update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12"
-								:iconShow="true" />
+							<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
+								:label="'설비그룹'" :disabled="eqpmGrpDisabled" @update:propsValue="selectValue01 = $event"
+								:labelCols="12" :textCols="12" :iconShow="true" />
 						</v-col>
 						<v-col>
 							<!-- FAB -->
-							<component :is="'SelectBoxMulti'" :propsValue="selectValue02" :itemList="selectValueList02" :label="'FAB'"
-								:labelCols="12" :multiple="true" :disabled="fabDisabled" @update:propsValue="selectValue02 = $event"
-								:textCols="12" :iconShow="true" />
+							<component :is="'SelectBoxMulti'" :propsValue="selectValue02" :itemList="selectValueList02"
+								:label="'FAB'" :labelCols="12" :multiple="true" :disabled="fabDisabled"
+								@update:propsValue="selectValue02 = $event" :textCols="12" :iconShow="true" />
 						</v-col>
-						<v-col>
+						<v-col >
 							<v-row>
 								<v-col :cols="12" class="py-0">
 									<label for="" class="search-box-label">
@@ -83,16 +86,15 @@
 				</div>
 
 				<div class="pa-5" style="height:calc(100% - 30px)">
-					<div ref="modalGridParent" :class="['h100', 'w100', isDarkMode ? 'dark-mode' : 'light-mode']">
+					<div ref="modalGridParent" class="h100 w100">
 						<component :ref="gridName" :is="loadGrid ? 'Grid' : null"
-							:dataPath="searchParam.eqpmSelectPopData.eqpmSelectPop" :gridName="gridName" :parentPrgmId="parentPrgmId"
-							@getRowsData="getRowData" />
+							:dataPath="searchParam.eqpmSelectPopData.eqpmSelectPop" :gridName="gridName"
+							:parentPrgmId="parentPrgmId" @getRowsData="getRowData" />
 					</div>
 				</div>
 
 				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
-					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)"
-						class="ant-btn-popup-default mr-2">닫기</a-button>
+					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="ant-btn-popup-default mr-2">닫기</a-button>
 					<a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>
 				</v-card-actions>
 			</v-card>
@@ -245,7 +247,6 @@ export default {
 					eqpmKindId: data.eqpmKindId,
 				}
 			},
-			isDarkMode: "isDarkMode",
 		}),
 		selectValue: {
 			get() {
@@ -584,9 +585,8 @@ var eqpmSelectPop = {
 
 	.tui-grid-lside-area {
 		.tui-grid-table {
-
 			.tui-grid-cell-header {
-				&.tui-grid-cell {
+				&.tui-grid-cell  {
 					input[type=checkbox] {
 						margin-top: 0px;
 					}
@@ -594,23 +594,7 @@ var eqpmSelectPop = {
 			}
 		}
 	}
-}
-
-@each $theme in dark, light {
-	@include theme($theme);
-
-	.#{$theme}-mode {
-		::v-deep {
-			.tui-grid-lside-area {
-				.tui-grid-table{
-					border-right: 1px solid map-deep-get($config,
-						#{$theme},
-						"tui-grid-border-vertical-color"
-					) !important;
-				}
-			}
-		}
-	}
 
 }
+
 </style>

components/pages/ems/EccInfo/EccAddInfoTab.vue

@@ -112,10 +112,10 @@ export default {
 				bodyHeight: gridHeight,
 				minBodyHeight: gridHeight,
 				header: {
-					height: 28,
+					height: 37,
 				},
-				rowHeight: 29,
-				minRowHeight: 29,
+				rowHeight: 37,
+				minRowHeight: 37,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};

pages/comm/auth/RoleMngPage.vue

@@ -505,3 +505,10 @@ const myDetail = [
 	},
 ];
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style>

pages/comm/auth/UserRoleMngPage.vue

@@ -1085,4 +1085,11 @@ function sha512(str) {
 		.update(str)
 		.digest('hex');
 }
-</script>
+</script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style> 

pages/comm/base/BatchLogMngPage.vue

@@ -143,7 +143,7 @@ export default {
 		chkIsFind(val) {
 			if (val) {
 				this.page = 1;
-				this.search();
+				this.search(false);
 			}
 		},
 		chkExecRsltCd() {
@@ -249,14 +249,16 @@ export default {
 
 			this.loadGrid = true;
 		},
-		async search() {
-			await this.getRowGridData();
+		async search(isPaging) {
+			await this.getRowGridData(isPaging);
 			await this.setPageData({
 				isFind: false,
 			});
 		},
-		async getRowGridData() {
-			this.loadGrid = false;
+		async getRowGridData(isPaging) {
+			if(!isPaging) {
+				this.loadGrid = false;
+			}
 			// this.setGridData({
 			// 	gridKey: this.gridName,
 			// 	value: [],
@@ -369,7 +371,7 @@ export default {
 			this.page = pageNum;
 			this.limit = limit;
 
-			this.search();
+			this.search(true);
 		},
 	},
 };

pages/comm/base/NoticeMngPage.vue

@@ -426,7 +426,7 @@ export default {
 			}
 		},
 		search() {
-			this.getGridData();
+			this.getGridData(false);
 		},
 		gridInit() {
 			const gridHeight = this.$refs.contents.offsetHeight - 120;
@@ -498,18 +498,18 @@ export default {
 			});
 			this.getGridData();
 		},
-		async getGridData() {
+		async getGridData(isPaging) {
 			var params = {
 				bordNo: 'BORD0001',
 				limit: this.limit,
 				page: this.page,
 				offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 			};
-
-			this.loadGrid = false;
-
+			if(!isPaging) {
+				this.loadGrid = false;
+			}
 			const res = await this.postApiReturn({
-				apiKey: 'selectPostPage',
+				apiKey: 'selectPostData',
 				resKey: 'postPage',
 				sendParam: params,
 			});
@@ -1059,7 +1059,8 @@ export default {
 			this.page = pageNum;
 			this.limit = limit;
 
-			this.search();
+			// this.search();
+			this.getGridData(true);
 		},
 	},
 };

pages/comm/base/PrgmMngPage.vue

@@ -522,3 +522,10 @@ const myDetail = [
 	},
 ];
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style> 

pages/ems/base/EnrgCostCenterMngPage.vue

@@ -1029,3 +1029,10 @@ const myDetail = [
 	},
 ];
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style>

pages/ems/base/EquipmentMasterMngPage.vue

@@ -1005,3 +1005,10 @@ const dataPathDataExample = getPathDataExample({
 		field2: '2222',
 	});
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style>

pages/ems/base/PastRsltDataReadPage.vue

@@ -12,7 +12,7 @@
 						</v-col>
 						<v-col :cols="3">
 							<component :is="'EvtObjPop'" :parentPrgmId="myPrgmId" :item="evtObjPopItem"
-								class="no-gutters" customClass="select-large" />
+								class="no-gutters" customClass="select-large pa-0" />
 						</v-col>
 						<v-col :cols="3">
 							<!-- 대상일 -->
@@ -144,17 +144,17 @@ export default {
 		chkIsFind(val) {
 			if (val) {
 				this.page = 1;
-				this.search();
+				this.search(false);
 			}
 		},
 		chkTagId(val) {
 			if (this.initFlag && val != null) {
-				this.search();
+				this.search(false);
 			}
 		},
 		chkTagNm() {
 			if (this.initFlag) {
-				this.search();
+				this.search(false);
 			}
 		},
 		chkReadPlcId() {
@@ -193,13 +193,13 @@ export default {
 			postApiReturn: 'modules/list/postApiReturn',
 			chkOpenTabList: 'chkOpenTabList',
 		}),
-		async search() {
+		async search(isPaging) {
 			// this.gridInit();
 			if (this.initFlag) {
 				if (this.pageData.tagId == '' || this.pageData.tagId == null) {
 					alert('TAG를 선택해 주세요');
 				} else {
-					this.getRowGridData();
+					this.getRowGridData(isPaging);
 				}
 			}
 			this.setPageData({
@@ -289,9 +289,10 @@ export default {
 
 			this.loadGrid = true;
 		},
-		async getRowGridData() {
-			this.loadGrid = false;
-
+		async getRowGridData(isPaging) {
+			if(!isPaging) {
+				this.loadGrid = false;
+			}
 			let res = [];
 			let res2 = [];
 			let yearQuarterData = [];
@@ -476,7 +477,7 @@ export default {
 			this.page = pageNum;
 			this.limit = limit;
 
-			this.search();
+			this.search(true);
 		},
 	},
 };

pages/ems/base/ReadResultCloseMngPage.vue

@@ -198,7 +198,7 @@ export default {
     chkIsFind(val) {
       if (val) {
 				this.page = 1;
-				this.search();
+				this.search(false);
 			}
     },
     chkBlocId() {
@@ -265,12 +265,13 @@ export default {
         value: myColumns,
       });
     },
-    async search() {
-      await this.getRowGridData();
+    async search(isPaging) {
+      await this.getRowGridData(isPaging);
     },
-    async getRowGridData() {
-      this.loadGrid = false;
-
+    async getRowGridData(isPaging) {
+      if(!isPaging) {
+        this.loadGrid = false;
+      }
       if (
         this.pageData.blocMstrList.length > 0 &&
         this.pageData.commCdList.length > 0 &&
@@ -356,7 +357,7 @@ export default {
 			this.page = pageNum;
 			this.limit = limit;
 
-			this.search();
+			this.search(true);
 		},
   },
 };
@@ -465,3 +466,10 @@ const myColumns = [
   },
 ];
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style>

pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue

@@ -211,7 +211,7 @@ export default {
 			}
 		},
 		chkIsFind(val) {
-			if (val) this.search();
+			if (val) this.search(false);
 		},
 		fabId(val) { },
 		fabNm(val) { },
@@ -371,8 +371,8 @@ export default {
 			}
 			await this.gridInit();
 		},
-		async search() {
-			await this.getRowGridData();
+		async search(isPaging) {
+			await this.getRowGridData(isPaging);
 			this.setPageData({
 				isFind: false,
 			});
@@ -725,9 +725,10 @@ export default {
 
 			this.getRowGridData();
 		},
-		async getRowGridData() {
-			this.loadGrid = false;
-
+		async getRowGridData(isPaging) {
+			if(!isPaging) {
+				this.loadGrid = false;
+			}
 			var res = await this.postApiReturn({
 				apiKey: 'selectEnrgEffcEqpmDetlMntr',
 				resKey: 'eqpmDetlData',
@@ -806,7 +807,7 @@ export default {
 			this.page = pageNum;
 			this.limit = limit;
 
-			this.search();
+			this.search(true);
 		},
 	},
 };

store/modules/list.js

@@ -514,7 +514,7 @@ const INIT_URL_STATE = {
 
 	// prgmId: "PRG0003" 공지사항
 	selectPostList: 'comm/base/NoticeMngCtr/selectPostList',
-	selectPostPage: 'comm/base/NoticeMngCtr/selectPostPage',
+	selectPostData: 'comm/base/NoticeMngCtr/selectPostData',
 	selectPostPageTotal: 'comm/base/NoticeMngCtr/selectPostPageTotal',
 	deletePostList: 'comm/base/NoticeMngCtr/deletePost',