reconfict

Reviewed-on: #95

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;

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/modal/ChangePswdPop.vue

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

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 => {

pages/ems/effc/DataSetMngPage.vue

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

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) {
@@ -401,4 +405,4 @@ export class NewCustomEditor {
 		// }
 		this.el.select();
 	}
-}
+}