From 4f3e6ac8b090b085329f3d05f2da64ae730d4700 Mon Sep 17 00:00:00 2001
From: Feynman <xufei@tapdata.io>
Date: Tue, 12 May 2026 17:41:18 +0800
Subject: [PATCH 1/2] refactor: streamline initialization process in main.ts
 and update settings handling in Login.vue

---
 apps/daas/src/main.ts               | 57 ++++++++++++-----------------
 apps/daas/src/views/login/Login.vue | 15 +++++---
 2 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/apps/daas/src/main.ts b/apps/daas/src/main.ts
index 4e27e5b79..a12870802 100644
--- a/apps/daas/src/main.ts
+++ b/apps/daas/src/main.ts
@@ -119,38 +119,36 @@ const init = () => {
 
 const loading = ElLoading.service({ fullscreen: true })
 
-fetchSettings()
-  .then(async (data) => {
-    const initData = data || []
-    setSettings(initData)
-
-    if (initData.length) {
-      localStorage.setItem('TAPDATA_SETTINGS', JSON.stringify(initData))
-      store.commit('setAppearanceBySetting', data)
-    }
-    if (token) {
-      //无权限，说明是首次进入页面，重新请求后台获取
-      const user = await getUserInfoByToken().catch(() => {
-        init()
-        return null
-      })
+const bootstrap = async () => {
+  if (token) {
+    //无权限，说明是首次进入页面，重新请求后台获取
+    const user = await getUserInfoByToken().catch(() => {
+      init()
+      return null
+    })
 
-      if (!user) {
-        return
-      }
+    if (user) {
+      configUser(user)
 
       await store.dispatch('feature/getFeatures')
+      const settings = await fetchSettings()
+      setSettings(settings)
 
-      //权限存在则存入缓存并继续向下走
-      configUser(user)
+      if (settings.length) {
+        localStorage.setItem('TAPDATA_SETTINGS', JSON.stringify(settings))
+        store.commit('setAppearanceBySetting', settings)
+      }
     }
+  }
 
-    init()
-    // 设置服务器时间
-    fetchTimestamp().then((t) => {
-      Time.setTime(t)
-    })
+  init()
+  // 设置服务器时间
+  fetchTimestamp().then((t) => {
+    Time.setTime(t)
   })
+}
+
+bootstrap()
   .catch((error) => {
     // eslint-disable-next-line
     console.log(i18n.global.t('daas_src_main_qingqiuquanjupei') + error)
@@ -158,15 +156,6 @@ fetchSettings()
   .finally(() => {
     loading.close()
   })
-//获取全局项目设置（OEM信息）
-
-//解决浏览器tab切换时，element ui 组件tooltip气泡不消失的问题  #7752
-document.addEventListener('visibilitychange', () => {
-  setTimeout(() => {
-    const ele = document.querySelector(':focus')
-    ele && ele.blur()
-  }, 50)
-})
 
 // community add jira issue collector
 if (import.meta.env.VUE_APP_MODE === 'community') {
diff --git a/apps/daas/src/views/login/Login.vue b/apps/daas/src/views/login/Login.vue
index 9bcd4b34b..f3f3a4822 100644
--- a/apps/daas/src/views/login/Login.vue
+++ b/apps/daas/src/views/login/Login.vue
@@ -1,4 +1,5 @@
 <script>
+import { fetchSettings } from '@tap/api/core/settings'
 import { fetchTimestamp } from '@tap/api/src/core/timestamp'
 import {
   checkLdapLoginEnable,
@@ -6,7 +7,7 @@ import {
   login,
 } from '@tap/api/src/core/users'
 import Cookie from '@tap/shared/src/cookie'
-import { getSettingByKey } from '@tap/shared/src/settings'
+import { setSettings } from '@tap/shared/src/settings'
 import { useDark } from '@vueuse/core'
 import cryptoJS from 'crypto-js'
 import { configUser } from '@/utils/util'
@@ -37,7 +38,6 @@ export default {
     }
   },
   methods: {
-    getSettingByKey,
     async loadAdEnable() {
       const data = await checkLdapLoginEnable()
       this.adEnable = data
@@ -83,6 +83,14 @@ export default {
 
         await this.$store.dispatch('feature/getFeatures')
 
+        const settings = await fetchSettings()
+        setSettings(settings)
+
+        if (settings.length) {
+          localStorage.setItem('TAPDATA_SETTINGS', JSON.stringify(settings))
+          this.$store.commit('setAppearanceBySetting', settings)
+        }
+
         const user = await getUserInfoByToken()
         configUser(user)
         const lastLocationHref = sessionStorage.getItem('lastLocationHref')
@@ -126,9 +134,6 @@ export default {
         <div class="sign-in-panel">
           <div class="title">
             {{ $t('app_signIn_signIn') }}
-            <span v-if="getSettingByKey('SHOW_REGISTER')" @click="registry">{{
-              $t('app_signIn_Registration')
-            }}</span>
           </div>
           <el-alert
             v-if="!!errorMessage"

From e8fa1ce0139005f5e8bce263014d62179fe7f116 Mon Sep 17 00:00:00 2001
From: Feynman <xufei@tapdata.io>
Date: Tue, 12 May 2026 20:30:33 +0800
Subject: [PATCH 2/2] refactor: reintroduce feature fetching in main.ts and
 Login.vue during user initialization

---
 apps/daas/src/main.ts               | 3 ++-
 apps/daas/src/views/login/Login.vue | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/daas/src/main.ts b/apps/daas/src/main.ts
index a12870802..65e55e467 100644
--- a/apps/daas/src/main.ts
+++ b/apps/daas/src/main.ts
@@ -130,10 +130,11 @@ const bootstrap = async () => {
     if (user) {
       configUser(user)
 
-      await store.dispatch('feature/getFeatures')
       const settings = await fetchSettings()
       setSettings(settings)
 
+      await store.dispatch('feature/getFeatures')
+
       if (settings.length) {
         localStorage.setItem('TAPDATA_SETTINGS', JSON.stringify(settings))
         store.commit('setAppearanceBySetting', settings)
diff --git a/apps/daas/src/views/login/Login.vue b/apps/daas/src/views/login/Login.vue
index f3f3a4822..3fce45da7 100644
--- a/apps/daas/src/views/login/Login.vue
+++ b/apps/daas/src/views/login/Login.vue
@@ -81,11 +81,11 @@ export default {
         Cookie.set('access_token', data?.id)
         Cookie.set('tem_token', data?.id)
 
-        await this.$store.dispatch('feature/getFeatures')
-
         const settings = await fetchSettings()
         setSettings(settings)
 
+        await this.$store.dispatch('feature/getFeatures')
+
         if (settings.length) {
           localStorage.setItem('TAPDATA_SETTINGS', JSON.stringify(settings))
           this.$store.commit('setAppearanceBySetting', settings)