From 50976ea5900a304571ce5d2dea569ba7299533e3 Mon Sep 17 00:00:00 2001 From: jameszow Date: Sat, 4 Nov 2023 20:27:56 +0800 Subject: [PATCH] Pull the dark mode of vben's vxtable --- .../VxeTable/src/css/component.scss | 3 +- .../components/VxeTable/src/css/index.scss | 3 +- .../VxeTable/src/css/scrollbar.scss | 2 +- .../components/VxeTable/src/css/toolbar.scss | 6 +- .../components/VxeTable/src/css/variable.scss | 60 +++++++++++++++++-- 5 files changed, 60 insertions(+), 14 deletions(-) diff --git a/web/src/components/VxeTable/src/css/component.scss b/web/src/components/VxeTable/src/css/component.scss index 12b46154..a9f7ba2f 100644 --- a/web/src/components/VxeTable/src/css/component.scss +++ b/web/src/components/VxeTable/src/css/component.scss @@ -52,7 +52,6 @@ & > .ant-input-number, & > .ant-cascader-picker .ant-cascader-input, & > .ant-calendar-picker .ant-calendar-picker-input { - // border-color: $vxe-table-validate-error-color; box-shadow: none; } } @@ -121,4 +120,4 @@ } } } -} +} \ No newline at end of file diff --git a/web/src/components/VxeTable/src/css/index.scss b/web/src/components/VxeTable/src/css/index.scss index 6023205c..7f34cabb 100644 --- a/web/src/components/VxeTable/src/css/index.scss +++ b/web/src/components/VxeTable/src/css/index.scss @@ -1,6 +1,5 @@ @import './common'; @import './variable'; -@import './scrollbar'; @import './toolbar'; @import './component'; -@import 'vxe-table/styles/index'; +@import 'vxe-table/styles/index'; \ No newline at end of file diff --git a/web/src/components/VxeTable/src/css/scrollbar.scss b/web/src/components/VxeTable/src/css/scrollbar.scss index beea2d71..4464aa2d 100644 --- a/web/src/components/VxeTable/src/css/scrollbar.scss +++ b/web/src/components/VxeTable/src/css/scrollbar.scss @@ -26,4 +26,4 @@ ::-webkit-scrollbar-corner { background-color: #fff; } -} +} \ No newline at end of file diff --git a/web/src/components/VxeTable/src/css/toolbar.scss b/web/src/components/VxeTable/src/css/toolbar.scss index 8b30e3ae..4a8897b5 100644 --- a/web/src/components/VxeTable/src/css/toolbar.scss +++ b/web/src/components/VxeTable/src/css/toolbar.scss @@ -10,7 +10,7 @@ .vxe-toolbar .vxe-tools--wrapper, .vxe-toolbar .vxe-tools--operate .vxe-button { - margin-left: 1px; + margin-left: 10px; border-radius: 0 !important; } @@ -22,5 +22,5 @@ .vxe-toolbar .vxe-tools--wrapper, .vxe-toolbar .vxe-tools--operate .vxe-custom--wrapper .vxe-button { - margin-left: 1px; -} + margin-left: 10px; +} \ No newline at end of file diff --git a/web/src/components/VxeTable/src/css/variable.scss b/web/src/components/VxeTable/src/css/variable.scss index eedcf8b4..56bf2139 100644 --- a/web/src/components/VxeTable/src/css/variable.scss +++ b/web/src/components/VxeTable/src/css/variable.scss @@ -1,6 +1,54 @@ -$vxe-primary-color: rgb(9 96 189) !default; -$vxe-table-row-current-background-color: rgb(9 96 189 / 30%); -$vxe-table-row-hover-current-background-color: rgb(9 96 189 / 20%); -$vxe-table-column-hover-background-color: rgb(9 96 189 / 30%); -$vxe-table-column-current-background-color: rgb(9 96 189 / 20%); -$vxe-table-validate-error-color: #f56c6c; +/* stylelint-disable scss/no-global-function-names */ +html[data-theme='dark'] { + // $bg-color: #151515; + // $tooltip-bg-color: #303133; + // $text-color: #c9d1d9; + // $border-color: #303030; + // $selected-bg-color: #1e1e1e; + // $striped-bg-color: #1e1e1e; + + --vxe-form-background-color: #151515; + --vxe-toolbar-background-color: #151515; + --vxe-pager-background-color: #151515; + --vxe-button-default-background-color: lighten(#151515, 15%); + --vxe-table-header-background-color: lighten(#151515, 5%); + --vxe-font-color: darken(#c9d1d9, 12%); + --vxe-table-header-font-color: #c9d1d9; + --vxe-table-footer-font-color: #c9d1d9; + --vxe-table-body-background-color: #151515; + --vxe-table-footer-background-color: #151515; + --vxe-table-row-striped-background-color: #1e1e1e; + --vxe-table-border-color: #303030; + --vxe-table-row-hover-background-color: #1e1e1e; + --vxe-table-row-hover-striped-background-color: darken(#1e1e1e, 10%); + --vxe-table-row-current-background-color: fade(#1e1e1e, 20%); + --vxe-table-row-hover-current-background-color: fade(#1e1e1e, 20%); + --vxe-table-column-hover-background-color: fade(#1e1e1e, 20%); + --vxe-table-column-current-background-color: fade(#1e1e1e, 20%); + --vxe-table-row-checkbox-checked-background-color: fade(#1e1e1e, 15%); + --vxe-table-row-hover-checkbox-checked-background-color: fade(#1e1e1e, 20%); + --vxe-table-menu-background-color: lighten(#303133, 10%); + --vxe-table-filter-panel-background-color: lighten(#151515, 5%); + --vxe-grid-maximize-background-color: #151515; + --vxe-pager-perfect-background-color: #151515; + --vxe-pager-perfect-button-background-color: lighten(#151515, 15%); + --vxe-input-background-color: #151515; + --vxe-input-border-color: #303030; + --vxe-select-panel-background-color: #151515; + --vxe-table-popup-border-color: #303030; + --vxe-select-option-hover-background-color: lighten(#1e1e1e, 15%); + --vxe-pulldown-panel-background-color: #151515; + --vxe-table-fixed-left-scrolling-box-shadow: 8px 0px 10px -5px rgb(255 255 255 / 12%); + --vxe-table-fixed-right-scrolling-box-shadow: -8px 0px 10px -5px rgb(255 255 255 / 12%); + --vxe-loading-background-color: rgb(0 0 0 / 50%); + --vxe-tooltip-dark-background-color: lighten(#303133, 25%); + --vxe-modal-header-background-color: #1e1e1e; + --vxe-modal-body-background-color: #303133; + --vxe-modal-border-color: #303030; + --vxe-toolbar-panel-background-color: #151515; + --vxe-input-disabled-color: lighten(#1e1e1e, 20%); + --vxe-input-disabled-background-color: lighten(#1e1e1e, 25%); + --vxe-checkbox-icon-background-color: lighten(#1e1e1e, 15%); + --vxe-checkbox-checked-icon-border-color: #303030; + --vxe-checkbox-indeterminate-icon-background-color: lighten(#1e1e1e, 15%); +} \ No newline at end of file