From 34c23ba31514c2bd4316e0330cfaabfcef4ebd6f Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Mon, 4 Mar 2024 10:29:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E5=90=8E=E5=89=8D=E7=AB=AF=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/assist-button/ColorButton.vue | 2 +- .../color-scheme/src/ColorScheme.vue | 2 +- .../src/components/dashboard/DbCanvasAttr.vue | 4 +-- .../FilterStyleSimpleSelector.vue | 2 +- .../dashboard-style/ViewSimpleTitle.vue | 6 ++--- .../pre-subject/SubjectTemplateItem.vue | 2 +- .../data-visualization/CanvasAttr.vue | 2 +- .../RealTimeComponentList.vue | 4 +-- .../data-visualization/RealTimeGroup.vue | 4 +-- .../data-visualization/RealTimeListTree.vue | 4 +-- .../data-visualization/canvas/ComposeShow.vue | 2 +- .../data-visualization/canvas/Shape.vue | 2 +- .../components/filter-text/src/FilterText.vue | 2 +- .../visualization/ComponentButton.vue | 2 +- .../visualization/ComponentButtonLabel.vue | 2 +- .../components/visualization/LinkJumpSet.vue | 2 +- .../components/visualization/LinkageSet.vue | 2 +- .../visualization/common/DeUpload.vue | 6 ++--- .../BackgroundOverallCommon.vue | 6 ++--- .../component-background/CanvasBackground.vue | 4 +-- .../src/components/visualization/linkJump.vue | 2 +- .../custom-component/common/CommonAttr.vue | 4 +-- .../component-group/CommonGroup.vue | 8 +++--- .../component-group/DragComponent.vue | 2 +- .../component-group/UserViewGroup.vue | 8 +++--- .../custom-component/de-graphical/Attr.vue | 6 ++--- .../src/custom-component/group/Component.vue | 2 +- .../src/custom-component/picture/Attr.vue | 6 ++--- .../v-query/QueryConditionConfiguration.vue | 4 +-- .../src/layout/components/AccountOperator.vue | 2 +- .../src/layout/components/Header.vue | 6 ++--- .../src/layout/components/Sidebar.vue | 2 +- core/core-frontend/src/style/index.less | 25 ++++++++++--------- .../editor/chart-type/ChartType.vue | 8 +++--- .../editor/dataset-select/DatasetSelect.vue | 8 +++--- .../editor/drag-item/DimensionItem.vue | 8 +++--- .../components/editor/drag-item/DrillItem.vue | 2 +- .../components/editor/drag-item/QuotaItem.vue | 6 ++--- .../editor/editor-senior/Senior.vue | 2 +- .../editor-senior/components/AssistLine.vue | 2 +- .../editor-senior/components/Threshold.vue | 2 +- .../components/dialog/TableThresholdEdit.vue | 2 +- .../editor/editor-style/VQueryChartStyle.vue | 4 +-- .../components/CustomColorStyleSelect.vue | 8 +++--- .../components/IndicatorNameSelector.vue | 4 +-- .../components/IndicatorValueSelector.vue | 4 +-- .../components/LegendSelector.vue | 4 +-- .../editor-style/components/TitleSelector.vue | 4 +-- .../components/table/TableCellSelector.vue | 4 +-- .../components/table/TableHeaderSelector.vue | 4 +-- .../views/chart/components/editor/index.vue | 10 ++++---- .../src/views/common/DeResourceArrow.vue | 2 +- .../src/views/common/DeResourceTree.vue | 2 +- .../dashboard/MobileBackgroundSelector.vue | 4 +-- core/core-frontend/src/views/login/index.vue | 2 +- .../src/views/share/share/ShareGrid.vue | 2 +- .../system/parameter/email/EmailEdit.vue | 2 +- .../views/system/parameter/map/Geometry.vue | 2 +- .../views/system/parameter/map/MapSetting.vue | 2 +- .../component/CategoryTemplateV2.vue | 4 +-- .../component/MarketPreview.vue | 8 +++--- .../component/MarketPreviewV2.vue | 8 +++--- .../component/TemplateMarketPreviewItem.vue | 4 +-- .../src/views/template-market/index.vue | 4 +-- .../template/component/DeTemplateItem.vue | 4 +-- .../visualized/data/dataset/form/AddSql.vue | 4 +-- .../data/dataset/form/DatasetUnion.vue | 12 ++++----- .../visualized/data/dataset/form/index.vue | 4 +-- .../views/visualized/data/dataset/index.vue | 2 +- .../data/datasource/BaseInfoContent.vue | 4 +-- .../visualized/data/datasource/SheetTabs.vue | 6 ++--- .../datasource/form/ApiHttpRequestDraw.vue | 8 +++--- .../data/datasource/form/EditorDetail.vue | 8 +++--- .../visualized/data/datasource/form/index.vue | 4 +-- .../visualized/data/datasource/index.vue | 4 +-- .../src/views/workbranch/JumpLinkageBack.vue | 2 +- .../src/views/workbranch/ShortcutTable.vue | 2 +- .../src/views/workbranch/index.vue | 2 +- 78 files changed, 169 insertions(+), 168 deletions(-) diff --git a/core/core-frontend/src/components/assist-button/ColorButton.vue b/core/core-frontend/src/components/assist-button/ColorButton.vue index 3de5cf47ba..fe629a2fc0 100644 --- a/core/core-frontend/src/components/assist-button/ColorButton.vue +++ b/core/core-frontend/src/components/assist-button/ColorButton.vue @@ -62,7 +62,7 @@ const colorButtonClick = () => { padding-left: 4px; padding-top: 4px; border-width: 2px; - border-color: #3370ff; + border-color: var(--ed-color-primary); } .color-button-inner { diff --git a/core/core-frontend/src/components/color-scheme/src/ColorScheme.vue b/core/core-frontend/src/components/color-scheme/src/ColorScheme.vue index a7ad6284ce..9a1c06898f 100644 --- a/core/core-frontend/src/components/color-scheme/src/ColorScheme.vue +++ b/core/core-frontend/src/components/color-scheme/src/ColorScheme.vue @@ -223,7 +223,7 @@ const resetCustomColor = () => { &.active { &::after { - border-color: #3370ff; + border-color: var(--ed-color-primary); display: block; } } diff --git a/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue b/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue index 425accb0f3..ed47a58dfe 100644 --- a/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue +++ b/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue @@ -239,7 +239,7 @@ const saveSelfSubject = () => { &:hover { .ed-icon { - color: #3370ff; + color: var(--ed-color-primary); } } } @@ -295,7 +295,7 @@ const saveSelfSubject = () => { .re-update-span { cursor: pointer; - color: #3370ff; + color: var(--ed-color-primary); size: 14px; line-height: 22px; font-weight: 400; diff --git a/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/FilterStyleSimpleSelector.vue b/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/FilterStyleSimpleSelector.vue index d35c5b1d87..73ea03fcf6 100644 --- a/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/FilterStyleSimpleSelector.vue +++ b/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/FilterStyleSimpleSelector.vue @@ -189,7 +189,7 @@ onMounted(() => { diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue index af164318ab..a0e111bfa4 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue @@ -963,7 +963,7 @@ onMounted(() => { } .active { - outline: 1px solid rgba(51, 112, 255, 1) !important; + outline: 1px solid var(--ed-color-primary) !important; user-select: none; } diff --git a/core/core-frontend/src/components/filter-text/src/FilterText.vue b/core/core-frontend/src/components/filter-text/src/FilterText.vue index f5b9bcfa9a..7a38bcfdd2 100644 --- a/core/core-frontend/src/components/filter-text/src/FilterText.vue +++ b/core/core-frontend/src/components/filter-text/src/FilterText.vue @@ -114,7 +114,7 @@ watch( } .clear-btn:hover { - color: #3370ff; + color: var(--ed-color-primary); } .filter-texts-container::-webkit-scrollbar { diff --git a/core/core-frontend/src/components/visualization/ComponentButton.vue b/core/core-frontend/src/components/visualization/ComponentButton.vue index 4c4e926db9..626b022b27 100644 --- a/core/core-frontend/src/components/visualization/ComponentButton.vue +++ b/core/core-frontend/src/components/visualization/ComponentButton.vue @@ -60,7 +60,7 @@ const emits = defineEmits(['customClick']) } .inner-active { - border: 1px solid #3370ff; + border: 1px solid var(--ed-color-primary); background: rgba(255, 255, 255, 0.2); } diff --git a/core/core-frontend/src/components/visualization/ComponentButtonLabel.vue b/core/core-frontend/src/components/visualization/ComponentButtonLabel.vue index 3c58a013e0..bbbb92a36c 100644 --- a/core/core-frontend/src/components/visualization/ComponentButtonLabel.vue +++ b/core/core-frontend/src/components/visualization/ComponentButtonLabel.vue @@ -65,7 +65,7 @@ const emits = defineEmits(['customClick']) } .inner-active { - border: 1px solid #3370ff; + border: 1px solid var(--ed-color-primary); background: rgba(255, 255, 255, 0.2); } diff --git a/core/core-frontend/src/components/visualization/LinkJumpSet.vue b/core/core-frontend/src/components/visualization/LinkJumpSet.vue index 17305c1486..3e39ae1b9d 100644 --- a/core/core-frontend/src/components/visualization/LinkJumpSet.vue +++ b/core/core-frontend/src/components/visualization/LinkJumpSet.vue @@ -1014,7 +1014,7 @@ span { align-items: center; } .view-type-icon { - color: #3370ff; + color: var(--ed-color-primary); width: 22px; height: 16px; } diff --git a/core/core-frontend/src/components/visualization/LinkageSet.vue b/core/core-frontend/src/components/visualization/LinkageSet.vue index 836f2cc9e5..e95f21dd30 100644 --- a/core/core-frontend/src/components/visualization/LinkageSet.vue +++ b/core/core-frontend/src/components/visualization/LinkageSet.vue @@ -642,7 +642,7 @@ span { align-items: center; } .view-type-icon { - color: #3370ff; + color: var(--ed-color-primary); width: 22px; height: 16px; } diff --git a/core/core-frontend/src/components/visualization/common/DeUpload.vue b/core/core-frontend/src/components/visualization/common/DeUpload.vue index f6fec8d639..8e5d7556a7 100644 --- a/core/core-frontend/src/components/visualization/common/DeUpload.vue +++ b/core/core-frontend/src/components/visualization/common/DeUpload.vue @@ -135,7 +135,7 @@ watch( &:hover { .ed-icon { - color: #3370ff; + color: var(--ed-color-primary); } } } @@ -213,7 +213,7 @@ watch( &:hover { .ed-icon { - color: #3370ff; + color: var(--ed-color-primary); } } } @@ -249,7 +249,7 @@ watch( .re-update-span { cursor: pointer; - color: #3370ff; + color: var(--ed-color-primary); size: 14px; line-height: 22px; font-weight: 400; diff --git a/core/core-frontend/src/components/visualization/component-background/BackgroundOverallCommon.vue b/core/core-frontend/src/components/visualization/component-background/BackgroundOverallCommon.vue index 87d217c97f..78392a2547 100644 --- a/core/core-frontend/src/components/visualization/component-background/BackgroundOverallCommon.vue +++ b/core/core-frontend/src/components/visualization/component-background/BackgroundOverallCommon.vue @@ -375,7 +375,7 @@ watch( &:hover { .ed-icon { - color: #3370ff; + color: var(--ed-color-primary); } } } @@ -428,7 +428,7 @@ watch( &:hover { .ed-icon { - color: #3370ff; + color: var(--ed-color-primary); } } } @@ -513,7 +513,7 @@ watch( .re-update-span { cursor: pointer; - color: #3370ff; + color: var(--ed-color-primary); size: 14px; line-height: 22px; font-weight: 400; diff --git a/core/core-frontend/src/components/visualization/component-background/CanvasBackground.vue b/core/core-frontend/src/components/visualization/component-background/CanvasBackground.vue index 889862f618..c046c8fa55 100644 --- a/core/core-frontend/src/components/visualization/component-background/CanvasBackground.vue +++ b/core/core-frontend/src/components/visualization/component-background/CanvasBackground.vue @@ -245,7 +245,7 @@ watch( &:hover { .ed-icon { - color: #3370ff; + color: var(--ed-color-primary); } } } @@ -298,7 +298,7 @@ watch( &:hover { .ed-icon { - color: #3370ff; + color: var(--ed-color-primary); } } } diff --git a/core/core-frontend/src/components/visualization/linkJump.vue b/core/core-frontend/src/components/visualization/linkJump.vue index 773ad05c71..e4eaead690 100644 --- a/core/core-frontend/src/components/visualization/linkJump.vue +++ b/core/core-frontend/src/components/visualization/linkJump.vue @@ -281,7 +281,7 @@ defineExpose({ color: #1f2329; .main-color { - color: #3370ff; + color: var(--ed-color-primary); } } } diff --git a/core/core-frontend/src/custom-component/common/CommonAttr.vue b/core/core-frontend/src/custom-component/common/CommonAttr.vue index 0f19fdbae4..39cfcf3222 100644 --- a/core/core-frontend/src/custom-component/common/CommonAttr.vue +++ b/core/core-frontend/src/custom-component/common/CommonAttr.vue @@ -454,7 +454,7 @@ const stopEvent = e => { &.dark { color: #a6a6a6; &.active { - color: #3370ff; + color: var(--ed-color-primary); background-color: rgba(51, 112, 255, 0.1); } &:hover { @@ -463,7 +463,7 @@ const stopEvent = e => { } &.active { - color: #3370ff; + color: var(--ed-color-primary); background-color: rgba(51, 112, 255, 0.1); } diff --git a/core/core-frontend/src/custom-component/component-group/CommonGroup.vue b/core/core-frontend/src/custom-component/component-group/CommonGroup.vue index f4cc1f701d..60ce0d5e28 100644 --- a/core/core-frontend/src/custom-component/component-group/CommonGroup.vue +++ b/core/core-frontend/src/custom-component/component-group/CommonGroup.vue @@ -149,9 +149,9 @@ const groupActiveChange = category => { .li-custom-active { background: rgba(51, 112, 255, 0.1); - color: #3370ff !important; + color: var(--ed-color-primary) !important; .li-a { - color: #3370ff !important; + color: var(--ed-color-primary) !important; } } @@ -165,7 +165,7 @@ const groupActiveChange = category => { border-radius: 4px; cursor: pointer; &:hover { - outline: 1px solid #3370ff; + outline: 1px solid var(--ed-color-primary); } .item-top-icon { width: 80px; @@ -191,7 +191,7 @@ const groupActiveChange = category => { padding: 4px; cursor: pointer; &:hover { - outline: 1px solid #3370ff; + outline: 1px solid var(--ed-color-primary); } .item-top-icon { width: 20px; diff --git a/core/core-frontend/src/custom-component/component-group/DragComponent.vue b/core/core-frontend/src/custom-component/component-group/DragComponent.vue index b7ccdf70c4..1bdb631538 100644 --- a/core/core-frontend/src/custom-component/component-group/DragComponent.vue +++ b/core/core-frontend/src/custom-component/component-group/DragComponent.vue @@ -59,7 +59,7 @@ const { icon, name, label, dragInfo, themes } = toRefs(props) height: 64px !important; border-radius: 4px; &:hover { - border: 1px solid rgba(51, 112, 255, 1); + border: 1px solid var(--ed-color-primary); cursor: pointer; } display: flex; diff --git a/core/core-frontend/src/custom-component/component-group/UserViewGroup.vue b/core/core-frontend/src/custom-component/component-group/UserViewGroup.vue index 139be6d5d2..0823910997 100644 --- a/core/core-frontend/src/custom-component/component-group/UserViewGroup.vue +++ b/core/core-frontend/src/custom-component/component-group/UserViewGroup.vue @@ -132,7 +132,7 @@ const groupActiveChange = category => { :deep(.li-custom) { color: #646a73 !important; &.li-custom-active { - color: #3370ff !important; + color: var(--ed-color-primary) !important; } &:hover { background: rgba(31, 35, 41, 0.1) !important; @@ -201,9 +201,9 @@ const groupActiveChange = category => { .li-custom-active { background: rgba(51, 112, 255, 0.1); - color: #3370ff !important; + color: var(--ed-color-primary) !important; .li-a { - color: #3370ff !important; + color: var(--ed-color-primary) !important; } } @@ -223,7 +223,7 @@ const groupActiveChange = category => { align-items: center; justify-content: center; &:hover { - border: 1px solid #3370ff; + border: 1px solid var(--ed-color-primary); } .item-top-icon { width: 80px; diff --git a/core/core-frontend/src/custom-component/de-graphical/Attr.vue b/core/core-frontend/src/custom-component/de-graphical/Attr.vue index 8205da1dca..8311d12ffc 100644 --- a/core/core-frontend/src/custom-component/de-graphical/Attr.vue +++ b/core/core-frontend/src/custom-component/de-graphical/Attr.vue @@ -157,7 +157,7 @@ onBeforeUnmount(() => { &:hover { .ed-icon { - color: #3370ff; + color: var(--ed-color-primary); } } } @@ -179,7 +179,7 @@ onBeforeUnmount(() => { } &:hover { .ed-icon { - color: #3370ff; + color: var(--ed-color-primary); } } } @@ -205,7 +205,7 @@ onBeforeUnmount(() => { .re-update-span { cursor: pointer; - color: #3370ff; + color: var(--ed-color-primary); size: 14px; line-height: 22px; font-weight: 400; diff --git a/core/core-frontend/src/custom-component/group/Component.vue b/core/core-frontend/src/custom-component/group/Component.vue index cca710c678..42c4e6e30a 100644 --- a/core/core-frontend/src/custom-component/group/Component.vue +++ b/core/core-frontend/src/custom-component/group/Component.vue @@ -118,6 +118,6 @@ watch( } .canvas-active-custom { - outline: 2px solid rgba(51, 112, 255, 1) !important; + outline: 2px solid var(--ed-color-primary) !important; } diff --git a/core/core-frontend/src/custom-component/picture/Attr.vue b/core/core-frontend/src/custom-component/picture/Attr.vue index ff1c824d1c..9828bac1a1 100644 --- a/core/core-frontend/src/custom-component/picture/Attr.vue +++ b/core/core-frontend/src/custom-component/picture/Attr.vue @@ -212,7 +212,7 @@ onBeforeUnmount(() => { &:hover { .ed-icon { - color: #3370ff; + color: var(--ed-color-primary); } } } @@ -234,7 +234,7 @@ onBeforeUnmount(() => { } &:hover { .ed-icon { - color: #3370ff; + color: var(--ed-color-primary); } } } @@ -260,7 +260,7 @@ onBeforeUnmount(() => { .re-update-span { cursor: pointer; - color: #3370ff; + color: var(--ed-color-primary); size: 14px; line-height: 22px; font-weight: 400; diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue index 7cef07f7a1..42d69b64cc 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -1486,7 +1486,7 @@ defineExpose({ .ed-icon { cursor: pointer; font-size: 16px; - color: #3370ff; + color: var(--ed-color-primary); } } .list-item_primary { @@ -1560,7 +1560,7 @@ defineExpose({ .component-type { margin-right: 4px; font-size: 20px; - color: #3370ff; + color: var(--ed-color-primary); } .list-item { height: 32px; diff --git a/core/core-frontend/src/layout/components/AccountOperator.vue b/core/core-frontend/src/layout/components/AccountOperator.vue index 7b9c06f7b9..141c35d4ee 100644 --- a/core/core-frontend/src/layout/components/AccountOperator.vue +++ b/core/core-frontend/src/layout/components/AccountOperator.vue @@ -190,7 +190,7 @@ if (uid.value === '1') { background-color: #1e2738; } .main-color { - background: #3370ff; + background: var(--ed-color-primary); width: 24px; height: 24px; border-radius: 50%; diff --git a/core/core-frontend/src/layout/components/Header.vue b/core/core-frontend/src/layout/components/Header.vue index 2d6411abae..1705913a12 100644 --- a/core/core-frontend/src/layout/components/Header.vue +++ b/core/core-frontend/src/layout/components/Header.vue @@ -128,21 +128,21 @@ onMounted(() => { &.is-active { border-bottom: none; color: #ffffff !important; - background-color: #245bdb; + background-color: var(--ed-color-primary); } } > .is-active { :deep(.ed-sub-menu__title) { color: #ffffff !important; - background-color: #245bdb; + background-color: var(--ed-color-primary); } } .ed-menu-item:not(.is-disabled):hover, :deep(.ed-sub-menu__title):not(.is-disabled):hover { color: #ffffff; - background-color: #245bdb; + background-color: var(--ed-color-primary); } } } diff --git a/core/core-frontend/src/layout/components/Sidebar.vue b/core/core-frontend/src/layout/components/Sidebar.vue index 14d720aba2..f1aec25d77 100644 --- a/core/core-frontend/src/layout/components/Sidebar.vue +++ b/core/core-frontend/src/layout/components/Sidebar.vue @@ -29,7 +29,7 @@ const { width, node } = useMoveLine('DATASET') position: absolute; right: -1px; top: 0; - background: #3370ff; + background: var(--ed-color-primary); } } diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less index 29fcc41113..3493643c00 100644 --- a/core/core-frontend/src/style/index.less +++ b/core/core-frontend/src/style/index.less @@ -1,6 +1,7 @@ :root { - font-family: '阿里巴巴普惠体 3.0 55 Regular L3', Helvetica Neue, Helvetica, '阿里巴巴普惠体 3.0 55 Regular L3', Hiragino Sans GB, Microsoft YaHei, - \5fae\8f6f\96c5\9ed1, Arial, sans-serif; + font-family: '阿里巴巴普惠体 3.0 55 Regular L3', Helvetica Neue, Helvetica, + '阿里巴巴普惠体 3.0 55 Regular L3', Hiragino Sans GB, Microsoft YaHei, \5fae\8f6f\96c5\9ed1, + Arial, sans-serif; line-height: 1.5; font-weight: 400; @@ -78,7 +79,7 @@ body { &.active { background: rgba(51, 112, 255, 0.1); - color: #3370ff; + color: var(--ed-color-primary); } } @@ -112,7 +113,7 @@ body { content: ''; width: 2px; height: 14px; - background: #3370ff; + background: var(--ed-color-primary); position: absolute; top: 50%; transform: translateY(-50%); @@ -134,11 +135,11 @@ body { } .field-icon-text { - color: #3370ff; + color: var(--ed-color-primary); } .field-icon-time { - color: #3370ff; + color: var(--ed-color-primary); } .field-icon-value { @@ -146,7 +147,7 @@ body { } .field-icon-location { - color: #3370ff; + color: var(--ed-color-primary); } .field-icon-red { @@ -160,7 +161,7 @@ body { } .field-icon-dimension { - color: #3370ff; + color: var(--ed-color-primary); } .field-icon-quota { @@ -195,7 +196,7 @@ body { } .hover-icon-in-table { - color: #3370ff !important; + color: var(--ed-color-primary) !important; &[aria-expanded='true'] { background: rgba(51, 112, 255, 0.1); } @@ -290,7 +291,7 @@ body { // padding: 0 0 64px 0 !important; // } -.ed-tree-node.is-current>.ed-tree-node__content:not(.is-menu):after { +.ed-tree-node.is-current > .ed-tree-node__content:not(.is-menu):after { display: none; } @@ -363,11 +364,11 @@ em { } .color-panel { - background: #3370ff; + background: var(--ed-color-primary); } .color-dashboard { - background: #3370ff; + background: var(--ed-color-primary); } .color-screen { diff --git a/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue b/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue index 2302df40b0..cdcc1bd3e5 100644 --- a/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue +++ b/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue @@ -177,9 +177,9 @@ const groupActiveChange = category => { .li-custom-active { background: rgba(51, 112, 255, 0.1); - color: #3370ff !important; + color: var(--ed-color-primary) !important; .li-a { - color: #3370ff !important; + color: var(--ed-color-primary) !important; } } @@ -199,7 +199,7 @@ const groupActiveChange = category => { align-items: center; justify-content: center; &:hover { - border: 1px solid #3370ff; + border: 1px solid var(--ed-color-primary); } .item-top-icon { width: 80px; @@ -208,7 +208,7 @@ const groupActiveChange = category => { } } .item-active { - border: 1px solid #3370ff; + border: 1px solid var(--ed-color-primary); } .item-bottom { height: 20px; diff --git a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue index 14875f8a12..32b296fdda 100644 --- a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue +++ b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue @@ -502,14 +502,14 @@ onMounted(() => { } &.active { - color: #3370ff; + color: var(--ed-color-primary); padding-right: 30px; } .checked-item { position: absolute; right: 10px; padding-top: 2px; - color: #3370ff; + color: var(--ed-color-primary); font-size: 16px; } } @@ -523,12 +523,12 @@ onMounted(() => { &:not(.is-disabled):focus, &:not(.is-disabled):hover { - color: rgba(51, 112, 255, 1); + color: var(--ed-color-primary); border-color: transparent; background-color: rgba(51, 112, 255, 0.1); } &:not(.is-disabled):active { - color: rgba(51, 112, 255, 1); + color: var(--ed-color-primary); border-color: transparent; background-color: rgba(51, 112, 255, 0.2); } diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue index e2b811e838..f32ab2b064 100644 --- a/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue +++ b/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue @@ -554,7 +554,7 @@ onMounted(() => { justify-content: space-between; align-items: center; background-color: #3370ff0a; - border: 1px solid #3370ff; + border: 1px solid var(--ed-color-primary); } .item-axis:hover { @@ -592,7 +592,7 @@ span { width: 100%; &.content-active { - color: #3370ff; + color: var(--ed-color-primary); } .sub-menu-content--icon { @@ -706,7 +706,7 @@ span { } .sub-menu-content--icon { - color: #3370ff; + color: var(--ed-color-primary); margin-right: -7px; } :nth-child(1).ed-icon { @@ -727,7 +727,7 @@ span { } .sub-menu-content--icon { - color: #3370ff; + color: var(--ed-color-primary); margin-right: -7px !important; } } diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/DrillItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/DrillItem.vue index d0d354af7e..0097636f48 100644 --- a/core/core-frontend/src/views/chart/components/editor/drag-item/DrillItem.vue +++ b/core/core-frontend/src/views/chart/components/editor/drag-item/DrillItem.vue @@ -144,7 +144,7 @@ onMounted(() => { justify-content: space-between; align-items: center; background-color: #3370ff0a; - border: 1px solid #3370ff; + border: 1px solid var(--ed-color-primary); } .item-axis:hover { diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue index 48d25deff0..bd35b97d46 100644 --- a/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue +++ b/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue @@ -787,7 +787,7 @@ span { width: 100%; &.content-active { - color: #3370ff; + color: var(--ed-color-primary); } .sub-menu-content--icon { @@ -908,7 +908,7 @@ span { } .sub-menu-content--icon { - color: #3370ff; + color: var(--ed-color-primary); margin-right: -7px; } :nth-child(1).ed-icon { @@ -929,7 +929,7 @@ span { } .sub-menu-content--icon { - color: #3370ff; + color: var(--ed-color-primary); margin-right: -7px !important; } } diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue index e400f8f779..61be726c9a 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue @@ -395,7 +395,7 @@ span { line-height: 20px; color: #a6a6a6 !important; &.ed-button { - color: #3370ff !important; + color: var(--ed-color-primary) !important; } &.is-disabled { color: #5f5f5f !important; diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/AssistLine.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/AssistLine.vue index b87195e00d..4a96182336 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/AssistLine.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/AssistLine.vue @@ -324,7 +324,7 @@ span { line-height: 20px; color: #a6a6a6 !important; &.ed-button { - color: #3370ff !important; + color: var(--ed-color-primary) !important; } &.is-disabled { color: #5f5f5f !important; diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue index e62353ece1..f10de480e6 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue @@ -803,7 +803,7 @@ span { line-height: 20px; color: #a6a6a6 !important; &.ed-button { - color: #3370ff !important; + color: var(--ed-color-primary) !important; } &.is-disabled { color: #5f5f5f !important; diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue index 6826c757c2..ca39621abd 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue @@ -544,7 +544,7 @@ span { .icon-style { width: 14px; height: 14px; - color: #3370ff; + color: var(--ed-color-primary); } .m-icon-btn { diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue index ff8bd977c9..295ba4a240 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue @@ -208,7 +208,7 @@ const { chart } = toRefs(props) &.dark { color: #a6a6a6; &.active { - color: #3370ff; + color: var(--ed-color-primary); background-color: rgba(51, 112, 255, 0.1); } &:hover { @@ -217,7 +217,7 @@ const { chart } = toRefs(props) } &.active { - color: #3370ff; + color: var(--ed-color-primary); background-color: rgba(51, 112, 255, 0.1); } diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/CustomColorStyleSelect.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/CustomColorStyleSelect.vue index 31d55c0d4a..449a15c14a 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/CustomColorStyleSelect.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/CustomColorStyleSelect.vue @@ -176,7 +176,7 @@ function onPopoverHide() {