gitadmin/sk_fems_ui
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix bug grid + buttons' (#66) from dev-dungtv-0814 into dev

Browse Source 
Reviewed-on: #66
lgtm
This commit is contained in:
dev
2025-08-14 15:54:22 +09:00
parent 1a5ec4c6a3 c810139554
commit ed9150aae8
6 changed files with 68 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
assets/scss/common/button.scss
View File

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

11
assets/scss/common/grid.scss
View File

@ -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,
#{$theme},
"tui-grid-cell-insert-color"
);
background: transparent;
// background:map-deep-get($config,
// #{$theme},
// "tui-grid-cell-insert-color"
// );
}
}
}

2
assets/scss/var.scss
View File

@ -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,

2
components/common/modal/EqpmSelectPop.vue
View File

@ -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>

4
components/pages/ems/DataSetInfo/DataSetTagRelTab.vue
View File

@ -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({

83
pages/comm/base/NoticeMngPage.vue
View File

@ -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;">
<a @click.prevent="downloadFile(fileData)">
<div class="d-flex justify-start search-box-label">
<div v-for="fileData in viewActionData.fileData"
:key="fileData.apndFileId"
: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>