From 951b620199324ec72cddd59712349c98cd7d2b5a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 7 Jun 2024 16:49:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20Tab?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/package.json               |   1 +
 .../custom-component/de-tabs/Component.vue    | 128 ++++++++++--------
 2 files changed, 71 insertions(+), 58 deletions(-)

diff --git a/core/core-frontend/package.json b/core/core-frontend/package.json
index 82d27937e7..bbedafb745 100644
--- a/core/core-frontend/package.json
+++ b/core/core-frontend/package.json
@@ -51,6 +51,7 @@
     "vue": "^3.3.4",
     "vue-clipboard3": "^2.0.0",
     "vue-codemirror": "^6.1.1",
+    "vue-draggable-next": "^2.2.1",
     "vue-i18n": "^9.2.2",
     "vue-router": "4.1.3",
     "vue-types": "^5.0.2",
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 86b453b4c8..581a8536e7 100644
--- a/core/core-frontend/src/custom-component/de-tabs/Component.vue
+++ b/core/core-frontend/src/custom-component/de-tabs/Component.vue
@@ -14,65 +14,67 @@
       :border-color="noBorderColor"
       :border-active-color="borderActiveColor"
     >
-      <el-tab-pane
-        class="el-tab-pane-custom"
-        :lazy="true"
-        :key="tabItem.name"
-        v-for="(tabItem, index) in element.propValue"
-        :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>
+      <draggable :list="moveTabs" animation="100" class="drag-list" item-key="id">
+        <el-tab-pane
+          class="el-tab-pane-custom"
+          :lazy="true"
+          :key="tabItem.name"
+          v-for="(tabItem, index) in moveTabs"
+          :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', 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>
+                  <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>
+      </draggable>
     </de-custom-tab>
     <el-dialog
       title="编辑标题"
@@ -118,6 +120,7 @@ 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)
@@ -174,8 +177,17 @@ 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) {