From 9275c7e352ff93106e5752c7f4d26abcac599d6f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 19 Jan 2024 17:38:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=88=9B=E5=BB=BA=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BD=BF=E7=94=A8=E6=A8=A1=E6=9D=BF=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=88=9B=E5=BB=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=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/workbranch/index.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/views/workbranch/index.vue b/core/core-frontend/src/views/workbranch/index.vue
index 44b369f83e..6f8d415a29 100644
--- a/core/core-frontend/src/views/workbranch/index.vue
+++ b/core/core-frontend/src/views/workbranch/index.vue
@@ -238,11 +238,13 @@ const toTemplateMarket = () => {
 }
 
 const toTemplateMarketAdd = () => {
-  const params = {
-    curPosition: 'branchCreate',
-    templateType: 'all'
+  if (havePanelAuth.value || haveScreenAuth.value) {
+    const params = {
+      curPosition: 'branchCreate',
+      templateType: 'all'
+    }
+    resourceCreateOpt.value.optInit(params)
   }
-  resourceCreateOpt.value.optInit(params)
 }
 
 fillCardInfo()

From 671dd498a13018ad6051116f6b924b0171450568 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 19 Jan 2024 17:40:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?=
 =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E9=94=AE=E7=9B=98?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=BB=84=E4=BB=B6=E7=A7=BB=E5=8A=A8=E5=90=8E?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A7=A6=E5=8F=91=E4=BF=9D=E5=AD=98=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20#7695?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/utils/DeShortcutKey.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/core-frontend/src/utils/DeShortcutKey.ts b/core/core-frontend/src/utils/DeShortcutKey.ts
index 0a6f846971..fe1994fd6b 100644
--- a/core/core-frontend/src/utils/DeShortcutKey.ts
+++ b/core/core-frontend/src/utils/DeShortcutKey.ts
@@ -180,6 +180,7 @@ function move(keyCode) {
     } else if (keyCode === downKey) {
       curComponent.value.style.top = ++curComponent.value.style.top
     }
+    snapshotStore.recordSnapshotCache('key-move')
   }
 }
 

From e80444e420f1d295c7ad69eb0200eb3178d8b296 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 19 Jan 2024 18:04:02 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=A8=A1=E6=9D=BF=E4=B8=AD=E5=BF=83=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=87=BA=E7=8E=B0=E5=BA=94=E7=94=A8=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template-market/component/TemplateMarketV2Item.vue    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue b/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue
index 9de51114a8..dd44ccbb2c 100644
--- a/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue
+++ b/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue
@@ -5,14 +5,10 @@
     <el-row
       class="bottom-area-show"
       :class="{
-        'create-area':
-          ['branchCreate', 'create'].includes(props.curPosition) ||
-          !createAuth[template.templateType]
+        'create-area': !createAuth[template.templateType]
       }"
     >
-      <el-row class="demonstration">
-        {{ template.title }}
-      </el-row>
+      <el-row class="demonstration"> {{ template.title }} </el-row>
       <el-row class="template-button">
         <el-button size="mini" style="width: calc(50% - 18px)" @click="templateInnerPreview">{{
           t('visualization.preview')