From 03e29c9eb8037e75a7b5df1090bcf68c6de7d6c7 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, 9 Dec 2024 17:29:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-module/data-rendering/index.vue    | 10 +--
 .../common/custom-module/model-icon/index.vue | 28 +++++--
 .../custom-module/model-image/index.vue       | 38 ++++++---
 .../custom-module/model-lines/index.vue       |  2 +-
 .../custom-module/model-panel/index.vue       |  4 +-
 .../common/custom-module/model-text/index.vue | 83 +++++++++++++++----
 src/components/common/filter-form/index.vue   |  4 +-
 .../model-custom/components/index.vue         |  3 +-
 .../model-custom/model-custom-content.vue     |  2 +-
 src/utils/index.ts                            | 22 +++++
 10 files changed, 147 insertions(+), 49 deletions(-)

diff --git a/src/components/common/custom-module/data-rendering/index.vue b/src/components/common/custom-module/data-rendering/index.vue
index e02baec0..e747184f 100644
--- a/src/components/common/custom-module/data-rendering/index.vue
+++ b/src/components/common/custom-module/data-rendering/index.vue
@@ -2,19 +2,19 @@
     <div class="w h re custom-other">
         <div v-for="(item, index) in list" :key="item.id" class="main-content" :style="{'left': percentage_count(item.location.x) , 'top': percentage_count(item.location.y), 'width': percentage_count(item.com_data.com_width), 'height': percentage_count(item.com_data.com_height), 'z-index': (customList.length - 1) - index}">
             <template v-if="item.key == 'text'">
-                <model-text :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :is-custom="isCustom" :title-params="showData?.data_name || 'name'" :is-percentage="true"></model-text>
+                <model-text :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :is-custom="isCustom" :title-params="showData?.data_name || 'name'" :is-display-panel="true"></model-text>
             </template>
             <template v-else-if="item.key == 'img'">
-                <model-image :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :is-custom="isCustom" :img-params="showData?.data_logo || ''" :is-percentage="true"></model-image>
+                <model-image :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :is-custom="isCustom" :img-params="showData?.data_logo || ''" :is-display-panel="true"></model-image>
             </template>
             <template v-else-if="item.key == 'auxiliary-line'">
-                <model-lines :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :is-custom="isCustom"  :is-percentage="true"></model-lines>
+                <model-lines :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :is-custom="isCustom"  :is-display-panel="true"></model-lines>
             </template>
             <template v-else-if="item.key == 'icon'">
-                <model-icon :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :is-custom="isCustom"  :is-percentage="true"></model-icon>
+                <model-icon :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :is-custom="isCustom"  :is-display-panel="true"></model-icon>
             </template>
             <template v-else-if="item.key == 'panel'">
-                <model-panel :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :is-custom="isCustom"  :is-percentage="true"></model-panel>
+                <model-panel :key="item.id" :value="item.com_data" :scale="scale" :source-list="sourceList" :is-custom="isCustom"  :is-display-panel="true"></model-panel>
             </template>
         </div>
     </div>
diff --git a/src/components/common/custom-module/model-icon/index.vue b/src/components/common/custom-module/model-icon/index.vue
index 0e524da0..57f4f8eb 100644
--- a/src/components/common/custom-module/model-icon/index.vue
+++ b/src/components/common/custom-module/model-icon/index.vue
@@ -9,7 +9,7 @@
     </div>
 </template>
 <script setup lang="ts">
-import { radius_computer, padding_computer, gradient_handle } from '@/utils';
+import { radius_computer, padding_computer, gradient_handle, get_nested_property } from '@/utils';
 import { isEmpty } from 'lodash';
 const props = defineProps({
     value: {
@@ -25,7 +25,7 @@ const props = defineProps({
             return {};
         }
     },
-    isPercentage: {
+    isDisplayPanel: {
         type: Boolean,
         default: false
     },
@@ -46,11 +46,23 @@ const icon_class = computed(() => {
         return form.value.icon_class;
     } else {
         if (!isEmpty(props.sourceList)) {
-            // 不输入商品， 文章和品牌时，从外层处理数据
-            let icon = props.sourceList[form.value.data_source_id];
-            // 如果是商品,品牌，文章的图片， 其他的切换为从data中取数据
-            if (!isEmpty(props.sourceList.data) && props.isCustom) {
-                icon = props.sourceList.data[form.value.data_source_id];
+            let icon = '';
+            // 获取数据源ID
+            const data_source_id = form.value.data_source_id;
+            if (!data_source_id.includes('.')) {
+                // 不输入商品， 文章和品牌时，从外层处理数据
+                icon = props.sourceList[data_source_id];
+                // 如果是商品,品牌，文章的图片， 其他的切换为从data中取数据
+                if (!isEmpty(props.sourceList.data) && props.isCustom) {
+                    icon = props.sourceList.data[data_source_id];
+                }
+            } else {
+                // 不输入商品， 文章和品牌时，从外层处理数据
+                icon = get_nested_property(props.sourceList, data_source_id);
+                // 如果是商品,品牌，文章的图片， 其他的切换为从data中取数据
+                if (!isEmpty(props.sourceList.data) && props.isCustom) {
+                    icon = get_nested_property(props.sourceList.data, data_source_id);
+                }
             }
             return icon;
         } else {
@@ -73,7 +85,7 @@ const com_style = computed(() => {
     return style;
 });
 const set_count = () => {
-    if (props.isPercentage) {
+    if (props.isDisplayPanel) {
         return '';
     } else {
         return `width: ${ form.value.com_width }px; height: ${ form.value.com_height }px;`;
diff --git a/src/components/common/custom-module/model-image/index.vue b/src/components/common/custom-module/model-image/index.vue
index 5035cc76..0a0f0d01 100644
--- a/src/components/common/custom-module/model-image/index.vue
+++ b/src/components/common/custom-module/model-image/index.vue
@@ -4,7 +4,7 @@
     </div>
 </template>
 <script setup lang="ts">
-import { percentage_count, radius_computer } from '@/utils';
+import { percentage_count, radius_computer, get_nested_property } from '@/utils';
 import { isEmpty } from 'lodash';
 const props = defineProps({
     value: {
@@ -20,7 +20,7 @@ const props = defineProps({
             return {};
         }
     },
-    isPercentage: {
+    isDisplayPanel: {
         type: Boolean,
         default: false
     },
@@ -45,14 +45,30 @@ const img = computed(() => {
         return form.value.img[0];
     } else {
         if (!isEmpty(props.sourceList)) {
-            // 不输入商品， 文章和品牌时，从外层处理数据
-            let image_url = props.sourceList[form.value.data_source_id];
-            // 如果是商品,品牌，文章的图片， 其他的切换为从data中取数据
-            if (!isEmpty(props.sourceList.data) && props.isCustom) {
-                if (form.value.data_source_id == props.imgParams) {
-                    image_url = !isEmpty(props.sourceList.new_cover)? props.sourceList.new_cover[0]?.url || '' : props.sourceList.data[props.imgParams];
-                } else {
-                    image_url = props.sourceList.data[form.value.data_source_id];
+            let image_url = '';
+            // 取出数据源ID
+            const data_source_id = form.value.data_source_id;
+            if (!data_source_id.includes('.')) {
+                // 不输入商品， 文章和品牌时，从外层处理数据
+                image_url = props.sourceList[data_source_id];
+                // 如果是商品,品牌，文章的图片， 其他的切换为从data中取数据
+                if (!isEmpty(props.sourceList.data) && props.isCustom) {
+                    if (data_source_id == props.imgParams) {
+                        image_url = !isEmpty(props.sourceList.new_cover)? props.sourceList.new_cover[0]?.url || '' : props.sourceList.data[data_source_id];
+                    } else {
+                        image_url = props.sourceList.data[data_source_id];
+                    }
+                }
+            } else {
+                // 循环取值,使用reduce 累加函数循环取值
+                image_url = get_nested_property(props.sourceList, data_source_id);
+                // 如果是商品,品牌，文章的图片， 其他的切换为从data中取数据
+                if (!isEmpty(props.sourceList.data) && props.isCustom) {
+                    if (data_source_id == props.imgParams) {
+                        image_url = !isEmpty(props.sourceList.new_cover)? props.sourceList.new_cover[0]?.url || '' : get_nested_property(props.sourceList.data, data_source_id);
+                    } else {
+                        image_url = get_nested_property(props.sourceList.data, data_source_id);
+                    }
                 }
             }
             return image_url;
@@ -74,7 +90,7 @@ const border_style = computed(() => {
     return style;
 });
 const set_count = () => {
-    if (props.isPercentage) {
+    if (props.isDisplayPanel) {
         return `width: ${ percentage_count(form.value.img_width, form.value.com_width) }; height: ${ percentage_count(form.value.img_height, form.value.com_height) };`;
     } else {
         return `width: ${form.value.img_width}px; height: ${form.value.img_height}px;`;
diff --git a/src/components/common/custom-module/model-lines/index.vue b/src/components/common/custom-module/model-lines/index.vue
index 573b1353..22232654 100644
--- a/src/components/common/custom-module/model-lines/index.vue
+++ b/src/components/common/custom-module/model-lines/index.vue
@@ -10,7 +10,7 @@ const props = defineProps({
         },
         required: true,
     },
-    isPercentage: {
+    isDisplayPanel: {
         type: Boolean,
         default: false,
     },
diff --git a/src/components/common/custom-module/model-panel/index.vue b/src/components/common/custom-module/model-panel/index.vue
index 63125d09..63f80703 100644
--- a/src/components/common/custom-module/model-panel/index.vue
+++ b/src/components/common/custom-module/model-panel/index.vue
@@ -19,7 +19,7 @@ const props = defineProps({
             return {};
         }
     },
-    isPercentage: {
+    isDisplayPanel: {
         type: Boolean,
         default: false
     },
@@ -47,7 +47,7 @@ const com_img_style = computed(() => {
     return background_computer(data);
 });
 const set_count = () => {
-    if (props.isPercentage) {
+    if (props.isDisplayPanel) {
         return '';
     } else {
         return `width: ${ form.value.com_width }px; height: ${ form.value.com_height }px;`;
diff --git a/src/components/common/custom-module/model-text/index.vue b/src/components/common/custom-module/model-text/index.vue
index 4136a4c5..1d8eeccc 100644
--- a/src/components/common/custom-module/model-text/index.vue
+++ b/src/components/common/custom-module/model-text/index.vue
@@ -11,7 +11,7 @@
     </div>
 </template>
 <script setup lang="ts">
-import { radius_computer, padding_computer, gradient_handle } from '@/utils';
+import { radius_computer, padding_computer, gradient_handle, get_nested_property } from '@/utils';
 import { isEmpty } from 'lodash';
 const props = defineProps({
     value: {
@@ -27,7 +27,7 @@ const props = defineProps({
             return {};
         }
     },
-    isPercentage: {
+    isDisplayPanel: {
         type: Boolean,
         default: false
     },
@@ -42,32 +42,79 @@ const props = defineProps({
     titleParams: {
         type: String,
         default: ''
+    },
+    options: {
+        type: Array<any>,
+        default: () => [],
     }
 });
 
 // 用于页面判断显示
 const form = computed(() => props.value);
 const text_title = computed(() => {
-    let text = '';
-    let text_title = props.sourceList[form.value.data_source_id];
-    // 如果是商品的标题或者是品牌的名称，需要判断是否有新的标题，没有的话就取原来的标题
-    if (!isEmpty(props.sourceList.data) && props.isCustom) {
-        // 其他的切换为从data中取数据
-        if (form.value.data_source_id == props.titleParams) {
-            text_title = !isEmpty(props.sourceList.new_title) ? props.sourceList.new_title : props.sourceList.data[props.titleParams];
+    return getTextTitle(form.value, props);
+});
+/**
+ * 根据表单值和属性获取文本标题
+ * 此函数用于根据提供的表单值和组件属性，在不同的条件下返回相应的文本标题
+ * 主要处理逻辑包括：检查表单值和数据源列表的存在性、处理数据源ID以获取标题、处理自定义标题情况、错误处理以及最终文本的确定
+ * 
+ * @param formValue 表单的当前值，包含数据源ID和可能的文本标题
+ * @param props 组件的属性，包括数据源列表、是否显示面板、是否自定义标题等
+ * @returns {string} 根据不同条件返回的文本标题
+ */
+ const getTextTitle = (formValue: any, props: any): string => {
+    // 检查表单值和数据源列表是否存在，以及是否显示面板，以确定返回的默认文本
+    if (!formValue || !props.sourceList) {
+        if (!props.isDisplayPanel) {
+            return '请在此输入文字';
         } else {
-            text_title = props.sourceList.data[form.value.data_source_id];
+            return '';
         }
     }
-    if (!isEmpty(form.value.text_title)) {
-        text = form.value.text_title;
-    } else if(text_title != undefined) {
-        text = text_title;
-    } else if(!props.isPercentage){
-        text = '请在此输入文字';
+    // 获取数据源ID
+    const data_source_id = formValue.data_source_id;
+    let text_title = '';
+    try {
+        // 根据数据源ID是否包含点号来区分处理方式
+        if (!data_source_id.includes('.')) {
+            // 从数据源列表中获取标题
+            text_title = props.sourceList[data_source_id];
+            // 如果是自定义标题，进一步处理
+            if (props.sourceList.data && props.isCustom) {
+                if (data_source_id === props.titleParams) {
+                    text_title = props.sourceList.new_title || props.sourceList.data[data_source_id];
+                } else {
+                    text_title = props.sourceList.data[data_source_id];
+                }
+            }
+        } else {
+            text_title = get_nested_property(props.sourceList, data_source_id);
+            // 如果是自定义标题，进一步处理嵌套对象中的数据
+            if (props.sourceList.data && props.isCustom) {
+                if (data_source_id === props.titleParams) {
+                    text_title = props.sourceList.new_title || get_nested_property(props.sourceList.data, data_source_id);
+                } else {
+                    text_title = get_nested_property(props.sourceList.data, data_source_id);
+                }
+            }
+        }
+    } catch (error) {
+        // 错误处理：打印错误信息，并根据是否显示面板返回默认文本
+        console.error('Error in getTextTitle:', error);
+        if (!props.isDisplayPanel) {
+            return '请在此输入文字';
+        } else {
+            return '';
+        }
+    }
+    // 确定最终返回的文本，优先使用表单值中的文本标题，如果为空则使用之前获取的标题或默认文本
+    let text = formValue.text_title || text_title;
+    if (text === '' && !props.isDisplayPanel) {
+        text = props.options.find((item: any) => item.field === data_source_id)?.name || '请在此输入文字';
     }
     return text;
-});
+}
 
 const text_style = computed(() => {
     let style = `font-size: ${ form.value.text_size * props.scale }px;line-height: ${ (typeof form.value.line_text_size === "number" ? form.value.line_text_size : form.value.text_size) * props.scale}px;color: ${ form.value.text_color }; text-align: ${ form.value.text_location }; transform: rotate(${form.value.text_rotate}deg);text-decoration: ${ form.value.text_option };${ padding_computer(form.value.text_padding, props.scale) };`;
@@ -91,7 +138,7 @@ const com_style = computed(() => {
     return style;
 });
 const set_count = () => {
-    if (props.isPercentage) {
+    if (props.isDisplayPanel) {
         return '';
     } else {
         return `width: ${ form.value.com_width }px; height: ${ form.value.com_height }px;`;
diff --git a/src/components/common/filter-form/index.vue b/src/components/common/filter-form/index.vue
index 357d3e08..e2996e7f 100644
--- a/src/components/common/filter-form/index.vue
+++ b/src/components/common/filter-form/index.vue
@@ -7,7 +7,7 @@
                     <template v-if="item.type == 'select'">
                         <template v-if="+item?.config?.is_level == 1">
                             <div class="flex-row gap-10">
-                                <el-cascader v-model="new_dataInterface[item.form_name]" :placeholder="placeholder_config(item, 'select')" clearable class="w h" collapse-tags popper-class="filter-form-cascader" :placement="+item?.config?.is_level == 1 && props.direction == 'vertical' ? 'left' : 'bottom'" :props="{ 'expandTrigger': 'hover', 'multiple': +item?.config?.is_multiple == 1, 'checkStrictly': true, 'emitPath': false, 'value': item?.data_key || 'id', 'label': item?.data_name || 'name', 'children': item?.config?.children || '' }" :options="selectData(item)" /> 
+                                <el-cascader v-model="new_dataInterface[item.form_name]" :placeholder="placeholder_config(item, 'select')" :show-all-levels="false" filterable clearable class="w h" collapse-tags popper-class="filter-form-cascader" :placement="+item?.config?.is_level == 1 && props.direction == 'vertical' ? 'left' : 'bottom'" :props="{ 'expandTrigger': 'hover', 'multiple': +item?.config?.is_multiple == 1, 'checkStrictly': true, 'emitPath': false, 'value': item?.data_key || 'id', 'label': item?.data_name || 'name', 'children': item?.config?.children || '' }" :options="selectData(item)" /> 
                                 <template v-if="+item?.config?.is_multiple == 1">
                                     <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="父级选中包含所有子级" raw-content placement="top">
                                         <icon name="miaosha-hdgz" size="12" color="#999"></icon>
@@ -16,7 +16,7 @@
                             </div>
                         </template>
                         <template v-else>
-                            <el-select v-model="new_dataInterface[item.form_name]" :multiple="+item?.config?.is_multiple == 1" collapse-tags :placeholder="placeholder_config(item, 'select')" clearable>
+                            <el-select v-model="new_dataInterface[item.form_name]" :multiple="+item?.config?.is_multiple == 1" filterable collapse-tags :placeholder="placeholder_config(item, 'select')" clearable>
                                 <el-option v-for="item1 in selectData(item)" :key="item1[item?.data_key || 'id']" :label="item1[item?.data_name || 'name']" :value="item1[item?.data_key || 'id']" />
                             </el-select>
                         </template>
diff --git a/src/components/model-custom/components/index.vue b/src/components/model-custom/components/index.vue
index 49a7bcc3..bda6f084 100644
--- a/src/components/model-custom/components/index.vue
+++ b/src/components/model-custom/components/index.vue
@@ -70,7 +70,7 @@
                                 <Vue3DraggableResizable v-for="(item, index) in diy_data" :key="item.id" v-model:w="item.com_data.com_width" v-model:h="item.com_data.com_height" :min-w="0" :min-h="0" :class="{'plug-in-show-component-line': is_show_component_line, 'plug-in-show-tabs': item.show_tabs == '1', 'vdr-handle-z-index': item.com_data.bottom_up == '1' }" :style="{ 'z-index': (diy_data.length - 1) - index }" :init-w="item.com_data.com_width" :init-h="item.com_data.com_height" :x="item.location.x" :y="item.location.y" :parent="true" :draggable="is_draggable" @mousedown.stop="on_choose(index, item.show_tabs)" @click.stop="on_choose(index, item.show_tabs)" @drag-end="dragEndHandle($event, index)" @resizing="resizingHandle($event, item.key, index)" @resize-end="resizingHandle($event, item.key, index)">
                                     <div :class="['main-content', { 'plug-in-border': item.show_tabs == '1' }]">
                                         <template v-if="item.key == 'text'">
-                                            <model-text :key="item.id" :value="item.com_data" :source-list="props.sourceList" :is-custom="isCustom" :title-params="showData?.data_name || 'name'"></model-text>
+                                            <model-text :key="item.id" :value="item.com_data" :source-list="props.sourceList" :is-custom="isCustom" :title-params="showData?.data_name || 'name'" :options="options"></model-text>
                                         </template>
                                         <template v-else-if="item.key == 'img'">
                                             <model-image :key="item.id" :value="item.com_data" :source-list="props.sourceList" :is-custom="isCustom" :img-params="showData?.data_logo || ''"></model-image>
@@ -122,6 +122,7 @@ interface Props {
     sourceList: object;
     isCustom: boolean;
     showData: any;
+    options: any;
 }
 const props = defineProps<Props>();
 //#endregion
diff --git a/src/components/model-custom/model-custom-content.vue b/src/components/model-custom/model-custom-content.vue
index b2bc23f1..30da2ef5 100644
--- a/src/components/model-custom/model-custom-content.vue
+++ b/src/components/model-custom/model-custom-content.vue
@@ -61,7 +61,7 @@
         <Dialog ref="dialog" @accomplish="accomplish">
             <div class="flex-row h w">
                 <!-- 左侧和中间区域 -->
-                <DragIndex ref="draglist" :key="dragkey" v-model:height="center_height" v-model:width="custom_width" :source-list="!isEmpty(data_source_content_list) ? data_source_content_list[0] : {}" :is-custom="form.is_custom_data == '1'" :show-data="form?.show_data || { data_key: 'id', data_name: 'name' }"  :list="custom_list" @right-update="right_update"></DragIndex>
+                <DragIndex ref="draglist" :key="dragkey" v-model:height="center_height" v-model:width="custom_width" :source-list="!isEmpty(data_source_content_list) ? data_source_content_list[0] : {}" :options="model_data_source" :is-custom="form.is_custom_data == '1'" :show-data="form?.show_data || { data_key: 'id', data_name: 'name' }"  :list="custom_list" @right-update="right_update"></DragIndex>
                 <!-- 右侧配置区域 -->
                 <div class="settings">
                     <template v-if="diy_data.key === 'img'">
diff --git a/src/utils/index.ts b/src/utils/index.ts
index d9c7fb3b..93cbd056 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -23,6 +23,28 @@ export function is_obj_empty(obj: object): boolean {
 export function is_number(val: string | number): boolean {
     return typeof val == 'number' && !isNaN(val);
 }
+
+/**
+ * 获取嵌套对象的属性值
+ * 
+ * 该函数旨在通过指定的属性路径获取嵌套对象中的属性值它接受一个对象和一个属性路径字符串作为参数，
+ * 并返回对应路径的属性值如果输入的路径无效或对象中不存在该路径，则返回空字符串
+ * 
+ * @param {Object} obj - 要从中获取属性的嵌套对象
+ * @param {string} path - 属性路径，使用点号分隔的字符串表示
+ * @returns {string} - 返回指定路径的属性值，如果路径无效则返回空字符串
+ */
+export function get_nested_property(obj: any, path: string): string {
+    // 检查路径参数是否为字符串且非空，若不满足条件则返回空字符串
+    if (typeof path !== 'string' || !path) return '';
+    
+    // 将属性路径字符串拆分为属性键数组
+    const keys = path.split('.');
+    
+    // 使用reduce方法遍历属性键数组，逐层访问对象属性
+    // 如果当前对象存在且拥有下一个属性键，则继续访问；否则返回空字符串
+    return keys.reduce((o, key) => (o && o[key] ? o[key] : ''), obj) || '';
+}
 /**
  * 将对象或数组中的字符串转换为数字
  * 此函数递归地遍历给定对象或数组，将所有能转换为数字的字符串转换成数字类型