From ce34cae3548708e471f7c4966eea1b4cd4fac659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 10 Dec 2024 17:44:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/custom-module/model-icon/model-icon-style.vue    | 4 ++--
 src/components/common/magic-cube/index.vue                  | 4 ++++
 .../components/magic-cube-settings/tabs-content.vue         | 6 +++++-
 .../model-data-magic/model-data-magic-content.vue           | 1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/common/custom-module/model-icon/model-icon-style.vue b/src/components/common/custom-module/model-icon/model-icon-style.vue
index 5da69ba8..e69973eb 100644
--- a/src/components/common/custom-module/model-icon/model-icon-style.vue
+++ b/src/components/common/custom-module/model-icon/model-icon-style.vue
@@ -139,9 +139,9 @@ const icon_change = (key: string) => {
 const link_change = (key: string) => {
     if (key == '2') {
         form.value.icon_link = {};
-        form.value.data_source_link_field = get_data_fields(props.options, 'icon', form.value.data_source_link_field.id);
+        form.value.data_source_link_field = get_data_fields(props.options, 'link', form.value.data_source_link_field.id);
     } else {
-        form.value.data_source_link_field = get_data_fields([], 'icon', '');
+        form.value.data_source_link_field = get_data_fields([], 'link', '');
     }
 };
 const mult_color_picker_event = (arry: color_list[], type: number) => {
diff --git a/src/components/common/magic-cube/index.vue b/src/components/common/magic-cube/index.vue
index 6848c961..8a64b0f5 100644
--- a/src/components/common/magic-cube/index.vue
+++ b/src/components/common/magic-cube/index.vue
@@ -270,6 +270,10 @@ const data_title = (item: CubeItem) => {
             title = `共有${ item.data_content.goods_list.length }个商品`;
         } else if (item.data_content.data_type == 'images') {
             title = `共有${ item.data_content.images_list.length }个图片`;
+        } else if (item.data_content.data_type == 'custom') {
+            title = `自定义${ !isEmpty(item.data_content.custom_mark_name) ? '(' + item.data_content.custom_mark_name + ')' : '' }`;
+        } else {
+            title = `视频`;
         }
     }
     return title;
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 fa711a6c..b1a288e3 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
@@ -94,7 +94,7 @@
     </template>
     <template v-else-if="form.data_type == 'custom'">
         <div class="bg-f5 divider-line" />
-        <model-custom-content :key="key" :value="form" :magic-width="form.width"></model-custom-content>
+        <model-custom-content :key="key" :value="form" :magic-width="form.width" @data_source_change="data_source_change"></model-custom-content>
     </template>
     <template v-else>
         <div class="bg-f5 divider-line" />
@@ -191,6 +191,10 @@ const url_value_dialog_call_back = (item: any[]) => {
         };
     }
 };
+
+const data_source_change = (name: string) => {
+    form.value.custom_mark_name = name;
+};
 </script>
 <style lang="scss" scoped>
 .card-background {
diff --git a/src/components/model-data-magic/model-data-magic-content.vue b/src/components/model-data-magic/model-data-magic-content.vue
index 5faf8c71..8403115f 100644
--- a/src/components/model-data-magic/model-data-magic-content.vue
+++ b/src/components/model-data-magic/model-data-magic-content.vue
@@ -253,6 +253,7 @@ const data_content = {
         // 自动
         data_auto_list: [],
     },
+    custom_mark_name: '',
     // 自定义内容列表
     custom_list: [],
     //视频信息