Update screen 13, grid color #64

Merged
dev merged 3 commits from dev-trungvq7-0729 into dev 2025-08-13 19:02:08 +09:00
5 changed files with 80 additions and 25 deletions

View File

@ -62,9 +62,11 @@
} }
} }
.tui-grid-table { .tui-grid-table {
.tui-grid-cell-header, .tui-grid-cell-header,
.tui-grid-cell-has-input .tui-grid-cell-content { .tui-grid-cell-has-input .tui-grid-cell-content {
padding: 8px; padding: 8px;
@ -76,6 +78,14 @@
} }
} }
.tui-grid-cell {
&:last-child {
input[type=checkbox] {
margin-top: 8px;
}
}
}
} }
.treeGrid { .treeGrid {
@ -155,6 +165,7 @@
width: auto !important; width: auto !important;
.tui-grid-table-container { .tui-grid-table-container {
// width: 100% !important; // width: 100% !important;
.tui-grid-table { .tui-grid-table {
// width: 100% !important; // width: 100% !important;
@ -166,6 +177,13 @@
// } // }
} }
} }
.tui-grid-layer-editing {
border-color: map-deep-get($config,
#{$theme},
"tui-grid-border-vertical-color"
);
}
} }
&-summary-area, &-summary-area,
@ -285,6 +303,7 @@
#{$theme}, #{$theme},
"ant-btn-primary-color" "ant-btn-primary-color"
); );
.radio-mark { .radio-mark {
border-color: map-deep-get($config, border-color: map-deep-get($config,
#{$theme}, #{$theme},
@ -294,6 +313,7 @@
#{$theme}, #{$theme},
"arow-line-btn-bg-color" "arow-line-btn-bg-color"
); );
&::after { &::after {
content: ""; content: "";
position: absolute; position: absolute;
@ -311,6 +331,33 @@
} }
} }
} }
.tui-grid-cell-content {
input[type='text'],
input[type='password'] {
border-color: map-deep-get($config,
#{$theme},
"v-input-fieldset-color"
);
background: map-deep-get($config,
#{$theme},
"v-input-backgroundColor"
);
border-radius: 4px;
color: map-deep-get($config,
#{$theme},
"tui-grid-cell-color"
);
}
&.tui-grid-layer-editing {
background:map-deep-get($config,
#{$theme},
"tui-grid-cell-insert-color"
);
}
}
} }
&-cell { &-cell {
@ -395,14 +442,14 @@
background-color: map-deep-get($config, background-color: map-deep-get($config,
#{$theme}, #{$theme},
"tui-grid-cell-insert-color" "tui-grid-cell-insert-color"
); ) !important;
} }
&.row-modify { &.row-modify {
background-color: map-deep-get($config, background-color: map-deep-get($config,
#{$theme}, #{$theme},
"tui-grid-cell-modify-color" "tui-grid-cell-modify-color"
); ) !important;
} }
&.row-removed { &.row-removed {
@ -497,6 +544,7 @@
&-tree-button-expand { &-tree-button-expand {
z-index: 9999; z-index: 9999;
.tui-grid-btn-tree { .tui-grid-btn-tree {
i { i {
width: 16px; width: 16px;
@ -516,6 +564,7 @@
&-tree-button-collapse { &-tree-button-collapse {
z-index: 9999; z-index: 9999;
.tui-grid-btn-tree { .tui-grid-btn-tree {
i { i {
width: 16px; width: 16px;

View File

@ -113,7 +113,7 @@ $config: (
tui-grid-cell-color: #FFFFFFD9, tui-grid-cell-color: #FFFFFFD9,
tui-grid-cell-insert-color: #2B2111, tui-grid-cell-insert-color: #2B2111,
tui-grid-cell-selected-color: #0A224F, tui-grid-cell-selected-color: #0A224F,
tui-grid-cell-modify-color: #13636c, tui-grid-cell-modify-color: #2B2111,
tui-grid-cell-removed-color: #2A1215, tui-grid-cell-removed-color: #2A1215,
tui-grid-cell-disabled-color: rgb(170, 170, 170), tui-grid-cell-disabled-color: rgb(170, 170, 170),
tui-grid-cell-hover-backgroundColor: #2d4571, tui-grid-cell-hover-backgroundColor: #2d4571,
@ -263,7 +263,7 @@ $config: (
tui-grid-cell-color: #000000E0, tui-grid-cell-color: #000000E0,
tui-grid-cell-insert-color: #FFFBE6, tui-grid-cell-insert-color: #FFFBE6,
tui-grid-cell-selected-color: #E6F4FF, tui-grid-cell-selected-color: #E6F4FF,
tui-grid-cell-modify-color: #e6f5f7, tui-grid-cell-modify-color: #FFFBE6,
tui-grid-cell-removed-color: #FFF1F0, tui-grid-cell-removed-color: #FFF1F0,
tui-grid-cell-hover-backgroundColor: #f5f5f5, tui-grid-cell-hover-backgroundColor: #f5f5f5,
v-tabs-items-border-color: #0000000F, v-tabs-items-border-color: #0000000F,

View File

@ -301,7 +301,7 @@ export default {
// console.log('startEditing2...') // console.log('startEditing2...')
if (this.editorGrid && e.rowKey >= 0) { if (this.editorGrid && e.rowKey >= 0) {
this.editorStartKey = e.rowKey; this.editorStartKey = e.rowKey;
this.gridInstance.invoke('startEditing', e.rowKey, e.columnName); this.gridInstance.invoke('startEditing', e.rowKey, e.columnName, 'row-modify');
this.$emit( this.$emit(
'getRowsData', 'getRowsData',
this.gridInstance.invoke('getRow', e.rowKey), this.gridInstance.invoke('getRow', e.rowKey),

View File

@ -238,7 +238,13 @@ export default {
type: Object, type: Object,
require: false, require: false,
default: () => { default: () => {
return {}; return {
selectTimeValue1: "00 : 00", // selectBoxTime에 필요한 prop
selectTimeValueList1: [], // selectBoxTime에 필요한 prop
selectTimeValue2: "01 : 00", // selectBoxTime에 필요한 prop
selectTimeValueList2: [], // selectBoxTime에 필요한 prop
minInterval: 10,
};
}, },
}, },
}, },

View File

@ -20,7 +20,7 @@
item-value="value" item-value="value"
solo solo
outlined outlined
:menu-props="{ auto: true, offsetY: true }" :menu-props="{ top: false, offsetY: true }"
:hide-details="true" :hide-details="true"
:class="['v-select__custom', customClass]" :class="['v-select__custom', customClass]"
:disabled="disabled" :disabled="disabled"