@origen-ui/admin-cli 1.1.0 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (159) hide show
  1. package/README.md +11 -7
  2. package/package.json +18 -2
  3. package/templates/current/clean/CHANGELOG.md +103 -0
  4. package/templates/current/clean/component-catalog.json +58 -17
  5. package/templates/current/clean/e2e/admin-shell.spec.ts +6 -0
  6. package/templates/current/clean/e2e/demo-shell.spec.ts +90 -46
  7. package/templates/current/clean/package.json +35 -21
  8. package/templates/current/clean/playwright.config.ts +1 -0
  9. package/templates/current/clean/playwright.demo.config.ts +1 -1
  10. package/templates/current/clean/scaffold.lock.json +2 -2
  11. package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/Forbidden.vue +7 -2
  12. package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/NotFound.vue +7 -2
  13. package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/ServerError.vue +7 -2
  14. package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/error-pages.spec.ts +11 -2
  15. package/templates/current/clean/scripts/clean-overlay/src/main.ts +23 -14
  16. package/templates/current/clean/scripts/clean-overlay/src/router/componentCache.ts +12 -0
  17. package/templates/current/clean/scripts/clean-overlay/src/router/componentRegistry.ts +2 -13
  18. package/templates/current/clean/scripts/clean-overlay/src/router/dynamicRoutes.spec.ts +34 -4
  19. package/templates/current/clean/scripts/clean-overlay/src/router/paths.ts +21 -0
  20. package/templates/current/clean/scripts/clean-overlay/src/router/staticRoutes.ts +6 -6
  21. package/templates/current/clean/scripts/demo-api.ts +84 -8
  22. package/templates/current/clean/scripts/generate-api.ts +87 -3
  23. package/templates/current/clean/scripts/vite-build-policy.spec.ts +1 -0
  24. package/templates/current/clean/src/api/generated/data-contracts.ts +2 -5
  25. package/templates/current/clean/src/api/generated/http-client.ts +28 -26
  26. package/templates/current/clean/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/345/206/205/345/256/271/346/226/207/347/253/240.ts +5 -8
  27. package/templates/current/clean/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/345/256/241/350/256/241.ts +1 -4
  28. package/templates/current/clean/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/346/226/207/344/273/266/344/270/212/344/274/240.ts +2 -5
  29. package/templates/current/clean/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/347/224/250/346/210/267.ts +8 -10
  30. package/templates/current/clean/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/350/217/234/345/215/225.ts +11 -12
  31. package/templates/current/clean/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/350/247/222/350/211/262.ts +8 -10
  32. package/templates/current/clean/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/350/256/242/345/215/225/350/215/211/347/250/277.ts +8 -10
  33. package/templates/current/clean/src/api/generated//350/256/244/350/257/201.ts +3 -6
  34. package/templates/current/clean/src/app/errorMessage.spec.ts +76 -0
  35. package/templates/current/clean/src/app/errorMessage.ts +53 -0
  36. package/templates/current/clean/src/app/menu-host.spec.ts +77 -0
  37. package/templates/current/clean/src/app/menu.spec.ts +39 -0
  38. package/templates/current/clean/src/app/menu.ts +48 -12
  39. package/templates/current/clean/src/app/runtimeConfig.ts +1 -1
  40. package/templates/current/clean/src/demo-api.spec.ts +311 -0
  41. package/templates/current/clean/src/features/auth/pages/Login.vue +8 -2
  42. package/templates/current/clean/src/features/auth/store/auth.ts +6 -19
  43. package/templates/current/clean/src/features/errors/pages/Forbidden.vue +7 -2
  44. package/templates/current/clean/src/features/errors/pages/NotFound.vue +7 -2
  45. package/templates/current/clean/src/features/errors/pages/ServerError.vue +7 -2
  46. package/templates/current/clean/src/features/errors/pages/error-pages.spec.ts +11 -2
  47. package/templates/current/clean/src/features/system/access/api/admin-repository.ts +2 -6
  48. package/templates/current/clean/src/features/system/access/api/rbac.ts +19 -9
  49. package/templates/current/clean/src/features/system/access/composables/useAuthorizationPolling.spec.ts +134 -0
  50. package/templates/current/clean/src/features/system/access/composables/useAuthorizationPolling.ts +96 -0
  51. package/templates/current/clean/src/features/workspace/pages/Profile.vue +1 -1
  52. package/templates/current/clean/src/layouts/AdminLayout.vue +3 -0
  53. package/templates/current/clean/src/layouts/TopBar.vue +37 -6
  54. package/templates/current/clean/src/layouts/topBarMenuSearch.spec.ts +24 -1
  55. package/templates/current/clean/src/layouts/topBarMenuSearch.ts +10 -0
  56. package/templates/current/clean/src/locales/en-US.json +30 -3
  57. package/templates/current/clean/src/locales/en-US.runtime.ts +2 -0
  58. package/templates/current/clean/src/locales/index.ts +39 -26
  59. package/templates/current/clean/src/locales/zh-CN.json +30 -3
  60. package/templates/current/clean/src/locales/zh-CN.runtime.ts +2 -0
  61. package/templates/current/clean/src/locales/zh-TW.json +30 -3
  62. package/templates/current/clean/src/locales/zh-TW.runtime.ts +2 -0
  63. package/templates/current/clean/src/main.ts +23 -14
  64. package/templates/current/clean/src/router/bootstrap.ts +10 -16
  65. package/templates/current/clean/src/router/componentCache.ts +12 -0
  66. package/templates/current/clean/src/router/componentRegistry.ts +2 -13
  67. package/templates/current/clean/src/router/dynamicMenuRefresh.spec.ts +101 -0
  68. package/templates/current/clean/src/router/dynamicMenuRefresh.ts +24 -0
  69. package/templates/current/clean/src/router/dynamicRoutes.spec.ts +34 -4
  70. package/templates/current/clean/src/router/dynamicRoutes.ts +14 -3
  71. package/templates/current/clean/src/router/paths.spec.ts +50 -0
  72. package/templates/current/clean/src/router/paths.ts +21 -0
  73. package/templates/current/clean/src/router/staticRoutes.ts +6 -6
  74. package/templates/current/clean/src/templates/og-table.ts +2 -4
  75. package/templates/current/clean/tsconfig.json +0 -1
  76. package/templates/current/clean/vite.build-policy.ts +55 -8
  77. package/templates/current/clean/vite.config.ts +30 -0
  78. package/templates/current/examples/CHANGELOG.md +103 -0
  79. package/templates/current/examples/component-catalog.json +58 -17
  80. package/templates/current/examples/e2e/admin-shell.spec.ts +6 -0
  81. package/templates/current/examples/e2e/demo-shell.spec.ts +90 -46
  82. package/templates/current/examples/package.json +35 -21
  83. package/templates/current/examples/playwright.config.ts +1 -0
  84. package/templates/current/examples/playwright.demo.config.ts +1 -1
  85. package/templates/current/examples/scaffold.lock.json +2 -2
  86. package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/Forbidden.vue +7 -2
  87. package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/NotFound.vue +7 -2
  88. package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/ServerError.vue +7 -2
  89. package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/error-pages.spec.ts +11 -2
  90. package/templates/current/examples/scripts/clean-overlay/src/main.ts +23 -14
  91. package/templates/current/examples/scripts/clean-overlay/src/router/componentCache.ts +12 -0
  92. package/templates/current/examples/scripts/clean-overlay/src/router/componentRegistry.ts +2 -13
  93. package/templates/current/examples/scripts/clean-overlay/src/router/dynamicRoutes.spec.ts +34 -4
  94. package/templates/current/examples/scripts/clean-overlay/src/router/paths.ts +21 -0
  95. package/templates/current/examples/scripts/clean-overlay/src/router/staticRoutes.ts +6 -6
  96. package/templates/current/examples/scripts/demo-api.ts +84 -8
  97. package/templates/current/examples/scripts/generate-api.ts +87 -3
  98. package/templates/current/examples/scripts/vite-build-policy.spec.ts +1 -0
  99. package/templates/current/examples/src/api/generated/data-contracts.ts +2 -5
  100. package/templates/current/examples/src/api/generated/http-client.ts +28 -26
  101. package/templates/current/examples/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/345/206/205/345/256/271/346/226/207/347/253/240.ts +5 -8
  102. package/templates/current/examples/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/345/256/241/350/256/241.ts +1 -4
  103. package/templates/current/examples/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/346/226/207/344/273/266/344/270/212/344/274/240.ts +2 -5
  104. package/templates/current/examples/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/347/224/250/346/210/267.ts +8 -10
  105. package/templates/current/examples/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/350/217/234/345/215/225.ts +11 -12
  106. package/templates/current/examples/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/350/247/222/350/211/262.ts +8 -10
  107. package/templates/current/examples/src/api/generated//347/263/273/347/273/237/347/256/241/347/220/206/350/256/242/345/215/225/350/215/211/347/250/277.ts +8 -10
  108. package/templates/current/examples/src/api/generated//350/256/244/350/257/201.ts +3 -6
  109. package/templates/current/examples/src/app/errorMessage.spec.ts +76 -0
  110. package/templates/current/examples/src/app/errorMessage.ts +53 -0
  111. package/templates/current/examples/src/app/menu-host.spec.ts +77 -0
  112. package/templates/current/examples/src/app/menu.spec.ts +39 -0
  113. package/templates/current/examples/src/app/menu.ts +48 -12
  114. package/templates/current/examples/src/app/runtimeConfig.ts +1 -1
  115. package/templates/current/examples/src/demo-api.spec.ts +311 -0
  116. package/templates/current/examples/src/features/auth/pages/Login.vue +8 -2
  117. package/templates/current/examples/src/features/auth/store/auth.ts +6 -19
  118. package/templates/current/examples/src/features/errors/pages/Forbidden.vue +2 -1
  119. package/templates/current/examples/src/features/errors/pages/NotFound.vue +2 -1
  120. package/templates/current/examples/src/features/errors/pages/ServerError.vue +2 -1
  121. package/templates/current/examples/src/features/feature-composables.spec.ts +11 -1
  122. package/templates/current/examples/src/features/system/access/api/admin-repository.ts +2 -6
  123. package/templates/current/examples/src/features/system/access/api/rbac.ts +19 -9
  124. package/templates/current/examples/src/features/system/access/composables/useAuthorizationPolling.spec.ts +134 -0
  125. package/templates/current/examples/src/features/system/access/composables/useAuthorizationPolling.ts +96 -0
  126. package/templates/current/examples/src/features/system/menus/components/MenuEditorForm.vue +115 -28
  127. package/templates/current/examples/src/features/system/menus/composables/useMenuManagement.ts +162 -66
  128. package/templates/current/examples/src/features/system/menus/menuDraft.spec.ts +204 -0
  129. package/templates/current/examples/src/features/system/menus/menuDraft.ts +116 -0
  130. package/templates/current/examples/src/features/system/menus/menuTreePrecheck.spec.ts +268 -0
  131. package/templates/current/examples/src/features/system/menus/menuTreePrecheck.ts +317 -0
  132. package/templates/current/examples/src/features/system/roles/components/RoleEditorForm.vue +1 -0
  133. package/templates/current/examples/src/features/workspace/pages/Profile.vue +1 -1
  134. package/templates/current/examples/src/layouts/AdminLayout.vue +3 -0
  135. package/templates/current/examples/src/layouts/TopBar.vue +37 -6
  136. package/templates/current/examples/src/layouts/topBarMenuSearch.spec.ts +24 -1
  137. package/templates/current/examples/src/layouts/topBarMenuSearch.ts +10 -0
  138. package/templates/current/examples/src/locales/en-US.json +30 -3
  139. package/templates/current/examples/src/locales/en-US.runtime.ts +2 -0
  140. package/templates/current/examples/src/locales/index.ts +39 -26
  141. package/templates/current/examples/src/locales/zh-CN.json +30 -3
  142. package/templates/current/examples/src/locales/zh-CN.runtime.ts +2 -0
  143. package/templates/current/examples/src/locales/zh-TW.json +30 -3
  144. package/templates/current/examples/src/locales/zh-TW.runtime.ts +2 -0
  145. package/templates/current/examples/src/main.ts +24 -22
  146. package/templates/current/examples/src/router/bootstrap.ts +10 -16
  147. package/templates/current/examples/src/router/componentCache.ts +18 -0
  148. package/templates/current/examples/src/router/componentRegistry.ts +1 -18
  149. package/templates/current/examples/src/router/dynamicMenuRefresh.spec.ts +101 -0
  150. package/templates/current/examples/src/router/dynamicMenuRefresh.ts +24 -0
  151. package/templates/current/examples/src/router/dynamicRoutes.spec.ts +20 -2
  152. package/templates/current/examples/src/router/dynamicRoutes.ts +14 -3
  153. package/templates/current/examples/src/router/paths.spec.ts +50 -0
  154. package/templates/current/examples/src/router/paths.ts +21 -0
  155. package/templates/current/examples/src/router/staticRoutes.ts +3 -3
  156. package/templates/current/examples/src/templates/og-table.ts +2 -4
  157. package/templates/current/examples/tsconfig.json +0 -1
  158. package/templates/current/examples/vite.build-policy.ts +55 -8
  159. package/templates/current/examples/vite.config.ts +30 -0
@@ -138,7 +138,9 @@
138
138
  },
139
139
  "errors": {
140
140
  "unknownPageError": "頁面發生未知錯誤",
141
- "startupFailed": "應用程式啟動失敗"
141
+ "startupFailed": "應用程式啟動失敗",
142
+ "networkError": "網路異常,請稍後再試",
143
+ "invalidResponse": "服務回應格式無效"
142
144
  }
143
145
  },
144
146
  "workspace": {
@@ -202,7 +204,8 @@
202
204
  "permissionItems": "項權限",
203
205
  "securityStatus": "安全狀態",
204
206
  "currentSession": "目前工作階段",
205
- "sessionDescription": "本裝置透過受保護的工作階段訪問管理工作區。"
207
+ "sessionDescription": "本裝置透過受保護的工作階段訪問管理工作區。",
208
+ "noEmail": "未設定電子郵件"
206
209
  }
207
210
  },
208
211
  "errors": {
@@ -440,15 +443,32 @@
440
443
  "pathRequired": "請填寫選單路由路徑",
441
444
  "submenuRelativePath": "子選單應使用相對路由路徑",
442
445
  "rootPathSlash": "根選單路由必須以 / 開頭",
443
- "componentRequired": "請選擇已註冊的頁面能力"
446
+ "componentRequired": "請選擇已註冊的頁面能力",
447
+ "treeCycle": "選單父子關係存在循環參照",
448
+ "treeOrphanParent": "上層選單不存在或已被刪除",
449
+ "treeDuplicateId": "選單識別碼重複",
450
+ "treeDuplicateCode": "選單編碼重複",
451
+ "treeDuplicatePath": "解析後的路由路徑重複",
452
+ "treeAmbiguousParent": "上層路由路徑存在歧義",
453
+ "treeUnresolvedParent": "上層路由路徑無法解析",
454
+ "treePrecheckFailed": "選單樹校驗未通過",
455
+ "treeTitleKeyMissing": "選單標題缺少翻譯鍵",
456
+ "treeDetail": "詳情:{detail}",
457
+ "titleKeyRequired": "請輸入選單標題翻譯鍵",
458
+ "versionConflict": "選單已被他人修改,請重新整理後再試"
444
459
  },
445
460
  "form": {
446
461
  "kind": "節點類型",
462
+ "redirect": "目錄重定向",
463
+ "redirectPlaceholder": "留空則回退到首頁路由",
447
464
  "parentButton": "所屬頁面",
448
465
  "parentDirectory": "上級目錄",
449
466
  "rootDirectory": "根目錄",
450
467
  "title": "選單名稱",
451
468
  "titlePlaceholder": "例如:元件覆蓋率",
469
+ "titleKey": "標題翻譯鍵",
470
+ "titleKeyPlaceholder": "例如:menus.coverage.title",
471
+ "titleKeyRuleMessage": "使用字母開頭的翻譯鍵,可含字母、數字、點或連字號",
452
472
  "code": "選單編碼",
453
473
  "codePlaceholder": "例如:user-list",
454
474
  "codeRuleMessage": "使用 3-48 位小寫字母、數字或連字號",
@@ -472,6 +492,13 @@
472
492
  "tabHidden": "隱藏分頁"
473
493
  }
474
494
  },
495
+ "access": {
496
+ "revision": {
497
+ "title": "權限已更新",
498
+ "body": "檢測到選單或權限配置已變更,是否立即重新整理?",
499
+ "refreshNow": "立即重新整理"
500
+ }
501
+ },
475
502
  "audit": {
476
503
  "title": "稽核日誌",
477
504
  "occurredAt": "發生時間",
@@ -1,5 +1,6 @@
1
1
  import { OG_DIALOG_LOCALE_ZH_TW } from '@origen-ui/dialog/locale'
2
2
  import { OG_EDITOR_LOCALE_ZH_TW } from '@origen-ui/editor/locale'
3
+ import { OG_FORM_TABLE_LOCALE_ZH_TW } from '@origen-ui/form-table/locale'
3
4
  import { OG_FORM_LOCALE_ZH_TW } from '@origen-ui/form/locale'
4
5
  import { OG_SEARCH_LOCALE_ZH_TW } from '@origen-ui/search/locale'
5
6
  import { OG_TABLE_LOCALE_ZH_TW } from '@origen-ui/table/locale'
@@ -13,6 +14,7 @@ export const origenUi = {
13
14
  dialog: OG_DIALOG_LOCALE_ZH_TW,
14
15
  editor: OG_EDITOR_LOCALE_ZH_TW,
15
16
  form: OG_FORM_LOCALE_ZH_TW,
17
+ formTable: OG_FORM_TABLE_LOCALE_ZH_TW,
16
18
  search: OG_SEARCH_LOCALE_ZH_TW,
17
19
  table: OG_TABLE_LOCALE_ZH_TW,
18
20
  tabs: OG_TABS_LOCALE_ZH_TW,
@@ -1,8 +1,11 @@
1
1
  import { createApp } from 'vue'
2
2
  import App from './App.vue'
3
+ import { translateAdminError } from './app/errorMessage'
3
4
  import { permission } from './app/permission'
4
5
  import { useAuthStore } from './features/auth/store/auth'
5
6
  import { devtoolsProtection } from './features/security/devtoolsProtection'
7
+ import { translateAdminMessage } from './locales'
8
+ import { replaceDynamicMenusWithAccessibleFallback } from './router/dynamicMenuRefresh'
6
9
  import { createRuntimeErrorRecovery, createStaleAssetRecovery } from './router/runtimeErrorRecovery'
7
10
  import { pinia } from './store'
8
11
  import 'element-plus/theme-chalk/src/tabs.scss'
@@ -46,43 +49,49 @@ async function bootstrap(): Promise<void> {
46
49
  language.install(app)
47
50
  const { createAdminUi } = await import('./app/createAdminUi')
48
51
  app.use(createAdminUi(language))
52
+ // 唯一的 errorHandler 装配点:运行期错误统一走提示 + 陈旧资源/运行时恢复。
49
53
  app.config.errorHandler = (error: unknown) => {
50
- const message = error instanceof Error ? error.message : '页面发生未知错误'
54
+ console.error('[admin] runtime error', error)
55
+ const message = translateAdminError(error, {
56
+ fallbackKey: 'common.errors.unknownPageError',
57
+ fallback: '页面发生未知错误',
58
+ })
51
59
  void notifyRuntimeError(message)
60
+ if (!staleAssetRecovery.handle(error)) recoverRuntimeError()
52
61
  }
53
62
 
54
63
  const auth = useAuthStore(pinia)
55
64
  const session = await auth.fetchSession()
56
65
  app.use(routing)
57
- await Promise.all([
58
- language.ready,
59
- routing.ready(),
60
- session ? import('./layouts/AdminLayout.vue') : Promise.resolve(),
61
- ])
62
- const reportRuntimeError = app.config.errorHandler
66
+ // 路由就绪是硬性等待;布局仅在登录态下并行预热。catch-tap 保证路由先失败
67
+ // 时预热 rejection 不会变成 unhandled——两个失败最终都按启动失败上报。
68
+ const layoutPreload = session ? import('./layouts/AdminLayout.vue') : undefined
69
+ layoutPreload?.catch(() => {})
70
+ await Promise.all([language.ready, routing.ready()])
71
+ await layoutPreload
63
72
  const { authorizationRefreshKey } =
64
73
  await import('./features/system/access/composables/useAuthorizationRefresh')
65
- app.config.errorHandler = (error, instance, info) => {
66
- reportRuntimeError?.(error, instance, info)
67
- if (!staleAssetRecovery.handle(error)) recoverRuntimeError()
68
- }
69
74
  app.provide(authorizationRefreshKey, async () => {
70
75
  await auth.refreshAuthorization()
71
- await routing.replaceDynamicRoutes(undefined, { fallback: '/workspace' })
76
+ await replaceDynamicMenusWithAccessibleFallback(routing)
72
77
  })
73
78
  app.mount('#app')
74
79
  staleAssetRecovery.clear()
75
80
  }
76
81
 
77
82
  void bootstrap().catch((error: unknown) => {
78
- const message = error instanceof Error ? error.message : '应用启动失败'
83
+ console.error('[admin] startup failed', error)
84
+ const message = translateAdminError(error, {
85
+ fallbackKey: 'common.errors.startupFailed',
86
+ fallback: '应用启动失败',
87
+ })
79
88
  const root = document.querySelector('#app')
80
89
  if (root) {
81
90
  const panel = document.createElement('main')
82
91
  panel.style.padding = '32px'
83
92
  panel.style.fontFamily = 'system-ui, sans-serif'
84
93
  const heading = document.createElement('h1')
85
- heading.textContent = '@origen-ui/admin 启动失败'
94
+ heading.textContent = `${'@origen-ui/admin'} ${translateAdminMessage('common.errors.startupFailed', { fallback: '启动失败' })}`
86
95
  const detail = document.createElement('p')
87
96
  detail.textContent = message
88
97
  panel.append(heading, detail)
@@ -2,13 +2,15 @@ import type { RouterAdapter } from '@origen-ui/router'
2
2
  import type { BackendMenuNode } from '../app/menuTypes'
3
3
  import { createAccessPolicy, createRouterAdapter, createWebStorageAdapter } from '@origen-ui/router'
4
4
  import { createWebHistory } from 'vue-router'
5
- import { embeddedMode, readHostInjection, reportMenusToHost } from '../app/embedded'
6
- import { fetchMenus } from '../app/menu'
5
+ import { embeddedMode, reportMenusToHost } from '../app/embedded'
6
+ import { loadMenusFromHost } from '../app/menu'
7
7
  import { appRuntimeConfig } from '../app/runtimeConfig'
8
8
  import { useAuthStore } from '../features/auth/store/auth'
9
9
  import { pinia } from '../store'
10
10
  import { hasPermission } from '../utils/permissions'
11
- import { componentRegistry, routeTransformer } from './dynamicRoutes'
11
+ import { componentRegistry } from './componentRegistry'
12
+ import { routeTransformer } from './dynamicRoutes'
13
+ import { NOT_FOUND_ROUTE_NAME } from './paths'
12
14
  import { staticRoutes } from './staticRoutes'
13
15
 
14
16
  type QueryCodecs = Pick<
@@ -23,16 +25,6 @@ type TitleOptions = Pick<
23
25
 
24
26
  let routing: RouterAdapter<BackendMenuNode> | undefined
25
27
 
26
- // 嵌入模式:动态菜单优先取主壳聚合下发(data 通道 backendMenus 字段,契约随
27
- // M3/D-2 定稿);主壳未下发时回落到子应用经主壳网关拉取自身菜单,独立模式不受影响。
28
- function loadMenusFromHost(): Promise<BackendMenuNode[]> {
29
- const menus = readHostInjection().backendMenus
30
- if (Array.isArray(menus) && menus.length > 0) {
31
- return Promise.resolve(menus as BackendMenuNode[])
32
- }
33
- return fetchMenus().then((menus) => [...menus])
34
- }
35
-
36
28
  export function getRouting(): RouterAdapter<BackendMenuNode> {
37
29
  if (!routing) {
38
30
  throw new Error('Routing has not been initialized yet')
@@ -55,7 +47,7 @@ export function initializeRouting(
55
47
  syncDocumentTitle: !embeddedMode,
56
48
  access: createAccessPolicy({
57
49
  getSession: () => useAuthStore(pinia).session,
58
- canAccess: (to, session) => hasPermission(session, to.meta.adapter?.permissions ?? []),
50
+ canAccess: (_to, session, meta) => hasPermission(session, meta.permissions ?? []),
59
51
  loginRoute: { name: 'login' },
60
52
  forbiddenRoute: { name: '403' },
61
53
  }),
@@ -63,7 +55,9 @@ export function initializeRouting(
63
55
  // 嵌入模式:菜单装载完成后向主壳上报(sub-app-menu);独立模式不触发。
64
56
  // 上报在 embedded.ts 内 try/catch 兜底,装载主流程不受影响。
65
57
  load: async () => {
66
- const menus = embeddedMode ? await loadMenusFromHost() : await fetchMenus()
58
+ // 嵌入模式:菜单装载完成后向主壳上报(sub-app-menu);独立模式不触发。
59
+ // loadMenusFromHost 内部处理主壳未下发时的 fetchMenus 回落。
60
+ const menus = await loadMenusFromHost()
67
61
  if (embeddedMode) reportMenusToHost(menus)
68
62
  return menus
69
63
  },
@@ -71,7 +65,7 @@ export function initializeRouting(
71
65
  resolveComponent: (key) => componentRegistry.get(key),
72
66
  },
73
67
  fallbacks: {
74
- notFound: { name: '404' },
68
+ notFound: { name: NOT_FOUND_ROUTE_NAME },
75
69
  error: { name: '500' },
76
70
  },
77
71
  workspace: {
@@ -0,0 +1,12 @@
1
+ /**
2
+ * componentKey → 页面组件 name 映射,用于生成 KeepAlive 缓存名单。
3
+ *
4
+ * KeepAlive 的 `:include` 匹配的是页面组件渲染后的 name(SFC `defineOptions({ name })`),
5
+ * 因此这里的值必须与各页面组件的 defineOptions name 完全一致,否则缓存失效。
6
+ * 修改组件 name 时必须同步更新此表,并保持 dynamicRoutes.spec.ts 断言一致。
7
+ */
8
+ export const componentCacheNames: Readonly<Record<string, string>> = {
9
+ workspace: 'EmptyPage',
10
+ }
11
+
12
+ export const fallbackComponentKey = 'workspace'
@@ -1,20 +1,9 @@
1
1
  import type { Component } from 'vue'
2
2
  import { RouterViewHost } from '@origen-ui/router'
3
3
 
4
- type ComponentLoader = () => Promise<Component>
5
-
6
- /**
7
- * componentKey → 页面组件 name 映射,用于生成 KeepAlive 缓存名单。
8
- *
9
- * KeepAlive 的 `:include` 匹配的是页面组件渲染后的 name(SFC `defineOptions({ name })`),
10
- * 因此这里的值必须与各页面组件的 defineOptions name 完全一致,否则缓存失效。
11
- * 修改组件 name 时必须同步更新此表,并保持 dynamicRoutes.spec.ts 断言一致。
12
- */
13
- export const componentCacheNames: Readonly<Record<string, string>> = {
14
- workspace: 'EmptyPage',
15
- }
4
+ export { componentCacheNames, fallbackComponentKey } from './componentCache'
16
5
 
17
- export const fallbackComponentKey = 'workspace'
6
+ type ComponentLoader = () => Promise<Component>
18
7
 
19
8
  export const componentRegistry: Map<string, ComponentLoader> = new Map([
20
9
  [
@@ -0,0 +1,101 @@
1
+ import type { BackendMenuNode } from '../app/menuTypes'
2
+ import { createRouterAdapter } from '@origen-ui/router'
3
+ import { describe, expect, it } from 'vitest'
4
+ import { defineComponent } from 'vue'
5
+ import { createMemoryHistory } from 'vue-router'
6
+ import { replaceDynamicMenusWithAccessibleFallback } from './dynamicMenuRefresh'
7
+ import { routeTransformer } from './dynamicRoutes'
8
+
9
+ const View = defineComponent({ template: '<div />' })
10
+
11
+ const staticRoutes = [
12
+ { name: 'login', path: '/login', component: View, meta: { adapter: { public: true, menu: { hidden: true } } } },
13
+ { name: '404', path: '/404', component: View, meta: { adapter: { public: true, menu: { hidden: true } } } },
14
+ { name: '500', path: '/500', component: View, meta: { adapter: { public: true, menu: { hidden: true } } } },
15
+ ]
16
+
17
+ function createAdaptersWithMenus(menus: readonly BackendMenuNode[]) {
18
+ let current = menus
19
+ const adapter = createRouterAdapter<BackendMenuNode>({
20
+ history: createMemoryHistory(),
21
+ staticRoutes,
22
+ dynamic: {
23
+ load: async () => current,
24
+ transform: routeTransformer,
25
+ resolveComponent: () => () => Promise.resolve(View),
26
+ },
27
+ fallbacks: { notFound: { name: '404' }, error: { name: '500' } },
28
+ })
29
+ return {
30
+ adapter,
31
+ setMenus(next: readonly BackendMenuNode[]) {
32
+ current = [...next]
33
+ },
34
+ }
35
+ }
36
+
37
+ describe('replaceDynamicMenusWithAccessibleFallback', () => {
38
+ it('falls back to the first reachable menu entry when home is revoked', async () => {
39
+ const { adapter, setMenus } = createAdaptersWithMenus([
40
+ { code: 'dashboard', path: '/dashboard', title: 'Dashboard' },
41
+ { code: 'reports', path: '/reports', title: 'Reports' },
42
+ ])
43
+ await adapter.router.push('/reports')
44
+ await adapter.router.isReady()
45
+ expect(adapter.router.currentRoute.value.path).toBe('/reports')
46
+
47
+ // 主页与当前页同时被裁撤:回落到刷新后菜单里首个真实可达入口。
48
+ setMenus([{ code: 'audit', path: '/audit', title: 'Audit' }])
49
+ await replaceDynamicMenusWithAccessibleFallback(adapter)
50
+
51
+ expect(adapter.router.currentRoute.value.path).toBe('/audit')
52
+ })
53
+
54
+ it('lands on home when the current route disappears but home remains', async () => {
55
+ const { adapter, setMenus } = createAdaptersWithMenus([
56
+ { code: 'dashboard', path: '/dashboard', title: 'Dashboard' },
57
+ { code: 'reports', path: '/reports', title: 'Reports' },
58
+ ])
59
+ await adapter.router.push('/reports')
60
+ await adapter.router.isReady()
61
+
62
+ setMenus([{ code: 'dashboard', path: '/dashboard', title: 'Dashboard' }])
63
+ await replaceDynamicMenusWithAccessibleFallback(adapter)
64
+
65
+ expect(adapter.router.currentRoute.value.path).toBe('/dashboard')
66
+ })
67
+
68
+ it('skips a directory whose redirect target was revoked and lands on a real entry', async () => {
69
+ const { adapter, setMenus } = createAdaptersWithMenus([
70
+ { code: 'system', path: '/system', title: 'System', redirect: '/dashboard' },
71
+ { code: 'reports', path: '/reports', title: 'Reports' },
72
+ ])
73
+ await adapter.router.push('/reports')
74
+ await adapter.router.isReady()
75
+
76
+ // 主页被裁撤后,首个菜单项(目录)的 redirect 仍指向 /dashboard——
77
+ // 可达性校验必须跳过它,否则会再次落回 404。
78
+ setMenus([
79
+ { code: 'system', path: '/system', title: 'System', redirect: '/dashboard' },
80
+ { code: 'audit', path: '/audit', title: 'Audit' },
81
+ ])
82
+ await replaceDynamicMenusWithAccessibleFallback(adapter)
83
+
84
+ expect(adapter.router.currentRoute.value.path).toBe('/audit')
85
+ })
86
+
87
+ it('does not redirect when the session is already on the not-found page', async () => {
88
+ const { adapter, setMenus } = createAdaptersWithMenus([
89
+ { code: 'dashboard', path: '/dashboard', title: 'Dashboard' },
90
+ { code: 'reports', path: '/reports', title: 'Reports' },
91
+ ])
92
+ await adapter.router.push('/reports')
93
+ await adapter.router.isReady()
94
+ await adapter.router.push('/404')
95
+
96
+ setMenus([{ code: 'audit', path: '/audit', title: 'Audit' }])
97
+ await replaceDynamicMenusWithAccessibleFallback(adapter)
98
+
99
+ expect(adapter.router.currentRoute.value.name).toBe('404')
100
+ })
101
+ })
@@ -0,0 +1,24 @@
1
+ import type { RouterAdapter } from '@origen-ui/router'
2
+ import type { RouteLocationRaw } from 'vue-router'
3
+ import type { BackendMenuNode } from '../app/menuTypes'
4
+ import { isUnmatchedRoute } from '@origen-ui/router'
5
+ import { firstMenuTarget, HOME_ROUTE, NOT_FOUND_ROUTE_NAME } from './paths'
6
+
7
+ function isReachableTarget(routing: RouterAdapter<BackendMenuNode>, to: RouteLocationRaw): boolean {
8
+ const resolved = routing.router.resolve(to)
9
+ return resolved.matched.length > 0 && !isUnmatchedRoute(resolved)
10
+ }
11
+
12
+ /**
13
+ * 替换动态菜单并在当前路由失效时回落:优先主页;主页已被裁撤时取
14
+ * 刷新后菜单树的首个真实可达入口,而不是把会话滞留在 404 页。
15
+ */
16
+ export async function replaceDynamicMenusWithAccessibleFallback(
17
+ routing: RouterAdapter<BackendMenuNode>,
18
+ ): Promise<void> {
19
+ const wasOnNotFound = routing.router.currentRoute.value.name === NOT_FOUND_ROUTE_NAME
20
+ await routing.replaceDynamicRoutes(undefined, { fallback: HOME_ROUTE })
21
+ if (wasOnNotFound || routing.router.currentRoute.value.name !== NOT_FOUND_ROUTE_NAME) return
22
+ const fallback = firstMenuTarget(routing.menu.value, (to) => isReachableTarget(routing, to))
23
+ if (fallback) await routing.router.replace(fallback)
24
+ }
@@ -1,6 +1,7 @@
1
1
  import { describe, expect, it } from 'vitest'
2
- import { componentCacheNames } from './componentRegistry'
3
- import { componentRegistry, routeTransformer } from './dynamicRoutes'
2
+ import { componentCacheNames } from './componentCache'
3
+ import { componentRegistry } from './componentRegistry'
4
+ import { routeTransformer } from './dynamicRoutes'
4
5
  import { staticRoutes } from './staticRoutes'
5
6
 
6
7
  describe('clean dynamic component registry', () => {
@@ -16,6 +17,23 @@ describe('clean dynamic component registry', () => {
16
17
  expect(route?.componentKey).toBe('workspace')
17
18
  expect(componentRegistry.has('workspace')).toBe(true)
18
19
  })
20
+
21
+ it('rejects flat parentPath entries whose parent route does not exist', () => {
22
+ expect(() =>
23
+ routeTransformer([
24
+ { code: 'orphan', path: 'orphan', parentPath: '/missing', title: 'Orphan' },
25
+ ]),
26
+ ).toThrow('Unresolved dynamic route parent path: /missing')
27
+ })
28
+
29
+ it('rejects duplicate route codes with an explicit error', () => {
30
+ expect(() =>
31
+ routeTransformer([
32
+ { code: 'dup', path: '/first', title: 'First' },
33
+ { code: 'dup', path: '/second', title: 'Second' },
34
+ ]),
35
+ ).toThrow('Duplicate dynamic route code: dup')
36
+ })
19
37
  })
20
38
 
21
39
  describe('clean keep-alive cache names', () => {
@@ -25,7 +43,13 @@ describe('clean keep-alive cache names', () => {
25
43
 
26
44
  it('generates cache.name from the component name mapping for cached dynamic routes', () => {
27
45
  const [workspace] = routeTransformer([
28
- { code: 'workspace', path: '/workspace', title: 'Workspace', componentKey: 'workspace', cache: true },
46
+ {
47
+ code: 'workspace',
48
+ path: '/workspace',
49
+ title: 'Workspace',
50
+ componentKey: 'workspace',
51
+ cache: true,
52
+ },
29
53
  ])
30
54
 
31
55
  expect(workspace?.meta?.cache).toEqual({ enabled: true, name: 'EmptyPage' })
@@ -33,7 +57,13 @@ describe('clean keep-alive cache names', () => {
33
57
 
34
58
  it('omits cache meta when the source disables caching', () => {
35
59
  const [workspace] = routeTransformer([
36
- { code: 'workspace', path: '/workspace', title: 'Workspace', componentKey: 'workspace', cache: false },
60
+ {
61
+ code: 'workspace',
62
+ path: '/workspace',
63
+ title: 'Workspace',
64
+ componentKey: 'workspace',
65
+ cache: false,
66
+ },
37
67
  ])
38
68
 
39
69
  expect(workspace?.meta?.cache).toBeUndefined()
@@ -1,8 +1,6 @@
1
1
  import type { RouteSourceNode } from '@origen-ui/router'
2
2
  import type { BackendMenuNode } from '../app/menuTypes'
3
- import { componentCacheNames, fallbackComponentKey } from './componentRegistry'
4
-
5
- export { componentRegistry } from './componentRegistry'
3
+ import { componentCacheNames, fallbackComponentKey } from './componentCache'
6
4
 
7
5
  function routeName(source: BackendMenuNode, used: Set<string>): string {
8
6
  const base = `dyn-${source.code.replace(/[^\w-]+/g, '-').replace(/^-|-$/g, '') || 'route'}`
@@ -128,6 +126,8 @@ function buildTree(nodes: readonly BackendMenuNode[]): readonly BackendMenuNode[
128
126
  ])
129
127
  candidates.delete(item)
130
128
  if (candidates.size > 1) throw new Error(`Ambiguous dynamic route parent path: ${parentPath}`)
129
+ if (candidates.size === 0)
130
+ throw new Error(`Unresolved dynamic route parent path: ${parentPath}`)
131
131
  }
132
132
 
133
133
  for (const item of entries) {
@@ -144,7 +144,18 @@ function buildTree(nodes: readonly BackendMenuNode[]): readonly BackendMenuNode[
144
144
  return roots.map(materialize)
145
145
  }
146
146
 
147
+ function assertUniqueCodes(nodes: readonly BackendMenuNode[], seen = new Set<string>()): void {
148
+ for (const node of nodes) {
149
+ if (seen.has(node.code)) throw new Error(`Duplicate dynamic route code: ${node.code}`)
150
+ seen.add(node.code)
151
+ assertUniqueCodes(node.children ?? [], seen)
152
+ }
153
+ }
154
+
147
155
  export function routeTransformer(sources: readonly BackendMenuNode[]): readonly RouteSourceNode[] {
156
+ // buildTree 按 code 去重会静默丢弃后到的重复节点,连同其子树一起消失;
157
+ // 在此显式失败,给出可定位的数据错误。
158
+ assertUniqueCodes(sources)
148
159
  const usedNames = new Set<string>()
149
160
  const tree = buildTree(sources)
150
161
 
@@ -0,0 +1,50 @@
1
+ import type { RouteMenuItem } from '@origen-ui/router'
2
+ import { describe, expect, it } from 'vitest'
3
+ import { firstMenuTarget, HOME_ROUTE, NOT_FOUND_ROUTE_NAME } from './paths'
4
+ import { staticRoutes } from './staticRoutes'
5
+
6
+ describe('router paths', () => {
7
+ it('keeps the root static redirect aligned with HOME_ROUTE', () => {
8
+ const root = staticRoutes.find((route) => route.name === 'root')
9
+ expect(root?.redirect).toBe(HOME_ROUTE)
10
+ })
11
+
12
+ it('pins the not-found fallback to the static 404 route', () => {
13
+ expect(staticRoutes.some((route) => route.name === NOT_FOUND_ROUTE_NAME)).toBe(true)
14
+ })
15
+
16
+ it('resolves the first navigable menu target depth-first', () => {
17
+ const items = [
18
+ { id: 'locked', label: 'Locked', children: [] },
19
+ {
20
+ id: 'section',
21
+ label: 'Section',
22
+ to: { name: 'section' },
23
+ children: [{ id: 'inner', label: 'Inner', to: { name: 'inner' }, children: [] }],
24
+ },
25
+ ] as readonly RouteMenuItem[]
26
+
27
+ expect(firstMenuTarget(items)).toEqual({ name: 'section' })
28
+ })
29
+
30
+ it('returns undefined when no menu item is navigable', () => {
31
+ const items = [{ id: 'empty', label: 'Empty', children: [] }] as readonly RouteMenuItem[]
32
+
33
+ expect(firstMenuTarget(items)).toBeUndefined()
34
+ })
35
+
36
+ it('skips entries rejected by the reachability predicate', () => {
37
+ const items = [
38
+ { id: 'gone', label: 'Gone', to: { path: '/gone' }, children: [] },
39
+ { id: 'live', label: 'Live', to: { name: 'live' }, children: [] },
40
+ ] as readonly RouteMenuItem[]
41
+
42
+ expect(
43
+ firstMenuTarget(items, (to) => {
44
+ const path = typeof to === 'string' ? to : to.path
45
+ return path !== '/gone'
46
+ }),
47
+ ).toEqual({ name: 'live' })
48
+ expect(firstMenuTarget(items, () => false)).toBeUndefined()
49
+ })
50
+ })
@@ -0,0 +1,21 @@
1
+ import type { RouteMenuItem } from '@origen-ui/router'
2
+ import type { RouteLocationRaw } from 'vue-router'
3
+
4
+ /** 授权后的默认首页路由;与 staticRoutes 根路由 redirect 由 paths.spec 钉住一致。 */
5
+ export const HOME_ROUTE = '/workspace'
6
+
7
+ /** staticRoutes 中 404 兜底页的路由名。 */
8
+ export const NOT_FOUND_ROUTE_NAME = '404'
9
+
10
+ /** 深度优先取菜单树中首个可导航入口;isReachable 用于剔除重定向到已裁撤路由的目录项。 */
11
+ export function firstMenuTarget(
12
+ items: readonly RouteMenuItem[],
13
+ isReachable: (to: RouteLocationRaw) => boolean = () => true,
14
+ ): RouteLocationRaw | undefined {
15
+ for (const item of items) {
16
+ if (item.to && isReachable(item.to)) return item.to
17
+ const child = firstMenuTarget(item.children, isReachable)
18
+ if (child) return child
19
+ }
20
+ return undefined
21
+ }
@@ -26,7 +26,7 @@ export const staticRoutes: RouteRecordRaw[] = [
26
26
  path: '/login',
27
27
  name: 'login',
28
28
  component: Login,
29
- meta: { adapter: { title: '登录', ...hiddenPublic } },
29
+ meta: { adapter: { titleKey: 'auth.login', ...hiddenPublic } },
30
30
  },
31
31
  {
32
32
  path: '/profile',
@@ -34,10 +34,10 @@ export const staticRoutes: RouteRecordRaw[] = [
34
34
  component: Profile,
35
35
  meta: {
36
36
  adapter: {
37
- title: '个人资料',
37
+ titleKey: 'menu.profile',
38
38
  icon: 'profile',
39
39
  menu: { order: 20 },
40
- breadcrumb: { label: '个人资料' },
40
+ breadcrumb: { labelKey: 'menu.profile' },
41
41
  cache: { enabled: true, name: 'ProfilePage' },
42
42
  },
43
43
  },
@@ -46,18 +46,18 @@ export const staticRoutes: RouteRecordRaw[] = [
46
46
  path: '/403',
47
47
  name: '403',
48
48
  component: Forbidden,
49
- meta: { adapter: { title: '无权访问', ...hiddenPublic } },
49
+ meta: { adapter: { titleKey: 'errors.forbidden.title', ...hiddenPublic } },
50
50
  },
51
51
  {
52
52
  path: '/404',
53
53
  name: '404',
54
54
  component: NotFound,
55
- meta: { adapter: { title: '页面不存在', ...hiddenPublic } },
55
+ meta: { adapter: { titleKey: 'errors.notFound.title', ...hiddenPublic } },
56
56
  },
57
57
  {
58
58
  path: '/500',
59
59
  name: '500',
60
60
  component: ServerError,
61
- meta: { adapter: { title: '服务异常', ...hiddenPublic } },
61
+ meta: { adapter: { titleKey: 'errors.serverError.title', ...hiddenPublic } },
62
62
  },
63
63
  ]
@@ -9,12 +9,10 @@ import type {
9
9
  TableRowKey,
10
10
  } from '@origen-ui/table'
11
11
  import type { AdminMessageKey } from '../locales'
12
- import { getAdminI18n } from '../locales'
12
+ import { translateAdminMessage } from '../locales'
13
13
 
14
14
  function tableText(key: AdminMessageKey): string {
15
- const global = getAdminI18n()?.global as unknown as
16
- { t: (key: AdminMessageKey) => string } | undefined
17
- return global ? global.t(key) : key
15
+ return translateAdminMessage(key)
18
16
  }
19
17
 
20
18
  function withLocalizedLabel<T extends object>(
@@ -9,7 +9,6 @@
9
9
  "DOM",
10
10
  "DOM.Iterable"
11
11
  ],
12
- "baseUrl": ".",
13
12
  "module": "ESNext",
14
13
  "moduleResolution": "Bundler",
15
14
  "paths": {