Merge pull request 'Apply same style for button favorite' (#97) from dev-nghiantt-fix-bugs into dev

Reviewed-on: #97

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/input.scss

@@ -1,5 +1,5 @@
 .v-select__custom {
-  padding: 0.125rem;
+  // padding: 0.125rem;
 
   &.v-text-field.v-text-field--solo:not(.v-text-field--solo-flat)>.v-input__control>.v-input__slot {
     box-shadow: none;

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/AdminMenu.vue

@@ -43,16 +43,16 @@
 			<!--        </div>-->
 			<!--      </v-list-item>-->
 			<v-list-item>
-				<v-btn @click="pswdChange" small elevation="0">
+				<v-list-item-title @click="pswdChange" class="body-2">
 					<v-icon class="mr-1" size="20">mdi-account-outline</v-icon>
 					<span class="body-2">비밀번호 변경</span>
-				</v-btn>
+				</v-list-item-title>
 			</v-list-item>
 			<v-list-item>
-				<v-btn @click="logout" small elevation="0">
+				<v-list-item-title @click="logout" class="body-2">
 					<v-icon class="mr-1" size="20">mdi-logout</v-icon>
 					<span class="body-2">로그아웃</span>
-				</v-btn>
+				</v-list-item-title>
 			</v-list-item>
 		</v-list>
 	</v-menu>
@@ -105,7 +105,7 @@ export default {
 			});
 		},
 		pswdChange() {
-			this.$parent.$parent.$parent.$parent.$refs['changePswdPop'].dialog = true;
+			this.$parent.$parent.$parent.$refs['changePswdPop'].dialog = true;
 		},
 	},
 	mounted() {},

components/common/Pagination.vue

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

components/common/modal/ChangePswdPop.vue

@@ -104,7 +104,6 @@ export default {
 	},
 	watch: {
 		async chkDialog(val) {
-			//console.log("watch : ", val)
 			if (val) {
 				this.openDialog();
 

components/common/modal/EqpmSelectPop.vue

@@ -2,17 +2,14 @@
 	<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>
@@ -31,17 +28,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">
@@ -86,15 +83,16 @@
 				</div>
 
 				<div class="pa-5" style="height:calc(100% - 30px)">
-					<div ref="modalGridParent" class="h100 w100">
+					<div ref="modalGridParent" :class="['h100', 'w100', isDarkMode ? 'dark-mode' : 'light-mode']">
 						<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>
@@ -247,6 +245,7 @@ export default {
 					eqpmKindId: data.eqpmKindId,
 				}
 			},
+			isDarkMode: "isDarkMode",
 		}),
 		selectValue: {
 			get() {
@@ -585,6 +584,7 @@ var eqpmSelectPop = {
 
 	.tui-grid-lside-area {
 		.tui-grid-table {
+
 			.tui-grid-cell-header {
 				&.tui-grid-cell {
 					input[type=checkbox] {
@@ -594,7 +594,23 @@ 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/common/modal/EvtObjPop.vue

@@ -53,7 +53,7 @@
 					</v-col>
 				</v-row>
 				<!-- <div :style="'height: calc(65vh)'"> -->
-				<div :style="'height: 600px'" class="px-5">
+				<div :style="'height: 620px'" class="px-5">
 					<!-- <div :style="{ height: 'calc(100% - 213px)' }"> -->
 					<div ref="modalGridParent" class="h100 py-3">
 						<!-- :is="loadGrid && dialog ? 'Grid' : null" -->

components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue

@@ -102,7 +102,7 @@ export default {
 			this.gridInit();
 		},
 		gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight - 31;
+			const gridHeight = this.$refs.gridParent.offsetHeight;
 
 			const myOptions = {
 				columnOptions: {
@@ -122,7 +122,6 @@ export default {
 				gridKey: this.gridName,
 				value: myOptions,
 			});
-
 			const _this = this;
 			let useFgSelectList = [];
 			this.pageData.useFgList.forEach(item => {

layouts/default.vue

@@ -61,7 +61,9 @@
                 </v-list-item>
               </v-list>
             </v-menu>
-            <a-button id="removeBm" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
+            <a-button id="removeBm" :style="{
+                    display: 'flex',
+                    alignItems: 'center'}" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
               <span class="material-icons" style="font-size: 17px">star</span>
             </a-button>
             <a-button id="addBm" class="btn-header" :style="{

pages/comm/base/BatchLogMngPage.vue

@@ -117,8 +117,8 @@ export default {
 			// rowGridOrigin: [],
 			detailList: myDetail,
 			itemsPerPage: 20,
-			itemsPerPageArray: [10, 20, 30],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			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],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			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],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			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">
-					<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,8 +117,8 @@ export default {
 				formFg: false,
 			},
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			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],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			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],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			limit: 10,
 			page: 1,
 			totalCount: 0,
 		};

pages/ems/effc/DataSetMngPage.vue

@@ -783,5 +783,8 @@ const dataPathDataExample = getPathDataExample({
   .v-window {
     overflow: visible;
   }
+  .ant-checkbox-inner {
+    padding: 8px;
+  }
 }
 </style>

pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue

@@ -159,8 +159,8 @@ export default {
 			eqpmGdIdxFlag: false,
 			fabFlag: false,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			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],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			limit: 10,
 			page: 1,
 			totalCount: 0,
 		};

plugins/gridUtility.js

@@ -327,6 +327,10 @@ export class NewCustomEditor {
 			} else {
 				el.checked = false;
 			}
+
+			divEl.style.position = 'relative';
+			divEl.style.top = rowKey === 0 ? '1px' : '3px';
+
 			el.addEventListener('change', (ev) => {
 				// console.log('props: %o', ev);
 				if (ev.target.checked) {