@liujitcn/kratos-uni-app-core 0.0.64 → 0.0.66

package/package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "git@github.com:liujitcn/kratos-admin.git"
   },
-  "version": "0.0.64",
+  "version": "0.0.66",
   "type": "module",
   "files": [
     "dist",

package/src/components/KratosSettingsPage.vue

@@ -3,6 +3,7 @@ import { computed, onMounted, ref, watch } from 'vue'
 import { useUserStore } from '../stores'
 import { navigateToLogin } from '../utils/navigation'
 import { getLanguageOptions, useI18n, type SupportedLocale } from '../locales'
+import { isAuthExpiredError } from '../utils/http'
 import { defMfaService } from '../api/base/v1/mfa'
 import MfaManageDialog from './MfaManageDialog.vue'
 
@@ -15,14 +16,6 @@ defineSlots<{
 
 const userStore = useUserStore()
 const { locale, setLocale, t } = useI18n()
-/** 登录态失效时请求层已弹窗引导重新登录，页面侧不再叠加失败提示。 */
-const isAuthExpiredError = (error: unknown) => {
-  if (error && typeof error === 'object') {
-    const statusCode = (error as { statusCode?: number }).statusCode
-    if (statusCode === 401 || statusCode === 403) return true
-  }
-  return error instanceof Error && /auth (required|expired)/.test(error.message)
-}
 
 const logoutLoading = ref(false)
 const mfaDialogVisible = ref(false)

package/src/components/KratosTabBar.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, onMounted } from 'vue'
 import { resolveModuleIcon, resolveStaticView } from '../module'
 import { APP_MENU_ROOT_ID, useAppMenuBadge, useAppNavigation } from '../navigation'
 import { resolveRootMenuId } from '../navigation-tree.mjs'
@@ -14,6 +14,12 @@ const activeMenu = computed(() => {
 })
 const visible = computed(() => Boolean(activeMenu.value && tabBar.value.length))
 const messageBadge = useAppMenuBadge('MESSAGE_INBOX')
+// #ifdef H5
+// H5 端 tabBar.custom 不隐藏内置 tabbar,需手动隐藏,否则其边线从自定义栏上方露出形成双线。
+onMounted(() => {
+  uni.hideTabBar({ fail: () => {} })
+})
+// #endif
 </script>
 
 <template>

package/src/utils/http.ts

@@ -74,6 +74,23 @@ type HttpRequestOptions = UniApp.RequestOptions & {
   authMode?: AuthMode
 }
 
+/** 认证缺失或失效错误：抛出前请求层已弹窗引导重新登录，页面侧无需重复提示。 */
+export class AuthPromptError extends Error {
+  constructor() {
+    super(t('core.auth.session_expired'))
+    this.name = 'AuthPromptError'
+  }
+}
+
+/** 判断错误是否为登录态失效（请求层已弹窗提示，或响应为 401/403）。 */
+export function isAuthExpiredError(error: unknown): boolean {
+  if (error && typeof error === 'object') {
+    const statusCode = (error as { statusCode?: number }).statusCode
+    if (statusCode === 401 || statusCode === 403) return true
+  }
+  return error instanceof AuthPromptError
+}
+
 // 添加拦截器
 const httpInterceptor = {
   // 拦截前触发
@@ -296,7 +313,7 @@ async function getAccessTokenByMode(authMode: AuthMode) {
   if (!getToken()) {
     if (authMode === 'required') {
       await promptRelogin()
-      throw new Error('auth required')
+      throw new AuthPromptError()
     }
     return ''
   }
@@ -315,7 +332,7 @@ async function getAccessTokenByMode(authMode: AuthMode) {
 
   if (authMode === 'required') {
     await promptRelogin()
-    throw new Error('auth expired')
+    throw new AuthPromptError()
   }
 
   silentClearAuthData()