From 6d5769529fbfa72b349c3c0f89fd697bcebce79b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 29 Dec 2022 14:50:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?style:=20=E5=AD=97=E4=BD=93=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appTemplate/component/TemplateList.vue    | 17 ++++++++++-----
 .../panel/template/component/TemplateList.vue | 21 ++++++++++++-------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/frontend/src/views/panel/appTemplate/component/TemplateList.vue b/frontend/src/views/panel/appTemplate/component/TemplateList.vue
index 16b8414afe..cc502c0606 100644
--- a/frontend/src/views/panel/appTemplate/component/TemplateList.vue
+++ b/frontend/src/views/panel/appTemplate/component/TemplateList.vue
@@ -47,7 +47,7 @@
             @command="(type) => clickMore(type, ele)"
           >
             <span class="el-dropdown-link">
-              <i class="el-icon-more" />
+              <i class="el-icon-more"/>
             </span>
             <el-dropdown-menu
               slot="dropdown"
@@ -63,13 +63,13 @@
                 icon="el-icon-edit"
                 command="edit"
               >
-                {{ $t("commons.edit") }}
+                {{ $t('commons.edit') }}
               </el-dropdown-item>
               <el-dropdown-item
                 icon="el-icon-delete"
                 command="delete"
               >
-                {{ $t("commons.delete") }}
+                {{ $t('commons.delete') }}
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -83,7 +83,7 @@
       secondary
       @click="add()"
     >
-      {{ $t("panel.add_app_category") }}
+      {{ $t('panel.add_app_category') }}
     </deBtn>
   </div>
 </template>
@@ -179,12 +179,14 @@ export default {
 .de-template-list {
   height: 100%;
   position: relative;
+
   ul {
     margin: 16px 0 20px 0;
     padding: 0;
     overflow-y: auto;
     max-height: calc(100% - 90px);
   }
+
   li {
     list-style: none;
     width: 100%;
@@ -209,12 +211,14 @@ export default {
       color: #8f959e;
       margin-right: 9px;
     }
+
     .more {
       position: absolute;
       top: 50%;
       right: 10px;
       transform: translateY(-50%);
       display: none;
+
       .el-icon-more {
         width: 24px;
         height: 24px;
@@ -247,16 +251,19 @@ export default {
 
   li.select {
     background: var(--deWhiteHover, #3370ff);
-    color: var(--primary, #3370ff);
+    color: var(--TextActive, #f4f4f5);
   }
+
   .de-btn-fix {
     position: absolute;
     bottom: 0;
     left: 0;
   }
 }
+
 .de-template-dropdown {
   margin-top: 0 !important;
+
   .popper__arrow {
     display: none !important;
   }
diff --git a/frontend/src/views/panel/template/component/TemplateList.vue b/frontend/src/views/panel/template/component/TemplateList.vue
index 87db45ec19..b52312dde6 100644
--- a/frontend/src/views/panel/template/component/TemplateList.vue
+++ b/frontend/src/views/panel/template/component/TemplateList.vue
@@ -47,7 +47,7 @@
             @command="(type) => clickMore(type, ele)"
           >
             <span class="el-dropdown-link">
-              <i class="el-icon-more" />
+              <i class="el-icon-more"/>
             </span>
             <el-dropdown-menu
               slot="dropdown"
@@ -57,19 +57,19 @@
                 icon="el-icon-upload2"
                 command="import"
               >
-                {{ $t("panel.import") }}
+                {{ $t('panel.import') }}
               </el-dropdown-item>
               <el-dropdown-item
                 icon="el-icon-edit"
                 command="edit"
               >
-                {{ $t("panel.rename") }}
+                {{ $t('panel.rename') }}
               </el-dropdown-item>
               <el-dropdown-item
                 icon="el-icon-delete"
                 command="delete"
               >
-                {{ $t("panel.delete") }}
+                {{ $t('panel.delete') }}
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -83,7 +83,7 @@
       secondary
       @click="add()"
     >
-      {{ $t("panel.add_category") }}
+      {{ $t('panel.add_category') }}
     </deBtn>
   </div>
 </template>
@@ -174,12 +174,14 @@ export default {
 .de-template-list {
   height: 100%;
   position: relative;
+
   ul {
     margin: 16px 0 20px 0;
     padding: 0;
     overflow-y: auto;
     max-height: calc(100% - 90px);
   }
+
   li {
     list-style: none;
     width: 100%;
@@ -200,7 +202,7 @@ export default {
     overflow: hidden;
     text-overflow: ellipsis;
 
-    .text-template-overflow{
+    .text-template-overflow {
       display: inline-block;
       max-width: 87%;
       overflow: hidden;
@@ -212,12 +214,14 @@ export default {
       color: #8f959e;
       margin-right: 9px;
     }
+
     .more {
       position: absolute;
       top: 50%;
       right: 10px;
       transform: translateY(-50%);
       display: none;
+
       .el-icon-more {
         width: 24px;
         height: 24px;
@@ -250,16 +254,19 @@ export default {
 
   li.select {
     background: var(--deWhiteHover, #3370ff);
-    color: var(--primary, #3370ff);
+    color: var(--TextActive, #f4f4f5);
   }
+
   .de-btn-fix {
     position: absolute;
     bottom: 0;
     left: 0;
   }
 }
+
 .de-template-dropdown {
   margin-top: 0 !important;
+
   .popper__arrow {
     display: none !important;
   }

From a44c6e264871b46113aeff856d5b7f8c5f48204e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 29 Dec 2022 15:01:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4Tab=E7=BB=84=E4=BB=B6=E7=9A=84=E6=8B=96?=
 =?UTF-8?q?=E6=8B=BD=E5=8C=BA=EF=BC=8CTab=E7=BB=84=E4=BB=B6=E6=8B=96?=
 =?UTF-8?q?=E6=8B=BD=E5=8C=BA=E5=9B=BA=E5=AE=9A=E5=9C=A8=E5=A4=B4=E9=83=A8?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E4=B8=8E=E5=86=85=E9=83=A8=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E5=8C=BA=E5=9F=9F=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/deDrag/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/deDrag/index.vue b/frontend/src/components/deDrag/index.vue
index 7ac61779e8..251764faa9 100644
--- a/frontend/src/components/deDrag/index.vue
+++ b/frontend/src/components/deDrag/index.vue
@@ -79,17 +79,17 @@
           @mousedown="elementMouseDown"
         />
         <div
-          v-show="!this.element.editing"
+          v-show="!this.element.editing && this.element.type !=='de-tabs'"
           class="de-drag-area de-drag-right"
           @mousedown="elementMouseDown"
         />
         <div
-          v-show="!this.element.editing"
+          v-show="!this.element.editing && this.element.type !=='de-tabs'"
           class="de-drag-area de-drag-bottom"
           @mousedown="elementMouseDown"
         />
         <div
-          v-show="!this.element.editing"
+          v-show="!this.element.editing && this.element.type !=='de-tabs'"
           class="de-drag-area de-drag-left"
           @mousedown="elementMouseDown"
         />