@origen-ui/admin-cli 1.0.3 → 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.
- package/README.md +11 -7
- package/package.json +19 -3
- package/templates/current/clean/CHANGELOG.md +137 -0
- package/templates/current/clean/component-catalog.json +58 -17
- package/templates/current/clean/e2e/admin-shell.spec.ts +6 -0
- package/templates/current/clean/e2e/demo-shell.spec.ts +90 -46
- package/templates/current/clean/package.json +55 -41
- package/templates/current/clean/playwright.config.ts +1 -0
- package/templates/current/clean/playwright.demo.config.ts +1 -1
- package/templates/current/clean/scaffold.lock.json +2 -2
- package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/Forbidden.vue +7 -2
- package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/NotFound.vue +7 -2
- package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/ServerError.vue +7 -2
- package/templates/current/clean/scripts/clean-overlay/src/features/errors/pages/error-pages.spec.ts +11 -2
- package/templates/current/clean/scripts/clean-overlay/src/main.ts +23 -14
- package/templates/current/clean/scripts/clean-overlay/src/router/componentCache.ts +12 -0
- package/templates/current/clean/scripts/clean-overlay/src/router/componentRegistry.ts +2 -13
- package/templates/current/clean/scripts/clean-overlay/src/router/dynamicRoutes.spec.ts +34 -4
- package/templates/current/clean/scripts/clean-overlay/src/router/paths.ts +21 -0
- package/templates/current/clean/scripts/clean-overlay/src/router/staticRoutes.ts +6 -6
- package/templates/current/clean/scripts/demo-api.ts +84 -8
- package/templates/current/clean/scripts/generate-api.ts +87 -3
- package/templates/current/clean/scripts/vite-build-policy.spec.ts +72 -0
- package/templates/current/clean/src/App.vue +10 -3
- package/templates/current/clean/src/api/client.ts +90 -10
- package/templates/current/clean/src/api/generated/data-contracts.ts +0 -3
- package/templates/current/clean/src/api/generated/http-client.ts +28 -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
- 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
- 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
- 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 +6 -9
- 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 +7 -10
- 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 +6 -9
- 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 +6 -9
- package/templates/current/clean/src/api/generated//350/256/244/350/257/201.ts +3 -6
- package/templates/current/clean/src/app/adminLocale.ts +90 -0
- package/templates/current/clean/src/app/createAdminUi.spec.ts +65 -9
- package/templates/current/clean/src/app/createAdminUi.ts +14 -29
- package/templates/current/clean/src/app/embedded-token.spec.ts +40 -0
- package/templates/current/clean/src/app/embedded.spec.ts +135 -0
- package/templates/current/clean/src/app/embedded.ts +255 -0
- package/templates/current/clean/src/app/errorMessage.spec.ts +76 -0
- package/templates/current/clean/src/app/errorMessage.ts +53 -0
- package/templates/current/clean/src/app/localeFormat.ts +52 -0
- package/templates/current/clean/src/app/menu-host.spec.ts +77 -0
- package/templates/current/clean/src/app/menu.spec.ts +65 -0
- package/templates/current/clean/src/app/menu.ts +52 -12
- package/templates/current/clean/src/app/menuTypes.ts +1 -0
- package/templates/current/clean/src/app/origenUiLocale.spec.ts +6 -5
- package/templates/current/clean/src/app/origenUiLocale.ts +3 -58
- package/templates/current/clean/src/app/permission.spec.ts +26 -0
- package/templates/current/clean/src/app/runtimeConfig.ts +9 -8
- package/templates/current/clean/src/demo-api.spec.ts +311 -0
- package/templates/current/clean/src/env.d.ts +18 -0
- package/templates/current/clean/src/features/appearance/components/ThemePanel.vue +21 -17
- package/templates/current/clean/src/features/appearance/store/theme.ts +2 -1
- package/templates/current/clean/src/features/auth/pages/Login.vue +22 -12
- package/templates/current/clean/src/features/auth/store/auth.ts +6 -9
- package/templates/current/clean/src/features/errors/pages/Forbidden.vue +7 -2
- package/templates/current/clean/src/features/errors/pages/NotFound.vue +7 -2
- package/templates/current/clean/src/features/errors/pages/ServerError.vue +7 -2
- package/templates/current/clean/src/features/errors/pages/error-pages.spec.ts +11 -2
- package/templates/current/clean/src/features/security/components/DevtoolsProtectionOverlay.vue +5 -2
- package/templates/current/clean/src/features/security/devtoolsProtection.spec.ts +7 -10
- package/templates/current/clean/src/features/security/devtoolsProtection.ts +2 -1
- package/templates/current/clean/src/features/system/access/api/admin-repository.spec.ts +14 -0
- package/templates/current/clean/src/features/system/access/api/admin-repository.ts +34 -15
- package/templates/current/clean/src/features/system/access/api/rbac.ts +52 -32
- package/templates/current/clean/src/features/system/access/composables/useAuthorizationPolling.spec.ts +134 -0
- package/templates/current/clean/src/features/system/access/composables/useAuthorizationPolling.ts +96 -0
- package/templates/current/clean/src/features/workspace/pages/Empty.vue +4 -1
- package/templates/current/clean/src/features/workspace/pages/Profile.vue +14 -12
- package/templates/current/clean/src/layouts/AdminLayout.vue +6 -1
- package/templates/current/clean/src/layouts/TopBar.vue +60 -11
- package/templates/current/clean/src/layouts/topBarMenuSearch.spec.ts +24 -1
- package/templates/current/clean/src/layouts/topBarMenuSearch.ts +10 -0
- package/templates/current/clean/src/locales/en-US.json +517 -0
- package/templates/current/clean/src/locales/en-US.runtime.ts +22 -0
- package/templates/current/clean/src/locales/index.ts +144 -47
- package/templates/current/clean/src/locales/messages-types.ts +62 -0
- package/templates/current/clean/src/locales/messages.spec.ts +113 -6
- package/templates/current/clean/src/locales/vue-i18n.d.ts +5 -0
- package/templates/current/clean/src/locales/zh-CN.json +517 -0
- package/templates/current/clean/src/locales/zh-CN.runtime.ts +22 -0
- package/templates/current/clean/src/locales/zh-TW.json +517 -0
- package/templates/current/clean/src/locales/zh-TW.runtime.ts +22 -0
- package/templates/current/clean/src/main.ts +23 -14
- package/templates/current/clean/src/router/bootstrap.ts +20 -11
- package/templates/current/clean/src/router/componentCache.ts +12 -0
- package/templates/current/clean/src/router/componentRegistry.ts +2 -13
- package/templates/current/clean/src/router/dynamicMenuRefresh.spec.ts +101 -0
- package/templates/current/clean/src/router/dynamicMenuRefresh.ts +24 -0
- package/templates/current/clean/src/router/dynamicRoutes.spec.ts +34 -4
- package/templates/current/clean/src/router/dynamicRoutes.ts +19 -4
- package/templates/current/clean/src/router/paths.spec.ts +50 -0
- package/templates/current/clean/src/router/paths.ts +21 -0
- package/templates/current/clean/src/router/queryEncryption.spec.ts +30 -4
- package/templates/current/clean/src/router/queryEncryption.ts +48 -44
- package/templates/current/clean/src/router/staticRoutes.ts +6 -6
- package/templates/current/clean/src/router/useRouteQueryDefaults.spec.ts +2 -1
- package/templates/current/clean/src/router/useRouteQueryDefaults.types.ts +2 -1
- package/templates/current/clean/src/templates/og-table.ts +79 -37
- package/templates/current/clean/src/templates/templates.spec.ts +19 -0
- package/templates/current/clean/tsconfig.json +0 -1
- package/templates/current/clean/vite.build-policy.ts +161 -289
- package/templates/current/clean/vite.config.ts +34 -5
- package/templates/current/examples/CHANGELOG.md +137 -0
- package/templates/current/examples/component-catalog.json +58 -17
- package/templates/current/examples/e2e/admin-shell.spec.ts +6 -0
- package/templates/current/examples/e2e/demo-shell.spec.ts +90 -46
- package/templates/current/examples/package.json +55 -41
- package/templates/current/examples/playwright.config.ts +1 -0
- package/templates/current/examples/playwright.demo.config.ts +1 -1
- package/templates/current/examples/scaffold.lock.json +2 -2
- package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/Forbidden.vue +7 -2
- package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/NotFound.vue +7 -2
- package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/ServerError.vue +7 -2
- package/templates/current/examples/scripts/clean-overlay/src/features/errors/pages/error-pages.spec.ts +11 -2
- package/templates/current/examples/scripts/clean-overlay/src/main.ts +23 -14
- package/templates/current/examples/scripts/clean-overlay/src/router/componentCache.ts +12 -0
- package/templates/current/examples/scripts/clean-overlay/src/router/componentRegistry.ts +2 -13
- package/templates/current/examples/scripts/clean-overlay/src/router/dynamicRoutes.spec.ts +34 -4
- package/templates/current/examples/scripts/clean-overlay/src/router/paths.ts +21 -0
- package/templates/current/examples/scripts/clean-overlay/src/router/staticRoutes.ts +6 -6
- package/templates/current/examples/scripts/demo-api.ts +84 -8
- package/templates/current/examples/scripts/generate-api.ts +87 -3
- package/templates/current/examples/scripts/vite-build-policy.spec.ts +72 -0
- package/templates/current/examples/src/App.vue +10 -3
- package/templates/current/examples/src/api/client.ts +90 -10
- package/templates/current/examples/src/api/generated/data-contracts.ts +0 -3
- package/templates/current/examples/src/api/generated/http-client.ts +28 -26
- 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
- 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
- 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
- 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 +6 -9
- 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 +7 -10
- 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 +6 -9
- 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 +6 -9
- package/templates/current/examples/src/api/generated//350/256/244/350/257/201.ts +3 -6
- package/templates/current/examples/src/app/adminLocale.ts +90 -0
- package/templates/current/examples/src/app/createAdminUi.spec.ts +65 -9
- package/templates/current/examples/src/app/createAdminUi.ts +14 -29
- package/templates/current/examples/src/app/embedded-token.spec.ts +40 -0
- package/templates/current/examples/src/app/embedded.spec.ts +135 -0
- package/templates/current/examples/src/app/embedded.ts +255 -0
- package/templates/current/examples/src/app/errorMessage.spec.ts +76 -0
- package/templates/current/examples/src/app/errorMessage.ts +53 -0
- package/templates/current/examples/src/app/localeFormat.ts +52 -0
- package/templates/current/examples/src/app/menu-host.spec.ts +77 -0
- package/templates/current/examples/src/app/menu.spec.ts +65 -0
- package/templates/current/examples/src/app/menu.ts +52 -12
- package/templates/current/examples/src/app/menuTypes.ts +1 -0
- package/templates/current/examples/src/app/origenUiLocale.spec.ts +6 -5
- package/templates/current/examples/src/app/origenUiLocale.ts +3 -58
- package/templates/current/examples/src/app/permission.spec.ts +26 -0
- package/templates/current/examples/src/app/runtimeConfig.ts +9 -8
- package/templates/current/examples/src/demo-api.spec.ts +311 -0
- package/templates/current/examples/src/env.d.ts +18 -0
- package/templates/current/examples/src/features/appearance/components/ThemePanel.vue +21 -17
- package/templates/current/examples/src/features/appearance/store/theme.ts +2 -1
- package/templates/current/examples/src/features/auth/pages/Login.vue +22 -12
- package/templates/current/examples/src/features/auth/store/auth.ts +6 -9
- package/templates/current/examples/src/features/errors/pages/Forbidden.vue +7 -2
- package/templates/current/examples/src/features/errors/pages/NotFound.vue +7 -2
- package/templates/current/examples/src/features/errors/pages/ServerError.vue +7 -2
- package/templates/current/examples/src/features/errors/pages/error-pages.spec.ts +9 -1
- package/templates/current/examples/src/features/feature-composables.spec.ts +47 -10
- package/templates/current/examples/src/features/security/components/DevtoolsProtectionOverlay.vue +5 -2
- package/templates/current/examples/src/features/security/devtoolsProtection.spec.ts +7 -10
- package/templates/current/examples/src/features/security/devtoolsProtection.ts +2 -1
- package/templates/current/examples/src/features/system/access/api/admin-repository.spec.ts +14 -0
- package/templates/current/examples/src/features/system/access/api/admin-repository.ts +34 -15
- package/templates/current/examples/src/features/system/access/api/rbac.ts +52 -32
- package/templates/current/examples/src/features/system/access/composables/useAuthorizationPolling.spec.ts +134 -0
- package/templates/current/examples/src/features/system/access/composables/useAuthorizationPolling.ts +96 -0
- package/templates/current/examples/src/features/system/audit/composables/useAuditManagement.ts +43 -38
- package/templates/current/examples/src/features/system/menus/components/MenuEditorForm.vue +137 -47
- package/templates/current/examples/src/features/system/menus/composables/useMenuManagement.ts +215 -107
- package/templates/current/examples/src/features/system/menus/menuDraft.spec.ts +204 -0
- package/templates/current/examples/src/features/system/menus/menuDraft.ts +116 -0
- package/templates/current/examples/src/features/system/menus/menuTreePrecheck.spec.ts +268 -0
- package/templates/current/examples/src/features/system/menus/menuTreePrecheck.ts +317 -0
- package/templates/current/examples/src/features/system/menus/pages/MenuList.vue +3 -1
- package/templates/current/examples/src/features/system/roles/components/RoleEditorForm.vue +19 -15
- package/templates/current/examples/src/features/system/roles/composables/useRoleManagement.ts +49 -53
- package/templates/current/examples/src/features/system/roles/pages/RoleList.vue +3 -1
- package/templates/current/examples/src/features/system/users/components/UserEditorForm.vue +22 -19
- package/templates/current/examples/src/features/system/users/composables/useUserManagement.ts +59 -64
- package/templates/current/examples/src/features/system/users/pages/UserList.vue +3 -1
- package/templates/current/examples/src/features/workspace/pages/Dashboard.spec.ts +9 -0
- package/templates/current/examples/src/features/workspace/pages/Dashboard.vue +54 -26
- package/templates/current/examples/src/features/workspace/pages/Empty.vue +4 -1
- package/templates/current/examples/src/features/workspace/pages/Profile.vue +14 -12
- package/templates/current/examples/src/layouts/AdminLayout.vue +6 -1
- package/templates/current/examples/src/layouts/TopBar.vue +60 -11
- package/templates/current/examples/src/layouts/topBarMenuSearch.spec.ts +24 -1
- package/templates/current/examples/src/layouts/topBarMenuSearch.ts +10 -0
- package/templates/current/examples/src/locales/en-US.json +517 -0
- package/templates/current/examples/src/locales/en-US.runtime.ts +22 -0
- package/templates/current/examples/src/locales/index.ts +144 -47
- package/templates/current/examples/src/locales/messages-types.ts +62 -0
- package/templates/current/examples/src/locales/messages.spec.ts +113 -6
- package/templates/current/examples/src/locales/vue-i18n.d.ts +5 -0
- package/templates/current/examples/src/locales/zh-CN.json +517 -0
- package/templates/current/examples/src/locales/zh-CN.runtime.ts +22 -0
- package/templates/current/examples/src/locales/zh-TW.json +517 -0
- package/templates/current/examples/src/locales/zh-TW.runtime.ts +22 -0
- package/templates/current/examples/src/main.ts +43 -15
- package/templates/current/examples/src/router/bootstrap.ts +20 -11
- package/templates/current/examples/src/router/componentCache.ts +18 -0
- package/templates/current/examples/src/router/componentRegistry.ts +1 -18
- package/templates/current/examples/src/router/dynamicMenuRefresh.spec.ts +101 -0
- package/templates/current/examples/src/router/dynamicMenuRefresh.ts +24 -0
- package/templates/current/examples/src/router/dynamicRoutes.spec.ts +37 -2
- package/templates/current/examples/src/router/dynamicRoutes.ts +19 -4
- package/templates/current/examples/src/router/paths.spec.ts +50 -0
- package/templates/current/examples/src/router/paths.ts +21 -0
- package/templates/current/examples/src/router/queryEncryption.spec.ts +30 -4
- package/templates/current/examples/src/router/queryEncryption.ts +48 -44
- package/templates/current/examples/src/router/staticRoutes.ts +4 -4
- package/templates/current/examples/src/router/useRouteQueryDefaults.spec.ts +2 -1
- package/templates/current/examples/src/router/useRouteQueryDefaults.types.ts +2 -1
- package/templates/current/examples/src/templates/og-table.ts +79 -37
- package/templates/current/examples/src/templates/templates.spec.ts +19 -0
- package/templates/current/examples/tsconfig.json +0 -1
- package/templates/current/examples/vite.build-policy.ts +161 -289
- package/templates/current/examples/vite.config.ts +34 -5
- package/templates/current/clean/scripts/check-admin-bundle.mjs +0 -214
- package/templates/current/clean/scripts/performance/baselines/bundle-gzip-v2-pre-entry-unification.json +0 -38
- package/templates/current/clean/src/locales/en-US.ts +0 -55
- package/templates/current/clean/src/locales/zh-CN.ts +0 -55
- package/templates/current/clean/src/locales/zh-TW.ts +0 -44
- package/templates/current/examples/scripts/check-admin-bundle.mjs +0 -214
- package/templates/current/examples/scripts/performance/baselines/bundle-gzip-v2-pre-entry-unification.json +0 -38
- package/templates/current/examples/src/locales/en-US.ts +0 -55
- package/templates/current/examples/src/locales/zh-CN.ts +0 -55
- package/templates/current/examples/src/locales/zh-TW.ts +0 -44
package/templates/current/clean/src/features/system/access/composables/useAuthorizationPolling.ts
ADDED
|
@@ -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
|
+
}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
<script setup lang="ts">
|
|
2
2
|
import { ElCard, ElEmpty } from 'element-plus'
|
|
3
|
+
import { useI18n } from 'vue-i18n'
|
|
3
4
|
|
|
4
5
|
defineOptions({ name: 'EmptyPage' })
|
|
6
|
+
|
|
7
|
+
const { t } = useI18n()
|
|
5
8
|
</script>
|
|
6
9
|
|
|
7
10
|
<template>
|
|
8
11
|
<ElCard shadow="never" class="empty-page">
|
|
9
|
-
<ElEmpty description="
|
|
12
|
+
<ElEmpty :description="t('workspace.empty.description')" />
|
|
10
13
|
</ElCard>
|
|
11
14
|
</template>
|
|
12
15
|
|
|
@@ -2,15 +2,17 @@
|
|
|
2
2
|
import { CircleCheckFilled, Key, Lock, Monitor } from '@element-plus/icons-vue'
|
|
3
3
|
import { ElAvatar, ElCard, ElDescriptions, ElDescriptionsItem, ElIcon, ElTag } from 'element-plus'
|
|
4
4
|
import { computed } from 'vue'
|
|
5
|
+
import { useI18n } from 'vue-i18n'
|
|
5
6
|
import { useAuthStore } from '../../auth/store/auth'
|
|
6
7
|
|
|
7
8
|
defineOptions({ name: 'ProfilePage' })
|
|
8
9
|
|
|
9
10
|
const auth = useAuthStore()
|
|
11
|
+
const { t } = useI18n()
|
|
10
12
|
const user = computed(() => auth.session?.user)
|
|
11
13
|
const permissions = computed(() => auth.session?.permissions ?? [])
|
|
12
14
|
const sessionId = computed(() =>
|
|
13
|
-
auth.session?.token ? `${auth.session.token.slice(0, 8)}••••` : '
|
|
15
|
+
auth.session?.token ? `${auth.session.token.slice(0, 8)}••••` : t('workspace.profile.noSession'),
|
|
14
16
|
)
|
|
15
17
|
</script>
|
|
16
18
|
|
|
@@ -22,21 +24,21 @@ const sessionId = computed(() =>
|
|
|
22
24
|
{{ user?.displayName.slice(0, 1) }}
|
|
23
25
|
</ElAvatar>
|
|
24
26
|
<div>
|
|
25
|
-
<h2>{{ user?.displayName ?? '
|
|
26
|
-
<p>{{ user?.email ?? '
|
|
27
|
+
<h2>{{ user?.displayName ?? t('workspace.profile.admin') }}</h2>
|
|
28
|
+
<p>{{ user?.email ?? t('workspace.profile.noEmail') }}</p>
|
|
27
29
|
</div>
|
|
28
30
|
<ElTag type="success" effect="plain">
|
|
29
|
-
<ElIcon><CircleCheckFilled /></ElIcon>
|
|
31
|
+
<ElIcon><CircleCheckFilled /></ElIcon> {{ t('workspace.profile.online') }}
|
|
30
32
|
</ElTag>
|
|
31
33
|
</div>
|
|
32
34
|
<ElDescriptions :column="1" class="profile-card__details">
|
|
33
|
-
<ElDescriptionsItem label="
|
|
35
|
+
<ElDescriptionsItem :label="t('workspace.profile.loginAccount')">
|
|
34
36
|
{{ user?.username ?? '-' }}
|
|
35
37
|
</ElDescriptionsItem>
|
|
36
|
-
<ElDescriptionsItem label="
|
|
38
|
+
<ElDescriptionsItem :label="t('workspace.profile.userId')">
|
|
37
39
|
{{ user?.id ?? '-' }}
|
|
38
40
|
</ElDescriptionsItem>
|
|
39
|
-
<ElDescriptionsItem label="
|
|
41
|
+
<ElDescriptionsItem :label="t('workspace.profile.sessionId')">
|
|
40
42
|
{{ sessionId }}
|
|
41
43
|
</ElDescriptionsItem>
|
|
42
44
|
</ElDescriptions>
|
|
@@ -46,9 +48,9 @@ const sessionId = computed(() =>
|
|
|
46
48
|
<template #header>
|
|
47
49
|
<div class="profile-card__heading">
|
|
48
50
|
<div>
|
|
49
|
-
<ElIcon><Key /></ElIcon><strong
|
|
51
|
+
<ElIcon><Key /></ElIcon><strong>{{ t('workspace.profile.accessGrant') }}</strong>
|
|
50
52
|
</div>
|
|
51
|
-
<span>{{ permissions.length }}
|
|
53
|
+
<span>{{ permissions.length }} {{ t('workspace.profile.permissionItems') }}</span>
|
|
52
54
|
</div>
|
|
53
55
|
</template>
|
|
54
56
|
<div class="permission-list">
|
|
@@ -58,13 +60,13 @@ const sessionId = computed(() =>
|
|
|
58
60
|
</div>
|
|
59
61
|
</ElCard>
|
|
60
62
|
|
|
61
|
-
<section class="profile-page__sessions og-card" aria-label="
|
|
63
|
+
<section class="profile-page__sessions og-card" :aria-label="t('workspace.profile.securityStatus')">
|
|
62
64
|
<div class="profile-page__session-icon">
|
|
63
65
|
<ElIcon><Monitor /></ElIcon>
|
|
64
66
|
</div>
|
|
65
67
|
<div>
|
|
66
|
-
<h2
|
|
67
|
-
<p
|
|
68
|
+
<h2>{{ t('workspace.profile.currentSession') }}</h2>
|
|
69
|
+
<p>{{ t('workspace.profile.sessionDescription') }}</p>
|
|
68
70
|
</div>
|
|
69
71
|
<ElIcon class="profile-page__session-lock">
|
|
70
72
|
<Lock />
|
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
import { OgDialogHost } from '@origen-ui/dialog'
|
|
3
3
|
import { RouterViewHost } from '@origen-ui/router'
|
|
4
4
|
import { ElDrawer } from 'element-plus'
|
|
5
|
+
import { useI18n } from 'vue-i18n'
|
|
5
6
|
import AdminWatermark from '../features/shell/components/AdminWatermark.vue'
|
|
6
7
|
import { useSidebarStore } from '../features/shell/store/sidebar'
|
|
8
|
+
import { useAuthorizationPolling } from '../features/system/access/composables/useAuthorizationPolling'
|
|
7
9
|
import BreadcrumbBar from './BreadcrumbBar.vue'
|
|
8
10
|
import SideMenu from './SideMenu.vue'
|
|
9
11
|
import TopBar from './TopBar.vue'
|
|
@@ -11,6 +13,9 @@ import WorkspaceTabs from './WorkspaceTabs.vue'
|
|
|
11
13
|
|
|
12
14
|
defineOptions({ name: 'AdminLayout' })
|
|
13
15
|
const sidebar = useSidebarStore()
|
|
16
|
+
const { t } = useI18n()
|
|
17
|
+
// 会话内轮询 RBAC revision:服务端权限/菜单变更经确认后刷新,随布局卸载停止。
|
|
18
|
+
useAuthorizationPolling()
|
|
14
19
|
</script>
|
|
15
20
|
|
|
16
21
|
<template>
|
|
@@ -18,7 +23,7 @@ const sidebar = useSidebarStore()
|
|
|
18
23
|
<div class="admin-shell">
|
|
19
24
|
<TopBar />
|
|
20
25
|
<div class="admin-shell__body" :class="{ 'is-collapsed': sidebar.collapsed }">
|
|
21
|
-
<aside class="admin-shell__sidebar" aria-label="
|
|
26
|
+
<aside class="admin-shell__sidebar" :aria-label="t('shell.applicationNavigation')">
|
|
22
27
|
<SideMenu />
|
|
23
28
|
</aside>
|
|
24
29
|
<main class="admin-shell__main">
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<script setup lang="ts">
|
|
2
|
-
import { Expand, Fold, Search, Setting } from '@element-plus/icons-vue'
|
|
2
|
+
import { Expand, Fold, Refresh, Search, Setting } from '@element-plus/icons-vue'
|
|
3
3
|
import {
|
|
4
4
|
ElAvatar,
|
|
5
5
|
ElButton,
|
|
@@ -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 {
|
|
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({
|
|
@@ -32,21 +37,49 @@ const { t } = useI18n()
|
|
|
32
37
|
const auth = useAuthStore()
|
|
33
38
|
const user = computed(() => auth.session?.user)
|
|
34
39
|
const menuSearchValue = shallowRef<string>()
|
|
40
|
+
const menuRefreshFailed = shallowRef(false)
|
|
41
|
+
const menuRefreshing = shallowRef(false)
|
|
35
42
|
const language = useOrigenUiLanguage()!
|
|
36
|
-
const languageOptions = [
|
|
37
|
-
{ value: 'zh-CN', label: '
|
|
38
|
-
{ value: 'en-US', label: '
|
|
39
|
-
{ value: 'zh-TW', label: '
|
|
40
|
-
]
|
|
43
|
+
const languageOptions = computed(() => [
|
|
44
|
+
{ value: 'zh-CN', label: t('shell.languageZhCN') },
|
|
45
|
+
{ value: 'en-US', label: t('shell.languageEnUS') },
|
|
46
|
+
{ value: 'zh-TW', label: t('shell.languageZhTW') },
|
|
47
|
+
])
|
|
41
48
|
const menuSearchOptions = computed(() => flattenMenuSearchOptions(getRouting().menu.value))
|
|
42
49
|
|
|
50
|
+
async function refreshLocalizedMenus(): Promise<void> {
|
|
51
|
+
if (isMenuRefreshDisabled(menuRefreshing.value, language.status.value === 'loading')) return
|
|
52
|
+
menuRefreshing.value = true
|
|
53
|
+
try {
|
|
54
|
+
await replaceDynamicMenusWithAccessibleFallback(getRouting())
|
|
55
|
+
menuRefreshFailed.value = false
|
|
56
|
+
} catch {
|
|
57
|
+
menuRefreshFailed.value = true
|
|
58
|
+
ElMessage.error({ message: t('shell.menuRefreshFailed'), showClose: true })
|
|
59
|
+
} finally {
|
|
60
|
+
menuRefreshing.value = false
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
|
|
43
64
|
async function switchLanguage(locale: string): Promise<void> {
|
|
44
|
-
if (
|
|
65
|
+
if (
|
|
66
|
+
!language ||
|
|
67
|
+
menuRefreshing.value ||
|
|
68
|
+
language.status.value === 'loading' ||
|
|
69
|
+
language.current.value === locale
|
|
70
|
+
) {
|
|
71
|
+
return
|
|
72
|
+
}
|
|
45
73
|
try {
|
|
46
|
-
await language.setLocale(locale)
|
|
74
|
+
const result = await language.setLocale(locale)
|
|
75
|
+
if (!result.applied) {
|
|
76
|
+
return
|
|
77
|
+
}
|
|
47
78
|
} catch {
|
|
48
|
-
ElMessage.error(t('shell.languageLoadFailed'))
|
|
79
|
+
ElMessage.error({ message: t('shell.languageLoadFailed'), showClose: true })
|
|
80
|
+
return
|
|
49
81
|
}
|
|
82
|
+
await refreshLocalizedMenus()
|
|
50
83
|
}
|
|
51
84
|
|
|
52
85
|
function navigateToMenu(id: string | undefined): void {
|
|
@@ -86,6 +119,7 @@ async function logout(): Promise<void> {
|
|
|
86
119
|
<ElSelect
|
|
87
120
|
v-model="menuSearchValue"
|
|
88
121
|
class="top-bar__search"
|
|
122
|
+
:disabled="isMenuSearchDisabled(menuRefreshing, language.status.value === 'loading')"
|
|
89
123
|
:placeholder="t('shell.searchMenu')"
|
|
90
124
|
filterable
|
|
91
125
|
clearable
|
|
@@ -126,11 +160,26 @@ async function logout(): Promise<void> {
|
|
|
126
160
|
<ElDropdownItem
|
|
127
161
|
v-for="item in languageOptions"
|
|
128
162
|
:key="item.value"
|
|
129
|
-
:disabled="
|
|
163
|
+
:disabled="
|
|
164
|
+
language.current.value === item.value
|
|
165
|
+
|| menuRefreshing
|
|
166
|
+
|| language.status.value === 'loading'
|
|
167
|
+
"
|
|
130
168
|
@click="switchLanguage(item.value)"
|
|
131
169
|
>
|
|
132
170
|
{{ item.label }}
|
|
133
171
|
</ElDropdownItem>
|
|
172
|
+
<ElDropdownItem
|
|
173
|
+
v-if="menuRefreshFailed"
|
|
174
|
+
divided
|
|
175
|
+
:disabled="
|
|
176
|
+
isMenuRefreshDisabled(menuRefreshing, language.status.value === 'loading')
|
|
177
|
+
"
|
|
178
|
+
@click="refreshLocalizedMenus"
|
|
179
|
+
>
|
|
180
|
+
<ElIcon><Refresh /></ElIcon>
|
|
181
|
+
{{ t('shell.retryMenuRefresh') }}
|
|
182
|
+
</ElDropdownItem>
|
|
134
183
|
</ElDropdownMenu>
|
|
135
184
|
</template>
|
|
136
185
|
</ElDropdown>
|
|
@@ -1,6 +1,29 @@
|
|
|
1
1
|
import type { RouteMenuItem } from '@origen-ui/router'
|
|
2
2
|
import { describe, expect, it } from 'vitest'
|
|
3
|
-
import {
|
|
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[],
|