@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
@@ -1,18 +1,22 @@
1
1
  {
2
2
  "name": "@origen-ui/admin-scaffold",
3
3
  "type": "module",
4
- "version": "1.1.0",
4
+ "version": "2.0.1",
5
5
  "private": true,
6
6
  "engines": {
7
- "node": "^22.22.1 || ^24.15.0"
7
+ "node": ">=22.0.0"
8
8
  },
9
9
  "scripts": {
10
10
  "dev": "vite",
11
11
  "dev:demo": "vite --mode demo",
12
+ "prepare:api": "pnpm run generate:api",
13
+ "prebuild": "pnpm run prepare:api",
12
14
  "build": "vue-tsc --noEmit && vite build",
13
15
  "build:debug": "vue-tsc --noEmit && vite build --mode debug",
14
16
  "preview": "vite preview",
17
+ "pretype-check": "pnpm run prepare:api",
15
18
  "type-check": "vue-tsc --noEmit",
19
+ "pretest": "pnpm run prepare:api",
16
20
  "test": "vitest run",
17
21
  "test:e2e": "playwright test -c playwright.config.ts",
18
22
  "test:demo:e2e": "playwright test -c playwright.demo.config.ts",
@@ -23,35 +27,38 @@
23
27
  "dependencies": {
24
28
  "@element-plus/icons-vue": "2.3.2",
25
29
  "@noble/ciphers": "2.3.0",
26
- "@origen-ui/dialog": "1.1.0",
27
- "@origen-ui/editor": "1.1.0",
28
- "@origen-ui/form": "1.1.0",
29
- "@origen-ui/http": "1.1.0",
30
- "@origen-ui/permission": "1.1.0",
31
- "@origen-ui/router": "1.1.0",
32
- "@origen-ui/search": "1.1.0",
33
- "@origen-ui/shared": "1.1.0",
34
- "@origen-ui/table": "1.1.0",
35
- "@origen-ui/table-search": "1.1.0",
36
- "@origen-ui/tabs": "1.1.0",
37
- "@origen-ui/upload": "1.1.0",
30
+ "@origen-ui/dialog": "2.0.1",
31
+ "@origen-ui/editor": "2.0.1",
32
+ "@origen-ui/form": "2.0.1",
33
+ "@origen-ui/form-table": "2.0.1",
34
+ "@origen-ui/http": "2.0.1",
35
+ "@origen-ui/permission": "2.0.1",
36
+ "@origen-ui/router": "2.0.1",
37
+ "@origen-ui/search": "2.0.1",
38
+ "@origen-ui/shared": "2.0.1",
39
+ "@origen-ui/table": "2.0.1",
40
+ "@origen-ui/table-search": "2.0.1",
41
+ "@origen-ui/tabs": "2.0.1",
42
+ "@origen-ui/upload": "2.0.1",
38
43
  "@vue/devtools-api": "8.2.1",
39
- "axios": "1.19.0",
40
- "element-plus": "2.14.5",
41
- "origen-ui": "1.1.0",
44
+ "@vueuse/core": "15.0.0",
45
+ "axios": "1.20.0",
46
+ "element-plus": "2.14.7",
47
+ "origen-ui": "2.0.1",
42
48
  "pinia": "4.0.3",
43
- "vue": "3.5.41",
49
+ "sortablejs": "1.15.7",
50
+ "vue": "3.5.42",
44
51
  "vue-i18n": "11.4.8",
45
52
  "vue-router": "5.2.0"
46
53
  },
47
54
  "devDependencies": {
48
- "@origen-ui/admin-cli": "1.1.0",
55
+ "@origen-ui/admin-cli": "2.0.1",
49
56
  "@playwright/test": "1.62.1",
50
57
  "@types/node": "22.20.1",
51
58
  "@vitejs/plugin-vue": "6.0.8",
52
59
  "@vitejs/plugin-vue-jsx": "5.1.6",
53
60
  "@vitest/coverage-v8": "4.1.11",
54
- "@vue/compiler-sfc": "3.5.41",
61
+ "@vue/compiler-sfc": "3.5.42",
55
62
  "@vue/test-utils": "2.4.11",
56
63
  "jsdom": "30.0.1",
57
64
  "sass": "1.103.0",
@@ -60,6 +67,13 @@
60
67
  "unplugin-element-plus": "0.11.2",
61
68
  "vite": "8.2.2",
62
69
  "vitest": "4.1.11",
63
- "vue-tsc": "3.3.10"
70
+ "vue-tsc": "3.3.13"
71
+ },
72
+ "devEngines": {
73
+ "packageManager": {
74
+ "name": "pnpm",
75
+ "version": "11.22.0",
76
+ "onFail": "error"
77
+ }
64
78
  }
65
79
  }
@@ -27,5 +27,6 @@ export default defineConfig({
27
27
  url: 'http://127.0.0.1:4175',
28
28
  reuseExistingServer: false,
29
29
  timeout: 900_000,
30
+ env: { VITE_DEFAULT_LOCALE: 'zh-CN' },
30
31
  },
31
32
  })
@@ -17,7 +17,7 @@ export default defineConfig({
17
17
  },
18
18
  projects: [{ name: 'demo-chromium', use: { ...devices['Desktop Chrome'], launchOptions } }],
19
19
  webServer: {
20
- command: 'pnpm exec vite --mode demo --host 127.0.0.1 --port 4176 --strictPort',
20
+ command: 'pnpm exec vite --mode demo --force --host 127.0.0.1 --port 4176 --strictPort',
21
21
  url: 'http://127.0.0.1:4176',
22
22
  reuseExistingServer: false,
23
23
  timeout: 120_000,
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "schemaVersion": 1,
3
- "scaffoldVersion": "1.1.0",
4
- "agentContractsVersion": "1.1.0",
3
+ "scaffoldVersion": "2.0.1",
4
+ "agentContractsVersion": "2.0.1",
5
5
  "variant": "clean",
6
6
  "examplesPresent": false,
7
7
  "appliedMigrations": [],
@@ -1,17 +1,22 @@
1
1
  <script setup lang="ts">
2
2
  import { ElButton, ElResult } from 'element-plus'
3
+ import { useI18n } from 'vue-i18n'
3
4
  import { useRouter } from 'vue-router'
5
+ import { HOME_ROUTE } from '../../../router/paths'
4
6
 
5
7
  defineOptions({ name: 'ForbiddenPage' })
6
8
 
7
9
  const router = useRouter()
10
+ const { t } = useI18n()
8
11
  </script>
9
12
 
10
13
  <template>
11
14
  <main class="error-page">
12
- <ElResult icon="warning" title="403" sub-title="抱歉,你没有访问此页面的权限。">
15
+ <ElResult icon="warning" :title="t('errors.forbidden.code')" :sub-title="t('errors.forbidden.message')">
13
16
  <template #extra>
14
- <ElButton type="primary" @click="router.push('/workspace')"> 回到工作台 </ElButton>
17
+ <ElButton type="primary" @click="router.push(HOME_ROUTE)">
18
+ {{ t('errors.forbidden.backHome') }}
19
+ </ElButton>
15
20
  </template>
16
21
  </ElResult>
17
22
  </main>
@@ -1,17 +1,22 @@
1
1
  <script setup lang="ts">
2
2
  import { ElButton, ElResult } from 'element-plus'
3
+ import { useI18n } from 'vue-i18n'
3
4
  import { useRouter } from 'vue-router'
5
+ import { HOME_ROUTE } from '../../../router/paths'
4
6
 
5
7
  defineOptions({ name: 'NotFoundPage' })
6
8
 
7
9
  const router = useRouter()
10
+ const { t } = useI18n()
8
11
  </script>
9
12
 
10
13
  <template>
11
14
  <main class="error-page">
12
- <ElResult icon="warning" title="404" sub-title="你访问的页面不存在或已经被移除。">
15
+ <ElResult icon="warning" :title="t('errors.notFound.code')" :sub-title="t('errors.notFound.message')">
13
16
  <template #extra>
14
- <ElButton type="primary" @click="router.push('/workspace')"> 回到工作台 </ElButton>
17
+ <ElButton type="primary" @click="router.push(HOME_ROUTE)">
18
+ {{ t('errors.notFound.backHome') }}
19
+ </ElButton>
15
20
  </template>
16
21
  </ElResult>
17
22
  </main>
@@ -1,17 +1,22 @@
1
1
  <script setup lang="ts">
2
2
  import { ElButton, ElResult } from 'element-plus'
3
+ import { useI18n } from 'vue-i18n'
3
4
  import { useRouter } from 'vue-router'
5
+ import { HOME_ROUTE } from '../../../router/paths'
4
6
 
5
7
  defineOptions({ name: 'ServerErrorPage' })
6
8
 
7
9
  const router = useRouter()
10
+ const { t } = useI18n()
8
11
  </script>
9
12
 
10
13
  <template>
11
14
  <main class="error-page">
12
- <ElResult icon="error" title="500" sub-title="服务暂时不可用,请稍后再试。">
15
+ <ElResult icon="error" :title="t('errors.serverError.code')" :sub-title="t('errors.serverError.message')">
13
16
  <template #extra>
14
- <ElButton type="primary" @click="router.push('/workspace')"> 回到工作台 </ElButton>
17
+ <ElButton type="primary" @click="router.push(HOME_ROUTE)">
18
+ {{ t('errors.serverError.backHome') }}
19
+ </ElButton>
15
20
  </template>
16
21
  </ElResult>
17
22
  </main>
@@ -1,9 +1,18 @@
1
1
  import { mount } from '@vue/test-utils'
2
2
  import { beforeEach, describe, expect, it, vi } from 'vitest'
3
+ import { createI18n } from 'vue-i18n'
4
+ import zhCN from '../../../locales/zh-CN.json'
5
+ import { HOME_ROUTE } from '../../../router/paths'
3
6
  import Forbidden from './Forbidden.vue'
4
7
  import NotFound from './NotFound.vue'
5
8
  import ServerError from './ServerError.vue'
6
9
 
10
+ const i18n = createI18n({
11
+ legacy: false,
12
+ locale: 'zh-CN',
13
+ messages: { 'zh-CN': zhCN },
14
+ })
15
+
7
16
  const { push } = vi.hoisted(() => ({
8
17
  push: vi.fn(),
9
18
  }))
@@ -22,11 +31,11 @@ describe('clean error page navigation', () => {
22
31
  ['404', NotFound],
23
32
  ['500', ServerError],
24
33
  ])('returns to the empty workspace from the %s page', async (_status, component) => {
25
- const wrapper = mount(component)
34
+ const wrapper = mount(component, { global: { plugins: [i18n] } })
26
35
 
27
36
  await wrapper.get('button').trigger('click')
28
37
 
29
38
  expect(push).toHaveBeenCalledOnce()
30
- expect(push).toHaveBeenCalledWith('/workspace')
39
+ expect(push).toHaveBeenCalledWith(HOME_ROUTE)
31
40
  })
32
41
  })
@@ -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)
@@ -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
  [
@@ -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()
@@ -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
  ]