From 889de555de4808be8e698e45b6ffb7b88e721c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 14 Nov 2024 18:16:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-custom/model-custom-content.vue     |  4 --
 .../magic-cube-settings/tabs-content.vue      |  5 +-
 src/views/layout/index.vue                    | 58 +++++++++++--------
 3 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/components/model-custom/model-custom-content.vue b/src/components/model-custom/model-custom-content.vue
index bd7e93f1..60b78e3c 100644
--- a/src/components/model-custom/model-custom-content.vue
+++ b/src/components/model-custom/model-custom-content.vue
@@ -85,10 +85,6 @@ const dialog = ref<expose | null>(null);
 const draglist = ref<diy_data | null>(null);
 const form = ref(props.value);
 const center_width = ref(props.magicWidth);
-watchEffect(() => {
-    form.value = props.value;
-    center_width.value = props.magicWidth;
-})
 // 弹出框里的内容
 let custom_list = reactive([]);
 const center_height = ref(0);
diff --git a/src/components/model-data-magic/components/magic-cube-settings/tabs-content.vue b/src/components/model-data-magic/components/magic-cube-settings/tabs-content.vue
index 895de2ba..fd3ee06d 100644
--- a/src/components/model-data-magic/components/magic-cube-settings/tabs-content.vue
+++ b/src/components/model-data-magic/components/magic-cube-settings/tabs-content.vue
@@ -89,7 +89,7 @@
     </template>
     <template v-else-if="form.data_type == 'custom'">
         <div class="bg-f5 divider-line" />
-        <model-custom-content :value="form" :magic-width="form.width"></model-custom-content>
+        <model-custom-content :key="key" :value="form" :magic-width="form.width"></model-custom-content>
     </template>
     <template v-else>
         <div class="bg-f5 divider-line" />
@@ -146,9 +146,10 @@ const goods_list_replace = (index: number) => {
     url_value_multiple_bool.value = false;
     url_value_dialog_visible.value = true;
 };
-
+const key = ref('0');
 watchEffect(() => {
     form.value = props.value;
+    key.value = get_math();
 });
 
 const goods_list_add = () => {
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 4607b308..c20b6606 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -22,7 +22,7 @@ import { is_obj, set_cookie, get_cookie } from '@/utils';
 import { Settings, AppMain } from './components/index';
 import defaultSettings from './components/main/index';
 import defaultConfigSetting from '@/config/setting';
-import { cloneDeep, omit } from 'lodash';
+import { cloneDeep, isEmpty, omit } from 'lodash';
 import DiyAPI, { diyData, headerAndFooter, diyConfig } from '@/api/diy';
 import CommonAPI from '@/api/common';
 import { commonStore } from '@/store';
@@ -305,37 +305,47 @@ const save_formmat_form_data = (data: diy_data_item, close: boolean = false, is_
                         data_id: item3.data.id,
                     };
                 });
-                const data_list = cloneDeep(item1.data_content.data_source_content.data_list);
-                // 数据改造,存放手动的id
-                item1.data_content.data_source_content.data_ids = data_list.map((item4: any) => item4.data.id).join(',') || '';
+                if (['goods', 'article', 'brand'].includes(item1.data_content.data_source)) {
+                    const data_list = cloneDeep(item1.data_content.data_source_content.data_list);
+                    // 数据改造,存放手动的id
+                    item1.data_content.data_source_content.data_ids = data_list.map((item4: any) => item4.data.id).join(',') || '';
+                    // 数据改造,存放手动的清除里边的data
+                    item1.data_content.data_source_content.data_list = data_list.map((item5: any) => {
+                        return {
+                            ...item5,
+                            data: [],
+                            data_id: item5.data.id,
+                        };
+                    });
+                } else {
+                    item1.data_content.data_source_content.data_ids = [];
+                    item1.data_content.data_source_content.data_list = [];
+                }
                 // 自动数据清空
                 item1.data_content.data_source_content.data_auto_list = [];
-                // 数据改造,存放手动的清除里边的data
-                item1.data_content.data_source_content.data_list = data_list.map((item5: any) => {
-                    return {
-                        ...item5,
-                        data: [],
-                        data_id: item5.data.id,
-                    };
-                });
             });
         } else if (new_array_5.includes(item.key)) {
             // 从数据中剔除data_source_content_value字段
             item.com_data.content = omit(cloneDeep(item.com_data.content), ['data_source_content_value']);
-            // 手动的数据内容
-            const data_list = cloneDeep(item.com_data.content.data_source_content.data_list);
-            // 数据改造,存放手动的id
-            item.com_data.content.data_source_content.data_ids = data_list.map((item: any) => item.data.id).join(',') || '';
+            if (['goods', 'article', 'brand'].includes(item.com_data.content.data_source)) {
+                // 手动的数据内容
+                const data_list = cloneDeep(item.com_data.content.data_source_content.data_list);
+                // 数据改造,存放手动的id
+                item.com_data.content.data_source_content.data_ids = data_list.map((item: any) => item.data.id || '').join(',') || '';
+                // 数据改造,存放手动的清除里边的data
+                item.com_data.content.data_source_content.data_list = data_list.map((item1: any) => {
+                    return {
+                        ...item1,
+                        data: [],
+                        data_id: item1.data.id,
+                    };
+                });
+            } else {
+                item.com_data.content.data_source_content.data_ids = [];
+                item.com_data.content.data_source_content.data_list = [];
+            }
             // 自动数据清空
             item.com_data.content.data_source_content.data_auto_list = [];
-            // 数据改造,存放手动的清除里边的data
-            item.com_data.content.data_source_content.data_list = data_list.map((item1: any) => {
-                return {
-                    ...item1,
-                    data: [],
-                    data_id: item1.data.id,
-                };
-            });
         }
         return {
             ...item,