From 0bf7614cbd4c33f1f2cbe0a3d9f4c9d0988549bc Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Mon, 15 Sep 2025 11:50:39 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E5=BF=83):=20=E5=BA=95=E9=83=A8=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E8=89=B2=E8=B7=9F=E9=9A=8F=E4=B8=BB=E9=A2=98=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/style/index.less | 6 +++++- .../filter/auth-tree-chart/FilterFiled.vue | 4 ++-- .../editor/filter/auth-tree/FilterFiled.vue | 4 ++-- .../src/views/share/share/ShareHandler.vue | 4 ++-- .../src/views/share/share/ShareVisualHead.vue | 4 ++-- .../parameter/third-party/ThirdEdit.vue | 19 ++++++++++++++++++- .../component/MarketPreviewV2.vue | 4 ++-- .../data/dataset/auth-tree/FilterFiled.vue | 4 ++-- .../visualized/data/dataset/form/AddSql.vue | 8 ++++---- 9 files changed, 39 insertions(+), 18 deletions(-) diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less index e20962612d..a359af87e1 100644 --- a/core/core-frontend/src/style/index.less +++ b/core/core-frontend/src/style/index.less @@ -497,7 +497,7 @@ strong { padding: 2px 4px; &:hover { - background: var(--primary10, #3370ff1a); + background: var(--ed-color-primary-1a, #3370ff1a); } } @@ -716,3 +716,7 @@ strong { background-color: transparent; } } + +.ed-menu--vertical.ed-menu--light .ed-menu-item.is-active.is-active.is-active { + background-color: var(--ed-color-primary-1a, #3370ff1a) !important; +} diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/FilterFiled.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/FilterFiled.vue index 87b6555764..e0e97e9251 100644 --- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/FilterFiled.vue +++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/FilterFiled.vue @@ -1084,9 +1084,9 @@ const emits = defineEmits(['update:item', 'del']) line-height: 26px; border-radius: 4px; padding: 0 4px; - color: #3370ff; + color: var(--ed-color-primary, #3370ff); &:hover { - background-color: #3370ff1a; + background-color: var(--ed-color-primary-1a, #3370ff1a); } } } diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/FilterFiled.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/FilterFiled.vue index 8bdd1de094..4d76ee9399 100644 --- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/FilterFiled.vue +++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/FilterFiled.vue @@ -916,9 +916,9 @@ const emits = defineEmits(['update:item', 'del']) line-height: 26px; border-radius: 4px; padding: 0 4px; - color: #3370ff; + color: var(--ed-color-primary, #3370ff); &:hover { - background-color: #3370ff1a; + background-color: var(--ed-color-primary-1a, #3370ff1a); } } } diff --git a/core/core-frontend/src/views/share/share/ShareHandler.vue b/core/core-frontend/src/views/share/share/ShareHandler.vue index 11a29669af..8ebd769edd 100644 --- a/core/core-frontend/src/views/share/share/ShareHandler.vue +++ b/core/core-frontend/src/views/share/share/ShareHandler.vue @@ -804,9 +804,9 @@ onMounted(() => { margin-right: 4px; } .done-finish { - color: #3370ff; + color: var(--ed-color-primary, #3370ff); &:hover { - background-color: #3370ff1a !important; + background-color: var(--ed-color-primary-1a, #3370ff1a) !important; } } .input-suffix-btn { diff --git a/core/core-frontend/src/views/share/share/ShareVisualHead.vue b/core/core-frontend/src/views/share/share/ShareVisualHead.vue index 8113defaab..db02d644d3 100644 --- a/core/core-frontend/src/views/share/share/ShareVisualHead.vue +++ b/core/core-frontend/src/views/share/share/ShareVisualHead.vue @@ -823,9 +823,9 @@ defineExpose({ margin-right: 4px; } .done-finish { - color: #3370ff; + color: var(--ed-color-primary, #3370ff); &:hover { - background-color: #3370ff1a !important; + background-color: var(--ed-color-primary-1a, #3370ff1a) !important; } } .input-suffix-btn { diff --git a/core/core-frontend/src/views/system/parameter/third-party/ThirdEdit.vue b/core/core-frontend/src/views/system/parameter/third-party/ThirdEdit.vue index 00aa5b6f26..ea0148b469 100644 --- a/core/core-frontend/src/views/system/parameter/third-party/ThirdEdit.vue +++ b/core/core-frontend/src/views/system/parameter/third-party/ThirdEdit.vue @@ -74,6 +74,23 @@ const save = () => { }) } +const saveClose = () => { + const param = { ...state.form } + const method = request.post({ url: '/sysParameter/sqlbot', data: param }) + showLoading() + method + .then(res => { + if (!res.msg) { + ElMessage.success(t('common.save_success')) + emits('saved') + } + closeLoading() + }) + .catch(() => { + closeLoading() + }) +} + const emits = defineEmits(['saved']) const submitForm = async (formEl: FormInstance | undefined) => { if (!formEl) return @@ -131,7 +148,7 @@ const validateHandlerOnly = () => { state.form.valid = false }) .finally(() => { - save() + saveClose() }) } diff --git a/core/core-frontend/src/views/template-market/component/MarketPreviewV2.vue b/core/core-frontend/src/views/template-market/component/MarketPreviewV2.vue index 7a15edf9d5..c04a9212e2 100644 --- a/core/core-frontend/src/views/template-market/component/MarketPreviewV2.vue +++ b/core/core-frontend/src/views/template-market/component/MarketPreviewV2.vue @@ -689,9 +689,9 @@ onMounted(() => { } &:hover { - color: #3370ff; + color: var(--ed-color-primary, #3370ff); &::after { - background: #3370ff1a; + background: var(--ed-color-primary-1a, #3370ff1a); display: block; } } diff --git a/core/core-frontend/src/views/visualized/data/dataset/auth-tree/FilterFiled.vue b/core/core-frontend/src/views/visualized/data/dataset/auth-tree/FilterFiled.vue index 87df53f65f..57572068a8 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/auth-tree/FilterFiled.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/auth-tree/FilterFiled.vue @@ -916,9 +916,9 @@ const emits = defineEmits(['update:item', 'del']) line-height: 26px; border-radius: 4px; padding: 0 4px; - color: #3370ff; + color: var(--ed-color-primary, #3370ff); &:hover { - background-color: #3370ff1a; + background-color: var(--ed-color-primary-1a, #3370ff1a); } } } diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue index 94db7d2bee..f8d977a024 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue @@ -1559,13 +1559,13 @@ const mousedownDrag = () => { } &:focus { - background: #3370ff1a; - color: #3370ff; + background: var(--ed-color-primary-1a, #3370ff1a); + color: var(--ed-color-primary, #3370ff); } &:focus:hover { - color: #3370ff; - background: #3370ff33; + color: var(--ed-color-primary, #3370ff); + background: var(--ed-color-primary-33, #3370ff33); } } }