{{ message }},{{ $t('chart.chart_show_error') }}
@@ -67,10 +68,11 @@ import { getToken, getLinkToken } from '@/utils/auth'
import DrillPath from '@/views/chart/view/DrillPath'
import { areaMapping } from '@/api/map/map'
import ChartComponentG2 from '@/views/chart/components/ChartComponentG2'
+import EditBarView from '@/components/canvas/components/Editor/EditBarView'
export default {
name: 'UserView',
- components: { ChartComponent, TableNormal, LabelNormal, DrillPath, ChartComponentG2 },
+ components: { EditBarView, ChartComponent, TableNormal, LabelNormal, DrillPath, ChartComponentG2 },
props: {
element: {
type: Object,
@@ -93,10 +95,19 @@ export default {
required: false,
default: false
},
- // eslint-disable-next-line vue/require-default-prop
componentIndex: {
type: Number,
required: false
+ },
+ inTab: {
+ type: Boolean,
+ required: false,
+ default: false
+ },
+ isEdit: {
+ type: Boolean,
+ require: false,
+ default: true
}
},
data() {
@@ -120,6 +131,9 @@ export default {
}
},
computed: {
+ editBarViewShowFlag() {
+ return this.active && this.inTab
+ },
charViewShowFlag() {
return this.httpRequest.status && this.chart.type && !this.chart.type.includes('table') && !this.chart.type.includes('text') && this.renderComponent() === 'echarts'
},
@@ -566,31 +580,31 @@ export default {
display: block !important;
}
- .rect-shape > i {
- right: 5px;
- color: gray;
- position: absolute;
- }
+ /*.rect-shape > i {*/
+ /* right: 5px;*/
+ /* color: gray;*/
+ /* position: absolute;*/
+ /*}*/
- .rect-shape > > > i:hover {
- color: red;
- }
+ /*.rect-shape > > > i:hover {*/
+ /* color: red;*/
+ /*}*/
- .rect-shape:hover > > > .icon-fangda {
- z-index: 2;
- display: block;
- }
+ /*.rect-shape:hover > > > .icon-fangda {*/
+ /* z-index: 2;*/
+ /* display: block;*/
+ /*}*/
- .rect-shape > > > .icon-fangda {
- display: none
- }
+ /*.rect-shape > > > .icon-fangda {*/
+ /* display: none*/
+ /*}*/
- .rect-shape:hover > > > .icon-shezhi {
- z-index: 2;
- display: block;
- }
+ /*.rect-shape:hover > > > .icon-shezhi {*/
+ /* z-index: 2;*/
+ /* display: block;*/
+ /*}*/
- .rect-shape > > > .icon-shezhi {
- display: none
- }
+ /*.rect-shape > > > .icon-shezhi {*/
+ /* display: none*/
+ /*}*/
diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue
index fbeea71071..2a5e45ed5a 100644
--- a/frontend/src/components/widget/DeWidget/DeTabs.vue
+++ b/frontend/src/components/widget/DeWidget/DeTabs.vue
@@ -35,7 +35,7 @@
-
+
@@ -94,6 +94,7 @@ import ViewSelect from '@/views/panel/ViewSelect'
import { uuid } from 'vue-uuid'
import bus from '@/utils/bus'
import componentList from '@/components/canvas/custom-component/component-list'
+import { mapState } from 'vuex'
export default {
name: 'DeTabls',
@@ -107,6 +108,10 @@ export default {
type: Boolean,
default: true
},
+ active: {
+ type: Boolean,
+ default: false
+ },
outStyle: {
type: Object,
required: false,
@@ -129,11 +134,24 @@ export default {
tabList: []
}
},
+ watch: {
+ curComponent: {
+ handler(newVal, oldVla) {
+ console.log(newVal)
+ },
+ deep: true
+ }
+ },
created() {
bus.$on('add-new-tab', this.addNewTab)
this.tabList = this.element.options && this.element.options.tabList
this.activeTabName = this.tabList[0].name
},
+ computed: {
+ ...mapState([
+ 'curComponent'
+ ])
+ },
methods: {
beforeHandleCommond(item, param) {
return {