From 5dfb686c5793e39870069049094ef868826225ee Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 11 Jun 2024 18:01:39 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/de-tabs/Component.vue    | 144 +++++++++---------
 .../de-tabs/CustomTabsSort.vue                |   2 +
 2 files changed, 75 insertions(+), 71 deletions(-)

diff --git a/core/core-frontend/src/custom-component/de-tabs/Component.vue b/core/core-frontend/src/custom-component/de-tabs/Component.vue
index fbe4866228..8a00528aaf 100644
--- a/core/core-frontend/src/custom-component/de-tabs/Component.vue
+++ b/core/core-frontend/src/custom-component/de-tabs/Component.vue
@@ -14,68 +14,65 @@
       :border-color="noBorderColor"
       :border-active-color="borderActiveColor"
     >
-      <draggable :list="moveTabs" animation="300" class="drag-list">
-        <template #item="{ element, index }">
-          <el-tab-pane
-            class="el-tab-pane-custom"
-            :lazy="true"
-            :key="element.name"
-            :label="element.title"
-            :name="element.name"
-          >
-            <template #label>
-              <span :style="titleStyle(element.name)">{{ element.title }}</span>
-              <el-dropdown
-                v-if="isEditMode"
-                style="line-height: 4 !important"
-                trigger="click"
-                @command="handleCommand"
-              >
-                <span class="el-dropdown-link">
-                  <el-icon v-if="isEdit"><ArrowDown /></el-icon>
-                </span>
-                <template #dropdown>
-                  <el-dropdown-menu>
-                    <el-dropdown-item :command="beforeHandleCommand('editTitle', element)">
-                      编辑标题
-                    </el-dropdown-item>
+      <template :key="tabItem.name" v-for="(tabItem, index) in element.propValue">
+        <el-tab-pane
+          class="el-tab-pane-custom"
+          :lazy="true"
+          :label="tabItem.title"
+          :name="tabItem.name"
+        >
+          <template #label>
+            <span :style="titleStyle(tabItem.name)">{{ tabItem.title }}</span>
+            <el-dropdown
+              v-if="isEditMode"
+              style="line-height: 4 !important"
+              trigger="click"
+              @command="handleCommand"
+            >
+              <span class="el-dropdown-link">
+                <el-icon v-if="isEdit"><ArrowDown /></el-icon>
+              </span>
+              <template #dropdown>
+                <el-dropdown-menu>
+                  <el-dropdown-item :command="beforeHandleCommand('editTitle', tabItem)">
+                    编辑标题
+                  </el-dropdown-item>
 
-                    <el-dropdown-item
-                      v-if="element.propValue.length > 1"
-                      :command="beforeHandleCommand('deleteCur', element)"
-                    >
-                      删除
-                    </el-dropdown-item>
-                  </el-dropdown-menu>
-                </template>
-              </el-dropdown>
-            </template>
-            <de-canvas
-              v-if="isEdit && !mobileInPc"
-              :ref="'tabCanvas_' + index"
-              :component-data="element.componentData"
-              :canvas-style-data="canvasStyleData"
-              :canvas-view-info="canvasViewInfo"
-              :canvas-id="element.id + '--' + element.name"
-              :class="moveActive ? 'canvas-move-in' : ''"
-              :canvas-active="editableTabsValue === element.name"
-            ></de-canvas>
-            <de-preview
-              v-else
-              :ref="'dashboardPreview'"
-              :dv-info="dvInfo"
-              :cur-gap="curPreviewGap"
-              :component-data="element.componentData"
-              :canvas-style-data="canvasStyleData"
-              :canvas-view-info="canvasViewInfo"
-              :canvas-id="element.id + '--' + element.name"
-              :preview-active="editableTabsValue === element.name"
-              :show-position="showPosition"
-              :outer-scale="scale"
-            ></de-preview>
-          </el-tab-pane>
-        </template>
-      </draggable>
+                  <el-dropdown-item
+                    v-if="element.propValue.length > 1"
+                    :command="beforeHandleCommand('deleteCur', tabItem)"
+                  >
+                    删除
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
+          </template>
+          <de-canvas
+            v-if="isEdit && !mobileInPc"
+            :ref="'tabCanvas_' + index"
+            :component-data="tabItem.componentData"
+            :canvas-style-data="canvasStyleData"
+            :canvas-view-info="canvasViewInfo"
+            :canvas-id="element.id + '--' + tabItem.name"
+            :class="moveActive ? 'canvas-move-in' : ''"
+            :canvas-active="editableTabsValue === tabItem.name"
+          ></de-canvas>
+          <de-preview
+            v-else
+            :ref="'dashboardPreview'"
+            :dv-info="dvInfo"
+            :cur-gap="curPreviewGap"
+            :component-data="tabItem.componentData"
+            :canvas-style-data="canvasStyleData"
+            :canvas-view-info="canvasViewInfo"
+            :canvas-id="element.id + '--' + tabItem.name"
+            :preview-active="editableTabsValue === tabItem.name"
+            :show-position="showPosition"
+            :outer-scale="scale"
+          ></de-preview>
+        </el-tab-pane>
+      </template>
     </de-custom-tab>
     <el-dialog
       title="编辑标题"
@@ -106,6 +103,7 @@ import {
   computed,
   getCurrentInstance,
   nextTick,
+  onBeforeMount,
   onMounted,
   reactive,
   ref,
@@ -121,7 +119,6 @@ import { canvasChangeAdaptor, findComponentIndexById } from '@/utils/canvasUtils
 import DeCustomTab from '@/custom-component/de-tabs/DeCustomTab.vue'
 import DePreview from '@/components/data-visualization/canvas/DePreview.vue'
 import { useEmitt } from '@/hooks/web/useEmitt'
-import draggable from 'vuedraggable'
 const dvMainStore = dvMainStoreWithOut()
 const { tabMoveInActiveId, bashMatrixInfo, editMode, mobileInPc } = storeToRefs(dvMainStore)
 const tabComponentRef = ref(null)
@@ -178,17 +175,8 @@ const editableTabsValue = ref(null)
 const noBorderColor = ref('none')
 let currentInstance
 
-const moveTabs = computed(
-  () => element.value.propValue || [{ name: '1', label: 'Tab 1', content: 'Content 1' }]
-)
-
 const isEditMode = computed(() => editMode.value === 'edit' && isEdit.value && !mobileInPc.value)
 
-const onMove = evt => {
-  // do custom
-  return true
-}
-
 const calcTabLength = () => {
   setTimeout(() => {
     if (element.value.propValue.length > 1) {
@@ -391,6 +379,13 @@ const activeCanvasId = computed(() => {
   return element.value.id + '--' + editableTabsValue.value
 })
 
+const reShow = () => {
+  state.tabShow = false
+  nextTick(() => {
+    state.tabShow = true
+  })
+}
+
 onMounted(() => {
   if (element.value.propValue.length > 0) {
     editableTabsValue.value = element.value.propValue[0].name
@@ -398,8 +393,15 @@ onMounted(() => {
   calcTabLength()
   eventBus.on('onTabMoveIn-' + element.value.id, componentMoveIn)
   eventBus.on('onTabMoveOut-' + element.value.id, componentMoveOut)
+  eventBus.on('onTabSortChange-' + element.value.id, reShow)
   currentInstance = getCurrentInstance()
 })
+
+onBeforeMount(() => {
+  eventBus.off('onTabMoveIn-' + element.value.id, componentMoveIn)
+  eventBus.off('onTabMoveOut-' + element.value.id, componentMoveOut)
+  eventBus.off('onTabSortChange-' + element.value.id, reShow)
+})
 </script>
 <style lang="less" scoped>
 :deep(.ed-tabs__content) {
diff --git a/core/core-frontend/src/custom-component/de-tabs/CustomTabsSort.vue b/core/core-frontend/src/custom-component/de-tabs/CustomTabsSort.vue
index 39e7a90a6d..1c690e2eaa 100644
--- a/core/core-frontend/src/custom-component/de-tabs/CustomTabsSort.vue
+++ b/core/core-frontend/src/custom-component/de-tabs/CustomTabsSort.vue
@@ -37,6 +37,7 @@ import { onMounted, ref, toRefs } from 'vue'
 import { deepCopy } from '@/utils/utils'
 import { ElButton } from 'element-plus-secondary'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
+import eventBus from '@/utils/eventBus'
 const snapshotStore = snapshotStoreWithOut()
 const props = defineProps({
   element: {
@@ -66,6 +67,7 @@ const closeDialog = () => {
 const save = () => {
   element.value.propValue = deepCopy(sortList.value)
   snapshotStore.recordSnapshotCache()
+  eventBus.emit('onTabSortChange-' + element.value.id)
   closeDialog()
 }