Skip to content

jml0128 / xrk-bi

Go to a project
Commit 187155ec by jml0128
Options

fix

1 parent 74499e6a
Inline Side-by-side
Showing with 47 additions and 30 deletions
src/packages/bi/src/commonComponents/chart-desc.vue
...@@ -63,6 +63,7 @@ export default { ...@@ -63,6 +63,7 @@ export default {
title: String, title: String,
text: String, text: String,
resText: String, resText: String,
customText: String,
maxLength: { maxLength: {
type: Number, type: Number,
default: 20 default: 20
...@@ -125,6 +126,14 @@ export default { ...@@ -125,6 +126,14 @@ export default {
document.execCommand('paste', false, text); document.execCommand('paste', false, text);
} }
}); });
},
watch: {
customText: {
handler(n) {
this.localText = n;
},
immediate: true
}
} }
}; };
</script> </script>
......
src/packages/bi/src/project/20-configurable.vue
...@@ -432,22 +432,26 @@ export default { ...@@ -432,22 +432,26 @@ export default {
this.Bi.getTopicInfo(), this.Bi.getTopicInfo(),
this.Bi.getGroupInfo(), this.Bi.getGroupInfo(),
this.Bi.getTemplateList() this.Bi.getTemplateList()
]).then( ])
([ .then(
baseInfo, ([
fixedInfo, baseInfo,
topicInfo, fixedInfo,
topicMixinInfo, topicInfo,
tempaletList = { data: { data: [] } } topicMixinInfo,
]) => { tempaletList = { data: { data: [] } }
this.dealBaseInfo(baseInfo.data.data[0] || {}); ]) => {
this.dealFixedInfo(fixedInfo.data.data || []); this.dealBaseInfo(baseInfo.data.data[0] || {});
this.dealChoice(topicInfo.data.data || []); this.dealFixedInfo(fixedInfo.data.data || []);
this.dealChoiceMixin(topicMixinInfo.data.data || []); this.dealChoice(topicInfo.data.data || []);
this.coverList = tempaletList.data.data || []; this.dealChoiceMixin(topicMixinInfo.data.data || []);
this.coverList = tempaletList.data.data || [];
window.status = '1';
}
)
.catch(() => {
window.status = '1'; window.status = '1';
} });
);
} }
}; };
</script> </script>
......
src/packages/bi/src/project/6-zone.vue
...@@ -473,22 +473,26 @@ export default { ...@@ -473,22 +473,26 @@ export default {
this.Bi.getTopicInfo(), this.Bi.getTopicInfo(),
this.Bi.getGroupInfo(), this.Bi.getGroupInfo(),
this.Bi.getTemplateList() this.Bi.getTemplateList()
]).then( ])
([ .then(
baseInfo, ([
fixedInfo, baseInfo,
topicInfo, fixedInfo,
topicMixinInfo, topicInfo,
tempaletList = { data: { data: [] } } topicMixinInfo,
]) => { tempaletList = { data: { data: [] } }
this.dealBaseInfo(baseInfo.data.data[0] || {}); ]) => {
this.dealFixedInfo(fixedInfo.data.data || []); this.dealBaseInfo(baseInfo.data.data[0] || {});
this.dealChoice(topicInfo.data.data || []); this.dealFixedInfo(fixedInfo.data.data || []);
this.dealChoiceMixin(topicMixinInfo.data.data || []); this.dealChoice(topicInfo.data.data || []);
this.coverList = tempaletList.data.data || []; this.dealChoiceMixin(topicMixinInfo.data.data || []);
this.coverList = tempaletList.data.data || [];
window.status = '1';
}
)
.catch(() => {
window.status = '1'; window.status = '1';
} });
);
} }
}; };
</script> </script>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!