diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 18a95793a0..6cf075a536 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -20,7 +20,7 @@ import { getQueryVariable, getUrlParameterWidthRegExp } from '@/utils'; import { setLoginExpires, setLongType, setToken } from '@/utils/auth'; import { getLocalStorage, setLocalStorage } from '@/utils/local-storage'; - import { setFavicon, watchStyle, watchTheme } from '@/utils/theme'; + import { setFavicon } from '@/utils/theme'; import { getLarkCallback, getLarkSuiteCallback, getPublicKeyRequest } from './api/modules/user'; import { hasAnyPermission } from './utils/permission'; @@ -42,9 +42,6 @@ } }); - // 初始化平台风格和主题色 - watchStyle(appStore.pageConfig.style, appStore.pageConfig); - watchTheme(appStore.pageConfig.theme, appStore.pageConfig); setFavicon(GetPlatformIconUrl); onBeforeMount(async () => { diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less index 1f68aac3bf..b60e34b86a 100644 --- a/frontend/src/assets/style/arco-reset.less +++ b/frontend/src/assets/style/arco-reset.less @@ -17,6 +17,10 @@ } } } +.arco-table-td { + border-color: var(--color-text-n9); + color: var(--color-text-1); +} .ms-table-row-disabled { td:not(.arco-table-col-fixed-right, .arco-table-checkbox), &:hover, @@ -26,13 +30,33 @@ background-color: var(--color-text-n8) !important; } } +.arco-table-header, +.arco-table-tr, +.arco-table-th { + background-color: var(--color-text-fff); +} +.arco-table-th { + border-color: var(--color-text-n8) !important; +} +.arco-table-td, +.arco-table-scroll-y { + border-color: var(--color-text-n8) !important; +} /** Tabs 组件样式 **/ +.arco-tabs, +.arco-tabs-nav { + border-color: var(--color-text-n8); +} .arco-tabs-nav-add-btn { font-size: var(--font-size-body-3); } .arco-tabs-tab { padding: 12px 0 !important; + color: var(--color-text-2); + &-active { + color: rgb(var(--primary-5)); + } &:hover { .arco-tabs-tab-title::before { background-color: inherit !important; @@ -58,9 +82,10 @@ @apply overflow-hidden; } .arco-modal { - @apply overflow-hidden bg-white; + @apply overflow-hidden; padding: 24px; + background-color: var(--color-text-fff); .arco-modal-header { @apply h-auto items-baseline border-b-0 p-0; @@ -298,6 +323,7 @@ .arco-select { width: 100%; border: 1px solid var(--color-text-n8); + border-color: var(--color-text-n8) !important; background-color: var(--color-text-fff); &:not( :disabled, @@ -308,16 +334,19 @@ .arco-picker-disabled ):hover { border-color: rgb(var(--primary-5)) !important; - background-color: white; - } - input::placeholder { - color: var(--color-text-brand); + background-color: var(--color-text-fff); } } +input::placeholder { + color: var(--color-text-brand) !important; +} .arco-select-view-multiple.arco-select-view-size-medium { overflow: hidden; // 防止多选输入过多,撑开 height: 32px; } +.arco-select-view-prefix { + color: var(--color-text-brand) !important; +} .arco-input-tag-disabled, .arco-select-view-disabled, .arco-textarea-disabled, @@ -379,12 +408,11 @@ } .arco-input-prepend, .arco-input-append { - @apply bg-white; + background-color: var(--color-text-fff); .arco-input-number-step-button { - @apply !bg-white; - border: 1px solid var(--color-text-n8) !important; border-radius: var(--border-radius-small) !important; + background-color: var(--color-text-fff) !important; .btn-outline-sec-hover(); .btn-outline-sec-active(); &:disabled { @@ -430,14 +458,14 @@ .arco-input-wrapper:not(.arco-input-disabled), .arco-select-view:not(.arco-select-view-disabled), .arco-textarea-wrapper:not(.arco-textarea-disabled) { - background: white; + background: var(--color-text-fff); } } .arco-input-wrapper:not(.arco-input-disabled), .arco-select-view:not(.arco-select-view-disabled), .arco-textarea-wrapper:not(.arco-textarea-disabled) { border-color: var(--color-text-input-border); - background: white; + background: var(--color-text-fff); } } .arco-form-item-message { @@ -493,10 +521,11 @@ .arco-checkbox-disabled.arco-checkbox-checked, .arco-checkbox-disabled.arco-checkbox-checked:hover { .arco-checkbox-icon { - @apply bg-white text-white; + @apply text-white; border-color: var(--color-text-input-border) !important; background: var(--color-text-n8) !important; + background-color: var(--color-text-fff); &::after { background-color: var(--color-text-4); } @@ -522,9 +551,8 @@ line-height: 20px; } .arco-radio-checked { - @apply bg-white; - color: rgb(var(--primary-5)); + background-color: var(--color-text-fff); } } .arco-radio-group-size-medium { @@ -547,12 +575,11 @@ } .arco-radio-checked:not(.arco-radio-disabled) { .arco-radio-icon { - @apply !bg-white; - width: 16px; height: 16px; - line-height: 16px; border: 1px solid rgb(var(--primary-6)); + background-color: var(--color-text-fff) !important; + line-height: 16px; &::after { top: 2px; left: 2px; @@ -703,9 +730,8 @@ margin: 1px; } .arco-radio-checked { - @apply bg-white; - color: rgb(var(--primary-5)); + background-color: var(--color-text-fff); } } .arco-radio-checked.arco-radio-disabled { @@ -719,12 +745,11 @@ } .arco-radio-checked:not(.arco-radio-disabled) { .arco-radio-icon { - @apply !bg-white; - width: 16px; height: 16px; - line-height: 16px; border: 1px solid rgb(var(--primary-6)); + background-color: var(--color-text-fff) !important; + line-height: 16px; &::after { top: 2px; left: 2px; @@ -745,6 +770,9 @@ font-size: 12px; line-height: 16px; } +.arco-popover-popup-content { + border-color: var(--color-text-n8); +} /** 链接 **/ .arco-link-status-normal { @@ -867,6 +895,8 @@ /** tooltip **/ .arco-tooltip-content { @apply break-all; + + color: var(--color-text-fff); } .arco-trigger-arrow { border-bottom-right-radius: var(--border-radius-mini) !important; @@ -930,3 +960,15 @@ flex-direction: row; margin: 12px; } + +/** 分割线 **/ +.arco-divider-horizontal, +.arco-divider-vertical { + border-color: var(--color-text-n8); +} + +/** 级联选择器 **/ +.arco-cascader-panel, +.arco-cascader-panel-column { + border-color: var(--color-text-n8) !important; +} diff --git a/frontend/src/assets/style/global.less b/frontend/src/assets/style/global.less index 3189ad143c..76506cd2e4 100644 --- a/frontend/src/assets/style/global.less +++ b/frontend/src/assets/style/global.less @@ -129,6 +129,7 @@ body { .arco-trigger-popup-wrapper { .arco-popover-popup-content { padding: 4px 8px; + border-color: var(--color-text-n8); } } diff --git a/frontend/src/assets/style/var.less b/frontend/src/assets/style/var.less index 69af717c40..125a7ba169 100644 --- a/frontend/src/assets/style/var.less +++ b/frontend/src/assets/style/var.less @@ -26,10 +26,9 @@ } .btn-outline-primary-disabled() { &:disabled { - @apply !bg-white; - border: 1px solid rgb(var(--primary-3)) !important; color: rgb(var(--primary-3)) !important; + background-color: var(--color-text-fff) !important; } } .btn-outline-sec-hover() { @@ -42,7 +41,7 @@ .btn-outline-sec-default() { border-color: var(--color-text-brand) !important; color: var(--color-text-1) !important; - background-color: white !important; + background-color: var(--color-text-fff) !important; } .btn-outline-sec-active() { &:not(:disabled):active { @@ -53,10 +52,9 @@ } .btn-outline-sec-disabled() { &:disabled { - @apply !bg-white; - border: 1px solid var(--color-text-input-border) !important; color: var(--color-text-4) !important; + background-color: var(--color-text-fff) !important; } } .btn-outline-danger-default() { @@ -79,10 +77,9 @@ } .btn-outline-danger-disabled() { &:disabled { - @apply !bg-white; - border: 1px solid rgb(var(--danger-2)) !important; color: rgb(var(--danger-2)); + background-color: var(--color-text-fff) !important; } } @@ -216,6 +213,7 @@ z-index: 1; width: 100%; height: 10px; + background-color: transparent; box-shadow: none; transition: box-shadow 0.1s cubic-bezier(0, 0, 1, 1); content: ''; @@ -231,6 +229,7 @@ z-index: 1; width: 100%; height: 10px; + background-color: transparent; box-shadow: none; transition: box-shadow 0.1s cubic-bezier(0, 0, 1, 1); content: ''; diff --git a/frontend/src/components/business/ms-batch-form/index.vue b/frontend/src/components/business/ms-batch-form/index.vue index d79e546508..442248dfaf 100644 --- a/frontend/src/components/business/ms-batch-form/index.vue +++ b/frontend/src/components/business/ms-batch-form/index.vue @@ -399,7 +399,7 @@ @apply rounded; } .dragChosenClass { - background: white; + background: var(--color-text-fff); opacity: 1 !important; @apply rounded; .minus { diff --git a/frontend/src/components/business/ms-comment/input.vue b/frontend/src/components/business/ms-comment/input.vue index 536d2cc054..c691cd8490 100644 --- a/frontend/src/components/business/ms-comment/input.vue +++ b/frontend/src/components/business/ms-comment/input.vue @@ -115,8 +115,9 @@ diff --git a/frontend/src/components/business/ms-minders/caseReviewMinder/index.vue b/frontend/src/components/business/ms-minders/caseReviewMinder/index.vue index bee11f2a04..f99aa0dd5c 100644 --- a/frontend/src/components/business/ms-minders/caseReviewMinder/index.vue +++ b/frontend/src/components/business/ms-minders/caseReviewMinder/index.vue @@ -41,7 +41,7 @@