Commit fba46be

authored

fix: Fix overview page refresh issue (1Panel-dev#9785)

1 parent be0a460 commit fba46beCopy full SHA for fba46be

File tree

+18

-4

lines changed

frontend/src
- layout/components/Sidebar/components
  - Collapse.vue
- views/home
  - index.vue

+18

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ const changeNode = (command: string) => {`
`178`	`178`	`globalStore.currentNode = command \|\| 'local';`
`179`	`179`	`globalStore.currentNodeAddr = '';`
`180`	`180`	`loadProductProFromDB();`
`181`		`- router.push({ name: 'home' });`
	`181`	`+ router.push({ name: 'home', query: { t: Date.now() } });`
`182`	`182`	`return;`
`183`	`183`	`}`
`184`	`184`	`for (const item of nodes.value) {`
`@@ -198,7 +198,7 @@ const changeNode = (command: string) => {`
`198`	`198`	`globalStore.currentNode = command \|\| 'local';`
`199`	`199`	`globalStore.currentNodeAddr = item.addr;`
`200`	`200`	`loadProductProFromDB();`
`201`		`- router.push({ name: 'home' });`
	`201`	`+ router.push({ name: 'home', query: { t: Date.now() } });`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`	`};`

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<template>`
`2`		`- <div>`
	`2`	`+ <div:key="$route.fullPath">`
`3`	`3`	`<RouterButton`
`4`	`4`	`:buttons="[`
`5`	`5`	`{`
`@@ -339,6 +339,9 @@ const currentInfo = ref<Dashboard.CurrentInfo>({`
`339`	`339`	`memoryTotal: 0,`
`340`	`340`	`memoryAvailable: 0,`
`341`	`341`	`memoryUsed: 0,`
	`342`	`+ memoryFree: 0,`
	`343`	`+ memoryShard: 0,`
	`344`	`+ memoryCache: 0,`
`342`	`345`	`memoryUsedPercent: 0,`
`343`	`346`	`swapMemoryTotal: 0,`
`344`	`347`	`swapMemoryAvailable: 0,`
`@@ -545,14 +548,25 @@ const toUpload = () => {`
`545`	`548`	`licenseRef.value.acceptParams();`
`546`	`549`	`};`
`547`	`550`
`548`		`-onMounted(() => {`
	`551`	`+const fetchData =() => {`
`549`	`552`	`window.addEventListener('focus', onFocus);`
`550`	`553`	`window.addEventListener('blur', onBlur);`
`551`	`554`	`loadSafeStatus();`
`552`	`555`	`loadUpgradeStatus();`
`553`	`556`	`onLoadNetworkOptions();`
`554`	`557`	`onLoadIOOptions();`
`555`	`558`	`onLoadBaseInfo(true, 'all');`
	`559`	`+};`
	`560`	`+`
	`561`	`+onBeforeRouteUpdate((to, from, next) => {`
	`562`	`+ if (to.name === 'home') {`
	`563`	`+ fetchData();`
	`564`	`+ }`
	`565`	`+ next();`
	`566`	`+});`
	`567`	`+`
	`568`	`+onMounted(() => {`
	`569`	`+ fetchData();`
`556`	`570`	`});`
`557`	`571`
`558`	`572`	`onBeforeUnmount(() => {`

Comments

(0)