Merge pull request #8819 from dataease/pr@dev@fix_panel

Pr@dev@fix panel
This commit is contained in:
王嘉豪 2024-04-01 12:11:24 +08:00 committed by GitHub
commit 83d70485d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions

View File

@ -84,6 +84,7 @@
:panel-info="panelInfo" :panel-info="panelInfo"
:in-screen="inScreen" :in-screen="inScreen"
:show-position="showPosition" :show-position="showPosition"
:user-id="userId"
/> />
</div> </div>
@ -280,6 +281,10 @@ export default {
terminal: { terminal: {
type: String, type: String,
default: 'pc' default: 'pc'
},
userId: {
type: String,
require: false
} }
}, },
data() { data() {

View File

@ -662,7 +662,7 @@ export default {
}, },
watch: { watch: {
// //
'$store.panel.mainActiveName': function(newVal, oldVal) { '$store.state.panel.mainActiveName': function(newVal, oldVal) {
if (newVal === 'PanelMain' && this.lastActiveNodeData) { if (newVal === 'PanelMain' && this.lastActiveNodeData) {
this.activeNodeAndClickOnly(this.lastActiveNodeData) this.activeNodeAndClickOnly(this.lastActiveNodeData)
} }