sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev

master
gongfuxiang 2024-12-10 17:26:58 +08:00
parent 2d4bc1bebc 40293110c4
commit db09d947e3
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/diy/modules/custom/model-icon.vue
View File

@ -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)

4
components/diy/modules/custom/model-image.vue
View File

@ -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(';')) {

2
components/diy/modules/custom/model-panel.vue
View File

@ -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);

4
components/diy/modules/custom/model-text.vue
View File

@ -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 || [];
// 多选判断