Merge branch 'dev' of github.com:dataease/dataease into dev

This commit is contained in:
taojinlong 2022-07-01 17:09:25 +08:00
commit 883c54b3c5
3 changed files with 6 additions and 3 deletions

View File

@ -3,7 +3,7 @@
ref="visualSelect"
v-model="selectValue"
:class="classId"
popper-class="VisualSelects"
popper-class="VisualSelects coustom-de-select"
no-match-text=" "
v-bind="$attrs"
v-on="$listeners"

View File

@ -7,6 +7,9 @@
<span :title="$t('panel.details')">
<i class="icon iconfont icon-chakan" @click.stop="showViewDetails('details')" />
</span>
<span :title="$t('panel.enlarge')">
<i class="icon iconfont icon-fangda" @click.stop="showViewDetails('enlarge')" />
</span>
</div>
<div v-if="positionCheck('multiplexing')" style="margin-right: -1px;width: 18px;z-index: 5">
<el-checkbox v-model="multiplexingCheckModel" size="medium" @change="multiplexingCheck" />
@ -88,7 +91,7 @@ export default {
this.$emit('amRemoveItem')
},
showViewDetails(params) {
this.$emit('showViewDetails', params)
this.$emit('showViewDetails', { openType: params })
},
positionCheck(position) {
return this.showPosition.includes(position)

View File

@ -68,7 +68,7 @@ export default {
},
computed: {
isAbsoluteContainer() {
return this.chart.type === 'symbol-map'
return this.showChartCanvas && this.chart.type === 'symbol-map'
},
showChartCanvas() {
return this.openType === 'enlarge'