From e2503d3cf730b061ff24e15595836f72c0267c49 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 11 Dec 2023 12:42:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E4=B8=AD=E5=BF=83=E9=BB=98=E8=AE=A4=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/template-market/index.vue | 2 +-
 1 file changed, 1 insertion(+), 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 168fbdcb1f..ca66b28faa 100644
--- a/core/core-frontend/src/views/template-market/index.vue
+++ b/core/core-frontend/src/views/template-market/index.vue
@@ -355,7 +355,7 @@ const initMarketTemplate = async () => {
       state.baseUrl = rsp.data.baseUrl
       state.currentMarketTemplateShowList = rsp.data.contents
       state.marketTabs = rsp.data.categories
-      state.marketActiveTab = state.marketTabs[0].label
+      state.marketActiveTab = state.marketTabs[1].label
       initStyle()
       initTemplateShow()
     })

From f76ca3f25063462c3d916501f376617f1ea9927d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 11 Dec 2023 13:08:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=8A=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E6=A8=A1=E6=9D=BF=E5=88=9B=E5=BB=BA=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=97=B6=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=80=89=E6=8B=A9=E6=96=87=E4=BB=B6=E5=A4=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/template-market/index.vue | 6 +++++-
 1 file changed, 5 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 ca66b28faa..312b74a06e 100644
--- a/core/core-frontend/src/views/template-market/index.vue
+++ b/core/core-frontend/src/views/template-market/index.vue
@@ -428,7 +428,11 @@ const apply = () => {
         templateData.type === 'dataV'
           ? '#/dvCanvas?opt=create&createType=template'
           : '#/dashboard?opt=create&createType=template'
-      window.open(baseUrl, '_blank')
+      if (state.pid) {
+        window.open(baseUrl + `&pid=${state.pid}`, '_blank')
+      } else {
+        window.open(baseUrl, '_blank')
+      }
     })
     .catch(() => {
       state.loading = false