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 2025-03-04 11:08:55 +08:00
parent b27ab4b8e1 ed15a6b570
commit fd7617a6e6
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/diy/modules/custom/data-group-rendering.vue
View File

@ -26,7 +26,7 @@ import modelLines from '@/components/diy/modules/custom/model-lines.vue';
import modelImage from '@/components/diy/modules/custom/model-image.vue';
import modelIcon from '@/components/diy/modules/custom/model-icon.vue';
import modelPanel from '@/components/diy/modules/custom/model-panel.vue';
import { location_compute } from '@/common/js/common/common.js';
import { location_compute, isEmpty } from '@/common/js/common/common.js';
export default {
components: {
modelText,
@ -112,7 +112,7 @@ export default {
watch: {
propKey(val) {
// 初始化
this.init();
this.init(this.propCustomList);
},
propCustomList(val) {
this.init(val);
@ -173,6 +173,10 @@ export default {
},
methods: {
async init(val) {
// 如果为空就不进行渲染
if (isEmpty(val)) {
return;
}
await this.get_custom_width();
this.set_new_list(val);
},

14
components/diy/modules/custom/data-rendering.vue
View File

@ -30,7 +30,7 @@ import modelImage from '@/components/diy/modules/custom/model-image.vue';
import modelIcon from '@/components/diy/modules/custom/model-icon.vue';
import modelPanel from '@/components/diy/modules/custom/model-panel.vue';
import modelCustomGroup from '@/components/diy/modules/custom/model-custom-group.vue';
import { location_compute } from '@/common/js/common/common.js';
import { location_compute, isEmpty } from '@/common/js/common/common.js';
export default {
components: {
modelText,
@ -123,7 +123,7 @@ export default {
watch: {
propKey(val) {
// 初始化
this.init();
this.init(this.propCustomList);
},
},
computed: {
@ -177,12 +177,16 @@ export default {
}
},
mounted() {
this.init();
this.init(this.propCustomList);
},
methods: {
async init() {
async init(val) {
// 如果为空就不进行渲染
if (isEmpty(val)) {
return;
}
await this.get_custom_width();
this.set_new_list(this.propCustomList);
this.set_new_list(val);
},
get_custom_width() {
// 获取当前容器的宽度