From c8101395545079e8057e2b3b80910883f7a4e446 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: Thu, 14 Aug 2025 12:30:55 +0700
Subject: [PATCH] fix bug grid + buttons
---
assets/scss/common/button.scss | 7 +-
assets/scss/common/grid.scss | 11 +--
assets/scss/var.scss | 2 +-
components/common/modal/EqpmSelectPop.vue | 2 +-
.../ems/DataSetInfo/DataSetTagRelTab.vue | 4 +-
pages/comm/base/NoticeMngPage.vue | 83 ++++++++++++-------
6 files changed, 68 insertions(+), 41 deletions(-)
diff --git a/assets/scss/common/button.scss b/assets/scss/common/button.scss
index b300118..0466fdc 100644
--- a/assets/scss/common/button.scss
+++ b/assets/scss/common/button.scss
@@ -144,11 +144,10 @@
}
&.ant-btn-danger {
-
&.ant-btn-background-ghost {
- color: map-deep-get($config, #{$theme}, "ant-btn-danger-color");
- border-color: map-deep-get($config, #{$theme}, "ant-btn-danger-color");
- // background: map-deep-get($config, #{$theme}, "ant-btn-danger-color") !important;
+ color:map-deep-get($config, #{$theme}, "ant-btn-danger-color");
+ border-color:map-deep-get($config, #{$theme}, "ant-btn-danger-border");
+ background: map-deep-get($config, #{$theme}, "ant-btn-danger-bg") !important;
}
}
diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss
index aced6bc..f6c637a 100644
--- a/assets/scss/common/grid.scss
+++ b/assets/scss/common/grid.scss
@@ -204,7 +204,7 @@
overflow: auto;
&::-webkit-scrollbar {
- width: $scrollbar-width !important;
+ // width: $scrollbar-width !important;
height: $scrollbar-width !important;
-webkit-appearance: initial;
background-color: rgba(0, 0, 0, 0) !important;
@@ -352,10 +352,11 @@
}
&.tui-grid-layer-editing {
- background:map-deep-get($config,
- #{$theme},
- "tui-grid-cell-insert-color"
- );
+ background: transparent;
+ // background:map-deep-get($config,
+ // #{$theme},
+ // "tui-grid-cell-insert-color"
+ // );
}
}
}
diff --git a/assets/scss/var.scss b/assets/scss/var.scss
index 94607bc..01242e8 100644
--- a/assets/scss/var.scss
+++ b/assets/scss/var.scss
@@ -166,7 +166,7 @@ $config: (
ant-btn-primary-color: #212224,
ant-btn-danger-bg:#D32029,
ant-btn-danger-border:#D32029,
- ant-btn-danger-color:#D32029,
+ ant-btn-danger-color:#212224,
ant-btn-default-border:#FFFFFF2E,
ant-btn-default-bg:#FFFFFF2E,
ant-btn-default-color:#FFFFFFD9,
diff --git a/components/common/modal/EqpmSelectPop.vue b/components/common/modal/EqpmSelectPop.vue
index 382a439..7cea177 100644
--- a/components/common/modal/EqpmSelectPop.vue
+++ b/components/common/modal/EqpmSelectPop.vue
@@ -94,7 +94,7 @@