From 0c93e91a23539bcf0caf8c1490403da93ae02f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 25 Nov 2024 18:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=81=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-nav-group/model-nav-group-content.vue | 4 +---
 src/views/layout/index.vue                                 | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/model-nav-group/model-nav-group-content.vue b/src/components/model-nav-group/model-nav-group-content.vue
index 67dc50e8..1167790d 100644
--- a/src/components/model-nav-group/model-nav-group-content.vue
+++ b/src/components/model-nav-group/model-nav-group-content.vue
@@ -215,9 +215,8 @@ const { form } = toRefs(state);
 const tabs_active_index = ref(0);
 onBeforeMount(() => {
     tabs_active_index.value = 0;
-    let nav_content_list = form.value.nav_content_list;
     // 兼容老数据
-    nav_content_list = nav_content_list.map(item => ({
+    form.value.nav_content_list = form.value.nav_content_list.map(item => ({
         ...item,
         tabs_name: 'content',
         // 角标配置
@@ -239,7 +238,6 @@ onBeforeMount(() => {
                 }
             } : item.subscript,
     }));
-    console.log(nav_content_list);
 });
 
 const add = () => {
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 762b2316..3e37f3d1 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -243,6 +243,8 @@ const save_formmat_form_data = (data: diy_data_item, close: boolean = false, is_
     const new_array_4 = ['data-magic'];
     // 自定义数据
     const new_array_5 = ['custom'];
+    // 导航组
+    const new_array_6 = ['nav-group'];
     clone_form.diy_data = clone_form.diy_data.map((item: any) => {
         if (new_array_1.includes(item.key)) {
             item.com_data.content.data_ids = item.com_data.content.data_list.map((item: any) => item.data.id).join(',') || '';
@@ -368,6 +370,8 @@ const save_formmat_form_data = (data: diy_data_item, close: boolean = false, is_
             }
             // 自动数据清空
             item.com_data.content.data_source_content.data_auto_list = [];
+        } else if (new_array_6.includes(item.key)) {
+            item.com_data.content.nav_content_list = item.com_data.content.nav_content_list.map((item0: any) => ({...omit(item0, 'tabs_name') }));
         }
         return {
             ...item,