Merge pull request #3509 from dataease/pr@dev_eslint_auto_fix

Pr@dev eslint auto fix
This commit is contained in:
wisonic-s 2022-10-28 10:42:46 +08:00 committed by GitHub
commit 549ae4859b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 6 deletions

View File

@ -151,8 +151,8 @@ const data = {
mouseY: 0, mouseY: 0,
width: 0, width: 0,
height: 0 height: 0
} },
previewVisible: false
}, },
mutations: { mutations: {
...animation.mutations, ...animation.mutations,
@ -172,6 +172,10 @@ const data = {
state.isClickComponent = status state.isClickComponent = status
}, },
setPreviewVisible(state, previewVisible) {
state.previewVisible = previewVisible
},
setEditMode(state, mode) { setEditMode(state, mode) {
state.editMode = mode state.editMode = mode
}, },

View File

@ -67,6 +67,7 @@ import TitleRemark from '@/views/chart/view/TitleRemark'
import { DEFAULT_TITLE_STYLE } from '@/views/chart/chart/chart' import { DEFAULT_TITLE_STYLE } from '@/views/chart/chart/chart'
import { baseMixOptionAntV } from '@/views/chart/chart/mix/mix_antv' import { baseMixOptionAntV } from '@/views/chart/chart/mix/mix_antv'
import { compareItem } from '@/views/chart/chart/compare' import { compareItem } from '@/views/chart/chart/compare'
import { mapState } from 'vuex'
import clickoutside from 'element-ui/src/utils/clickoutside.js' import clickoutside from 'element-ui/src/utils/clickoutside.js'
import bus from '@/utils/bus' import bus from '@/utils/bus'
@ -163,7 +164,11 @@ export default {
}, },
mainActiveName() { mainActiveName() {
return this.$store.state.panel.mainActiveName return this.$store.state.panel.mainActiveName
} },
...mapState([
'mobileLayoutStatus',
'previewVisible'
])
}, },
watch: { watch: {
chart: { chart: {
@ -444,7 +449,7 @@ export default {
}) })
}, },
handleTitleEditer() { handleTitleEditer() {
if (this.mainActiveName !== 'PanelEdit') return if (this.mainActiveName !== 'PanelEdit' || this.mobileLayoutStatus || this.previewVisible) return
this.chartTitleEditer = true this.chartTitleEditer = true
this.chartTitleUpdate = this.chart.title this.chartTitleUpdate = this.chart.title
this.$nextTick(() => { this.$nextTick(() => {

View File

@ -98,6 +98,7 @@ import TitleRemark from '@/views/chart/view/TitleRemark'
import { DEFAULT_TITLE_STYLE } from '@/views/chart/chart/chart' import { DEFAULT_TITLE_STYLE } from '@/views/chart/chart/chart'
import clickoutside from 'element-ui/src/utils/clickoutside.js' import clickoutside from 'element-ui/src/utils/clickoutside.js'
import bus from '@/utils/bus' import bus from '@/utils/bus'
import { mapState } from 'vuex'
import { compareItem } from '@/views/chart/chart/compare' import { compareItem } from '@/views/chart/chart/compare'
import { import {
getChartDetails getChartDetails
@ -197,7 +198,11 @@ export default {
}, },
mainActiveName() { mainActiveName() {
return this.$store.state.panel.mainActiveName return this.$store.state.panel.mainActiveName
} },
...mapState([
'mobileLayoutStatus',
'previewVisible'
])
}, },
watch: { watch: {
chart: { chart: {
@ -479,7 +484,7 @@ export default {
}) })
}, },
handleTitleEditer() { handleTitleEditer() {
if (this.mainActiveName !== 'PanelEdit') return if (this.mainActiveName !== 'PanelEdit' || this.mobileLayoutStatus || this.previewVisible) return
this.chartTitleEditer = true this.chartTitleEditer = true
this.chartTitleUpdate = this.chart.title this.chartTitleUpdate = this.chart.title
this.$nextTick(() => { this.$nextTick(() => {

View File

@ -778,6 +778,9 @@ export default {
}, },
mobileLayoutStatus() { mobileLayoutStatus() {
this.restore() this.restore()
},
previewVisible(val) {
this.$store.commit('setPreviewVisible', val)
} }
}, },
created() { created() {