@liujitcn/kratos-taro-app-core 0.0.31 → 0.0.33

package/dist/runner.mjs

@@ -281,7 +281,7 @@ function restoreBuildTransaction(transaction, transactionFile) {
     removeEmptyParents(dirname(file), transaction.inputDir);
   }
   removeGeneratedStaticFiles(
-    transaction.generatedStaticFiles ?? [],
+    transaction.generatedStaticFiles,
     resolve(transaction.inputDir, "static")
   );
   writeFileSync(transaction.appConfigFile, transaction.originalAppConfig);

package/package.json

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

package/src/api/base/{config.ts → v1/config.ts}

@@ -1,5 +1,5 @@
-import { http } from '../../utils/http'
-import type { ConfigService, GetConfigRequest, GetConfigResponse } from '../../rpc/base/v1/config'
+import { http } from '../../../utils/http'
+import type { ConfigService, GetConfigRequest, GetConfigResponse } from '../../../rpc/base/v1/config'
 
 const CONFIG_URL = '/v1/base/config'
 

package/src/api/base/{file.ts → v1/file.ts}

@@ -3,10 +3,10 @@ import type {
   DownloadFileRequest,
   FileInfo,
   MultiUploadFileResponse,
-} from '../../rpc/base/v1/file'
-import { uploadFile, uploadFileList } from '../../utils/file'
-import { getLocaleRequestHeaders, t } from '../../locales'
-import { getRequestAccessToken, requestBaseURL } from '../../utils/http'
+} from '../../../rpc/base/v1/file'
+import { uploadFile, uploadFileList } from '../../../utils/file'
+import { getLocaleRequestHeaders, t } from '../../../locales'
+import { getRequestAccessToken, requestBaseURL } from '../../../utils/http'
 
 const FILE_URL = '/v1/base/file'
 

package/src/api/base/{language.ts → v1/language.ts}

@@ -1,5 +1,5 @@
-import { http } from '../../utils/http'
-import type { LanguageService, OptionLanguageRequest, OptionLanguageResponse } from '../../rpc/base/v1/language'
+import { http } from '../../../utils/http'
+import type { LanguageService, OptionLanguageRequest, OptionLanguageResponse } from '../../../rpc/base/v1/language'
 
 const LANGUAGE_URL = '/v1/base/language'
 

package/src/api/base/{login.ts → v1/login.ts}

@@ -1,4 +1,4 @@
-import { http } from '../../utils/http'
+import { http } from '../../../utils/http'
 import type {
   CaptchaRequest,
   CaptchaResponse,
@@ -12,8 +12,8 @@ import type {
   VerifyCaptchaRequest,
   VerifyCaptchaResponse,
   LoginService,
-} from '../../rpc/base/v1/login'
-import type { Empty } from '../../rpc/google/protobuf/empty'
+} from '../../../rpc/base/v1/login'
+import type { Empty } from '../../../rpc/google/protobuf/empty'
 
 const CAPTCHA_URL = '/v1/base/captcha'
 const CAPTCHA_VERIFY_URL = '/v1/base/captcha/verify'

package/src/api/base/{mfa.ts → v1/mfa.ts}

@@ -1,5 +1,5 @@
-import { http } from '../../utils/http'
-import type { LoginResponse } from '../../rpc/base/v1/login'
+import { http } from '../../../utils/http'
+import type { LoginResponse } from '../../../rpc/base/v1/login'
 import type {
   BeginMfaDisableRequest,
   BeginMfaDisableResponse,
@@ -18,8 +18,8 @@ import type {
   RecoveryCodesResponse,
   RegenerateMfaRecoveryCodesRequest,
   VerifyMfaRequest,
-} from '../../rpc/base/v1/mfa'
-import type { Empty } from '../../rpc/google/protobuf/empty'
+} from '../../../rpc/base/v1/mfa'
+import type { Empty } from '../../../rpc/google/protobuf/empty'
 
 const MFA_URL = '/v1/base/mfa'
 

package/src/api/base/{oauth.ts → v1/oauth.ts}

@@ -1,4 +1,4 @@
-import { http } from '../../utils/http'
+import { http } from '../../../utils/http'
 import type {
   CreateOauthAuthorizationRequest,
   CreateOauthAuthorizationResponse,
@@ -19,8 +19,8 @@ import type {
   ListOauthProviderResponse,
   OauthService,
   UnbindOauthAccountRequest,
-} from '../../rpc/base/v1/oauth'
-import type { Empty } from '../../rpc/google/protobuf/empty'
+} from '../../../rpc/base/v1/oauth'
+import type { Empty } from '../../../rpc/google/protobuf/empty'
 
 const OAUTH_PROVIDER_URL = '/v1/base/oauth/provider'
 const OAUTH_AUTHORIZATION_URL = '/v1/base/oauth/authorization'

package/src/api/system/{auth.ts → app/v1/auth.ts}

@@ -1,26 +1,20 @@
-import { http } from '../../utils/http'
+import { http } from '../../../../utils/http'
 import {
   type AuthService,
   type BindUserPhoneRequest,
   type BindUserPhoneResponse,
+  type GetUserProfileRequest,
+  type UpdateUserProfileRequest,
   type UserProfileForm,
-} from '../../rpc/system/app/v1/auth'
-import type { Empty } from '../../rpc/google/protobuf/empty'
+} from '../../../../rpc/system/app/v1/auth'
+import type { Empty } from '../../../../rpc/google/protobuf/empty'
 
 const AUTH_URL = '/v1/app/auth'
 
-/** 获取用户资料请求兼容空请求结构。 */
-type GetUserProfileRequestCompat = Empty
-
-/** 更新用户资料请求兼容新旧两种表单包裹方式。 */
-type UpdateUserProfileRequestCompat = Partial<UserProfileForm> & {
-  user_profile?: UserProfileForm
-}
-
 /** 用户认证资料服务 */
 export class AuthServiceImpl implements AuthService {
   /** 获取已登录用户资料 */
-  GetUserProfile(request: GetUserProfileRequestCompat): Promise<UserProfileForm> {
+  GetUserProfile(request: GetUserProfileRequest): Promise<UserProfileForm> {
     return http<UserProfileForm>({
       url: `${AUTH_URL}/profile`,
       method: 'GET',
@@ -30,13 +24,12 @@ export class AuthServiceImpl implements AuthService {
   }
 
   /** 修改个人中心用户信息 */
-  UpdateUserProfile(request: UpdateUserProfileRequestCompat): Promise<Empty> {
-    const userProfile = request.user_profile ?? (request as UserProfileForm)
+  UpdateUserProfile(request: UpdateUserProfileRequest): Promise<Empty> {
     return http<Empty>({
       url: `${AUTH_URL}/profile`,
       method: 'PUT',
       authMode: 'required',
-      data: userProfile,
+      data: request.user_profile,
     })
   }
 

package/src/api/system/{base_area.ts → app/v1/base_area.ts}

@@ -1,9 +1,9 @@
-import { http } from '../../utils/http'
+import { http } from '../../../../utils/http'
 import type {
   BaseAreaService,
   TreeBaseAreaRequest,
   TreeBaseAreaResponse,
-} from '../../rpc/system/app/v1/base_area'
+} from '../../../../rpc/system/app/v1/base_area'
 
 const BASE_AREA_URL = '/v1/app/base/area'
 

package/src/api/system/app/v1/base_dict.ts

@@ -0,0 +1,17 @@
+import { http } from '../../../../utils/http'
+import type { BaseDictForm, BaseDictService, GetBaseDictRequest } from '../../../../rpc/system/app/v1/base_dict'
+
+const BASE_DICT_URL = '/v1/app/base/dict'
+
+/** 字典服务 */
+export class BaseDictServiceImpl implements BaseDictService {
+  /** 查询单个字典 */
+  GetBaseDict(request: GetBaseDictRequest): Promise<BaseDictForm> {
+    return http<BaseDictForm>({
+      url: `${BASE_DICT_URL}/${request.code}`,
+      method: 'GET',
+    })
+  }
+}
+
+export const defBaseDictService = new BaseDictServiceImpl()

package/src/api/{base/menu.ts → system/app/v1/base_menu.ts}

@@ -1,5 +1,5 @@
-import { http } from '../../utils/http'
-import type { ListBaseMenuResponse } from '../../rpc/system/app/v1/base_menu'
+import { http } from '../../../../utils/http'
+import type { ListBaseMenuResponse } from '../../../../rpc/system/app/v1/base_menu'
 
 /** 远端移动菜单服务。 */
 export class BaseMenuServiceImpl {

package/src/bootstrap.ts

@@ -16,7 +16,7 @@ import {
   registerLocaleMessages,
   t,
 } from './locales'
-import { defLanguageService } from './api/base/language'
+import { defLanguageService } from './api/base/v1/language'
 
 /** Taro 应用启动参数。 */
 export interface KratosTaroBootstrapOptions {

package/src/components/KratosTabBar.scss

@@ -34,26 +34,50 @@
 .kratos-tab-bar__message-icon {
   position: relative;
   width: 22PX;
-  height: 16PX;
-  margin-bottom: 8PX;
+  height: 18PX;
+  margin-bottom: 6PX;
   border: 2PX solid #9aa4b2;
-  border-radius: 3PX;
+  border-radius: 6PX;
   box-sizing: border-box;
 }
+.kratos-tab-bar__message-icon::before {
+  position: absolute;
+  top: 5PX;
+  left: 4PX;
+  width: 3PX;
+  height: 3PX;
+  border-radius: 50%;
+  background: #9aa4b2;
+  box-shadow:
+    5PX 0 #9aa4b2,
+    10PX 0 #9aa4b2;
+  content: '';
+}
 
 .kratos-tab-bar__message-icon::after {
   position: absolute;
-  top: 1PX;
-  left: 4PX;
-  width: 9PX;
-  height: 9PX;
+  bottom: -5PX;
+  left: 3PX;
+  width: 7PX;
+  height: 7PX;
   border-right: 2PX solid #9aa4b2;
   border-bottom: 2PX solid #9aa4b2;
+  background: #fff;
   content: '';
   transform: rotate(45deg);
 }
 
-.kratos-tab-bar__message-icon--active,
+.kratos-tab-bar__message-icon--active {
+  border-color: #27ba9b;
+}
+
+.kratos-tab-bar__message-icon--active::before {
+  background: #27ba9b;
+  box-shadow:
+    5PX 0 #27ba9b,
+    10PX 0 #27ba9b;
+}
+
 .kratos-tab-bar__message-icon--active::after {
   border-color: #27ba9b;
 }
@@ -64,15 +88,12 @@
 
 .kratos-tab-bar__badge {
   position: absolute;
-  top: 2PX;
-  right: calc(50% - 22PX);
-  min-width: 14PX;
-  height: 14PX;
-  padding: 0 3PX;
-  border-radius: 8PX;
+  top: 0;
+  right: calc(50% - 19PX);
+  width: 10PX;
+  height: 10PX;
+  box-sizing: border-box;
+  border: 2PX solid #fff;
+  border-radius: 50%;
   background: #e5484d;
-  color: #fff;
-  font-size: 9PX;
-  line-height: 14PX;
-  text-align: center;
 }

package/src/components/KratosTabBar.tsx

@@ -38,7 +38,9 @@ export function KratosTabBar({ route }: KratosTabBarProps) {
             {!icon && item.viewKey === 'MESSAGE_INBOX' ? (
               <View className={`kratos-tab-bar__message-icon${active ? ' kratos-tab-bar__message-icon--active' : ''}`} />
             ) : null}
-            {item.viewKey === 'MESSAGE_INBOX' && messageBadge ? <Text className='kratos-tab-bar__badge'>{messageBadge}</Text> : null}
+            {item.viewKey === 'MESSAGE_INBOX' && messageBadge ? (
+              <View className='kratos-tab-bar__badge' aria-hidden='true' />
+            ) : null}
             <Text className={active ? 'kratos-tab-bar__text--active' : ''}>{item.title}</Text>
           </View>
         )

package/src/locales/en-US.json

@@ -97,12 +97,9 @@
   "core.navigation.error.child_tab": "Only second-level app menus can be tabs: {name}",
   "core.navigation.error.cycle": "Menu parent cycle detected: {name}",
   "core.navigation.error.identity": "Menu id, name, or app/ path is invalid",
-  "core.navigation.error.item_object": "Menu item is not an object",
-  "core.navigation.error.list_missing": "Menu response does not contain a flat list",
   "core.navigation.error.name_prefix": "Menu name must start with App: {name}",
   "core.navigation.error.parent_missing": "Menu parent id is missing: {name}",
   "core.navigation.error.parent_not_found": "Menu parent was not found: {name}",
-  "core.navigation.error.response_object": "Menu response is not an object",
   "core.navigation.error.root_tab": "Second-level app menu must be a tab: {name}",
   "core.navigation.error.tab_count": "tabBar must contain 0 or 2-5 items",
   "core.navigation.error.unique": "Menu id, name, and path must be unique",

package/src/locales/ja-JP.json

@@ -97,12 +97,9 @@
   "core.navigation.error.child_tab": "モバイル セカンダリ メニューのみがタブとして使用できます: {name}",
   "core.navigation.error.cycle": "モバイル メニューにはループの親があります: {name}",
   "core.navigation.error.identity": "メニュー ID、名前、またはアプリ/パスが無効です",
-  "core.navigation.error.item_object": "メニュー項目はオブジェクトではありません",
-  "core.navigation.error.list_missing": "メニュー応答にフラット リストがありません",
   "core.navigation.error.name_prefix": "メニュー名にはアプリの接頭辞を使用する必要があります: {name}",
   "core.navigation.error.parent_missing": "メニューに親番号がありません: {name}",
   "core.navigation.error.parent_not_found": "モバイル メニューの親が存在しません: {name}",
-  "core.navigation.error.response_object": "メニュー応答はオブジェクトではありません",
   "core.navigation.error.root_tab": "モバイル セカンダリ メニューはタブとして使用する必要があります: {name}",
   "core.navigation.error.tab_count": "tabBar は 0 または 2 ～ 5 個の項目のみを設定できます",
   "core.navigation.error.unique": "メニュー ID、名前、パスは一意である必要があります",

package/src/locales/zh-CN.json

@@ -97,12 +97,9 @@
   "core.navigation.error.child_tab": "只有移动端二级菜单可以作为 tab：{name}",
   "core.navigation.error.cycle": "移动端菜单存在循环父级：{name}",
   "core.navigation.error.identity": "菜单 id、name 或 app/ 路径无效",
-  "core.navigation.error.item_object": "菜单项不是对象",
-  "core.navigation.error.list_missing": "菜单响应缺少扁平列表",
   "core.navigation.error.name_prefix": "菜单名称必须使用 App 前缀：{name}",
   "core.navigation.error.parent_missing": "菜单缺少父级编号：{name}",
   "core.navigation.error.parent_not_found": "移动端菜单父级不存在：{name}",
-  "core.navigation.error.response_object": "菜单响应不是对象",
   "core.navigation.error.root_tab": "移动端二级菜单必须作为 tab：{name}",
   "core.navigation.error.tab_count": "tabBar 只能配置 0 或 2-5 项",
   "core.navigation.error.unique": "菜单 id、name、path 必须唯一",

package/src/locales/zh-TW.json

@@ -97,12 +97,9 @@
   "core.navigation.error.child_tab": "只有移動端二級選單可以作為 tab：{name}",
   "core.navigation.error.cycle": "移動端選單存在迴圈父級：{name}",
   "core.navigation.error.identity": "選單 id、name 或 app/ 路徑無效",
-  "core.navigation.error.item_object": "選單項不是物件",
-  "core.navigation.error.list_missing": "選單響應缺少扁平列表",
   "core.navigation.error.name_prefix": "選單名稱必須使用 App 字首：{name}",
   "core.navigation.error.parent_missing": "選單缺少父級編號：{name}",
   "core.navigation.error.parent_not_found": "移動端選單父級不存在：{name}",
-  "core.navigation.error.response_object": "選單響應不是物件",
   "core.navigation.error.root_tab": "移動端二級選單必須作為 tab：{name}",
   "core.navigation.error.tab_count": "tabBar 只能配置 0 或 2-5 項",
   "core.navigation.error.unique": "選單 id、name、path 必須唯一",

package/src/navigation.ts

@@ -1,6 +1,7 @@
 import Taro, { getCurrentPages } from '@tarojs/taro'
 import { create } from 'zustand'
-import { defBaseMenuService } from './api/base/menu'
+import { defBaseMenuService } from './api/system/app/v1/base_menu'
+import type { BaseMenu, ListBaseMenuResponse } from './rpc/system/app/v1/base_menu'
 import { resolveStaticView } from './module'
 import { matchLogicalPath, parseLogicalQuery } from './navigation-pattern.mjs'
 import { buildMenuTree } from './navigation-tree.mjs'
@@ -33,7 +34,7 @@ export interface AppMenuNode extends AppMenu {
 /** 菜单获取适配器。 */
 export interface AppNavigationAdapter {
   /** 获取扁平移动菜单配置。 */
-  list(): Promise<unknown>
+  list(): Promise<ListBaseMenuResponse>
 }
 
 /** 逻辑路由解析结果。 */
@@ -72,11 +73,11 @@ export function setAppMenuBadge(viewKey: string, count: number): void {
 const ANONYMOUS_CACHE_KEY = 'kratos-taro-app:navigation:anonymous'
 const AUTHENTICATED_CACHE_KEY = 'kratos-taro-app:navigation:authenticated'
 /** 固定移动端菜单根目录编号。 */
-export const APP_MENU_ROOT_ID = 999
+export const APP_MENU_ROOT_ID = 99000000
 /** 本地兜底移动菜单。 */
 export const defaultAppMenus: AppMenu[] = [
   {
-    id: 99901,
+    id: 99010000,
     parentId: APP_MENU_ROOT_ID,
     name: 'AppHome',
     path: 'app/home',
@@ -88,7 +89,7 @@ export const defaultAppMenus: AppMenu[] = [
     selectedIcon: 'HOME_SELECTED',
   },
   {
-    id: 9990904,
+    id: 99040000,
     parentId: APP_MENU_ROOT_ID,
     name: 'AppMessage',
     path: 'app/message',
@@ -100,7 +101,7 @@ export const defaultAppMenus: AppMenu[] = [
     selectedIcon: 'MESSAGE_SELECTED',
   },
   {
-    id: 99909,
+    id: 99090000,
     parentId: APP_MENU_ROOT_ID,
     name: 'AppMy',
     path: 'app/my',
@@ -112,8 +113,8 @@ export const defaultAppMenus: AppMenu[] = [
     selectedIcon: 'USER_SELECTED',
   },
   {
-    id: 9990101,
-    parentId: 99901,
+    id: 99010100,
+    parentId: 99010000,
     name: 'AppLogin',
     path: 'app/login',
     viewKey: 'LOGIN',
@@ -122,8 +123,8 @@ export const defaultAppMenus: AppMenu[] = [
     inTabBar: false,
   },
   {
-    id: 999010101,
-    parentId: 9990101,
+    id: 99010101,
+    parentId: 99010100,
     name: 'AppProtocol',
     path: 'app/protocol/:type',
     viewKey: 'PROTOCOL',
@@ -132,8 +133,8 @@ export const defaultAppMenus: AppMenu[] = [
     inTabBar: false,
   },
   {
-    id: 9990901,
-    parentId: 99909,
+    id: 99090100,
+    parentId: 99090000,
     name: 'AppProfile',
     path: 'app/profile',
     viewKey: 'PROFILE',
@@ -142,8 +143,8 @@ export const defaultAppMenus: AppMenu[] = [
     inTabBar: false,
   },
   {
-    id: 9990902,
-    parentId: 99909,
+    id: 99090200,
+    parentId: 99090000,
     name: 'AppSettings',
     path: 'app/settings',
     viewKey: 'SETTINGS',
@@ -152,8 +153,8 @@ export const defaultAppMenus: AppMenu[] = [
     inTabBar: false,
   },
   {
-    id: 9990903,
-    parentId: 99909,
+    id: 99090300,
+    parentId: 99090000,
     name: 'AppAi',
     path: 'app/ai',
     viewKey: 'AI',
@@ -162,8 +163,8 @@ export const defaultAppMenus: AppMenu[] = [
     inTabBar: false,
   },
   {
-    id: 9990102,
-    parentId: 99901,
+    id: 99010200,
+    parentId: 99010000,
     name: 'AppWebView',
     path: 'app/webview',
     viewKey: 'WEBVIEW',
@@ -186,6 +187,7 @@ const defaultMenuTitleKeys: Record<string, string> = {
 
 let tabNavigationTarget: string | undefined
 const nativeTabViewKeys = ['HOME', 'PROFILE_HOME']
+const resetTabViewKeys = ['MESSAGE_INBOX']
 
 function localizedDefaultAppMenus(): AppMenu[] {
   return defaultAppMenus.map((menu) => ({
@@ -254,10 +256,7 @@ export function resolveAppRoute(rawRoute: string): ResolvedAppRoute | undefined
 }
 
 /** 跳转逻辑路由，并执行登录访问控制。 */
-export function navigateAppRoute(
-  rawRoute: string,
-  options: { replace?: boolean } = {},
-): void {
+export function navigateAppRoute(rawRoute: string, options: { replace?: boolean } = {}): void {
   const resolved = resolveAppRoute(rawRoute)
   if (!resolved) {
     launchAppStatus('NOT_FOUND')
@@ -320,9 +319,15 @@ function navigateTabRoute(url: string): void {
     if (tabNavigationTarget === targetRoute) tabNavigationTarget = undefined
   }
   if (nativeTabViewKeys.some((viewKey) => resolveStaticView(viewKey) === targetRoute)) {
-    void Taro.switchTab({ url }).then(release).catch(() => {
-      navigateTabRouteInStack(url, targetRoute, pages, currentIndex, release)
-    })
+    void Taro.switchTab({ url })
+      .then(release)
+      .catch(() => {
+        navigateTabRouteInStack(url, targetRoute, pages, currentIndex, release)
+      })
+    return
+  }
+  if (resetTabViewKeys.some((viewKey) => resolveStaticView(viewKey) === targetRoute)) {
+    void Taro.reLaunch({ url }).then(release, release)
     return
   }
   navigateTabRouteInStack(url, targetRoute, pages, currentIndex, release)
@@ -347,10 +352,7 @@ function navigateTabRouteInStack(
 }
 
 /** 打开可替换的状态视图。 */
-export function launchAppStatus(
-  state: import('./module').BootstrapViewKey,
-  detail = '',
-): void {
+export function launchAppStatus(state: import('./module').BootstrapViewKey, detail = ''): void {
   const route = resolveStaticView(state) ?? 'pages/status/index'
   const query = `state=${encodeURIComponent(state)}${detail ? `&detail=${encodeURIComponent(detail)}` : ''}`
   void Taro.reLaunch({ url: `/${route}?${query}` })
@@ -365,47 +367,32 @@ function readCachedMenus(cacheKey: string): AppMenu[] | undefined {
   const cached = Taro.getStorageSync<unknown>(cacheKey)
   if (!Array.isArray(cached)) return
   try {
-    const normalized = cached.map(normalizeMenu)
-    validateMenus(normalized)
-    return normalized
+    const cachedMenus = cached as AppMenu[]
+    validateMenus(cachedMenus)
+    return cachedMenus
   } catch {
     Taro.removeStorageSync(cacheKey)
   }
 }
 
-function normalizeMenuResponse(response: unknown): AppMenu[] {
-  if (Array.isArray(response)) return response.map(normalizeMenu)
-  if (!response || typeof response !== 'object') throw new Error(t('core.navigation.error.response_object'))
-  const record = response as Record<string, unknown>
-  const list = record.items ?? record.list ?? record.data
-  if (!Array.isArray(list)) throw new Error(t('core.navigation.error.list_missing'))
-  return list.map(normalizeMenu)
+function normalizeMenuResponse(response: ListBaseMenuResponse): AppMenu[] {
+  return response.items.map(normalizeMenu)
 }
 
-function normalizeMenu(value: unknown): AppMenu {
-  if (!value || typeof value !== 'object') throw new Error(t('core.navigation.error.item_object'))
-  const item = value as Record<string, unknown>
-  const meta = (item.meta ?? {}) as Record<string, unknown>
-  const app = (meta.app ?? item.app ?? {}) as Record<string, unknown>
+function normalizeMenu(item: BaseMenu): AppMenu {
+  const meta = item.meta
+  const app = meta?.app
   return {
-    id: Number(item.id),
-    parentId:
-      item.parent_id === undefined && item.parentId === undefined
-        ? undefined
-        : Number(item.parent_id ?? item.parentId),
-    name: String(item.name ?? ''),
-    path: String(item.path ?? ''),
-    viewKey: String(app.view_key ?? app.viewKey ?? item.view_key ?? item.viewKey ?? ''),
-    title: String(meta.title ?? item.title ?? ''),
-    access: String(app.access ?? 'AUTHENTICATED') as AppMenuAccess,
-    inTabBar: Boolean(app.in_tab_bar ?? app.inTabBar),
-    icon: typeof meta.icon === 'string' ? meta.icon : undefined,
-    selectedIcon:
-      typeof app.selected_icon === 'string'
-        ? app.selected_icon
-        : typeof app.selectedIcon === 'string'
-          ? app.selectedIcon
-          : undefined,
+    id: item.id,
+    parentId: item.parent_id,
+    name: item.name,
+    path: item.path,
+    viewKey: app?.view_key ?? '',
+    title: meta?.title ?? '',
+    access: (app?.access ?? 'AUTHENTICATED') as AppMenuAccess,
+    inTabBar: app?.in_tab_bar ?? false,
+    icon: meta?.icon,
+    selectedIcon: app?.selected_icon,
   }
 }
 
@@ -446,10 +433,12 @@ function validateMenus(nextMenus: AppMenu[]): void {
     const visited = new Set<number>([menu.id])
     let parentId = menu.parentId
     while (parentId !== APP_MENU_ROOT_ID) {
-      if (visited.has(parentId)) throw new Error(t('core.navigation.error.cycle', { name: menu.name }))
+      if (visited.has(parentId))
+        throw new Error(t('core.navigation.error.cycle', { name: menu.name }))
       visited.add(parentId)
       const parent = menuMap.get(parentId)
-      if (!parent?.parentId) throw new Error(t('core.navigation.error.parent_not_found', { name: menu.name }))
+      if (!parent?.parentId)
+        throw new Error(t('core.navigation.error.parent_not_found', { name: menu.name }))
       parentId = parent.parentId
     }
   }

package/src/rpc/base/v1/login.ts

@@ -22,6 +22,8 @@ export enum PasswordCryptoScene {
   PASSWORD_CRYPTO_SCENE_UPDATE_USER_PASSWORD = 4,
   /** PASSWORD_CRYPTO_SCENE_MFA - 多因素认证敏感操作场景。 */
   PASSWORD_CRYPTO_SCENE_MFA = 5,
+  /** PASSWORD_CRYPTO_SCENE_CONFIGURE_PASSWORD_POLICY - 密码策略初始化密码配置场景。 */
+  PASSWORD_CRYPTO_SCENE_CONFIGURE_PASSWORD_POLICY = 6,
 }
 
 /**
@@ -107,7 +109,7 @@ export interface RefreshTokenRequest {
 export interface RefreshTokenResponse {
   /** 访问令牌，必选项。 */
   access_token: string;
-  /** 更新令牌，用来获取下一次的访问令牌，可选项。 */
+  /** 更新令牌；管理端 Cookie-only 请求不在响应体返回，应用端请求可返回。 */
   refresh_token: string;
   /** 令牌类型，该值大小写不敏感，必选项，可以是bearer类型或mac类型。 */
   token_type: string;
@@ -135,7 +137,7 @@ export interface LoginRequest {
 export interface LoginResponse {
   /** 访问令牌，必选项。 */
   access_token: string;
-  /** 更新令牌，用来获取下一次的访问令牌，可选项。 */
+  /** 更新令牌；管理端 Cookie-only 请求不在响应体返回，应用端请求可返回。 */
   refresh_token: string;
   /** 令牌类型，该值大小写不敏感，必选项，可以是bearer类型或mac类型。 */
   token_type: string;

package/src/rpc/system/app/v1/auth.ts

@@ -6,6 +6,7 @@
 
 /* eslint-disable */
 import type { Empty } from "../../../google/protobuf/empty";
+import type { BaseUserIDType } from "../../common/v1/common";
 
 /** 获取用户资料请求参数 */
 export interface GetUserProfileRequest {
@@ -21,6 +22,12 @@ export interface UserProfileForm {
   gender: number;
   /** 手机号 */
   phone: string;
+  /** 邮箱 */
+  email: string;
+  /** 证件类型：枚举【BaseUserIDType】 */
+  id_type: BaseUserIDType;
+  /** 证件号 */
+  id_code: string;
   /** 头像 */
   avatar: string;
 }

package/src/rpc/system/common/v1/common.ts

@@ -0,0 +1,35 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.11.8
+//   protoc               unknown
+// source: system/common/v1/common.proto
+
+/* eslint-disable */
+
+/** 系统公共用户相关枚举。 */
+export enum BaseUserIDType {
+  /** BASE_USER_ID_TYPE_UNSPECIFIED - 未指定证件类型。 */
+  BASE_USER_ID_TYPE_UNSPECIFIED = 0,
+  /** BASE_USER_ID_TYPE_ID_CARD - 居民身份证。 */
+  BASE_USER_ID_TYPE_ID_CARD = 1,
+  /** BASE_USER_ID_TYPE_PASSPORT - 护照。 */
+  BASE_USER_ID_TYPE_PASSPORT = 2,
+  /** BASE_USER_ID_TYPE_HK_MACAO_PERMIT - 港澳居民来往内地通行证。 */
+  BASE_USER_ID_TYPE_HK_MACAO_PERMIT = 3,
+  /** BASE_USER_ID_TYPE_TAIWAN_PERMIT - 台湾居民来往大陆通行证。 */
+  BASE_USER_ID_TYPE_TAIWAN_PERMIT = 4,
+  /** BASE_USER_ID_TYPE_FOREIGN_PERMANENT_RESIDENCE - 外国人永久居留身份证。 */
+  BASE_USER_ID_TYPE_FOREIGN_PERMANENT_RESIDENCE = 5,
+  /** BASE_USER_ID_TYPE_OTHER - 其他证件。 */
+  BASE_USER_ID_TYPE_OTHER = 6,
+}
+
+/** 用户密码修改状态。 */
+export enum BaseUserPasswordChangeStatus {
+  /** BASE_USER_PASSWORD_CHANGE_STATUS_UNSPECIFIED - 未指定密码修改状态。 */
+  BASE_USER_PASSWORD_CHANGE_STATUS_UNSPECIFIED = 0,
+  /** BASE_USER_PASSWORD_CHANGE_STATUS_REQUIRED - 当前必须修改密码。 */
+  BASE_USER_PASSWORD_CHANGE_STATUS_REQUIRED = 1,
+  /** BASE_USER_PASSWORD_CHANGE_STATUS_NOT_REQUIRED - 当前无需修改密码。 */
+  BASE_USER_PASSWORD_CHANGE_STATUS_NOT_REQUIRED = 2,
+}

package/src/runner.ts

@@ -365,7 +365,7 @@ function restoreBuildTransaction(transaction: BuildTransaction, transactionFile:
     removeEmptyParents(dirname(file), transaction.inputDir)
   }
   removeGeneratedStaticFiles(
-    transaction.generatedStaticFiles ?? [],
+    transaction.generatedStaticFiles,
     resolve(transaction.inputDir, 'static'),
   )
   writeFileSync(transaction.appConfigFile, transaction.originalAppConfig)

package/src/stores/setting.ts

@@ -1,5 +1,5 @@
 import { create } from 'zustand'
-import { defConfigService } from '../api/base/config'
+import { defConfigService } from '../api/base/v1/config'
 import { t } from '../locales'
 import { BaseConfigSite } from '../rpc/base/v1/config'
 

package/src/stores/user.ts

@@ -1,11 +1,11 @@
 import Taro from '@tarojs/taro'
 import { create } from 'zustand'
-import { defLoginService } from '../api/base/login'
-import { defOauthService } from '../api/base/oauth'
-import { defAuthService } from '../api/system/auth'
+import { defLoginService } from '../api/base/v1/login'
+import { defOauthService } from '../api/base/v1/oauth'
+import { defAuthService } from '../api/system/app/v1/auth'
 import type { LoginRequest, LoginResponse } from '../rpc/base/v1/login'
 import type { VerifyMfaRequest } from '../rpc/base/v1/mfa'
-import { defMfaService } from '../api/base/mfa'
+import { defMfaService } from '../api/base/v1/mfa'
 import type {
   BindOauthSessionRequest,
   CreateOauthSessionRequest,

package/src/utils/http.ts

@@ -33,9 +33,6 @@ const NO_AUTH_URL_SET = new Set([
   CONFIG_URL,
   LANGUAGE_URL,
   PASSWORD_PUBLIC_KEY_URL,
-  '/auth',
-  '/login/captcha',
-  '/auth/token',
 ])
 const AUTH_EXPIRED_EXCLUDED_URL_SET = new Set([
   SESSION_URL,
@@ -43,8 +40,6 @@ const AUTH_EXPIRED_EXCLUDED_URL_SET = new Set([
   CONFIG_URL,
   LANGUAGE_URL,
   PASSWORD_PUBLIC_KEY_URL,
-  '/auth',
-  '/login/captcha',
 ])
 /** 认证状态被静默清理的事件名。 */
 export const AUTH_SILENT_LOGOUT_EVENT = 'auth:silent-logout'

package/src/utils/passwordCrypto.ts

@@ -1,6 +1,6 @@
 import Taro from '@tarojs/taro'
 import * as miniCrypto from 'asmcrypto.js'
-import { defLoginService } from '../api/base/login'
+import { defLoginService } from '../api/base/v1/login'
 import { t } from '../locales'
 import { PasswordCryptoScene } from '../rpc/base/v1/login'
 import type { PasswordCrypto } from '../rpc/common/v1/types'
@@ -223,8 +223,8 @@ export async function encryptPassword(
   const publicKeyResponse = await defLoginService.PasswordPublicKey({ scene })
 
   const cryptoApi = globalThis.crypto
-  // 微信小程序和局域网 HTTP 页面没有 WebCrypto，使用纯 JavaScript 实现保持协议一致。
-  if (process.env.TARO_ENV === 'weapp' || !cryptoApi?.subtle) {
+  const isSecureContext = typeof window === 'undefined' || window.isSecureContext
+  if (process.env.TARO_ENV === 'weapp' || !cryptoApi?.subtle || !isSecureContext) {
     return encryptPortablePassword(miniCrypto, plainPassword, publicKeyResponse)
   }
 

package/src/views/pages/login/login.tsx

@@ -2,8 +2,8 @@ import { Button, Image, Input, Picker, Text, View } from '@tarojs/components'
 import Taro, { useLoad } from '@tarojs/taro'
 import { useEffect, useMemo, useRef, useState } from 'react'
 import defaultLogo from '@liujitcn/kratos-taro-app-core/static/images/logo_icon.png'
-import { defLoginService } from '../../../api/base/login'
-import { defMfaService } from '../../../api/base/mfa'
+import { defLoginService } from '../../../api/base/v1/login'
+import { defMfaService } from '../../../api/base/v1/mfa'
 import { navigateAppRoute } from '../../../navigation'
 import { LoginStatus, type LoginRequest, type LoginResponse } from '../../../rpc/base/v1/login'
 import { useSettingStore, useUserStore } from '../../../stores'

package/src/api/system/base_dict.ts

@@ -1,24 +0,0 @@
-import { http } from '../../utils/http'
-import type { BaseDictForm, BaseDictService } from '../../rpc/system/app/v1/base_dict'
-
-const BASE_DICT_URL = '/v1/app/base/dict'
-
-/** 字典查询请求兼容结构，支持 code 和旧版 value。 */
-type GetBaseDictRequestCompat = {
-  code?: string
-  value?: string
-}
-
-/** 字典服务 */
-export class BaseDictServiceImpl implements BaseDictService {
-  /** 查询单个字典 */
-  GetBaseDict(request: GetBaseDictRequestCompat): Promise<BaseDictForm> {
-    const code = request.code ?? request.value ?? ''
-    return http<BaseDictForm>({
-      url: `${BASE_DICT_URL}/${code}`,
-      method: 'GET',
-    })
-  }
-}
-
-export const defBaseDictService = new BaseDictServiceImpl()