diff --git a/src/components/common/custom-module/model-icon/index.vue b/src/components/common/custom-module/model-icon/index.vue index 82645434..ee37d3de 100644 --- a/src/components/common/custom-module/model-icon/index.vue +++ b/src/components/common/custom-module/model-icon/index.vue @@ -48,7 +48,7 @@ const icon_class = computed(() => { if (!isEmpty(props.sourceList)) { let icon = ''; // 取出数据源ID - const data_source_id = !isEmpty(form.value?.data_source_field?.id || '') ? form.value?.data_source_field?.id : form.value.data_source_id; + const data_source_id = !isEmpty(form.value?.data_source_field?.id || '') ? form.value?.data_source_field?.id : ''; // 数据源内容 const option = form.value?.data_source_field?.option || {}; if (data_source_id.includes(';')) { diff --git a/src/components/common/custom-module/model-image/index.vue b/src/components/common/custom-module/model-image/index.vue index 57fb9e1c..8cc346e0 100644 --- a/src/components/common/custom-module/model-image/index.vue +++ b/src/components/common/custom-module/model-image/index.vue @@ -47,7 +47,7 @@ const img = computed(() => { if (!isEmpty(props.sourceList)) { let image_url = ''; // 取出数据源ID - const data_source_id = !isEmpty(form.value?.data_source_field?.id || '') ? form.value?.data_source_field?.id : form.value.data_source_id; + const data_source_id = !isEmpty(form.value?.data_source_field?.id || '') ? form.value?.data_source_field?.id : ''; // 数据源内容 const option = form.value?.data_source_field?.option || {}; // 如果是商品,品牌,文章的图片, 其他的切换为从data中取数据 diff --git a/src/components/common/custom-module/model-text/index.vue b/src/components/common/custom-module/model-text/index.vue index 1f0f86b4..24d98ed2 100644 --- a/src/components/common/custom-module/model-text/index.vue +++ b/src/components/common/custom-module/model-text/index.vue @@ -73,9 +73,9 @@ const text_title = computed(() => { } } // 获取数据源ID - const data_source_id = !isEmpty(formValue?.data_source_field?.id || '') ? formValue?.data_source_field?.id : [ formValue.data_source_id ]; + const data_source_id = !isEmpty(formValue?.data_source_field?.id || []) ? formValue?.data_source_field?.id : []; // 数据源内容 - const option = formValue?.data_source_field?.option || {}; + const option = formValue?.data_source_field?.option || []; // 文本信息 let text_title = ''; try { diff --git a/src/components/common/custom-module/model-text/model-text-style.vue b/src/components/common/custom-module/model-text/model-text-style.vue index ce3ff211..4c1ad72f 100644 --- a/src/components/common/custom-module/model-text/model-text-style.vue +++ b/src/components/common/custom-module/model-text/model-text-style.vue @@ -163,7 +163,10 @@ const text_change = (key: string) => { if (form.value.data_source_field.id.length > 0) { form.value.data_source_field.option = props.options.filter((item) => item.type == 'text' && form.value.data_source_field.id.includes(item.field)) } else { - form.value.data_source_field = get_data_fields([], 'text', ''); + form.value.data_source_field = { + id: [], + option: [], + }; } } else { // 如果没有数据,就赋值为空 diff --git a/src/components/common/data-filter/index.vue b/src/components/common/data-filter/index.vue index 04321621..8146098b 100644 --- a/src/components/common/data-filter/index.vue +++ b/src/components/common/data-filter/index.vue @@ -16,12 +16,12 @@ - + - + @@ -57,7 +57,7 @@ - + @@ -96,7 +96,7 @@ - + diff --git a/src/components/common/url-value/link-articles.vue b/src/components/common/url-value/link-articles.vue index ecb403a0..6d60dfc5 100644 --- a/src/components/common/url-value/link-articles.vue +++ b/src/components/common/url-value/link-articles.vue @@ -2,7 +2,7 @@
- + diff --git a/src/components/common/url-value/link-brand.vue b/src/components/common/url-value/link-brand.vue index 6535af55..b11b983c 100644 --- a/src/components/common/url-value/link-brand.vue +++ b/src/components/common/url-value/link-brand.vue @@ -2,7 +2,7 @@
- + diff --git a/src/components/common/url-value/link-coupon.vue b/src/components/common/url-value/link-coupon.vue index 47b20b72..6c345394 100644 --- a/src/components/common/url-value/link-coupon.vue +++ b/src/components/common/url-value/link-coupon.vue @@ -2,7 +2,7 @@
- + diff --git a/src/components/common/url-value/link-goods.vue b/src/components/common/url-value/link-goods.vue index d50330d5..57b8cf1a 100644 --- a/src/components/common/url-value/link-goods.vue +++ b/src/components/common/url-value/link-goods.vue @@ -2,8 +2,8 @@
- - + + diff --git a/src/components/common/url-value/url-value-dialog.vue b/src/components/common/url-value/url-value-dialog.vue index cbc8197a..b78d4df6 100644 --- a/src/components/common/url-value/url-value-dialog.vue +++ b/src/components/common/url-value/url-value-dialog.vue @@ -157,9 +157,9 @@ const dialog_title = computed(() => { } else if (props.type[0] == 'coupon') { name = '优惠券'; } - return name + '链接'; + return name + '选择'; } else { - return '选择链接'; + return '内容选择'; } }); diff --git a/src/components/model-coupon/model-coupon-content.vue b/src/components/model-coupon/model-coupon-content.vue index ddfa8081..8bd0ee07 100644 --- a/src/components/model-coupon/model-coupon-content.vue +++ b/src/components/model-coupon/model-coupon-content.vue @@ -29,7 +29,7 @@