@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
@@ -0,0 +1,134 @@
1
+ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
2
+ import { useAuthorizationPolling } from './useAuthorizationPolling'
3
+
4
+ interface HarnessOptions {
5
+ local?: number | undefined
6
+ remote?: number
7
+ confirmed?: boolean
8
+ }
9
+
10
+ function createHarness({ local, remote = 1, confirmed = true }: HarnessOptions = {}) {
11
+ const fetchRemoteRevision = vi.fn(async () => remote)
12
+ const getLocalRevision = vi.fn(() => local)
13
+ const confirmDrift = vi.fn(async () => confirmed)
14
+ const onDrift = vi.fn(async () => {})
15
+ const polling = useAuthorizationPolling({
16
+ intervalMs: 30_000,
17
+ fetchRemoteRevision,
18
+ getLocalRevision,
19
+ confirmDrift,
20
+ onDrift,
21
+ })
22
+ return { polling, fetchRemoteRevision, getLocalRevision, confirmDrift, onDrift }
23
+ }
24
+
25
+ describe('useAuthorizationPolling', () => {
26
+ beforeEach(() => {
27
+ vi.useFakeTimers()
28
+ })
29
+
30
+ afterEach(() => {
31
+ vi.useRealTimers()
32
+ })
33
+
34
+ it('skips checks while the session has no revision', async () => {
35
+ const { polling, fetchRemoteRevision, confirmDrift } = createHarness({ local: undefined })
36
+
37
+ await polling.checkOnce()
38
+
39
+ expect(fetchRemoteRevision).not.toHaveBeenCalled()
40
+ expect(confirmDrift).not.toHaveBeenCalled()
41
+ })
42
+
43
+ it('does nothing when revisions match', async () => {
44
+ const { polling, confirmDrift, onDrift } = createHarness({ local: 1, remote: 1 })
45
+
46
+ await polling.checkOnce()
47
+
48
+ expect(confirmDrift).not.toHaveBeenCalled()
49
+ expect(onDrift).not.toHaveBeenCalled()
50
+ })
51
+
52
+ it('prompts and refreshes on drift when confirmed', async () => {
53
+ const { polling, confirmDrift, onDrift } = createHarness({
54
+ local: 1,
55
+ remote: 2,
56
+ confirmed: true,
57
+ })
58
+
59
+ await polling.checkOnce()
60
+
61
+ expect(confirmDrift).toHaveBeenCalledTimes(1)
62
+ expect(onDrift).toHaveBeenCalledTimes(1)
63
+ })
64
+
65
+ it('keeps polling when the user postpones the refresh', async () => {
66
+ const { polling, confirmDrift, onDrift } = createHarness({
67
+ local: 1,
68
+ remote: 2,
69
+ confirmed: false,
70
+ })
71
+
72
+ await polling.checkOnce()
73
+ expect(onDrift).not.toHaveBeenCalled()
74
+
75
+ await polling.checkOnce()
76
+ expect(confirmDrift).toHaveBeenCalledTimes(2)
77
+ expect(onDrift).not.toHaveBeenCalled()
78
+ })
79
+
80
+ it('stays silent when a revision fetch fails', async () => {
81
+ const fetchRemoteRevision = vi.fn(async () => {
82
+ throw new Error('network down')
83
+ })
84
+ const { checkOnce } = useAuthorizationPolling({
85
+ intervalMs: 30_000,
86
+ fetchRemoteRevision,
87
+ getLocalRevision: () => 1,
88
+ confirmDrift: vi.fn(async () => true),
89
+ onDrift: vi.fn(async () => {}),
90
+ })
91
+
92
+ await expect(checkOnce()).resolves.toBeUndefined()
93
+ })
94
+
95
+ it('ignores overlapping checks while one is in flight', async () => {
96
+ let resolveFetch: (value: number) => void = () => {}
97
+ const fetchRemoteRevision = vi.fn(
98
+ () =>
99
+ new Promise<number>((resolve) => {
100
+ resolveFetch = resolve
101
+ }),
102
+ )
103
+ const confirmDrift = vi.fn(async () => true)
104
+ const onDrift = vi.fn(async () => {})
105
+ const polling = useAuthorizationPolling({
106
+ intervalMs: 30_000,
107
+ fetchRemoteRevision,
108
+ getLocalRevision: () => 1,
109
+ confirmDrift,
110
+ onDrift,
111
+ })
112
+
113
+ const first = polling.checkOnce()
114
+ const second = polling.checkOnce()
115
+ resolveFetch(2)
116
+ await Promise.all([first, second])
117
+
118
+ expect(fetchRemoteRevision).toHaveBeenCalledTimes(1)
119
+ expect(confirmDrift).toHaveBeenCalledTimes(1)
120
+ expect(onDrift).toHaveBeenCalledTimes(1)
121
+ })
122
+
123
+ it('starts and stops on the configured interval', async () => {
124
+ const { polling, fetchRemoteRevision } = createHarness({ local: 1, remote: 1 })
125
+
126
+ polling.start()
127
+ await vi.advanceTimersByTimeAsync(30_000)
128
+ expect(fetchRemoteRevision).toHaveBeenCalledTimes(1)
129
+
130
+ polling.stop()
131
+ await vi.advanceTimersByTimeAsync(60_000)
132
+ expect(fetchRemoteRevision).toHaveBeenCalledTimes(1)
133
+ })
134
+ })
@@ -0,0 +1,96 @@
1
+ import { getCurrentInstance, onBeforeUnmount, onMounted } from 'vue'
2
+ import { translateAdminMessage } from '../../../../locales'
3
+ import { useAuthStore } from '../../../auth/store/auth'
4
+ import { rbacRevision } from '../api/rbac'
5
+ import { useAuthorizationRefresh } from './useAuthorizationRefresh'
6
+
7
+ export const DEFAULT_AUTHORIZATION_POLLING_INTERVAL_MS = 30_000
8
+
9
+ export interface AuthorizationPollingOptions {
10
+ /** 轮询间隔,默认 30s。 */
11
+ intervalMs?: number
12
+ /** 注入点(测试):远端 revision 来源,默认 /system/rbac/revision。 */
13
+ fetchRemoteRevision?: () => Promise<number>
14
+ /** 注入点(测试):本地会话 revision,默认 auth.session.authorizationRevision。 */
15
+ getLocalRevision?: () => number | undefined
16
+ /** 注入点(测试):漂移确认交互;resolve(true) 表示立即刷新。 */
17
+ confirmDrift?: () => Promise<boolean>
18
+ /** 注入点(测试):确认后的刷新动作,默认 refreshAuthorization 回路。 */
19
+ onDrift?: () => Promise<void>
20
+ }
21
+
22
+ /** 默认确认交互:消息框确认,拒绝(关闭/取消)视为稍后处理。 */
23
+ async function confirmByMessageBox(): Promise<boolean> {
24
+ const { ElMessageBox } = await import('element-plus/es/components/message-box/index.mjs')
25
+ try {
26
+ await ElMessageBox.confirm(
27
+ translateAdminMessage('system.access.revision.body'),
28
+ translateAdminMessage('system.access.revision.title'),
29
+ {
30
+ confirmButtonText: translateAdminMessage('system.access.revision.refreshNow'),
31
+ cancelButtonText: translateAdminMessage('common.actions.cancel'),
32
+ type: 'warning',
33
+ },
34
+ )
35
+ return true
36
+ } catch {
37
+ return false
38
+ }
39
+ }
40
+
41
+ /**
42
+ * 跨会话权限感知:周期比对服务端 RBAC revision 与本地会话,发现漂移后
43
+ * 提示用户确认再刷新(refreshAuthorization + 动态菜单重建)。取"提示确认"
44
+ * 而非静默替换,避免打断正在填写的表单;轮询失败静默,不干扰主流程。
45
+ * 在组件 setup 中调用时自动随挂载启停;亦可手动 start/stop。
46
+ */
47
+ export function useAuthorizationPolling(options: AuthorizationPollingOptions = {}) {
48
+ const intervalMs = options.intervalMs ?? DEFAULT_AUTHORIZATION_POLLING_INTERVAL_MS
49
+ const fetchRemoteRevision = options.fetchRemoteRevision ?? rbacRevision
50
+ const getLocalRevision =
51
+ options.getLocalRevision ?? (() => useAuthStore().session?.authorizationRevision)
52
+ const confirmDrift = options.confirmDrift ?? confirmByMessageBox
53
+ const onDrift = options.onDrift ?? useAuthorizationRefresh()
54
+
55
+ let timer: ReturnType<typeof setInterval> | undefined
56
+ let checking = false
57
+
58
+ async function checkOnce(): Promise<void> {
59
+ if (checking) return
60
+ const local = getLocalRevision()
61
+ if (local === undefined) return
62
+ checking = true
63
+ try {
64
+ const remote = await fetchRemoteRevision()
65
+ if (remote === local) return
66
+ // 后台标签页不打扰;回到前台后的下一轮检测到漂移会再次提示。
67
+ if (typeof document !== 'undefined' && document.hidden) return
68
+ if (!(await confirmDrift())) return
69
+ await onDrift()
70
+ } catch {
71
+ // 保守吞掉:revision 拉取/刷新异常不冒泡到全局错误提示。
72
+ } finally {
73
+ checking = false
74
+ }
75
+ }
76
+
77
+ function start(): void {
78
+ if (timer !== undefined) return
79
+ timer = setInterval(() => {
80
+ void checkOnce()
81
+ }, intervalMs)
82
+ }
83
+
84
+ function stop(): void {
85
+ if (timer === undefined) return
86
+ clearInterval(timer)
87
+ timer = undefined
88
+ }
89
+
90
+ if (getCurrentInstance()) {
91
+ onMounted(start)
92
+ onBeforeUnmount(stop)
93
+ }
94
+
95
+ return { start, stop, checkOnce }
96
+ }
@@ -25,7 +25,7 @@ const sessionId = computed(() =>
25
25
  </ElAvatar>
26
26
  <div>
27
27
  <h2>{{ user?.displayName ?? t('workspace.profile.admin') }}</h2>
28
- <p>{{ user?.email ?? 'admin@example.com' }}</p>
28
+ <p>{{ user?.email ?? t('workspace.profile.noEmail') }}</p>
29
29
  </div>
30
30
  <ElTag type="success" effect="plain">
31
31
  <ElIcon><CircleCheckFilled /></ElIcon> {{ t('workspace.profile.online') }}
@@ -5,6 +5,7 @@ import { ElDrawer } from 'element-plus'
5
5
  import { useI18n } from 'vue-i18n'
6
6
  import AdminWatermark from '../features/shell/components/AdminWatermark.vue'
7
7
  import { useSidebarStore } from '../features/shell/store/sidebar'
8
+ import { useAuthorizationPolling } from '../features/system/access/composables/useAuthorizationPolling'
8
9
  import BreadcrumbBar from './BreadcrumbBar.vue'
9
10
  import SideMenu from './SideMenu.vue'
10
11
  import TopBar from './TopBar.vue'
@@ -13,6 +14,8 @@ import WorkspaceTabs from './WorkspaceTabs.vue'
13
14
  defineOptions({ name: 'AdminLayout' })
14
15
  const sidebar = useSidebarStore()
15
16
  const { t } = useI18n()
17
+ // 会话内轮询 RBAC revision:服务端权限/菜单变更经确认后刷新,随布局卸载停止。
18
+ useAuthorizationPolling()
16
19
  </script>
17
20
 
18
21
  <template>
@@ -18,7 +18,12 @@ import { useI18n } from 'vue-i18n'
18
18
  import { useAuthStore } from '../features/auth/store/auth'
19
19
  import { useSidebarStore } from '../features/shell/store/sidebar'
20
20
  import { getRouting } from '../router/bootstrap'
21
- import { flattenMenuSearchOptions } from './topBarMenuSearch'
21
+ import { replaceDynamicMenusWithAccessibleFallback } from '../router/dynamicMenuRefresh'
22
+ import {
23
+ flattenMenuSearchOptions,
24
+ isMenuRefreshDisabled,
25
+ isMenuSearchDisabled,
26
+ } from './topBarMenuSearch'
22
27
 
23
28
  defineOptions({ name: 'TopBar' })
24
29
  const ThemePanel = defineAsyncComponent({
@@ -33,6 +38,7 @@ const auth = useAuthStore()
33
38
  const user = computed(() => auth.session?.user)
34
39
  const menuSearchValue = shallowRef<string>()
35
40
  const menuRefreshFailed = shallowRef(false)
41
+ const menuRefreshing = shallowRef(false)
36
42
  const language = useOrigenUiLanguage()!
37
43
  const languageOptions = computed(() => [
38
44
  { value: 'zh-CN', label: t('shell.languageZhCN') },
@@ -42,20 +48,33 @@ const languageOptions = computed(() => [
42
48
  const menuSearchOptions = computed(() => flattenMenuSearchOptions(getRouting().menu.value))
43
49
 
44
50
  async function refreshLocalizedMenus(): Promise<void> {
51
+ if (isMenuRefreshDisabled(menuRefreshing.value, language.status.value === 'loading')) return
52
+ menuRefreshing.value = true
45
53
  try {
46
- await getRouting().replaceDynamicRoutes(undefined, { fallback: '/dashboard' })
54
+ await replaceDynamicMenusWithAccessibleFallback(getRouting())
47
55
  menuRefreshFailed.value = false
48
56
  } catch {
49
57
  menuRefreshFailed.value = true
50
58
  ElMessage.error({ message: t('shell.menuRefreshFailed'), showClose: true })
59
+ } finally {
60
+ menuRefreshing.value = false
51
61
  }
52
62
  }
53
63
 
54
64
  async function switchLanguage(locale: string): Promise<void> {
55
- if (!language || language.current.value === locale) return
65
+ if (
66
+ !language ||
67
+ menuRefreshing.value ||
68
+ language.status.value === 'loading' ||
69
+ language.current.value === locale
70
+ ) {
71
+ return
72
+ }
56
73
  try {
57
74
  const result = await language.setLocale(locale)
58
- if (!result.applied) return
75
+ if (!result.applied) {
76
+ return
77
+ }
59
78
  } catch {
60
79
  ElMessage.error({ message: t('shell.languageLoadFailed'), showClose: true })
61
80
  return
@@ -100,6 +119,7 @@ async function logout(): Promise<void> {
100
119
  <ElSelect
101
120
  v-model="menuSearchValue"
102
121
  class="top-bar__search"
122
+ :disabled="isMenuSearchDisabled(menuRefreshing, language.status.value === 'loading')"
103
123
  :placeholder="t('shell.searchMenu')"
104
124
  filterable
105
125
  clearable
@@ -140,12 +160,23 @@ async function logout(): Promise<void> {
140
160
  <ElDropdownItem
141
161
  v-for="item in languageOptions"
142
162
  :key="item.value"
143
- :disabled="language.current.value === item.value"
163
+ :disabled="
164
+ language.current.value === item.value
165
+ || menuRefreshing
166
+ || language.status.value === 'loading'
167
+ "
144
168
  @click="switchLanguage(item.value)"
145
169
  >
146
170
  {{ item.label }}
147
171
  </ElDropdownItem>
148
- <ElDropdownItem v-if="menuRefreshFailed" divided @click="refreshLocalizedMenus">
172
+ <ElDropdownItem
173
+ v-if="menuRefreshFailed"
174
+ divided
175
+ :disabled="
176
+ isMenuRefreshDisabled(menuRefreshing, language.status.value === 'loading')
177
+ "
178
+ @click="refreshLocalizedMenus"
179
+ >
149
180
  <ElIcon><Refresh /></ElIcon>
150
181
  {{ t('shell.retryMenuRefresh') }}
151
182
  </ElDropdownItem>
@@ -1,6 +1,29 @@
1
1
  import type { RouteMenuItem } from '@origen-ui/router'
2
2
  import { describe, expect, it } from 'vitest'
3
- import { flattenMenuSearchOptions } from './topBarMenuSearch'
3
+ import {
4
+ flattenMenuSearchOptions,
5
+ isMenuRefreshDisabled,
6
+ isMenuSearchDisabled,
7
+ } from './topBarMenuSearch'
8
+
9
+ describe('isMenuSearchDisabled', () => {
10
+ it('disables menu search while localized routes are loading or refreshing', () => {
11
+ expect(isMenuSearchDisabled(true, false)).toBe(true)
12
+ expect(isMenuSearchDisabled(false, true)).toBe(true)
13
+ })
14
+
15
+ it('keeps menu search enabled when route state is settled', () => {
16
+ expect(isMenuSearchDisabled(false, false)).toBe(false)
17
+ })
18
+ })
19
+
20
+ describe('isMenuRefreshDisabled', () => {
21
+ it('prevents a refresh while another refresh or locale transition is active', () => {
22
+ expect(isMenuRefreshDisabled(true, false)).toBe(true)
23
+ expect(isMenuRefreshDisabled(false, true)).toBe(true)
24
+ expect(isMenuRefreshDisabled(false, false)).toBe(false)
25
+ })
26
+ })
4
27
 
5
28
  describe('flattenMenuSearchOptions', () => {
6
29
  it('returns only navigable leaves with their visible hierarchy', () => {
@@ -7,6 +7,16 @@ export interface TopBarMenuSearchOption {
7
7
  to: RouteLocationRaw
8
8
  }
9
9
 
10
+ /** Keep menu search unavailable while its route-backed options are being replaced. */
11
+ export function isMenuSearchDisabled(menuRefreshing: boolean, languageLoading: boolean): boolean {
12
+ return menuRefreshing || languageLoading
13
+ }
14
+
15
+ /** Prevent menu refreshes from racing a locale transition. */
16
+ export function isMenuRefreshDisabled(menuRefreshing: boolean, languageLoading: boolean): boolean {
17
+ return menuRefreshing || languageLoading
18
+ }
19
+
10
20
  /** Builds searchable destinations from the visible leaf menu items. */
11
21
  export function flattenMenuSearchOptions(
12
22
  items: readonly RouteMenuItem[],
@@ -138,7 +138,9 @@
138
138
  },
139
139
  "errors": {
140
140
  "unknownPageError": "An unexpected page error occurred",
141
- "startupFailed": "The application failed to start"
141
+ "startupFailed": "The application failed to start",
142
+ "networkError": "A network error occurred. Please try again later.",
143
+ "invalidResponse": "The service returned an invalid response."
142
144
  }
143
145
  },
144
146
  "workspace": {
@@ -202,7 +204,8 @@
202
204
  "permissionItems": "permissions",
203
205
  "securityStatus": "Security Status",
204
206
  "currentSession": "Current Session",
205
- "sessionDescription": "This device accesses the admin workspace through a protected session."
207
+ "sessionDescription": "This device accesses the admin workspace through a protected session.",
208
+ "noEmail": "No email set"
206
209
  }
207
210
  },
208
211
  "errors": {
@@ -440,15 +443,32 @@
440
443
  "pathRequired": "Please enter the menu route path",
441
444
  "submenuRelativePath": "Child menus must use relative route paths",
442
445
  "rootPathSlash": "Root menu paths must start with /",
443
- "componentRequired": "Please select a registered page capability"
446
+ "componentRequired": "Please select a registered page capability",
447
+ "treeCycle": "Menu parent chain contains a cycle",
448
+ "treeOrphanParent": "Parent menu does not exist or was removed",
449
+ "treeDuplicateId": "Duplicate menu identifier",
450
+ "treeDuplicateCode": "Duplicate menu code",
451
+ "treeDuplicatePath": "Duplicate resolved route path",
452
+ "treeAmbiguousParent": "Ambiguous parent route path",
453
+ "treeUnresolvedParent": "Unresolved parent route path",
454
+ "treePrecheckFailed": "Menu tree validation failed",
455
+ "treeTitleKeyMissing": "Menu title is missing a translation key",
456
+ "treeDetail": "Detail: {detail}",
457
+ "titleKeyRequired": "Enter a translation key for the menu title",
458
+ "versionConflict": "Menu was modified by someone else. Refresh and retry"
444
459
  },
445
460
  "form": {
446
461
  "kind": "Node Type",
462
+ "redirect": "Directory Redirect",
463
+ "redirectPlaceholder": "Leave empty to fall back to the home route",
447
464
  "parentButton": "Parent Page",
448
465
  "parentDirectory": "Parent Directory",
449
466
  "rootDirectory": "Root Directory",
450
467
  "title": "Menu Name",
451
468
  "titlePlaceholder": "e.g. Component coverage",
469
+ "titleKey": "Title Translation Key",
470
+ "titleKeyPlaceholder": "e.g. menus.coverage.title",
471
+ "titleKeyRuleMessage": "Start with a letter; letters, digits, dots or hyphens allowed",
452
472
  "code": "Menu Code",
453
473
  "codePlaceholder": "e.g. user-list",
454
474
  "codeRuleMessage": "Use 3-48 lowercase letters, digits or hyphens",
@@ -472,6 +492,13 @@
472
492
  "tabHidden": "Hide Tab"
473
493
  }
474
494
  },
495
+ "access": {
496
+ "revision": {
497
+ "title": "Permissions updated",
498
+ "body": "Menu or permission configuration has changed. Refresh now?",
499
+ "refreshNow": "Refresh now"
500
+ }
501
+ },
475
502
  "audit": {
476
503
  "title": "Audit Log",
477
504
  "occurredAt": "Time",
@@ -1,5 +1,6 @@
1
1
  import { OG_DIALOG_LOCALE_EN_US } from '@origen-ui/dialog/locale'
2
2
  import { OG_EDITOR_LOCALE_EN_US } from '@origen-ui/editor/locale'
3
+ import { OG_FORM_TABLE_LOCALE_EN_US } from '@origen-ui/form-table/locale'
3
4
  import { OG_FORM_LOCALE_EN_US } from '@origen-ui/form/locale'
4
5
  import { OG_SEARCH_LOCALE_EN_US } from '@origen-ui/search/locale'
5
6
  import { OG_TABLE_LOCALE_EN_US } from '@origen-ui/table/locale'
@@ -13,6 +14,7 @@ export const origenUi = {
13
14
  dialog: OG_DIALOG_LOCALE_EN_US,
14
15
  editor: OG_EDITOR_LOCALE_EN_US,
15
16
  form: OG_FORM_LOCALE_EN_US,
17
+ formTable: OG_FORM_TABLE_LOCALE_EN_US,
16
18
  search: OG_SEARCH_LOCALE_EN_US,
17
19
  table: OG_TABLE_LOCALE_EN_US,
18
20
  tabs: OG_TABS_LOCALE_EN_US,
@@ -6,7 +6,11 @@ import type { I18n } from 'vue-i18n'
6
6
  import type { RouteLocationNormalizedLoaded } from 'vue-router'
7
7
  import type { AdminLocale } from '../app/adminLocale'
8
8
  import type { AdminMessages } from './messages-types'
9
- import { createOrigenUiLanguageRuntime, defineOrigenUiLanguage, mergeLocale } from 'origen-ui/language'
9
+ import {
10
+ createOrigenUiLanguageRuntime,
11
+ defineOrigenUiLanguage,
12
+ mergeLocale,
13
+ } from 'origen-ui/language'
10
14
  import { watch } from 'vue'
11
15
  import { createI18n } from 'vue-i18n'
12
16
  import {
@@ -15,26 +19,14 @@ import {
15
19
  resolveInitialLocale,
16
20
  setAdminLocale,
17
21
  } from '../app/adminLocale'
18
- import {
19
- enUSLocale,
20
- validateAdminLocaleMessages,
21
- zhCNLocale,
22
- zhTWLocale,
23
- } from './messages-types'
22
+ import { enUSLocale, validateAdminLocaleMessages, zhCNLocale, zhTWLocale } from './messages-types'
24
23
  import zhCN from './zh-CN.json'
25
- import {
26
- elementPlus as zhCNElementPlus,
27
- origenUi as zhCNOrigenUi,
28
- } from './zh-CN.runtime'
24
+ import { elementPlus as zhCNElementPlus, origenUi as zhCNOrigenUi } from './zh-CN.runtime'
29
25
 
30
26
  export type { AdminLocale } from '../app/adminLocale'
31
27
  export { currentAdminLocale, normalizeAdminLocale, SUPPORTED_LOCALES } from '../app/adminLocale'
32
28
 
33
- export type AdminLanguageModule = OrigenUiLanguageModule<
34
- AdminMessages,
35
- unknown,
36
- OrigenUiMessages
37
- >
29
+ export type AdminLanguageModule = OrigenUiLanguageModule<AdminMessages, unknown, OrigenUiMessages>
38
30
 
39
31
  /** Admin 消息树叶子 key 的联合类型(如 'auth.login'),用于动态 key 的编译期标注。 */
40
32
  export type AdminMessageKey = PathKeys<AdminMessages>
@@ -99,26 +91,45 @@ export function getAdminI18n(): I18n | null {
99
91
  return runtimeI18n
100
92
  }
101
93
 
94
+ /** vue-i18n Composer narrowed to the admin message keys. */
95
+ export interface AdminTranslator {
96
+ t: (key: AdminMessageKey, named?: Record<string, unknown>) => string
97
+ te: (key: AdminMessageKey) => boolean
98
+ }
99
+
100
+ function translatorOf(i18n: I18n | null | undefined): AdminTranslator | undefined {
101
+ // The single cast boundary: vue-i18n's Composer is generic over message
102
+ // schemas, while admin callers pass runtime string keys guarded by te().
103
+ return i18n?.global as unknown as AdminTranslator | undefined
104
+ }
105
+
106
+ /** te-guarded translation: unknown keys and pre-bootstrap calls return `options.fallback ?? key`. */
107
+ export function translateAdminMessage(
108
+ key: string,
109
+ options: { fallback?: string, named?: Record<string, unknown> } = {},
110
+ ): string {
111
+ const translator = translatorOf(getAdminI18n())
112
+ if (!translator || !translator.te(key as AdminMessageKey)) return options.fallback ?? key
113
+ return translator.t(key as AdminMessageKey, options.named)
114
+ }
115
+
102
116
  export function createAdminTitleResolver(
103
117
  i18n: I18n,
104
118
  ): (route: RouteLocationNormalizedLoaded, meta: AdapterRouteMeta) => string | undefined {
105
119
  return (_route, meta) => {
106
120
  const key = meta.breadcrumb?.labelKey ?? meta.titleKey
107
121
  if (!key) return meta.title
108
- const global = i18n.global as unknown as {
109
- te?: (key: string) => boolean
110
- t: (key: string) => string
111
- }
112
- if (global.te?.(key)) return global.t(key as AdminMessageKey)
113
- return meta.breadcrumb?.labelKey ? meta.breadcrumb?.label ?? meta.title : meta.title
122
+ const translator = translatorOf(i18n)
123
+ if (translator?.te(key as AdminMessageKey)) return translator.t(key as AdminMessageKey)
124
+ return meta.breadcrumb?.labelKey ? (meta.breadcrumb?.label ?? meta.title) : meta.title
114
125
  }
115
126
  }
116
127
 
117
128
  export function createAdminI18n(existing?: I18n): AdminI18nRuntime {
118
129
  const hostLocale = existing?.global.locale
119
- const initial = normalizeAdminLocale(
120
- typeof hostLocale === 'string' ? hostLocale : hostLocale?.value,
121
- ) ?? resolveInitialLocale()
130
+ const initial =
131
+ normalizeAdminLocale(typeof hostLocale === 'string' ? hostLocale : hostLocale?.value) ??
132
+ resolveInitialLocale()
122
133
  const i18n =
123
134
  existing ??
124
135
  createI18n({
@@ -166,7 +177,9 @@ export function createAdminI18n(existing?: I18n): AdminI18nRuntime {
166
177
  i18n.global.setLocaleMessage(
167
178
  module.locale,
168
179
  mergeLocale(
169
- (hostMessages && typeof hostMessages === 'object' ? hostMessages : {}) as AdminMessages,
180
+ (hostMessages && typeof hostMessages === 'object'
181
+ ? hostMessages
182
+ : {}) as AdminMessages,
170
183
  module.messages,
171
184
  ),
172
185
  )
@@ -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_CN } from '@origen-ui/dialog/locale'
2
2
  import { OG_EDITOR_LOCALE_ZH_CN } from '@origen-ui/editor/locale'
3
+ import { OG_FORM_TABLE_LOCALE_ZH_CN } from '@origen-ui/form-table/locale'
3
4
  import { OG_FORM_LOCALE_ZH_CN } from '@origen-ui/form/locale'
4
5
  import { OG_SEARCH_LOCALE_ZH_CN } from '@origen-ui/search/locale'
5
6
  import { OG_TABLE_LOCALE_ZH_CN } from '@origen-ui/table/locale'
@@ -13,6 +14,7 @@ export const origenUi = {
13
14
  dialog: OG_DIALOG_LOCALE_ZH_CN,
14
15
  editor: OG_EDITOR_LOCALE_ZH_CN,
15
16
  form: OG_FORM_LOCALE_ZH_CN,
17
+ formTable: OG_FORM_TABLE_LOCALE_ZH_CN,
16
18
  search: OG_SEARCH_LOCALE_ZH_CN,
17
19
  table: OG_TABLE_LOCALE_ZH_CN,
18
20
  tabs: OG_TABS_LOCALE_ZH_CN,