diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index ad23a09eb..7112ffa7f 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -100,8 +100,7 @@ export default { panelId: {}, chartDetailInfo: Object, timeRange: Array, // 时间范围 - panelLock: { type: Boolean, default: true }, - isGroup: { type: Boolean, default: false }, + isGroup: Boolean, groupInfo: {}, from: String, dataList: Array // 看板中所有图表信息 @@ -123,6 +122,9 @@ export default { }, layoutMargintop () { return this.isGroup ? '0' : (this.dataList.length ? (-1 * (this.stepWidth + 14) + 'px') : '0') + }, + panelLock () { + return this.$store.getters.getPanelLock } }, data () { @@ -333,6 +335,9 @@ export default { this.$store.commit('setChartListId', `chartList${this.timestamp}`) } }, + beforeDestroy () { + this.$store.dispatch('dispatchPanelLock', { flag: true }) + }, watch: { dataList: { deep: true, diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 55b45ecf6..217503faa 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -64,7 +64,7 @@ > - {{!panelLock ? $t('overall.locked') : $t('overall.unlocked')}} + {{!panelLock ? $t('overall.locked') : $t('overall.unlocked')}} @@ -90,7 +90,6 @@ :data-list="dataList" :nowTimeType="nowTimeType" :from="fromRoute.panel" - :panel-lock="panelLock" :time-range="searchTime" @edit-chart="editChart" @on-refresh-time="refreshTime" @@ -170,7 +169,6 @@ export default { panelTabLoading: false, overScroll10: false, isLoading: true, - panelLock: true, showTopBtn: false, // top按钮 visible: false, chartListLoading: true, @@ -294,6 +292,9 @@ export default { }, delChartFlag () { return this.$store.getters.getDelChart + }, + panelLock () { + return this.$store.getters.getPanelLock } }, methods: { diff --git a/nezha-fronted/src/store/panel.js b/nezha-fronted/src/store/panel.js index 243d5ec67..777d48db0 100644 --- a/nezha-fronted/src/store/panel.js +++ b/nezha-fronted/src/store/panel.js @@ -1,6 +1,7 @@ const panel = { state: { showRightBox: false, + panelLock: true, chart: '', delChart: false, groupId: '', @@ -20,6 +21,9 @@ const panel = { setShowRightBox (state, flag) { state.showRightBox = flag }, + setPanelLock (state, flag) { + state.panelLock = flag + }, setChart (state, chart) { state.chart = chart }, @@ -61,6 +65,9 @@ const panel = { getShowRightBox (state) { return state.showRightBox }, + getPanelLock (state) { + return state.panelLock + }, getChart (state) { return state.chart }, @@ -119,6 +126,9 @@ const panel = { dispatchHeaderH (store, playload) { store.commit('setHeaderH', playload.headerH) }, + dispatchPanelLock (store, playload) { + store.commit('setPanelLock', playload.flag) + }, clearPanel (store) { store.commit('cleanPanel') }