diff --git a/frontend/src/components/canvas/components/Editor/EditBarView.vue b/frontend/src/components/canvas/components/Editor/EditBarView.vue index e7d995173d..9d9a652572 100644 --- a/frontend/src/components/canvas/components/Editor/EditBarView.vue +++ b/frontend/src/components/canvas/components/Editor/EditBarView.vue @@ -9,7 +9,7 @@
- +
@@ -41,6 +41,7 @@ export default { }, data() { return { + multiplexingCheckModel: false, componentType: null, linkageActiveStatus: false, editFilter: [ @@ -67,6 +68,10 @@ export default { ]) }, mounted() { + if (this.showPosition === 'multiplexing-view') { + this.multiplexingCheckModel = true + this.multiplexingCheck(this.multiplexingCheckModel) + } }, beforeDestroy() { }, @@ -86,7 +91,7 @@ export default { this.$emit('showViewDetails') }, positionCheck(position) { - return this.showPosition === position + return this.showPosition.includes(position) }, multiplexingCheck(val) { if (val) { diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index cc775d6b4d..b3bab89ced 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -153,7 +153,7 @@
- +
@@ -181,7 +181,6 @@ diff --git a/frontend/src/components/widget/DeWidget/TitlePostion.vue b/frontend/src/components/widget/DeWidget/TitlePostion.vue index 513a07563f..f2ac85e4e6 100644 --- a/frontend/src/components/widget/DeWidget/TitlePostion.vue +++ b/frontend/src/components/widget/DeWidget/TitlePostion.vue @@ -7,17 +7,16 @@ - + {{ $t('chart.text_pos_left') }} {{ $t('chart.text_pos_center') }} {{ $t('chart.text_pos_right') }} - - + + {{ $t('chart.text_pos_top') }} {{ $t('chart.text_pos_center') }} - {{ $t('chart.text_pos_bottom') }} @@ -37,25 +36,10 @@ export default { styleInfo: { type: Object, default: null - } - }, - - data() { - return { - defaultPosition: { - hPosition: 'left', - vPosition: 'center' - } - } - }, - - created() { - - }, - methods: { - - styleChange() { - this.$store.commit('recordStyleChange') + }, + showVertical: { + type: Boolean, + default: false } } diff --git a/frontend/src/views/panel/ViewSelect/multiplexing.vue b/frontend/src/views/panel/ViewSelect/multiplexing.vue index 787989953c..93b2dc8ec8 100644 --- a/frontend/src/views/panel/ViewSelect/multiplexing.vue +++ b/frontend/src/views/panel/ViewSelect/multiplexing.vue @@ -11,7 +11,7 @@ v-if="selectedPanel" :component-data="componentData" :canvas-style-data="canvasStyleData" - :show-position="'multiplexing'" + :show-position="showPosition" /> @@ -45,6 +45,7 @@ export default { }, data() { return { + showPosition: 'multiplexing', activeName: 'PanelList', viewLoading: false, panelLoading: false, @@ -60,21 +61,25 @@ export default { }, mounted() { + this.$store.commit('initCurMultiplexingComponents') }, methods: { showDetails(params) { + this.$store.commit('initCurMultiplexingComponents') const _this = this _this.selectedPanel = params if (params.showType === 'panel') { - this.panelLoading = true + _this.showPosition = 'multiplexing' + _this.panelLoading = true findOne(params.showId).then(response => { - this.panelLoading = false + _this.panelLoading = false panelDataPrepare(JSON.parse(response.data.panelData), JSON.parse(response.data.panelStyle), function(rsp) { _this.componentData = rsp.componentData _this.canvasStyleData = rsp.componentStyle }) }) } else if (params.showType === 'view') { + _this.showPosition = 'multiplexing-view' _this.componentData = [] const componentId = uuid.v1() _this.canvasStyleData = deepCopy(DEFAULT_COMMON_CANVAS_STYLE_STRING)