[Draf] compare dev vs main #43

Open
dev wants to merge 298 commits from dev into dev-base
248 changed files with 40896 additions and 30573 deletions
Showing only changes of commit f633eb413a - Show all commits

View File

@ -173,8 +173,9 @@ export default {
this.gridScrollTop = e.target.scrollTop;
this.gridScrollLeft = e.target.scrollLeft;
});
if (!(this.scrollBody.scrollHeight > this.scrollBody.clientHeight)) {
if (this.scrollBody.scrollHeight > this.scrollBody.clientHeight) {
this.gridInstance.$el.getElementsByClassName('tui-grid-content-area')[0].classList.remove('tui-grid-no-scroll-y');
} else {
this.gridInstance.$el.getElementsByClassName('tui-grid-content-area')[0].classList.add('tui-grid-no-scroll-y');
}
}

View File

@ -509,7 +509,7 @@ export default {
this.loadGrid = false;
const res = await this.postApiReturn({
apiKey: 'selectPostPage',
apiKey: 'selectPostData',
resKey: 'postPage',
sendParam: params,
});

View File

@ -12,7 +12,7 @@
</v-col>
<v-col :cols="3">
<component :is="'EvtObjPop'" :parentPrgmId="myPrgmId" :item="evtObjPopItem"
class="no-gutters" customClass="select-large" />
class="no-gutters" customClass="select-large pa-0" />
</v-col>
<v-col :cols="3">
<!-- 대상일 -->

View File

@ -514,7 +514,7 @@ const INIT_URL_STATE = {
// prgmId: "PRG0003" 공지사항
selectPostList: 'comm/base/NoticeMngCtr/selectPostList',
selectPostPage: 'comm/base/NoticeMngCtr/selectPostPage',
selectPostData: 'comm/base/NoticeMngCtr/selectPostData',
selectPostPageTotal: 'comm/base/NoticeMngCtr/selectPostPageTotal',
deletePostList: 'comm/base/NoticeMngCtr/deletePost',