fix bug grid + buttons

assets/scss/common.scss

@@ -231,35 +231,6 @@ a {
   .v-application.#{$theme}-mode {
     min-width: 1000px;
 
-    .ant-checkbox-wrapper.ant-checkbox-wrapper-disabled,
-    .ant-checkbox-disabled .ant-checkbox-input
-    {
-      cursor: default !important;
-    }
-
-    .v-list-item__title {
-      font-family: var(--desktop-normal-font-family, "Inter-Regular", sans-serif) !important;
-    }
-
-    .btn-close-menu-list {
-      min-width: 100px;
-      border-color: transparent;
-      background-color: map-deep-get($config, #{$theme}, "btn-header-select-bg") !important;
-  
-      .v-list-item {
-        min-height: 30px;
-      }
-  
-      .v-list-item__title {
-        color: map-deep-get($config, #{$theme}, "btn-header-select-color") !important;
-  
-        &:hover {
-          color: #46c0ff !important;
-          cursor: pointer;
-        }
-      }
-    }
-
     .icon-datepicker-color {
       color: map-deep-get($config, #{$theme}, "icon-datepicker-color");
     }
@@ -837,7 +808,6 @@ a {
       font-size: 2rem;
       font-weight: bold;
       padding-left: 8px;
-      margin-top: 2px;
 
       img {
         width: 139px;
@@ -854,11 +824,20 @@ a {
   .btn-close-menu-list {
     min-width: 100px;
     border-color: transparent;
+    background-color: map-deep-get($config, #{$theme}, "btn-header-select-bg") !important;
 
     .v-list-item {
       min-height: 30px;
     }
 
+    .v-list-item__title {
+      color: map-deep-get($config, #{$theme}, "btn-header-select-color");
+
+      &:hover {
+        color: #46c0ff;
+      }
+    }
+
     .v-btn {
       background-color: transparent !important;
       color: map-deep-get($config, #{$theme}, "btn-header-select-color") !important;

assets/scss/common/button.scss

@@ -144,11 +144,10 @@
       }
 
       &.ant-btn-danger {
-
         &.ant-btn-background-ghost {
-          color: map-deep-get($config, #{$theme}, "ant-btn-danger-color");
+          color:map-deep-get($config, #{$theme}, "ant-btn-danger-color");
-          border-color: map-deep-get($config, #{$theme}, "ant-btn-danger-color");
+          border-color:map-deep-get($config, #{$theme}, "ant-btn-danger-border");
-          // background: map-deep-get($config, #{$theme}, "ant-btn-danger-color") !important;
+          background: map-deep-get($config, #{$theme}, "ant-btn-danger-bg") !important;
         }
       }
 

assets/scss/common/grid.scss

@@ -204,7 +204,7 @@
         overflow: auto;
 
         &::-webkit-scrollbar {
-          width: $scrollbar-width !important;
+          // width: $scrollbar-width !important;
           height: $scrollbar-width !important;
           -webkit-appearance: initial;
           background-color: rgba(0, 0, 0, 0) !important;
@@ -352,10 +352,11 @@
           }
 
           &.tui-grid-layer-editing {
-            background:map-deep-get($config,
+            background: transparent;
-              #{$theme},
+            // background:map-deep-get($config,
-              "tui-grid-cell-insert-color"
+            //   #{$theme},
-            );
+            //   "tui-grid-cell-insert-color"
+            // );
           }
         }
       }

assets/scss/var.scss

@@ -166,7 +166,7 @@ $config: (
     ant-btn-primary-color: #212224,
     ant-btn-danger-bg:#D32029,
     ant-btn-danger-border:#D32029,
-    ant-btn-danger-color:#D32029,
+    ant-btn-danger-color:#212224,
     ant-btn-default-border:#FFFFFF2E,
     ant-btn-default-bg:#FFFFFF2E,
     ant-btn-default-color:#FFFFFFD9,

components/common/modal/EqpmSelectPop.vue

@@ -94,7 +94,7 @@
 				</div>
 
 				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
-					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="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>

components/pages/ems/DataSetInfo/DataSetTagRelTab.vue

@@ -175,7 +175,7 @@ export default {
           header: '사용여부',
           name: 'useFg',
           align: 'left',
-          width: 100,
+          minWidth: 80,
           formatter({ value }) {
             value = value === true ? '1' : '0';
             const newValue = _this.pageData.useFgList.filter(
@@ -190,7 +190,7 @@ export default {
           //   }
           // }
         },
-        { header: '비고', name: 'rmrk', align: 'left' },
+        { header: '비고', name: 'rmrk', align: 'left', minWidth: 50, },
       ];
 
       this.setGridColumn({

components/pages/ems/EccInfo/EccIaoTab.vue

@@ -98,17 +98,19 @@ export default {
 	watch: {
 		selectedObjId(val) {
 			if (val === 'TAG') {
-				this.detailList[1].class = 'd-none ';
+				this.detailList[1].class = 'd-none';
-				this.detailList[2].class = 'd-block pl-4 mt-2';
+				this.detailList[2].class = 'd-block pl-4';
 				this.detailList[3].class = 'd-block';
-				this.detailList[4].class = 'pl-4 mt-2';
 			} else {
 				// }else if(val==="READ_PLC"){
-				this.detailList[4].class = 'pl-4 mt-2';
 				this.detailList[3].class = 'd-block';
 				this.detailList[2].class = 'd-none';
-				this.detailList[1].class = 'd-block pl-4 mt-1 pb-0';
+				this.detailList[1].class = 'd-block pl-4';
 			}
+			this.detailList[4].class = 'pl-4 mt-2';
+			
+			console.log(val)
+			console.log(this.detailList)
 		},
 	},
 	created() {},
@@ -378,7 +380,7 @@ const myDetail = [
 		label: '대상 유형',
 		disabled: false,
 		cols: 6,
-		class: 'pr-4 py-2 mt-1',
+		class: 'pr-4 py-2',
 		list: 'emMapDivList',
 		valueNm: 'objKind',
 		itemText: 'commCdNm',

pages/comm/auth/UserRoleMngPage.vue

@@ -912,6 +912,17 @@ const myColumns = [
 ];
 
 const unAsgnRoleByUserColumns = [
+	{
+		header: '',
+		name: '',
+		align: 'center',
+		width: 50,
+		formatter: (props) => {
+			return `<label class="custom-radio">
+						<span class="radio-mark"></span>
+					</label>`;
+		}
+	},	
 	{ header: '역할ID', name: 'roleId', align: 'left' },
 	{ header: '역할명', name: 'roleNm' },
 	{ header: '적용시작일', name: 'aplyStartDt', hidden: true },
@@ -921,7 +932,8 @@ const unAsgnRoleByUserColumns = [
 ];
 
 const asgnRoleByUserColumns = [
-	{ header: '역할ID', name: 'roleId', align: 'left' },
+	
+	{ header: '역할ID', name: 'roleId', align: 'center' },
 	{ header: '역할명', name: 'roleNm' },
 	{
 		header: '적용시작일',
@@ -935,17 +947,6 @@ const asgnRoleByUserColumns = [
 ];
 
 const asgnMenuByUserColumns = [
-	{
-		header: '',
-		name: '',
-		align: 'center',
-		width: 50,
-		formatter: (props) => {
-			return `<label class="custom-radio">
-						<span class="radio-mark"></span>
-					</label>`;
-		}
-	},	
 	{ header: '메뉴명', name: 'menuNm' }];
 
 const myDetail = blocCdList => {

pages/comm/base/NoticeMngPage.vue

@@ -60,9 +60,13 @@
 						<v-card-title class="custom-title-7 pa-0">
 							파일목록
 						</v-card-title>
-						<div v-for="fileData in viewActionData.fileData" :key="fileData.apndFileId" class="file-item" style="background-color: unset;">
+						<div v-for="fileData in viewActionData.fileData" 
-							<a @click.prevent="downloadFile(fileData)">
+							:key="fileData.apndFileId" 
-								<div class="d-flex justify-start search-box-label">
+							:class="['file-item', isDarkMode?'dark':'light']"
+							style="background-color: unset;"
+						>
+							<a @click.prevent="downloadFile(fileData)" class="pa-0">
+								<div class="d-flex justify-start search-box-label mb-0">
 									<v-icon>mdi-paperclip</v-icon>
 									<span class="file-item-name ml-2">{{ fileData.apndFileNm + '.' +
 										fileData.apndFileExt }}</span>
@@ -96,7 +100,8 @@
 							<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
 							<div class="" v-if="writeActionData.fileData">
 								<div v-for="(fileData, index) in writeActionData.fileData" :key="fileData.apndFileId"
-									class="file-item d-flex justify-space-between">
+									:class="['file-item d-flex justify-space-between', isDarkMode?'dark':'light']"
+								>
 									<div class="file-item-detail">
 										<v-icon>mdi-paperclip</v-icon>
 										<span href="#" class="file-item-name">{{ fileData.name }}</span>
@@ -144,7 +149,8 @@
 						<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
 						<div class="" v-if="replyActionData.fileData">
 							<div v-for="(fileData, index) in replyActionData.fileData" :key="fileData.apndFileId"
-								class="file-item d-flex justify-space-between">
+								:class="['file-item d-flex justify-space-between', isDarkMode?'dark':'light']"
+							>
 								<div class="file-item-detail">
 									<v-icon>mdi-paperclip</v-icon>
 									<span href="#" class="file-item-name">{{ fileData.name }}</span>
@@ -173,7 +179,7 @@
 		</div>
 		<!-- 답글 작성 페이지 끝 -->
 		<!-- 수정 페이지 시작 -->
-		<div v-if="pageActionFlag == 'update'">
+		<div v-if="pageActionFlag == 'update'" class="update">
 			<v-card>
 				<div class="pa-5">
 					<v-row align="center" no-gutters>
@@ -195,7 +201,8 @@
 							<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
 							<div class="" v-if="updateActionData.fileData">
 								<div v-for="(fileData, index) in updateActionData.fileData" :key="fileData.apndFileId"
-									class="file-item d-flex justify-space-between">
+									:class="['file-item d-flex justify-space-between', isDarkMode?'dark':'light']"
+								>
 									<div class="file-item-detail">
 										<v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
 										<span href="#" class="file-item-name">{{ fileData.name }}</span>
@@ -204,9 +211,11 @@
 										@click="updateActionData.fileData.splice(index, 1)" />
 								</div>
 							</div>
-							<div class="" v-if="updateActionData.currentFileList">
+							<div class="current-files" v-if="updateActionData.currentFileList">
 								<div v-for="(fileData, index) in updateActionData.currentFileList"
-									:key="fileData.apndFileId" class="file-item d-flex justify-space-between">
+									:key="fileData.apndFileId"
+									:class="['file-item d-flex justify-space-between', isDarkMode?'dark':'light']"
+								>
 									<div class="file-item-detail">
 										<v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
 										<span @click.prevent="downloadFile(fileData)" href="#"
@@ -1050,17 +1059,6 @@ const defaultData = {
 	cursor: pointer;
 }
 
-.file-item {
-	width: auto;
-	margin: 2px 0;
-	padding: 4px;
-	background-color: #0000000A;
-
-	.file-item-name {
-		color: #1677FF;
-	}
-}
-
 ::v-deep {
 	.v-input__slot {
 		padding-left: 8px;
@@ -1084,17 +1082,46 @@ const defaultData = {
 		font-size: 1.0rem !important;
 	}
 
-	.toastui-editor-mode-switch .tab-item.active {
-		color: #1677FF
-	}
-
-	.toastui-editor-light .toastui-editor-mode-switch .tab-item {
-		color: #000000E0
-	}
-
 	.v-icon.anticon-delete svg {
 		width: 14px;
 		height: 14px;
 	}
 }
+
+@each $theme in dark, light {
+	@include theme($theme);
+	
+	::v-deep {
+		.toastui-editor-#{$theme} {
+			.toastui-editor-mode-switch {
+				>.tab-item {
+					border: none;
+					background-color: transparent;
+					color: map-deep-get($config, #{$theme}, "card-title-color") !important;
+	
+					&.active {
+						color: map-deep-get($config, #{$theme}, "card-text-info-color") !important;
+						border-top: 1px solid map-deep-get($config, #{$theme}, "card-text-info-color");
+					}
+
+				}
+			}
+	
+		}
+	}
+
+	.file-item {
+		&.#{$theme} {
+			width: auto;
+			margin: 2px 0;
+			padding: 4px;
+			background-color: map-deep-get($config, #{$theme}, "v-calendar-day-in-not-month-color");
+
+			.file-item-name {
+				color: map-deep-get($config, #{$theme}, "card-text-info-color");
+			}
+
+		}
+	}
+}
 </style>