Merge pull request 'fix bug 07/08/25' (#44) from dev-manhph1-figbug into dev

Reviewed-on: #44

components/common/Grid.vue

@@ -272,9 +272,7 @@ export default {
 			this.handleSelectedRow(evt);
 		},
 		focusChangeEvt(e) {
-			if(e.rowKey === 0) {
+			this.handleSelectedRow(e);	
-				this.handleSelectedRow(e);	
-			}
 		},
 		handleSelectedRow(e) {
 			// console.log('focusChangeEvt1...')

pages/comm/auth/MenuRoleMngPage.vue

@@ -32,15 +32,18 @@
 					</div>
 				</v-card>
 			</v-col>
-			<v-col cols="12" lg="9">
+			<v-col cols="12" lg="9" class="pl-0">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">역할 메뉴별 권한</span>
 					</v-card-title>
 					<v-row align="center" no-gutters :style="{ height: 'calc(100% - 62px)' }" class="px-5">
 						<v-col class="h100" style="max-width: 400px;">
-							<span class="body-1 font-weight-bold d-flex align-center"
+							<v-card-title class="pl-0 pb-3">
-								:style="{ minHeight: '36px' }">[미배정]메뉴리스트</span>
+								<span class="custom-title-4">[미배정]메뉴리스트</span>
+							</v-card-title>
+							<!-- <span class="body-1 font-weight-bold d-flex align-center"
+								:style="{ minHeight: '36px' }">[미배정]메뉴리스트</span> -->
 							<div ref="treeGridParent" class="px-0 mt-2" style="height: 60vh;">
 								<!-- <div
 									ref="treeGridParent"
@@ -55,15 +58,18 @@
 							<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
 								:btnActionsFnc="dualGridBtnActions" />
 						</v-col> -->
-						<div class="pr-2">
+						<div class="pr-2 arrow-button">
 							<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
-								:btnActionsFnc="dualGridBtnActions" />
+								:btnActionsFnc="dualGridBtnActions"/>
 						</div>
 						<v-col :cols="7" class="h100">
-							<v-row justify="space-between" align="center" no-gutters class="px-5">
+							<v-row justify="space-between" align="center" no-gutters class="px-5 pl-0">
 								<v-col :cols="11">
-									<span class="body-1 font-weight-bold d-flex align-center"
+									<v-card-title class="pl-0 pb-3">
-										:style="{ minHeight: '36px' }">[배정]메뉴별권한 리스트</span>
+										<span class="custom-title-4">[배정]메뉴별권한 리스트</span>
+									</v-card-title>
+									<!-- <span class="body-1 font-weight-bold d-flex align-center"
+										:style="{ minHeight: '36px' }">[배정]메뉴별권한 리스트</span> -->
 									<!-- <span class="body-1 font-weight-bold">[배정]메뉴별권한 리스트</span> -->
 								</v-col>
 								<v-col :cols="1" class="text-right">
@@ -344,8 +350,8 @@ export default {
 			const _this = this;
 
 			const myColumns = [
-				{ header: '역할ID', name: 'roleId', align: 'left', minWidth: 70,width:120 },
+				{ header: '역할ID', name: 'roleId', align: 'left', minWidth: 70, width: 120 },
-				{ header: '역할명', name: 'roleNm', minWidth: 70, align: 'left',width:120 },
+				{ header: '역할명', name: 'roleNm', minWidth: 70, align: 'left', width: 120 },
 				{
 					header: '사용여부',
 					name: 'useFg',
@@ -805,4 +811,23 @@ function numberFormatter({ value }) {
 		return value;
 	}
 }
+
 </script>
+
+
+<style lang="scss" scoped>
+::v-deep {
+	.arrow-button button {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 24px;
+		height: 24px;
+	}
+
+	.arrow-button svg {
+		width: 14px;
+		height: 14px;
+	}
+}
+</style>

pages/comm/base/NoticeMngPage.vue

@@ -46,19 +46,21 @@
 								icon="delete">삭제</a-button>
 						</div>
 					</v-col>
-					<v-col :cols="12" class="mt-5">
+					<v-col :cols="12" class="mt-5 pb-4">
 						<v-card-title class="custom-title-6 pa-0">{{ viewActionData.title }}</v-card-title>
 					</v-col>
-					<v-col :cols="12" style="min-height: 30vh;" class="pa-0">
+					<v-col :cols="12" style="min-height: 30vh;" class="pa-0 custom-view">
-						<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
+						<v-card class="pa-3" style="overflow-y:auto;">
-							:initialValue="viewActionData.content" theme="white"
+							<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
-							:class="[isDarkMode ? 'theme--white' : 'theme--black', 'custom-view pa-3']" />
+								:initialValue="viewActionData.content" theme="white"
+								:class="[isDarkMode ? 'theme--white' : 'theme--black']" />
+						</v-card>
 					</v-col>
 					<v-col :cols="6" class="mt-5">
 						<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">
+						<div v-for="fileData in viewActionData.fileData" :key="fileData.apndFileId" class="file-item" style="background-color: unset;">
 							<a @click.prevent="downloadFile(fileData)">
 								<div class="d-flex justify-start search-box-label">
 									<v-icon>mdi-paperclip</v-icon>
@@ -187,13 +189,26 @@
 								<div v-for="(fileData, index) in updateActionData.fileData" :key="fileData.apndFileId"
 									class="file-item d-flex justify-space-between">
 									<div class="file-item-detail">
-										<v-icon>mdi-paperclip</v-icon>
+										<v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
 										<span href="#" class="file-item-name">{{ fileData.name }}</span>
 									</div>
 									<a-icon type="delete" class="v-icon pointer"
 										@click="updateActionData.fileData.splice(index, 1)" />
 								</div>
 							</div>
+							<div class="" v-if="updateActionData.currentFileList">
+								<div v-for="(fileData, index) in updateActionData.currentFileList"
+									:key="fileData.apndFileId" class="file-item d-flex justify-space-between">
+									<div class="file-item-detail">
+										<v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
+										<span @click.prevent="downloadFile(fileData)" href="#"
+											class="file-item-name pointer">{{ fileData.apndFileNm + '.' +
+												fileData.apndFileExt }}</span>
+									</div>
+									<a-icon type="delete" class="v-icon pointer"
+										@click="addFileToDeleteFileList(fileData)" />
+								</div>
+							</div>
 							<a-button class="mt-2" icon="upload" @click="$refs.updateInputFile.$refs.input.click()">
 								업로드
 							</a-button>
@@ -1044,7 +1059,7 @@ const defaultData = {
 	.custom-view {
 		border: 1px solid;
 		border-radius: 6px;
-		height: 100%;
+		height: 0;
 
 		@each $theme in dark, light {
 			@include theme($theme);
@@ -1065,5 +1080,10 @@ const defaultData = {
 	.toastui-editor-mode-switch .tab-item {
 		color: #000000E0
 	}
+
+	.v-icon.anticon-delete svg {
+		width: 14px;
+		height: 14px;
+	}
 }
 </style>

pages/comm/base/PrgmMngPage.vue

@@ -103,21 +103,6 @@ export default {
 			gridName: 'rowGrid',
 			// rowGridOrigin: [],
 			detailList: myDetail,
-
-			dataPathMock: {
-				'rowGrid': {
-					column: [
-						{ header: '프로그램ID', name: 'field1', align: 'left' },
-						{ header: '프로그램덤', name: 'field2', align: 'left' },
-						{ header: '타임', name: 'field3', align: 'left' },
-						{ header: '사용여부', name: 'field4', align: 'left' }
-					],
-					option: {
-						scrollY: false,
-						scrollX: false,
-					}
-				}
-			},
 		};
 	},
 	computed: {
@@ -189,17 +174,17 @@ export default {
 			const gridHeight = this.$refs.gridParent.offsetHeight - 36;
 
 			const myOptions = {
-				scrollX: false,
+				scrollY: true,
 			};
 			// console.log("this.pageData", this.pageData)
 			const _this = this;
 			const myColumns = [
-				{ header: '프로그램ID', name: 'prgmId', align: 'center' },
+				{ header: '프로그램ID', name: 'prgmId', align: 'left' },
-				{ header: '프로그램명', name: 'prgmNm' },
+				{ header: '프로그램명', name: 'prgmNm', align: 'left' },
 				{
 					header: '타입',
 					name: 'prgmTpCd',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						return value ? (value === '1' ? '프로그램' : '팝업') : null;
 					},
@@ -207,7 +192,7 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.selectUseFgList.filter(