From bf6d03df63dd5918cb047307c6fb8a1185257a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tran=20Van=20Dung/=28Tran=20Van=20Dung=29/=ED=98=84?= =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074470@skcc.com> Date: Tue, 5 Aug 2025 17:28:12 +0700 Subject: [PATCH] fixbugs grid --- assets/scss/common.scss | 207 ++++-------------- assets/scss/common/grid.scss | 13 +- assets/scss/var.scss | 7 +- components/common/Grid.vue | 65 +++--- components/common/form/SelectBox.vue | 4 +- components/common/modal/EqpmSelectPop.vue | 27 ++- components/common/select/SelectBlocMstr.vue | 4 +- components/common/select/SelectBox.vue | 10 +- components/common/select/SelectBoxMulti.vue | 23 +- components/common/select/selectCodeList.vue | 4 +- .../ems/DataSetInfo/DataSetTagRelTab.vue | 2 +- .../pages/ems/EqpmInfo/EqpmAddInfoTab.vue | 6 +- pages/ems/effc/DataSetMngPage.vue | 4 +- pages/ems/effc/EnrgReptMngPage.vue | 30 ++- 14 files changed, 169 insertions(+), 237 deletions(-) diff --git a/assets/scss/common.scss b/assets/scss/common.scss index f3d3a69..3c6f2d4 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -611,48 +611,12 @@ a { } } - // .v-banner { - // &__wrapper { - // border-bottom-color: map-deep-get($config, - // #{$theme}, - // "v-banner-border-color" - // ) !important; - // } - // } - .v-navigation-drawer__append { >p { color: map-deep-get($config, #{$theme}, "v-banner-border-color" ) !important; - // @if $theme ==dark { - // color: rgba(255, 255, 255, 0.6); - // } - - // @else { - // color: #999; - // } } } - // .v-footer { - // @if $theme ==light { - // background-color: #dfdfe5; - // color: #767d83; - // } - // } - - // .bd { - // @if $theme ==dark { - // &-r-1 { - // border-right: 1px #373f45 solid; - // } - // } - // @else { - // &-r-1 { - // border-right: 1px #efefef solid; - // } - // } - // } - .border-bottom-1 { border-bottom: 1px solid map-deep-get($config, #{$theme}, "border-color"); } @@ -809,114 +773,7 @@ a { } } - - } - - // &>.v-treeview-node__root { - // &:before { - // background-color: map-deep-get($config, #{$theme}, "v-treeview-node-root-backgroundColor" ); - // } - - // &>.v-treeview-node__content { - // .v-treeview-node__label { - // color: map-deep-get($config, #{$theme}, "v-treeview-node-root-label-color"); - // } - // } - - // &:hover { - // &>.v-treeview-node__content { - // .v-treeview-node__label { - // color: map-deep-get($config, - // #{$theme}, - // "v-treeview-node-root-label-active-color" - // ); - // } - - // .v-icon { - // color: map-deep-get($config, - // #{$theme}, - // "v-treeview-node-root-icon-active-color" - // ); - // } - // } - // } - // } - - // &>.v-treeview-node__children { - // &>.v-treeview-node { - - // &>.v-treeview-node__root { - // &:before { - // background-color: map-deep-get($config, - // #{$theme}, - // "v-treeview-node-subroot-backgroundColor" - // ); - // } - - // &>.v-treeview-node__content { - // .v-treeview-node__label { - // color: map-deep-get($config, #{$theme}, "v-treeview-node-label-color" ); - // } - - // .v-icon { - // color: map-deep-get($config, #{$theme}, "v-treeview-icon-color" ); - // } - // } - - // &:not(.v-treeview-node--active):hover { - // &:before { - // background-color: map-deep-get($config, - // #{$theme}, - // "v-treeview-leaf-active-backgroundColor" - // ); - // } - - // &>.v-treeview-node__content { - // .v-treeview-node__label { - // color: map-deep-get($config, - // #{$theme}, - // "v-treeview-leaf-active-color" - // ); - // } - - // .v-icon { - // color: map-deep-get($config, - // #{$theme}, - // "v-treeview-leaf-active-color" - // ); - // } - // } - // } - // } - - // &>.v-treeview-node__children { - // // background-color: map-deep-get($config, - // // #{$theme}, - // // "v-treeview-leaf-subchildren-backgroundColor" - // // ); - // } - - // // &[aria-expanded="true"] { - // // & .v-treeview-node__root>.v-treeview-node__content { - // // .v-treeview-node__label { - // // color: map-deep-get($config, - // // #{$theme}, - // // "v-treeview-node-label-children-color" - // // ); - // // } - - // // .v-icon { - // // color: map-deep-get($config, - // // #{$theme}, - // // "v-treeview-icon-active-color" - // // ); - // // } - // // } - // // } - // } - // } - } } @@ -1259,26 +1116,47 @@ a { } .v-list { - background-color: map-deep-get($config, - #{$theme}, - "tui-datepicker-backgroundColor" - ); - border: 1px solid map-deep-get($config, #{$theme}, "tui-datepicker-border-color"); - border-radius: 4px; + background-color: map-deep-get($config, + #{$theme}, + "tui-datepicker-backgroundColor" + ); + border: 1px solid map-deep-get($config, #{$theme}, "tui-datepicker-border-color"); + border-radius: 4px; + padding: 4px; + + &-item--active { + border-radius: 4px; + &:before { + opacity: 0; + } + + .v-list-item__title { + color: map-deep-get($config, #{$theme}, "tui-datepicker-calendar-color"); + } + } + + &.v-select-list{ + >.v-list-item { + margin-bottom: 4px; + .anticon { + &.anticon-check { + display: none; + } + } + &[aria-selected="true"] { + border-radius: 8px; + background-color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-bg"); + .anticon { + &.anticon-check { + display: block; + color: map-deep-get($config, #{$theme}, "v-icon-blue"); + } + } + } + } + } - &-item--active { - &:before { - opacity: 0; - } - - .v-list-item__title { - color: map-deep-get($config, - #{$theme}, - "tui-datepicker-calendar-color" - ); - } - } - } + } .theme--white { .toastui-editor-contents { @@ -1396,11 +1274,6 @@ a { } } - - - - - } diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss index 39ee11e..d7a0349 100644 --- a/assets/scss/common/grid.scss +++ b/assets/scss/common/grid.scss @@ -155,6 +155,12 @@ // "tui-grid-cell-borderColor" // ); width: auto !important; + .tui-grid-table-container{ + width: 100% !important; + .tui-grid-table { + width: 100% !important; + } + } } &-container, @@ -164,6 +170,7 @@ & ::-webkit-scrollbar { width: $scrollbar-width !important; + width: 0 !important; height: $scrollbar-width !important; -webkit-appearance: initial; // background-color: map-deep-get($config, @@ -183,7 +190,7 @@ } & ::-webkit-scrollbar-thumb { - width: 50px !important; + // width: 50px !important; height: 50px !important; background-color: map-deep-get($config, #{$theme}, "scrollbar-thumb"); // background-color: rgba(0, 0, 0, 0); @@ -356,6 +363,10 @@ #{$theme}, "tui-grid-cell-backgroundColor" ); + width: 100% !important; + .tui-grid-table { + width: 100% !important; + } } &-row-odd, diff --git a/assets/scss/var.scss b/assets/scss/var.scss index 8357c06..b4b3846 100644 --- a/assets/scss/var.scss +++ b/assets/scss/var.scss @@ -110,7 +110,7 @@ $config: ( tui-grid-border-horziontal-color: #212224, tui-grid-border-vertical-color: #FFFFFF0F, tui-grid-cell-backgroundColor: #212224, - tui-grid-cell-color: #fff, + tui-grid-cell-color: #FFFFFFA6, tui-grid-cell-insert-color: #13636c, tui-grid-cell-selected-color: #0A224F, tui-grid-cell-modify-color: #13636c, @@ -211,7 +211,6 @@ $config: ( router-tab-item-hover-color: #1677ff, router-tab-slot-end-button-backgroundColor: #3f4d7d, v-btn-backgroundColor: #1677ff, - // v-btn-backgroundColor: #fff, v-box: #FFFFFF, v-banner-border-color: #ddd, v-treeview-node-root-backgroundColor: #FFFFFF, @@ -253,10 +252,10 @@ $config: ( tui-grid-border-vertical-color: rgba(0, 0, 0, 0.06), //#d4d4d4, tui-grid-cell-backgroundColor: #fff, tui-grid-cell-color: #000000E0, - tui-grid-cell-insert-color: #13636c, + tui-grid-cell-insert-color: #FFFBE6, tui-grid-cell-selected-color: #E6F4FF, tui-grid-cell-modify-color: #e6f5f7, - tui-grid-cell-removed-color: #fddde1, + tui-grid-cell-removed-color: #FFF1F0, tui-grid-cell-hover-backgroundColor: #f5f5f5, v-tabs-items-border-color: #0000000F, v-tabs-backgroundColor: #ddd, diff --git a/components/common/Grid.vue b/components/common/Grid.vue index 1641bd4..b61f1ef 100644 --- a/components/common/Grid.vue +++ b/components/common/Grid.vue @@ -617,62 +617,62 @@ export default { list.map(item => this.gridInstance.invoke('check', item)); }, refreshLayout() { + // console.log("---------DEBUG---refreshLayout: "); this.gridInstance.invoke('refreshLayout'); }, refreshGrid(){ + console.log("---------DEBUG---refreshGrid: "); // console.log("refreshLayout",this.$refs['tuigrid' + this.gridName]) var store = this.$refs['tuigrid' + this.gridName].gridInstance.store; var containerEl = this.$refs['tuigrid' + this.gridName].$el; // var containerEl = document.querySelector('.tui-grid-container') var parentEl = containerEl.parentElement; - - - - // console.log("containerEl : ",containerEl); - // console.log('parentEl : ', parentEl) - // function refreshLayout(store, containerEl, parentEl) { - var dimension = store.dimension; - var autoWidth = dimension.autoWidth, fitToParentHeight = dimension.fitToParentHeight; - var clientHeight = containerEl.clientHeight, clientWidth = containerEl.clientWidth, scrollTop = containerEl.scrollTop, scrollLeft = containerEl.scrollLeft; - var _a = containerEl.getBoundingClientRect(), top = _a.top, left = _a.left; - this.setOffsetTop(store, top + scrollTop); - // store.dimension.setOffsetTop = top + scrollTop; - this.setOffsetLeft(store, left + scrollLeft); - // store.dimension.headerHeight = left + scrollLeft; - this.setWidth(store, clientWidth, autoWidth); - // store.dimension.autoWidth = autoWidth; - // store.dimension.width = clientWidth; - // console.log("###",getComputedStyle(parentEl)); - // console.log("fitToParentHeight : ",fitToParentHeight); - // console.log("parentEl : ",parentEl) - // console.log("parentEl.clientHeight" , parentEl.clientHeight) - // console.log("clientHeight : ",clientHeight); - if (parentEl && parentEl.clientHeight !== clientHeight) { - var _b = getComputedStyle(parentEl), paddingTop = _b.paddingTop, paddingBottom = _b.paddingBottom; - this.setHeight(store, parentEl.clientHeight - (parseFloat(paddingTop) + parseFloat(paddingBottom))); - } + + // console.log("---------DEBUG---containerEl: ",containerEl); + // console.log('---------DEBUG---parentEl: ', parentEl) + // function refreshLayout(store, containerEl, parentEl) { + var dimension = store.dimension; + var autoWidth = dimension.autoWidth, fitToParentHeight = dimension.fitToParentHeight; + var clientHeight = containerEl.clientHeight, clientWidth = containerEl.clientWidth, scrollTop = containerEl.scrollTop, scrollLeft = containerEl.scrollLeft; + var _a = containerEl.getBoundingClientRect(), top = _a.top, left = _a.left; + this.setOffsetTop(store, top + scrollTop); + // store.dimension.setOffsetTop = top + scrollTop; + this.setOffsetLeft(store, left + scrollLeft); + // store.dimension.headerHeight = left + scrollLeft; + this.setWidth(store, clientWidth, autoWidth); + // store.dimension.autoWidth = autoWidth; + // store.dimension.width = clientWidth; + // console.log("###",getComputedStyle(parentEl)); + // console.log("fitToParentHeight : ",fitToParentHeight); + // console.log("parentEl : ",parentEl) + // console.log("parentEl.clientHeight" , parentEl.clientHeight) + // console.log("clientHeight : ",clientHeight); + if (parentEl && parentEl.clientHeight !== clientHeight) { + var _b = getComputedStyle(parentEl), paddingTop = _b.paddingTop, paddingBottom = _b.paddingBottom; + this.setHeight(store, parentEl.clientHeight - (parseFloat(paddingTop) + parseFloat(paddingBottom))); + } // } }, setOffsetTop(store, offsetTop) { - // console.log("setOffsetTop"); + // console.log("---------DEBUG---setOffsetTop: "); store.dimension.offsetTop = offsetTop; }, setWidth(_a, width, autoWidth) { - // console.log("setWidth"); + // console.log("---------DEBUG---setWidth: "); var dimension = _a.dimension; dimension.autoWidth = autoWidth; dimension.width = width; }, setHeaderHeight(store, height) { - // console.log("setHeaderHeight") + // console.log("---------DEBUG---setHeaderHeight: "); store.dimension.headerHeight = height; }, setOffsetLeft(store, offsetLeft) { - // console.log("setOffsetLeft") + // console.log("---------DEBUG---setOffsetLeft: "); store.dimension.offsetLeft = offsetLeft; }, setHeight(_a,height){ - // console.log("setHeight"); + // console.log("---------DEBUG---setHeight: "); var dimension = _a.dimension; var headerHeight = dimension.headerHeight, summaryHeight = dimension.summaryHeight, tableBorderWidth = dimension.tableBorderWidth; dimension.bodyHeight = height - headerHeight - summaryHeight - tableBorderWidth; @@ -703,10 +703,11 @@ export default { // resetData() { // // console.log("resetData = ", this.tuigridProps.data); // this.$refs.tuigrid.invoke("resetData", this.tuigridProps.data); - // } + // }, }, }; + + diff --git a/components/common/select/selectCodeList.vue b/components/common/select/selectCodeList.vue index eb62857..f2cb7ab 100644 --- a/components/common/select/selectCodeList.vue +++ b/components/common/select/selectCodeList.vue @@ -11,7 +11,9 @@ + :class="['v-select__custom', customClass]" + :menu-props="{ top: false, offsetY: true }" + > diff --git a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue index 94c86db..e5c4fa6 100644 --- a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue +++ b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue @@ -1,7 +1,7 @@