From 5ef255705e3d02f4c081c572d910c8ada1f672c7 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Wed, 29 Nov 2023 16:55:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BF=AB=E9=80=9F=E5=88=9B=E5=BB=BA-?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=A8=A1=E6=9D=BF=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/svg/icon_template_colorful.svg | 7 ++++ .../src/views/template-market/index.vue | 9 ++++- .../src/views/workbranch/index.vue | 39 ++++++++++++++++--- 3 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 core/core-frontend/src/assets/svg/icon_template_colorful.svg diff --git a/core/core-frontend/src/assets/svg/icon_template_colorful.svg b/core/core-frontend/src/assets/svg/icon_template_colorful.svg new file mode 100644 index 0000000000..a19c0b2869 --- /dev/null +++ b/core/core-frontend/src/assets/svg/icon_template_colorful.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/core/core-frontend/src/views/template-market/index.vue b/core/core-frontend/src/views/template-market/index.vue index 375174ae81..d13fdbf9e1 100644 --- a/core/core-frontend/src/views/template-market/index.vue +++ b/core/core-frontend/src/views/template-market/index.vue @@ -12,7 +12,7 @@ > - 模版市场 + {{ title }} { } onMounted(() => { + if (route.params.add === '1') { + title.value = '使用模版新建' + } previewInit() initMarketTemplate() const erd = elementResizeDetectorMaker() diff --git a/core/core-frontend/src/views/workbranch/index.vue b/core/core-frontend/src/views/workbranch/index.vue index 4514353224..516757cbdc 100644 --- a/core/core-frontend/src/views/workbranch/index.vue +++ b/core/core-frontend/src/views/workbranch/index.vue @@ -27,19 +27,23 @@ const router = useRouter() const quickCreationList = shallowRef([ { icon: 'icon_dashboard_outlined', - name: 'panel' + name: 'panel', + color: '#3370ff' }, { icon: 'icon_operation-analysis_outlined', - name: 'screen' + name: 'screen', + color: '#00d6b9' }, { icon: 'icon_app_outlined', - name: 'dataset' + name: 'dataset', + color: '#16c0ff' }, { icon: 'icon_database_outlined', - name: 'datasource' + name: 'datasource', + color: '#7f3bf6' } ]) @@ -96,7 +100,7 @@ const state = reactive({ watch( () => activeTabBtn.value, - value => { + () => { initTemplateShow() } ) @@ -220,6 +224,15 @@ const toTemplateMarket = () => { push('/template-market/index') } +const toTemplateMarketAdd = () => { + push({ + name: 'template-market', + params: { + add: '1' + } + }) +} + fillCardInfo() initMarketTemplate() @@ -272,13 +285,19 @@ initMarketTemplate() >
- + {{ t(`auth.${ele.name}`) }}
+
+ + + + 使用模版新建 +
@@ -493,6 +512,14 @@ initMarketTemplate() line-height: 22px; } } + + .item-quick { + width: 100%; + .main-color-quick { + font-size: 32px; + margin-right: 12px; + } + } .quick-create-disabled { cursor: not-allowed; color: var(--ed-color-info-light-5);