Fix bugs screen 13, 17, 7 #83

Merged
dev merged 2 commits from dev-trungvq7-0729 into dev 2025-08-20 19:20:56 +09:00
2 changed files with 85 additions and 46 deletions

View File

@ -10,6 +10,14 @@
&-container { &-container {
width: 100%; width: 100%;
border-radius: 10px; border-radius: 10px;
.tui-select-box-input {
p {
font-size: 14px;
font-family: inherit
}
}
} }
&-content-area { &-content-area {
@ -23,6 +31,7 @@
&-no-scroll-y { &-no-scroll-y {
.tui-grid-rside-area { .tui-grid-rside-area {
.tui-grid-header-area, .tui-grid-header-area,
.tui-grid-summary-area { .tui-grid-summary-area {
margin-right: 0 !important; margin-right: 0 !important;
@ -150,6 +159,15 @@
.tui-select-box-input { .tui-select-box-input {
border-radius: 6px; border-radius: 6px;
.tui-select-box-icon {
width: 14px;
height: 14px;
background-repeat: no-repeat;
background-size: contain;
margin-top: -20px;
}
} }
.tui-select-box-dropdown { .tui-select-box-dropdown {
@ -158,7 +176,9 @@
padding: 4px; padding: 4px;
box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.2), 0px 0px 0px 0px rgba(0, 0, 0, 0.14), 0px 0px 0px 0px rgba(0, 0, 0, 0.12); box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.2), 0px 0px 0px 0px rgba(0, 0, 0, 0.14), 0px 0px 0px 0px rgba(0, 0, 0, 0.12);
.tui-select-box-item { .tui-select-box-item {
font-size: 14px;
margin-bottom: 4px; margin-bottom: 4px;
position: relative; position: relative;
@ -204,44 +224,6 @@
@include theme($theme); @include theme($theme);
.v-application.#{$theme}-mode { .v-application.#{$theme}-mode {
.enrg-effc {
.tui-grid-rside-area {
.tui-grid-table {
tr {
td:nth-child(4),
td:nth-child(10) {
.tui-grid-cell-content {
color: map-deep-get($config,
#{$theme},
"router-tab-item-active-color"
);
}
}
}
.tui-grid {
&-row-odd,
&-row-even {
&:hover {
>td:nth-child(4),
td:nth-child(10) {
.tui-grid-cell-content {
color: map-deep-get($config,
#{$theme},
"router-tab-item-active-color"
);
}
}
}
}
}
}
}
}
.tui-grid-content-area { .tui-grid-content-area {
.tui-grid-header-area { .tui-grid-header-area {
height: auto !important; height: auto !important;
@ -715,7 +697,7 @@
} }
&-tree-button-expand { &-tree-button-expand {
z-index: 9999; z-index: 7;
.tui-grid-btn-tree { .tui-grid-btn-tree {
i { i {
@ -735,7 +717,7 @@
} }
&-tree-button-collapse { &-tree-button-collapse {
z-index: 9999; z-index: 7;
.tui-grid-btn-tree { .tui-grid-btn-tree {
i { i {
@ -862,6 +844,17 @@
"tui-grid-cell-color" "tui-grid-cell-color"
); );
.tui-select-box-icon {
@if $theme ==dark {
background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2217%22%20height%3D%2216%22%20viewBox%3D%220%200%2017%2016%22%20fill%3D%22none%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%3E%3Cpath%20fill%3D%22rgba(255%2C%20255%2C%20255%2C%200.45)%22%20d%3D%22M1.90728%203.65546L8.20371%2012.3358C8.43228%2012.6501%208.90014%2012.6501%209.12692%2012.3358L15.4251%203.65546C15.4406%203.63411%2015.4499%203.60889%2015.452%203.58259C15.454%203.55628%2015.4487%203.52993%2015.4367%203.50644C15.4247%203.48296%2015.4064%203.46326%2015.3839%203.44954C15.3613%203.43581%2015.3354%203.42859%2015.3091%203.42868H13.9698C13.8787%203.42868%2013.793%203.47332%2013.7394%203.54653L8.66621%2010.5394L3.593%203.54653C3.53942%203.47332%203.45371%203.42868%203.36264%203.42868H2.02335C1.90728%203.42868%201.83943%203.56082%201.90728%203.65546Z%22/%3E%3C/svg%3E");
}
@else {
background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2217%22%20height%3D%2216%22%20viewBox%3D%220%200%2017%2016%22%20fill%3D%22none%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%3E%3Cpath%20fill%3D%22rgba(0%2C%200%2C%200%2C%200.45)%22%20d%3D%22M1.90728%203.65546L8.20371%2012.3358C8.43228%2012.6501%208.90014%2012.6501%209.12692%2012.3358L15.4251%203.65546C15.4406%203.63411%2015.4499%203.60889%2015.452%203.58259C15.454%203.55628%2015.4487%203.52993%2015.4367%203.50644C15.4247%203.48296%2015.4064%203.46326%2015.3839%203.44954C15.3613%203.43581%2015.3354%203.42859%2015.3091%203.42868H13.9698C13.8787%203.42868%2013.793%203.47332%2013.7394%203.54653L8.66621%2010.5394L3.593%203.54653C3.53942%203.47332%203.45371%203.42868%203.36264%203.42868H2.02335C1.90728%203.42868%201.83943%203.56082%201.90728%203.65546Z%22/%3E%3C/svg%3E");
}
}
} }
.tui-select-box-dropdown { .tui-select-box-dropdown {
@ -886,7 +879,8 @@
.tui-select-box-highlight { .tui-select-box-highlight {
background:none !important; background: none !important;
&:before { &:before {
background: map-deep-get($config, background: map-deep-get($config,
#{$theme}, #{$theme},

View File

@ -589,6 +589,39 @@ export default {
}); });
const _this = this; const _this = this;
class CustomButton {
constructor(props) {
const { grid, rowKey, columnInfo } = props;
const gridData = grid.store.data.rawData;
const value = gridData[rowKey][columnInfo.name];
this.disabled = columnInfo.renderer.options.disabled || false;
const elDiv = document.createElement('div');
if (value != null) {
elDiv.innerHTML = `<span>${value}</span>`;
$(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between');
const el2 = document.createElement('button');
$(el2).addClass('edit-btn blue--text');
el2.innerText = '보기';
elDiv.appendChild(el2);
} else {
elDiv.innerHTML = `<span></span>`;
}
this.el = elDiv;
}
getElement() {
return this.el;
}
getValue() {
// return this.el.value;
}
mounted() {
// this.el.focus();
}
}
const myColumns = [ const myColumns = [
{ {
header: 'FAB', header: 'FAB',
@ -633,7 +666,13 @@ export default {
{ {
header: '가이드명', header: '가이드명',
name: 'gdIdxNm', name: 'gdIdxNm',
width: 200, width: 250,
renderer: {
type: CustomButton,
options: {
value: "보기",
}
},
}, },
{ {
header: '주의', header: '주의',
@ -668,6 +707,12 @@ export default {
name: 'ngCnt', name: 'ngCnt',
align: 'right', align: 'right',
width: 80, width: 80,
renderer: {
type: CustomButton,
options: {
value: "보기",
}
},
}, },
]; ];