diff --git a/components/diy/modules/custom/model-icon.vue b/components/diy/modules/custom/model-icon.vue index ce766dd1..1bc11de2 100644 --- a/components/diy/modules/custom/model-icon.vue +++ b/components/diy/modules/custom/model-icon.vue @@ -60,7 +60,7 @@ if (!isEmpty(this.propSourceList)) { let icon = ''; // 获取数据源ID - const data_source_id = !isEmpty(this.propValue?.data_source_field?.id || '') ? this.propValue?.data_source_field?.id : this.propValue.data_source_id; + const data_source_id = this.propValue?.data_source_field?.id || ''; // 数据源内容 const option = this.propValue?.data_source_field?.option || {}; if (data_source_id.includes(';')) { @@ -93,7 +93,7 @@ url = this.propValue.icon_link?.page || ''; } else { // 获取数据源ID - const data_source_link_id = !isEmpty(this.propValue?.data_source_link_field?.id || '') ? this.propValue?.data_source_link_field?.id : this.propValue.data_source_link; + const data_source_link_id = this.propValue?.data_source_link_field?.id || ''; // 数据源内容 const source_link_option = this.propValue?.data_source_link_field?.option || {}; url = get_custom_link(data_source_link_id, this.propSourceList, source_link_option) diff --git a/components/diy/modules/custom/model-image.vue b/components/diy/modules/custom/model-image.vue index 2623e81c..3f276034 100644 --- a/components/diy/modules/custom/model-image.vue +++ b/components/diy/modules/custom/model-image.vue @@ -79,7 +79,7 @@ url = this.propValue.link?.page || ''; } else { // 获取数据源ID - const data_source_link_id = !isEmpty(this.propValue?.data_source_link_field?.id || '') ? this.propValue?.data_source_link_field?.id : this.propValue.data_source_link; + const data_source_link_id = this.propValue?.data_source_link_field?.id || ''; // 数据源内容 const source_link_option = this.propValue?.data_source_link_field?.option || {}; url = get_custom_link(data_source_link_id, this.propSourceList, source_link_option) @@ -93,7 +93,7 @@ if (!isEmpty(this.propSourceList)) { let image_url = ''; // 获取数据源ID - const data_source_id = !isEmpty(form?.data_source_field?.id || '') ? form?.data_source_field?.id : form.data_source_id; + const data_source_id = form?.data_source_field?.id || ''; // 数据源内容 const option = form?.data_source_field?.option || {}; if (data_source_id.includes(';')) { diff --git a/components/diy/modules/custom/model-panel.vue b/components/diy/modules/custom/model-panel.vue index 11566d5e..2bad0fba 100644 --- a/components/diy/modules/custom/model-panel.vue +++ b/components/diy/modules/custom/model-panel.vue @@ -54,7 +54,7 @@ url = this.propValue.link?.page || ''; } else { // 获取数据源ID - const data_source_link_id = !isEmpty(this.propValue?.data_source_link_field?.id || '') ? this.propValue?.data_source_link_field?.id : this.propValue.data_source_link; + const data_source_link_id = this.propValue?.data_source_link_field?.id || ''; // 数据源内容 const source_link_option = this.propValue?.data_source_link_field?.option || {}; url = get_custom_link(data_source_link_id, this.propSourceList, source_link_option); diff --git a/components/diy/modules/custom/model-text.vue b/components/diy/modules/custom/model-text.vue index e0b28e09..2280f801 100644 --- a/components/diy/modules/custom/model-text.vue +++ b/components/diy/modules/custom/model-text.vue @@ -74,7 +74,7 @@ url = this.propValue.text_link?.page || ''; } else { // 获取数据源ID - const data_source_link_id = !isEmpty(this.propValue?.data_source_link_field?.id || '') ? this.propValue?.data_source_link_field?.id : this.propValue.data_source_link; + const data_source_link_id = this.propValue?.data_source_link_field?.id || ''; // 数据源内容 const source_link_option = this.propValue?.data_source_link_field?.option || {}; // 调用方法处理数据显示 @@ -95,7 +95,7 @@ } else { let text_title = ''; // 获取数据源ID - const data_source_id = !isEmpty(form?.data_source_field?.id || '') ? form?.data_source_field?.id : [ form.data_source_id ]; + const data_source_id = form?.data_source_field?.id || []; // 数据源内容 const option = form?.data_source_field?.option || []; // 多选判断