diff --git a/components/common/Grid.vue b/components/common/Grid.vue index 8eb4417..28a70af 100644 --- a/components/common/Grid.vue +++ b/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...') diff --git a/pages/comm/auth/MenuRoleMngPage.vue b/pages/comm/auth/MenuRoleMngPage.vue index d2fa68b..6c7cdb1 100644 --- a/pages/comm/auth/MenuRoleMngPage.vue +++ b/pages/comm/auth/MenuRoleMngPage.vue @@ -32,15 +32,18 @@ - + 역할 메뉴별 권한 - [미배정]메뉴리스트 + + [미배정]메뉴리스트 + +
-
+
+ :btnActionsFnc="dualGridBtnActions"/>
- + - [배정]메뉴별권한 리스트 + + [배정]메뉴별권한 리스트 + + @@ -344,8 +350,8 @@ export default { const _this = this; const myColumns = [ - { header: '역할ID', name: 'roleId', align: 'left', minWidth: 70,width:120 }, - { header: '역할명', name: 'roleNm', minWidth: 70, align: 'left',width:120 }, + { header: '역할ID', name: 'roleId', align: 'left', minWidth: 70, width: 120 }, + { header: '역할명', name: 'roleNm', minWidth: 70, align: 'left', width: 120 }, { header: '사용여부', name: 'useFg', @@ -805,4 +811,23 @@ function numberFormatter({ value }) { return value; } } + + + + \ No newline at end of file diff --git a/pages/comm/base/NoticeMngPage.vue b/pages/comm/base/NoticeMngPage.vue index cc71731..8e2b837 100644 --- a/pages/comm/base/NoticeMngPage.vue +++ b/pages/comm/base/NoticeMngPage.vue @@ -46,19 +46,21 @@ icon="delete">삭제
- + {{ viewActionData.title }} - - + + + + 파일목록 -
+
mdi-paperclip @@ -187,13 +189,26 @@
- mdi-paperclip + mdi-paperclip {{ fileData.name }}
+
+
+
+ mdi-paperclip + {{ fileData.apndFileNm + '.' + + fileData.apndFileExt }} +
+ +
+
업로드 @@ -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; + } } diff --git a/pages/comm/base/PrgmMngPage.vue b/pages/comm/base/PrgmMngPage.vue index d8a180b..e465f2a 100644 --- a/pages/comm/base/PrgmMngPage.vue +++ b/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: '프로그램명', name: 'prgmNm' }, + { header: '프로그램ID', name: 'prgmId', align: 'left' }, + { 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(