diff --git a/packages/bigscreen/designer/components/componentConfig.vue b/packages/bigscreen/designer/components/componentConfig.vue index f2228f76..38dff140 100644 --- a/packages/bigscreen/designer/components/componentConfig.vue +++ b/packages/bigscreen/designer/components/componentConfig.vue @@ -29,177 +29,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
@@ -220,44 +50,16 @@ diff --git a/packages/bigscreen/designer/components/configExtra.vue b/packages/bigscreen/designer/components/configExtra.vue new file mode 100644 index 00000000..54fad8b3 --- /dev/null +++ b/packages/bigscreen/designer/components/configExtra.vue @@ -0,0 +1,221 @@ + + + + + diff --git a/ui/dv/AiDvRender.vue b/ui/dv/AiDvRender.vue index b21c9f64..15f0a1a1 100644 --- a/ui/dv/AiDvRender.vue +++ b/ui/dv/AiDvRender.vue @@ -67,7 +67,7 @@ @@ -139,7 +139,9 @@ export default { const tab = meta.find(e => e.label === label) const comps = [] if (Array.isArray(v.data)) { - comps.push({label: "内容", ...tab}) + const origin = tab.comps?.[0] || {} + delete origin.comps + comps.push({...origin, label: "内容"}) } else { Object.keys(v.data).map(name => { const layer = tab.comps.find(e => e.label === name) @@ -151,9 +153,9 @@ export default { } else if (this.currentType === 'AiDvTable') { this.dvTableConfig = this.data[this.data.dataType].map((v, i) => { return { - color: this.data.config[i] ? (this.data.config[i].color || '') : '', - width: this.data.config[i] ? (this.data.config[i].width || '') : '', - align: this.data.config[i] ? (this.data.config[i].align || '') : '' + color: this.data.config?.[i]?.color || '', + width: this.data.config?.[i]?.width || '', + align: this.data.config?.[i]?.align || '', } }) this.data.config = this.dvTableConfig diff --git a/ui/dv/AiDvTabs.vue b/ui/dv/AiDvTabs.vue index d76e9b54..a57e695a 100644 --- a/ui/dv/AiDvTabs.vue +++ b/ui/dv/AiDvTabs.vue @@ -1,6 +1,4 @@