From 0d84a700204833c60629be46e432eb6ee8b3512d Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 18 Sep 2024 14:04:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/drag/index.vue                        | 8 ++++----
 src/components/model-article-tabs/index.vue               | 2 +-
 .../model-article-tabs/model-article-tabs-content.vue     | 6 ++++++
 src/components/model-goods-tabs/index.vue                 | 3 ++-
 .../model-goods-tabs/model-goods-tabs-content.vue         | 6 ++++++
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/base/drag/index.vue b/src/components/base/drag/index.vue
index c44114f8..cabcd357 100644
--- a/src/components/base/drag/index.vue
+++ b/src/components/base/drag/index.vue
@@ -1,12 +1,12 @@
 <template>
     <VueDraggable v-model="from" :animation="500" target=".sort-target" handle=".icon-drag" :scroll="true" :on-sort="on_sort">
         <TransitionGroup type="transition" tag="ul" name="fade" class="sort-target flex-col gap-x-20">
-            <li v-for="(item, index) in from" :key="item.id" :class="className" class="flex gap-y-16 re" @click="on_click(item, index)">
+            <li v-for="(item, index) in from" :key="item.id" :class="className" class="flex gap-y-16 re" @click.stop="on_click(item, index)">
                 <el-icon class="iconfont icon-drag size-16 cursor-move" />
                 <slot :row="item" :index="index" />
-                <el-icon v-if="isShowEdit" class="iconfont icon-commodity-edit size-16 cr-primary do-not-trigger two-click" @click="edit(index)" />
-                <el-icon v-if="type == 'line'" class="iconfont icon-del-o size-16 do-not-trigger" @click="remove(index)" />
-                <el-icon v-if="type == 'card'" class="iconfont icon-close-o size-16 abs cr-c top-de-5 right-de-5" @click="remove(index)" />
+                <el-icon v-if="isShowEdit" class="iconfont icon-commodity-edit size-16 cr-primary do-not-trigger two-click" @click.stop="edit(index)" />
+                <el-icon v-if="type == 'line'" class="iconfont icon-del-o size-16 do-not-trigger" @click.stop="remove(index)" />
+                <el-icon v-if="type == 'card'" class="iconfont icon-close-o size-16 abs cr-c top-de-5 right-de-5" @click.stop="remove(index)" />
             </li>
         </TransitionGroup>
     </VueDraggable>
diff --git a/src/components/model-article-tabs/index.vue b/src/components/model-article-tabs/index.vue
index 5b5a2256..a343e301 100644
--- a/src/components/model-article-tabs/index.vue
+++ b/src/components/model-article-tabs/index.vue
@@ -25,7 +25,7 @@ watch(
         const newVal = cloneDeep(val);
         const new_style = newVal?.style;
         let new_data = newVal;
-        tabs_active_index.value = new_data.content.tabs_list.length - 1 >= new_data.content.tabs_active_index ? new_data.content.tabs_active_index : new_data.content.tabs_list.length - 1;
+        tabs_active_index.value = new_data.content.tabs_active_index;
         new_data.content.theme = new_data.content.article_theme;
         new_data.content.data_type = new_data.content.tabs_list[tabs_active_index.value].data_type;
         new_data.content.category_ids = new_data.content.tabs_list[tabs_active_index.value].category_ids;
diff --git a/src/components/model-article-tabs/model-article-tabs-content.vue b/src/components/model-article-tabs/model-article-tabs-content.vue
index 9e05bf5d..2c599e8b 100644
--- a/src/components/model-article-tabs/model-article-tabs-content.vue
+++ b/src/components/model-article-tabs/model-article-tabs-content.vue
@@ -195,7 +195,13 @@ const tabs_list_click = (item: any, index: number) => {
 const tabs_list_remove = (index: number) => {
     if (form.tabs_list.length > 1) {
         form.tabs_list.splice(index, 1);
+        if (form.tabs_list.length > index) {
+            form.tabs_active_index = index;
+        } else {
+            form.tabs_active_index = index - 1;
+        }
     } else {
+        form.tabs_active_index = 0;
         ElMessage.warning('至少保留一个选项卡');
     }
 };
diff --git a/src/components/model-goods-tabs/index.vue b/src/components/model-goods-tabs/index.vue
index b59ee564..a8cf2e41 100644
--- a/src/components/model-goods-tabs/index.vue
+++ b/src/components/model-goods-tabs/index.vue
@@ -25,10 +25,11 @@ const tabs_active_index = ref(0);
 watch(
     () => props.value,
     (val) => {
+        console.log('1');
         const new_val = cloneDeep(val);
         const new_style = new_val?.style;
         let new_data = new_val;
-        tabs_active_index.value = new_data.content.tabs_list.length - 1 >= new_data.content.tabs_active_index ? new_data.content.tabs_active_index : new_data.content.tabs_list.length - 1;
+        tabs_active_index.value = new_data.content.tabs_active_index;
         // 产品的值
         new_data.content.data_type = new_data.content.tabs_list[tabs_active_index.value].data_type;
         new_data.content.category_ids = new_data.content.tabs_list[tabs_active_index.value].category_ids;
diff --git a/src/components/model-goods-tabs/model-goods-tabs-content.vue b/src/components/model-goods-tabs/model-goods-tabs-content.vue
index a9d98d16..e247fc45 100644
--- a/src/components/model-goods-tabs/model-goods-tabs-content.vue
+++ b/src/components/model-goods-tabs/model-goods-tabs-content.vue
@@ -181,7 +181,13 @@ const tabs_list_click = (item: any, index: number) => {
 const tabs_list_remove = (index: number) => {
     if (form.value.tabs_list.length > 1) {
         form.value.tabs_list.splice(index, 1);
+        if (form.value.tabs_list.length > index) {
+            form.value.tabs_active_index = index;
+        } else {
+            form.value.tabs_active_index = index - 1;
+        }
     } else {
+        form.value.tabs_active_index = 0;
         ElMessage.warning('至少保留一个选项卡');
     }
 };