From 32fc16126f82715d1ea5898975a27fa238c1661b Mon Sep 17 00:00:00 2001
From: wangruidong <940853815@qq.com>
Date: Fri, 19 Apr 2024 10:13:03 +0800
Subject: [PATCH 1/4] perf: dashboard typo

---
 src/i18n/langs/en.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index a83f5df88..38415c9f0 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -994,14 +994,14 @@
     "RealTimeData": "Real-time data",
     "UserAssetActivity": "User/asset activity status",
     "UserData": "User data",
-    "LoginUserToday": "Login account today",
+    "LoginUserToday": "Login accounts today",
     "AssetData": "Asset data",
-    "LoginAssetToday": "Active asset today",
+    "LoginAssetToday": "Active assets today",
     "WeekAdd": "New this week",
     "ProportionOfAssetTypes": "Proportion of asset types",
     "Proportion": "Proportion",
     "LoginUserRanking": "Session user ranking",
-    "ActiveAssetRanking": "Session asset Ranking",
+    "ActiveAssetRanking": "Session asset ranking",
     "AssetName": "Asset name",
     "NumberOfVisits": "Number of visits",
     "ranking": "Ranking",
@@ -2434,4 +2434,4 @@
     "BindResource": "Bind resource",
     "SelectResource": "Select resource"
   }
-}
\ No newline at end of file
+}

From ce23d53e3ce759074a324f151a83cd5057f2682c Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Mon, 22 Apr 2024 13:56:01 +0800
Subject: [PATCH 2/4] =?UTF-8?q?perf:=20=E6=96=B0=E5=BB=BA/=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E4=BA=A7=E6=97=B6=EF=BC=8C=E6=96=B0tab?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Asset/AssetList/components/BaseList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/assets/Asset/AssetList/components/BaseList.vue b/src/views/assets/Asset/AssetList/components/BaseList.vue
index e0ceab0d2..67fc28621 100644
--- a/src/views/assets/Asset/AssetList/components/BaseList.vue
+++ b/src/views/assets/Asset/AssetList/components/BaseList.vue
@@ -101,7 +101,7 @@ export default {
         route.query.type = row.type.value
         route.query.category = row.type.category
       }
-      const createInNewPage = this.$route.query.node_id && routeAction === 'Create'
+      const createInNewPage = this.$route.query.node_id
       if (createInNewPage) {
         const { href } = vm.$router.resolve(route)
         window.open(href, '_blank')

From c93a061852f54af04a733bf5ef06e893fc174734 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Mon, 22 Apr 2024 15:53:13 +0800
Subject: [PATCH 3/4] fix: Linux Platform id is not 1, create gateway error

---
 .../assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
index fa0d8ecd7..212d8618b 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
@@ -131,7 +131,7 @@ export default {
       const { defaultConfig } = this
       const { node, platform } = this.$route?.query || {}
       const nodesInitial = node ? [node] : []
-      const platformId = platform || 1
+      const platformId = platform || 'Linux'
       const url = `/api/v1/assets/platforms/${platformId}/`
       this.platform = await this.$axios.get(url)
       const initial = {

From 70b5ec3683754d0d7482f17b2ed46dd55472ebd8 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Mon, 22 Apr 2024 19:12:03 +0800
Subject: [PATCH 4/4] fix: Fixed User first login long wait.(SYSTEM ORG)

---
 src/utils/startup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/startup.js b/src/utils/startup.js
index f521ab267..15d96e24e 100644
--- a/src/utils/startup.js
+++ b/src/utils/startup.js
@@ -41,7 +41,7 @@ async function getPublicSetting({ to, from, next }, isOpen) {
 }
 
 async function refreshCurrentOrg() {
-  orgs.getCurrentOrg().then(org => {
+  return orgs.getCurrentOrg().then(org => {
     store.dispatch('users/setCurrentOrg', org)
   })
 }