From 439079eee8e469bcf6e326d9b1c314c487697eeb Mon Sep 17 00:00:00 2001 From: Michael <20074391@skcc.com> Date: Thu, 7 Aug 2025 12:49:14 +0900 Subject: [PATCH] Fix checkboxes in form --- assets/scss/common/input.scss | 9 ++++++++- assets/scss/var.scss | 4 ++++ components/common/form/CheckBox.vue | 21 ++++++++++++++++----- pages/ems/base/DashboardPage.vue | 2 +- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/assets/scss/common/input.scss b/assets/scss/common/input.scss index ba15cd1..518f1de 100644 --- a/assets/scss/common/input.scss +++ b/assets/scss/common/input.scss @@ -241,9 +241,16 @@ input[type="checkbox"] { .v-application.#{$theme}-mode { .ant-checkbox-wrapper { + .ant-checkbox { + .ant-checkbox-inner { + background-color: map-deep-get($config, #{$theme}, "ant-checkbox-bg"); // background for unchecked checkbox + border-color: map-deep-get($config, #{$theme}, "ant-checkbox-border"); + } + } + .ant-checkbox-checked { .ant-checkbox-inner { - background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg"); + background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg"); // background for checked checkbox border-color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg"); color:map-deep-get($config, #{$theme}, "ant-btn-primary-color"); diff --git a/assets/scss/var.scss b/assets/scss/var.scss index 8bacdf2..cda8301 100644 --- a/assets/scss/var.scss +++ b/assets/scss/var.scss @@ -177,6 +177,8 @@ $config: ( v-header-border: #424242, v-chart-border: #424242, v-sidebar-border: #303030, + ant-checkbox-bg: #212224, + ant-checkbox-border: #424242, ), light: (w-g5: $--color-gray_555, g5-w: $--color-white, @@ -317,5 +319,7 @@ $config: ( v-header-border: #D9D9D9, v-chart-border: #D9D9D9, v-sidebar-border: #F0F0F0, + ant-checkbox-bg: #FFFFFF, + ant-checkbox-border: #D9D9D9, ), ); \ No newline at end of file diff --git a/components/common/form/CheckBox.vue b/components/common/form/CheckBox.vue index 99cb216..193b77e 100644 --- a/components/common/form/CheckBox.vue +++ b/components/common/form/CheckBox.vue @@ -12,15 +12,26 @@ - + :color="isDarkMode ? '#1668DC' : '#1890ff'" + @change="modifyValue" + class="small-checkbox" + > --> + + @@ -141,7 +152,7 @@ export default { modifyValue(e) { const dt = { columnName: this.item.valueNm, - value: e, + value: e.target.checked, }; this.$emit('gridEditingFinish', dt); }, diff --git a/pages/ems/base/DashboardPage.vue b/pages/ems/base/DashboardPage.vue index 54d04df..977086c 100644 --- a/pages/ems/base/DashboardPage.vue +++ b/pages/ems/base/DashboardPage.vue @@ -840,7 +840,7 @@ export default { { header: "주의", name: "careStndVal", align: "right", width: 40 }, { header: "경고", name: "warnStndVal", align: "right", width: 40 }, { header: "가이드", name: "totVal", align: "right", width: 40 }, - { header: "알람 내용", name: "alrmMsg", align: "left" }, + { header: "알람 내용", name: "alrmMsg", align: "left", resizable: false }, { header: "설비종류", name: "eqpmKindId", align: "left", hidden: true }, { header: "설비종류", name: "eqpmKindNm", align: "left", hidden: true }, ]; -- 2.50.1.windows.1