From cdf2dc2b367254c0ecdc891086edbd217cb6f72a Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Thu, 21 Nov 2024 21:26:11 +0800
Subject: [PATCH] =?UTF-8?q?chore(editor):=20=E4=BC=98=E5=8C=96=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2tab=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page-bar/PageBarScrollContainer.vue       | 39 ++++++++++++-------
 .../editor/src/layouts/page-bar/PageList.vue  |  2 +
 packages/editor/src/theme/page-bar.scss       | 33 +++++++++++-----
 3 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/packages/editor/src/layouts/page-bar/PageBarScrollContainer.vue b/packages/editor/src/layouts/page-bar/PageBarScrollContainer.vue
index 7a76c1b6..0e442e17 100644
--- a/packages/editor/src/layouts/page-bar/PageBarScrollContainer.vue
+++ b/packages/editor/src/layouts/page-bar/PageBarScrollContainer.vue
@@ -1,16 +1,23 @@
 <template>
   <div class="m-editor-page-bar" ref="pageBar">
     <slot name="prepend"></slot>
-
-    <div v-if="canScroll" class="m-editor-page-bar-item m-editor-page-bar-item-icon" @click="scroll('left')">
-      <Icon :icon="ArrowLeftBold"></Icon>
-    </div>
-
-    <div v-if="length" class="m-editor-page-bar-items" ref="itemsContainer" :style="`width: ${itemsContainerWidth}px`">
+    <div v-if="length" class="m-editor-page-bar-items" ref="itemsContainer">
       <slot></slot>
     </div>
 
-    <div v-if="canScroll" class="m-editor-page-bar-item m-editor-page-bar-item-icon" @click="scroll('right')">
+    <div
+      v-if="canScroll"
+      class="m-editor-page-bar-item m-editor-page-bar-item-icon m-editor-page-bar-item-left-icon"
+      @click="scroll('left')"
+    >
+      <Icon :icon="ArrowLeftBold"></Icon>
+    </div>
+
+    <div
+      v-if="canScroll"
+      class="m-editor-page-bar-item m-editor-page-bar-item-icon m-editor-page-bar-item-right-icon"
+      @click="scroll('right')"
+    >
       <Icon :icon="ArrowRightBold"></Icon>
     </div>
   </div>
@@ -80,18 +87,18 @@ onBeforeUnmount(() => {
 let translateLeft = 0;
 
 const scroll = (type: 'left' | 'right' | 'start' | 'end') => {
-  if (!itemsContainer.value) return;
+  if (!itemsContainer.value || !canScroll.value) return;
 
   const maxScrollLeft = itemsContainer.value.scrollWidth - itemsContainerWidth.value;
 
   if (type === 'left') {
-    translateLeft += 100;
+    translateLeft += 200;
 
     if (translateLeft > 0) {
       translateLeft = 0;
     }
   } else if (type === 'right') {
-    translateLeft -= 100;
+    translateLeft -= 200;
 
     if (-translateLeft > maxScrollLeft) {
       translateLeft = -maxScrollLeft;
@@ -110,11 +117,13 @@ watch(
   (length = 0, preLength = 0) => {
     setTimeout(() => {
       setCanScroll();
-      if (length < preLength) {
-        scroll('start');
-      } else {
-        scroll('end');
-      }
+      nextTick(() => {
+        if (length < preLength || preLength === 0) {
+          scroll('start');
+        } else {
+          scroll('end');
+        }
+      });
       if (length > 1) {
         const el = document.querySelector('.m-editor-page-bar-items') as HTMLElement;
         let beforeDragList: Id[] = [];
diff --git a/packages/editor/src/layouts/page-bar/PageList.vue b/packages/editor/src/layouts/page-bar/PageList.vue
index c3c16257..50cc53b3 100644
--- a/packages/editor/src/layouts/page-bar/PageList.vue
+++ b/packages/editor/src/layouts/page-bar/PageList.vue
@@ -18,6 +18,7 @@
             :data="{
               type: 'button',
               text: item.devconfig?.tabName || item.name || item.id,
+              className: item.id === page?.id ? 'active' : '',
               handler: () => switchPage(item.id),
             }"
             :key="index"
@@ -55,6 +56,7 @@ const uiService = services?.uiService;
 const editorService = services?.editorService;
 
 const showPageListButton = computed(() => uiService?.get('showPageListButton'));
+const page = computed(() => editorService?.get('page'));
 const switchPage = (id: Id) => {
   editorService?.select(id);
 };
diff --git a/packages/editor/src/theme/page-bar.scss b/packages/editor/src/theme/page-bar.scss
index 1ea2f551..831f755a 100644
--- a/packages/editor/src/theme/page-bar.scss
+++ b/packages/editor/src/theme/page-bar.scss
@@ -6,13 +6,6 @@
   user-select: none;
 }
 
-.m-editor-page-bar-item-icon {
-  .icon-active {
-    font-weight: bold;
-    color: $--theme-color;
-  }
-}
-
 .m-editor-page-list-item {
   display: flex;
   width: 100%;
@@ -64,6 +57,11 @@
     &-icon {
       position: relative;
       z-index: 1;
+
+      .icon-active {
+        font-weight: bold;
+        color: $--theme-color;
+      }
     }
 
     &-title {
@@ -72,6 +70,18 @@
       white-space: nowrap;
       overflow: hidden;
     }
+
+    &-left-icon,
+    &-right-icon {
+      position: absolute;
+      right: 0;
+      top: 0;
+      height: 100%;
+    }
+
+    &-left-icon {
+      right: 34px;
+    }
   }
 }
 
@@ -85,14 +95,19 @@
     transition: all 0.2s ease 0s;
     padding: 5px 14px;
 
-    .el-button--text,
-    i {
+    .tmagic-design-button {
       color: $--font-color;
     }
 
     &:hover {
       background-color: $--hover-color;
     }
+
+    &.active {
+      .tmagic-design-button {
+        color: $--theme-color;
+      }
+    }
   }
 }