From f0d01853fcc0a4dcf224731770361e479b9acc78 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Thu, 22 Feb 2024 15:18:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E9=80=89=E6=8B=A9=E5=BC=B9=E6=A1=86=E4=B8=AD?= =?UTF-8?q?=E5=86=85=E7=BD=AE=E7=9A=84=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/chart/components/editor/util/chart.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/core/core-frontend/src/views/chart/components/editor/util/chart.ts b/core/core-frontend/src/views/chart/components/editor/util/chart.ts index 590bab5478..49d415f371 100644 --- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts +++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts @@ -660,15 +660,16 @@ export const DEFAULT_SCROLL: ScrollCfg = { } export const COLOR_PANEL = [ - '#1E90FF', - '#90EE90', + '#FF4500', + '#FF8C00', + '#FFD700', + '#71AE46', '#00CED1', - '#E2BD84', - '#7A90E0', - '#3BA272', - '#2BE7FF', - '#0A8ADA', - '#FFD700' + '#1E90FF', + '#C71585', + '#999999', + '#000000', + '#FFFFFF' ] export const COLOR_CASES = [ From 251c950644c33d46ec9987a38e110d3aeb71f7b0 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Thu, 22 Feb 2024 15:56:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=86=85=E6=8C=89=E9=92=AE=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=AC=A1=E8=A6=81=E6=8C=89=E9=92=AE=E4=BA=A4=E4=BA=92=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/views/template-market/index.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/views/template-market/index.vue b/core/core-frontend/src/views/template-market/index.vue index e7f3711777..d04a12ed36 100644 --- a/core/core-frontend/src/views/template-market/index.vue +++ b/core/core-frontend/src/views/template-market/index.vue @@ -19,12 +19,17 @@ /> {{ state.curTemplate.title }}1 - 上一个 下一个 From e7d6954e52022741561a7daa30c18e06ec93411f Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Thu, 22 Feb 2024 17:31:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=AD=E5=BF=83=E9=97=B4=E8=B7=9D=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9=EF=BC=8C=E6=AD=A3=E7=A1=AE=E4=B8=BA16px?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/template-market/component/CategoryTemplateV2.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/views/template-market/component/CategoryTemplateV2.vue b/core/core-frontend/src/views/template-market/component/CategoryTemplateV2.vue index 108991348e..83afcba1ae 100644 --- a/core/core-frontend/src/views/template-market/component/CategoryTemplateV2.vue +++ b/core/core-frontend/src/views/template-market/component/CategoryTemplateV2.vue @@ -9,7 +9,7 @@ v-for="(templateItem, index) in fullTemplateShowList" v-show="showFlagCheck(templateItem)" :key="templateItem.id + label" - style="float: left; padding: 24px 12px 0; text-align: center; flex: 0" + style="float: left; padding: 8px 8px 0; text-align: center; flex: 0" :style="{ width: templateSpan }" > Date: Fri, 23 Feb 2024 11:08:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86):?= =?UTF-8?q?=20=E5=B7=A6=E4=BE=A7=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=A0=87=E9=A2=98=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/layout/index.vue | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/core/core-frontend/src/layout/index.vue b/core/core-frontend/src/layout/index.vue index 9ef95a5ea1..2d47f936a0 100644 --- a/core/core-frontend/src/layout/index.vue +++ b/core/core-frontend/src/layout/index.vue @@ -23,6 +23,7 @@ const toolboxMenu = computed(() => route.path.includes('toolbox'))
+
组织管理中心
route.path.includes('toolbox')) height: calc(100vh - 56px); } + .org-config-center { + height: 48px; + padding-left: 24px; + display: flex; + align-items: center; + font-size: 14px; + font-weight: 500; + line-height: 22px; + color: #8f959e; + border-bottom: 1px solid #1f232926; + position: sticky; + top: 0; + left: 0; + background: #fff; + z-index: 10; + } + .layout-main { flex: 1; background-color: var(--MainBG, #f5f6f7);