@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
|
@@ -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="
|
|
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(
|
|
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="
|
|
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(
|
|
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,17 @@
|
|
|
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'
|
|
3
5
|
import Forbidden from './Forbidden.vue'
|
|
4
6
|
import NotFound from './NotFound.vue'
|
|
5
7
|
import ServerError from './ServerError.vue'
|
|
6
8
|
|
|
9
|
+
const i18n = createI18n({
|
|
10
|
+
legacy: false,
|
|
11
|
+
locale: 'zh-CN',
|
|
12
|
+
messages: { 'zh-CN': zhCN },
|
|
13
|
+
})
|
|
14
|
+
|
|
7
15
|
const { push } = vi.hoisted(() => ({
|
|
8
16
|
push: vi.fn(),
|
|
9
17
|
}))
|
|
@@ -22,7 +30,7 @@ describe('error page navigation', () => {
|
|
|
22
30
|
['404', NotFound],
|
|
23
31
|
['500', ServerError],
|
|
24
32
|
])('returns to the dashboard by path from the %s page', async (_status, component) => {
|
|
25
|
-
const wrapper = mount(component)
|
|
33
|
+
const wrapper = mount(component, { global: { plugins: [i18n] } })
|
|
26
34
|
|
|
27
35
|
await wrapper.get('button').trigger('click')
|
|
28
36
|
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { PageResult } from '@origen-ui/shared'
|
|
1
2
|
import type {
|
|
2
3
|
OgTableDataSource,
|
|
3
4
|
OgTableExportRequest,
|
|
@@ -5,14 +6,41 @@ import type {
|
|
|
5
6
|
OgTableRequestContext,
|
|
6
7
|
OgTableRow,
|
|
7
8
|
} from '@origen-ui/table'
|
|
9
|
+
import { mount } from '@vue/test-utils'
|
|
8
10
|
import { createPinia, setActivePinia } from 'pinia'
|
|
9
11
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
12
|
+
import { defineComponent } from 'vue'
|
|
13
|
+
import { createI18n } from 'vue-i18n'
|
|
14
|
+
import zhCN from '../locales/zh-CN.json'
|
|
10
15
|
import { useTheme } from './appearance/composables/useTheme'
|
|
11
16
|
import { useAuditManagement } from './system/audit/composables/useAuditManagement'
|
|
12
17
|
import { useMenuManagement } from './system/menus/composables/useMenuManagement'
|
|
13
18
|
import { useRoleManagement } from './system/roles/composables/useRoleManagement'
|
|
14
19
|
import { useUserManagement } from './system/users/composables/useUserManagement'
|
|
15
20
|
|
|
21
|
+
const i18n = createI18n({
|
|
22
|
+
legacy: false,
|
|
23
|
+
locale: 'zh-CN',
|
|
24
|
+
messages: { 'zh-CN': zhCN },
|
|
25
|
+
})
|
|
26
|
+
|
|
27
|
+
/** Calls a composable inside a mounted setup so useI18n()/useAuthStore() work(在挂载 setup 中调用 composable)。 */
|
|
28
|
+
function callInSetup<T>(factory: () => T): T {
|
|
29
|
+
let captured: T | undefined
|
|
30
|
+
mount(
|
|
31
|
+
defineComponent({
|
|
32
|
+
setup: () => {
|
|
33
|
+
captured = factory()
|
|
34
|
+
return () => null
|
|
35
|
+
},
|
|
36
|
+
}),
|
|
37
|
+
{
|
|
38
|
+
global: { plugins: [i18n] },
|
|
39
|
+
},
|
|
40
|
+
)
|
|
41
|
+
return captured as T
|
|
42
|
+
}
|
|
43
|
+
|
|
16
44
|
vi.mock('../api/client', () => {
|
|
17
45
|
function ensureActive(signal?: AbortSignal): void {
|
|
18
46
|
if (signal?.aborted) throw new DOMException('The operation was aborted.', 'AbortError')
|
|
@@ -122,11 +150,20 @@ function createExportRequest<TQuery extends object>(): OgTableExportRequest<TQue
|
|
|
122
150
|
mode: 'all',
|
|
123
151
|
source: 'display',
|
|
124
152
|
watermark: false,
|
|
153
|
+
fileName: 'export',
|
|
154
|
+
format: 'xlsx',
|
|
125
155
|
}
|
|
126
156
|
}
|
|
127
157
|
|
|
128
158
|
function createRequestContext(signal: AbortSignal): OgTableRequestContext {
|
|
129
|
-
return {
|
|
159
|
+
return {
|
|
160
|
+
signal,
|
|
161
|
+
requestId: 1,
|
|
162
|
+
pagination: {
|
|
163
|
+
buildRequest: (extra = {}) => ({ ...extra }),
|
|
164
|
+
parseResponse: <T extends OgTableRow>(raw: unknown): PageResult<T> => raw as PageResult<T>,
|
|
165
|
+
},
|
|
166
|
+
}
|
|
130
167
|
}
|
|
131
168
|
|
|
132
169
|
async function expectCancellableList<T extends OgTableRow, TQuery extends object>(
|
|
@@ -175,14 +212,14 @@ describe('feature composables', () => {
|
|
|
175
212
|
})
|
|
176
213
|
|
|
177
214
|
it('exposes audit loading and export configuration', async () => {
|
|
178
|
-
const { config, dataSource } = useAuditManagement()
|
|
215
|
+
const { config, dataSource } = callInSetup(() => useAuditManagement())
|
|
179
216
|
const result = await dataSource.list(
|
|
180
217
|
createTableQuery(),
|
|
181
218
|
createRequestContext(new AbortController().signal),
|
|
182
219
|
)
|
|
183
220
|
|
|
184
221
|
expect(result.total).toBeGreaterThanOrEqual(0)
|
|
185
|
-
expect(config.toolbar?.export).toBe('system:audit:export')
|
|
222
|
+
expect(config.value.toolbar?.export).toBe('system:audit:export')
|
|
186
223
|
expect(
|
|
187
224
|
await dataSource.export?.(createExportRequest(), { signal: new AbortController().signal }),
|
|
188
225
|
).toBeInstanceOf(Blob)
|
|
@@ -191,18 +228,18 @@ describe('feature composables', () => {
|
|
|
191
228
|
it('keeps CRUD feature data sources cancellable', async () => {
|
|
192
229
|
const refresh = vi.fn(async () => undefined)
|
|
193
230
|
const refreshAuthorization = vi.fn(async () => undefined)
|
|
194
|
-
await expectCancellableList(useUserManagement({ refresh, refreshAuthorization }).dataSource)
|
|
195
|
-
await expectCancellableList(useRoleManagement({ refresh, refreshAuthorization }).dataSource)
|
|
196
|
-
await expectCancellableList(useMenuManagement({ refresh, refreshAuthorization }).dataSource)
|
|
231
|
+
await expectCancellableList(callInSetup(() => useUserManagement({ refresh, refreshAuthorization })).dataSource)
|
|
232
|
+
await expectCancellableList(callInSetup(() => useRoleManagement({ refresh, refreshAuthorization })).dataSource)
|
|
233
|
+
await expectCancellableList(callInSetup(() => useMenuManagement({ refresh, refreshAuthorization })).dataSource)
|
|
197
234
|
})
|
|
198
235
|
|
|
199
236
|
it('uses a four-column search baseline for every system management page', () => {
|
|
200
237
|
const refresh = vi.fn(async () => undefined)
|
|
201
238
|
const refreshAuthorization = vi.fn(async () => undefined)
|
|
202
239
|
|
|
203
|
-
expect(useUserManagement({ refresh, refreshAuthorization }).config.search?.columns).toBe(4)
|
|
204
|
-
expect(useRoleManagement({ refresh, refreshAuthorization }).config.search?.columns).toBe(4)
|
|
205
|
-
expect(useMenuManagement({ refresh, refreshAuthorization }).config.search?.columns).toBe(4)
|
|
206
|
-
expect(useAuditManagement().config.search?.columns).toBe(4)
|
|
240
|
+
expect(callInSetup(() => useUserManagement({ refresh, refreshAuthorization })).config.value.search?.columns).toBe(4)
|
|
241
|
+
expect(callInSetup(() => useRoleManagement({ refresh, refreshAuthorization })).config.value.search?.columns).toBe(4)
|
|
242
|
+
expect(callInSetup(() => useMenuManagement({ refresh, refreshAuthorization })).config.value.search?.columns).toBe(4)
|
|
243
|
+
expect(callInSetup(() => useAuditManagement()).config.value.search?.columns).toBe(4)
|
|
207
244
|
})
|
|
208
245
|
})
|
package/templates/current/examples/src/features/security/components/DevtoolsProtectionOverlay.vue
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
<script setup lang="ts">
|
|
2
2
|
import { nextTick, useTemplateRef, watch } from 'vue'
|
|
3
|
+
import { useI18n } from 'vue-i18n'
|
|
3
4
|
|
|
4
5
|
defineOptions({ name: 'DevtoolsProtectionOverlay' })
|
|
5
6
|
|
|
@@ -7,6 +8,8 @@ const props = defineProps<{
|
|
|
7
8
|
blocked: boolean
|
|
8
9
|
}>()
|
|
9
10
|
|
|
11
|
+
const { t } = useI18n()
|
|
12
|
+
|
|
10
13
|
const overlay = useTemplateRef<HTMLElement>('overlay')
|
|
11
14
|
|
|
12
15
|
watch(
|
|
@@ -27,11 +30,11 @@ watch(
|
|
|
27
30
|
ref="overlay"
|
|
28
31
|
class="devtools-protection-overlay"
|
|
29
32
|
role="alertdialog"
|
|
30
|
-
aria-label="
|
|
33
|
+
:aria-label="t('security.devtoolsBlocked')"
|
|
31
34
|
aria-modal="true"
|
|
32
35
|
tabindex="-1"
|
|
33
36
|
>
|
|
34
|
-
<p
|
|
37
|
+
<p>{{ t('security.devtoolsBlocked') }}</p>
|
|
35
38
|
</section>
|
|
36
39
|
</Teleport>
|
|
37
40
|
</template>
|
|
@@ -1,24 +1,21 @@
|
|
|
1
|
+
import type { DevtoolsDetector, KeyboardEventTarget, StorageLike } from './devtoolsProtection'
|
|
1
2
|
import { describe, expect, it, vi } from 'vitest'
|
|
2
3
|
import {
|
|
3
4
|
createDevtoolsProtection,
|
|
4
|
-
|
|
5
|
-
type KeyboardEventTarget,
|
|
6
|
-
type StorageLike,
|
|
5
|
+
|
|
7
6
|
} from './devtoolsProtection'
|
|
8
7
|
|
|
9
8
|
type TestDetector = DevtoolsDetector & {
|
|
10
|
-
callbacks?:
|
|
11
|
-
start: ReturnType<typeof vi.fn>
|
|
9
|
+
callbacks?: Parameters<DevtoolsDetector['start']>[0]
|
|
12
10
|
}
|
|
13
11
|
|
|
14
12
|
function createDetector(): TestDetector {
|
|
15
13
|
const detector: TestDetector = {
|
|
16
|
-
start: vi.fn()
|
|
17
|
-
|
|
14
|
+
start: vi.fn<DevtoolsDetector['start']>((callbacks) => {
|
|
15
|
+
detector.callbacks = callbacks
|
|
16
|
+
}),
|
|
17
|
+
stop: vi.fn<DevtoolsDetector['stop']>(),
|
|
18
18
|
}
|
|
19
|
-
detector.start.mockImplementation((callbacks) => {
|
|
20
|
-
detector.callbacks = callbacks
|
|
21
|
-
})
|
|
22
19
|
return detector
|
|
23
20
|
}
|
|
24
21
|
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest'
|
|
2
|
+
import { ADMIN_USER_DEPARTMENTS, createUserDraft } from './admin-repository'
|
|
3
|
+
|
|
4
|
+
describe('admin repository user defaults', () => {
|
|
5
|
+
it('keeps translated department labels separate from their backend wire values', () => {
|
|
6
|
+
expect(ADMIN_USER_DEPARTMENTS).toEqual([
|
|
7
|
+
{ code: 'platform', labelKey: 'system.users.departments.platform', value: '平台产品' },
|
|
8
|
+
{ code: 'growth', labelKey: 'system.users.departments.growth', value: '增长运营' },
|
|
9
|
+
{ code: 'analytics', labelKey: 'system.users.departments.analytics', value: '数据分析' },
|
|
10
|
+
{ code: 'customer', labelKey: 'system.users.departments.customer', value: '客户成功' },
|
|
11
|
+
])
|
|
12
|
+
expect(createUserDraft().department).toBe('增长运营')
|
|
13
|
+
})
|
|
14
|
+
})
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { PageResult } from '@origen-ui/shared'
|
|
2
|
+
import type { AdminMessageKey } from '../../../../locales'
|
|
2
3
|
import type { PageRequest, RbacRole, RbacStatus, RbacUser } from './rbac'
|
|
3
4
|
import { apiClient } from '../../../../api/client'
|
|
5
|
+
import { translateAdminMessage } from '../../../../locales'
|
|
4
6
|
|
|
5
7
|
export type AdminRecordStatus = RbacStatus
|
|
6
8
|
|
|
@@ -26,6 +28,14 @@ export interface AdminUserDraft {
|
|
|
26
28
|
status: AdminRecordStatus
|
|
27
29
|
}
|
|
28
30
|
|
|
31
|
+
/** Stable department codes provide translated labels while retaining the current API values. */
|
|
32
|
+
export const ADMIN_USER_DEPARTMENTS = [
|
|
33
|
+
{ code: 'platform', labelKey: 'system.users.departments.platform', value: '平台产品' },
|
|
34
|
+
{ code: 'growth', labelKey: 'system.users.departments.growth', value: '增长运营' },
|
|
35
|
+
{ code: 'analytics', labelKey: 'system.users.departments.analytics', value: '数据分析' },
|
|
36
|
+
{ code: 'customer', labelKey: 'system.users.departments.customer', value: '客户成功' },
|
|
37
|
+
] as const satisfies readonly { code: string, labelKey: AdminMessageKey, value: string }[]
|
|
38
|
+
|
|
29
39
|
export interface AdminUserQuery {
|
|
30
40
|
name?: string
|
|
31
41
|
department?: string
|
|
@@ -221,7 +231,7 @@ export function createUserDraft(row?: AdminUserRecord): AdminUserDraft {
|
|
|
221
231
|
return {
|
|
222
232
|
name: row?.name ?? '',
|
|
223
233
|
email: row?.email ?? '',
|
|
224
|
-
department: row?.department ??
|
|
234
|
+
department: row?.department ?? ADMIN_USER_DEPARTMENTS[1].value,
|
|
225
235
|
roleIds: row?.roleIds ?? [],
|
|
226
236
|
status: row?.status ?? 'active',
|
|
227
237
|
}
|
|
@@ -237,26 +247,34 @@ export function createRoleDraft(row?: AdminRoleRecord): AdminRoleDraft {
|
|
|
237
247
|
}
|
|
238
248
|
}
|
|
239
249
|
|
|
240
|
-
function
|
|
241
|
-
|
|
250
|
+
function rbacText(key: string, named?: Record<string, unknown>): string {
|
|
251
|
+
return translateAdminMessage(key, { named })
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
function requiredString(value: unknown, labelKey: string): string {
|
|
255
|
+
if (typeof value !== 'string' || !value.trim()) {
|
|
256
|
+
throw new Error(rbacText('rbac.errors.required', { label: rbacText(labelKey) }))
|
|
257
|
+
}
|
|
242
258
|
return value.trim()
|
|
243
259
|
}
|
|
244
260
|
|
|
245
261
|
function requiredStatus(value: unknown): AdminRecordStatus {
|
|
246
262
|
if (value === 'active' || value === 'suspended') return value
|
|
247
|
-
throw new Error('
|
|
263
|
+
throw new Error(rbacText('rbac.errors.requiredStatus'))
|
|
248
264
|
}
|
|
249
265
|
|
|
250
266
|
export function parseUserDraft(value: Record<string, unknown> | undefined): AdminUserDraft {
|
|
251
267
|
const draft = asRecord(value)
|
|
252
|
-
const email = requiredString(draft.email, '
|
|
253
|
-
if (!/^[^\s@]+@[^\s@][^\s.@]*\.[^\s@]+$/.test(email))
|
|
268
|
+
const email = requiredString(draft.email, 'rbac.fields.workEmail')
|
|
269
|
+
if (!/^[^\s@]+@[^\s@][^\s.@]*\.[^\s@]+$/.test(email)) {
|
|
270
|
+
throw new Error(rbacText('rbac.errors.invalidEmail'))
|
|
271
|
+
}
|
|
254
272
|
const roleIds = readStringArray(draft.roleIds)
|
|
255
|
-
if (!roleIds.length) throw new Error('
|
|
273
|
+
if (!roleIds.length) throw new Error(rbacText('rbac.errors.requireRole'))
|
|
256
274
|
return {
|
|
257
|
-
name: requiredString(draft.name, '
|
|
275
|
+
name: requiredString(draft.name, 'rbac.fields.memberName'),
|
|
258
276
|
email,
|
|
259
|
-
department: requiredString(draft.department, '
|
|
277
|
+
department: requiredString(draft.department, 'rbac.fields.department'),
|
|
260
278
|
roleIds,
|
|
261
279
|
status: requiredStatus(draft.status),
|
|
262
280
|
}
|
|
@@ -264,15 +282,16 @@ export function parseUserDraft(value: Record<string, unknown> | undefined): Admi
|
|
|
264
282
|
|
|
265
283
|
export function parseRoleDraft(value: Record<string, unknown> | undefined): AdminRoleDraft {
|
|
266
284
|
const draft = asRecord(value)
|
|
267
|
-
const code = requiredString(draft.code, '
|
|
268
|
-
if (!/^[a-z][a-z0-9_]{2,31}$/.test(code))
|
|
269
|
-
throw new Error('
|
|
285
|
+
const code = requiredString(draft.code, 'rbac.fields.roleCode')
|
|
286
|
+
if (!/^[a-z][a-z0-9_]{2,31}$/.test(code)) {
|
|
287
|
+
throw new Error(rbacText('rbac.errors.invalidRoleCode'))
|
|
288
|
+
}
|
|
270
289
|
const permissions = readStringArray(draft.permissions)
|
|
271
|
-
if (!permissions.length) throw new Error('
|
|
290
|
+
if (!permissions.length) throw new Error(rbacText('rbac.errors.requirePermission'))
|
|
272
291
|
return {
|
|
273
|
-
name: requiredString(draft.name, '
|
|
292
|
+
name: requiredString(draft.name, 'rbac.fields.roleName'),
|
|
274
293
|
code,
|
|
275
|
-
description: requiredString(draft.description, '
|
|
294
|
+
description: requiredString(draft.description, 'rbac.fields.roleDescription'),
|
|
276
295
|
status: requiredStatus(draft.status),
|
|
277
296
|
permissions,
|
|
278
297
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { PageResult, SelectOption } from '@origen-ui/shared'
|
|
2
2
|
import { apiClient } from '../../../../api/client'
|
|
3
|
+
import { translateAdminMessage } from '../../../../locales'
|
|
3
4
|
|
|
4
5
|
export type RbacStatus = 'active' | 'suspended'
|
|
5
6
|
export type MenuKind = 'directory' | 'page' | 'button'
|
|
@@ -33,6 +34,8 @@ export interface RbacMenu {
|
|
|
33
34
|
kind: MenuKind
|
|
34
35
|
code: string
|
|
35
36
|
title: string
|
|
37
|
+
/** Optional i18n key resolved by the app title resolver; falls back to `title`. */
|
|
38
|
+
titleKey?: string
|
|
36
39
|
path?: string
|
|
37
40
|
componentKey?: string
|
|
38
41
|
icon?: string
|
|
@@ -43,12 +46,14 @@ export interface RbacMenu {
|
|
|
43
46
|
cache: boolean
|
|
44
47
|
tabHidden: boolean
|
|
45
48
|
redirect?: string
|
|
49
|
+
/** Optimistic-lock revision; assigned on create and incremented on every update. */
|
|
50
|
+
version: number
|
|
46
51
|
createdAt: string
|
|
47
52
|
updatedAt: string
|
|
48
53
|
children?: RbacMenu[]
|
|
49
54
|
}
|
|
50
55
|
|
|
51
|
-
export type RbacMenuDraft = Omit<RbacMenu, 'id' | 'createdAt' | 'updatedAt'>
|
|
56
|
+
export type RbacMenuDraft = Omit<RbacMenu, 'id' | 'createdAt' | 'updatedAt' | 'version'>
|
|
52
57
|
|
|
53
58
|
export interface RbacAuditEvent {
|
|
54
59
|
id: string
|
|
@@ -64,11 +69,15 @@ export interface RbacAuditEvent {
|
|
|
64
69
|
|
|
65
70
|
export interface RbacPageCapability {
|
|
66
71
|
componentKey: string
|
|
67
|
-
|
|
68
|
-
|
|
72
|
+
labelKey: string
|
|
73
|
+
descriptionKey: string
|
|
69
74
|
icon: string
|
|
70
75
|
permission: string
|
|
71
|
-
operations: readonly { code: string,
|
|
76
|
+
operations: readonly { code: string, labelKey: string }[]
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
export function rbacText(key: string): string {
|
|
80
|
+
return translateAdminMessage(key)
|
|
72
81
|
}
|
|
73
82
|
|
|
74
83
|
export interface PageRequest<TQuery extends object> {
|
|
@@ -82,54 +91,54 @@ export interface PageRequest<TQuery extends object> {
|
|
|
82
91
|
export const RBAC_PAGE_CATALOG: readonly RbacPageCapability[] = [
|
|
83
92
|
{
|
|
84
93
|
componentKey: 'dashboard',
|
|
85
|
-
|
|
86
|
-
|
|
94
|
+
labelKey: 'rbac.pages.dashboard.label',
|
|
95
|
+
descriptionKey: 'rbac.pages.dashboard.description',
|
|
87
96
|
icon: 'dashboard',
|
|
88
97
|
permission: 'workspace:dashboard:read',
|
|
89
98
|
operations: [],
|
|
90
99
|
},
|
|
91
100
|
{
|
|
92
101
|
componentKey: 'user-list',
|
|
93
|
-
|
|
94
|
-
|
|
102
|
+
labelKey: 'rbac.pages.userList.label',
|
|
103
|
+
descriptionKey: 'rbac.pages.userList.description',
|
|
95
104
|
icon: 'users',
|
|
96
105
|
permission: 'system:user:read',
|
|
97
106
|
operations: [
|
|
98
|
-
{ code: 'system:user:write',
|
|
99
|
-
{ code: 'system:user:role',
|
|
100
|
-
{ code: 'system:user:export',
|
|
107
|
+
{ code: 'system:user:write', labelKey: 'rbac.pages.userList.operations.write' },
|
|
108
|
+
{ code: 'system:user:role', labelKey: 'rbac.pages.userList.operations.role' },
|
|
109
|
+
{ code: 'system:user:export', labelKey: 'rbac.pages.userList.operations.export' },
|
|
101
110
|
],
|
|
102
111
|
},
|
|
103
112
|
{
|
|
104
113
|
componentKey: 'role-list',
|
|
105
|
-
|
|
106
|
-
|
|
114
|
+
labelKey: 'rbac.pages.roleList.label',
|
|
115
|
+
descriptionKey: 'rbac.pages.roleList.description',
|
|
107
116
|
icon: 'roles',
|
|
108
117
|
permission: 'system:role:read',
|
|
109
118
|
operations: [
|
|
110
|
-
{ code: 'system:role:write',
|
|
111
|
-
{ code: 'system:role:export',
|
|
119
|
+
{ code: 'system:role:write', labelKey: 'rbac.pages.roleList.operations.write' },
|
|
120
|
+
{ code: 'system:role:export', labelKey: 'rbac.pages.roleList.operations.export' },
|
|
112
121
|
],
|
|
113
122
|
},
|
|
114
123
|
{
|
|
115
124
|
componentKey: 'menu-list',
|
|
116
|
-
|
|
117
|
-
|
|
125
|
+
labelKey: 'rbac.pages.menuList.label',
|
|
126
|
+
descriptionKey: 'rbac.pages.menuList.description',
|
|
118
127
|
icon: 'menus',
|
|
119
128
|
permission: 'system:menu:read',
|
|
120
129
|
operations: [
|
|
121
|
-
{ code: 'system:menu:write',
|
|
122
|
-
{ code: 'system:menu:publish',
|
|
123
|
-
{ code: 'system:menu:export',
|
|
130
|
+
{ code: 'system:menu:write', labelKey: 'rbac.pages.menuList.operations.write' },
|
|
131
|
+
{ code: 'system:menu:publish', labelKey: 'rbac.pages.menuList.operations.publish' },
|
|
132
|
+
{ code: 'system:menu:export', labelKey: 'rbac.pages.menuList.operations.export' },
|
|
124
133
|
],
|
|
125
134
|
},
|
|
126
135
|
{
|
|
127
136
|
componentKey: 'audit-list',
|
|
128
|
-
|
|
129
|
-
|
|
137
|
+
labelKey: 'rbac.pages.auditList.label',
|
|
138
|
+
descriptionKey: 'rbac.pages.auditList.description',
|
|
130
139
|
icon: 'audit',
|
|
131
140
|
permission: 'system:audit:read',
|
|
132
|
-
operations: [{ code: 'system:audit:export',
|
|
141
|
+
operations: [{ code: 'system:audit:export', labelKey: 'rbac.pages.auditList.operations.export' }],
|
|
133
142
|
},
|
|
134
143
|
]
|
|
135
144
|
|
|
@@ -157,21 +166,24 @@ export function getPageCapability(
|
|
|
157
166
|
export function pageCatalogOptions(boundComponentKeys: readonly string[] = []): SelectOption[] {
|
|
158
167
|
const bound = new Set(boundComponentKeys)
|
|
159
168
|
return RBAC_PAGE_CATALOG.filter((page) => !bound.has(page.componentKey)).map((page) => ({
|
|
160
|
-
label: page.
|
|
169
|
+
label: rbacText(page.labelKey),
|
|
161
170
|
value: page.componentKey,
|
|
162
171
|
}))
|
|
163
172
|
}
|
|
164
173
|
|
|
165
174
|
export async function permissionTree(): Promise<SelectOption[]> {
|
|
166
175
|
return [
|
|
167
|
-
{ label: '
|
|
176
|
+
{ label: rbacText('rbac.allPermissions'), value: '*' },
|
|
168
177
|
...RBAC_PAGE_CATALOG.map((page) => ({
|
|
169
|
-
label: page.
|
|
178
|
+
label: rbacText(page.labelKey),
|
|
170
179
|
value: `group:${page.componentKey}`,
|
|
171
180
|
disabled: true,
|
|
172
181
|
children: [
|
|
173
|
-
{ label: '
|
|
174
|
-
...page.operations.map((operation) => ({
|
|
182
|
+
{ label: rbacText('rbac.accessPage'), value: page.permission },
|
|
183
|
+
...page.operations.map((operation) => ({
|
|
184
|
+
label: rbacText(operation.labelKey),
|
|
185
|
+
value: operation.code,
|
|
186
|
+
})),
|
|
175
187
|
],
|
|
176
188
|
})),
|
|
177
189
|
]
|
|
@@ -221,15 +233,23 @@ export async function createMenu(draft: RbacMenuDraft, signal: AbortSignal): Pro
|
|
|
221
233
|
return apiClient.post<RbacMenu>('/system/menus', draft, { signal, silent: true })
|
|
222
234
|
}
|
|
223
235
|
|
|
236
|
+
/** Business code returned by the server when a menu update loses a version race. */
|
|
237
|
+
export const MENU_VERSION_CONFLICT_CODE = 40901
|
|
238
|
+
|
|
224
239
|
export async function updateMenu(
|
|
225
240
|
menuId: string,
|
|
226
241
|
draft: RbacMenuDraft,
|
|
242
|
+
version: number,
|
|
227
243
|
signal: AbortSignal,
|
|
228
244
|
): Promise<RbacMenu> {
|
|
229
|
-
return apiClient.put<RbacMenu>(
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
245
|
+
return apiClient.put<RbacMenu>(
|
|
246
|
+
`/system/menus/${encodeURIComponent(menuId)}`,
|
|
247
|
+
{ ...draft, version },
|
|
248
|
+
{
|
|
249
|
+
signal,
|
|
250
|
+
silent: true,
|
|
251
|
+
},
|
|
252
|
+
)
|
|
233
253
|
}
|
|
234
254
|
|
|
235
255
|
export async function setMenusStatus(
|