@origen-ui/admin-cli 2.0.1 → 2.0.2
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 +33 -5
- package/package.json +23 -15
- package/templates/current/clean/.node-version +1 -0
- package/templates/current/clean/CHANGELOG.md +22 -0
- package/templates/current/clean/README.md +2 -1
- package/templates/current/clean/e2e/demo-shell.spec.ts +4 -4
- package/templates/current/clean/package.json +22 -22
- package/templates/current/clean/pnpm-workspace.yaml +18 -0
- package/templates/current/clean/scaffold.lock.json +2 -2
- package/templates/current/clean/scripts/check-admin-scaffold.mjs +5 -1
- package/templates/current/clean/scripts/demo-api.ts +4 -4
- package/templates/current/clean/scripts/remove-examples.mjs +4 -4
- package/templates/current/clean/src/demo-api.spec.ts +3 -3
- package/templates/current/clean/src/features/auth/pages/Login.vue +2 -1
- package/templates/current/clean/src/router/queryEncryption.spec.ts +10 -1
- package/templates/current/clean/src/router/routeQuery.spec.ts +2 -1
- package/templates/current/clean/src/router/routeQuery.ts +4 -1
- package/templates/current/examples/.node-version +1 -0
- package/templates/current/examples/CHANGELOG.md +22 -0
- package/templates/current/examples/README.md +2 -1
- package/templates/current/examples/e2e/demo-shell.spec.ts +4 -4
- package/templates/current/examples/package.json +22 -22
- package/templates/current/examples/pnpm-workspace.yaml +18 -0
- package/templates/current/examples/scaffold.lock.json +2 -2
- package/templates/current/examples/scripts/check-admin-scaffold.mjs +5 -1
- package/templates/current/examples/scripts/demo-api.ts +4 -4
- package/templates/current/examples/scripts/remove-examples.mjs +4 -4
- package/templates/current/examples/src/demo-api.spec.ts +3 -3
- package/templates/current/examples/src/features/auth/pages/Login.vue +2 -1
- package/templates/current/examples/src/router/queryEncryption.spec.ts +10 -1
- package/templates/current/examples/src/router/routeQuery.spec.ts +2 -1
- package/templates/current/examples/src/router/routeQuery.ts +4 -1
package/README.md
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
# @origen-ui/admin-cli
|
|
2
2
|
|
|
3
|
-
`@origen-ui/admin-cli`
|
|
3
|
+
`@origen-ui/admin-cli` 用于创建独立的 Admin 脚手架。
|
|
4
4
|
|
|
5
5
|
```sh
|
|
6
6
|
npx @origen-ui/admin-cli create origen-smoke --skip-install
|
|
7
7
|
pnpm dlx @origen-ui/admin-cli create origen-smoke --skip-install
|
|
8
8
|
```
|
|
9
9
|
|
|
10
|
-
`og-admin`
|
|
11
|
-
command so pnpm resolves the documented `pnpm dlx` form correctly.
|
|
10
|
+
`og-admin` 是规范二进制命令。包名对应的 bin 也指向同一命令,因此 pnpm 可以正确解析文档中的 `pnpm dlx` 用法。
|
|
12
11
|
|
|
13
12
|
## CLI 命令
|
|
14
13
|
|
|
@@ -20,5 +19,34 @@ command so pnpm resolves the documented `pnpm dlx` form correctly.
|
|
|
20
19
|
`og-admin` 只提供 `create` 命令。目标目录必须为空或不存在;`--variant` 可选
|
|
21
20
|
`clean` 或 `examples`,`--skip-install` 与 `--no-git` 适合自动化环境。
|
|
22
21
|
|
|
23
|
-
|
|
24
|
-
|
|
22
|
+
使用 `--variant examples` 可以创建包含 Demo 的脚手架。`--skip-install` 和 `--no-git` 适合自动化初始化。
|
|
23
|
+
|
|
24
|
+
## 环境要求
|
|
25
|
+
|
|
26
|
+
- Node.js `>=22.0.0`
|
|
27
|
+
- pnpm `11.22.0`(使用 `pnpm dlx` 时也建议保持该版本)
|
|
28
|
+
|
|
29
|
+
## 参数
|
|
30
|
+
|
|
31
|
+
```text
|
|
32
|
+
og-admin create <directory> [--variant clean|examples] [--skip-install] [--no-git]
|
|
33
|
+
```
|
|
34
|
+
|
|
35
|
+
- `<directory>` 必须是不存在的目录或空目录;CLI 不会覆盖已有文件。
|
|
36
|
+
- `--variant clean` 生成最小脚手架,默认使用该变体。
|
|
37
|
+
- `--variant examples` 保留 Demo 页面、mock API 和示例测试。
|
|
38
|
+
- `--skip-install` 跳过依赖安装,适合 CI 或后续统一安装的场景。
|
|
39
|
+
- `--no-git` 跳过 Git 初始化,适合已有仓库或自动化目录。
|
|
40
|
+
|
|
41
|
+
完整示例:
|
|
42
|
+
|
|
43
|
+
```sh
|
|
44
|
+
pnpm dlx @origen-ui/admin-cli create origen-admin --variant examples --skip-install --no-git
|
|
45
|
+
cd origen-admin
|
|
46
|
+
pnpm install
|
|
47
|
+
pnpm type-check
|
|
48
|
+
pnpm test
|
|
49
|
+
pnpm build
|
|
50
|
+
```
|
|
51
|
+
|
|
52
|
+
`examples` 变体中的登录凭据仅用于本地 mock API:`demo-admin / demo-password`。这些凭据不是生产凭据,部署到真实环境前必须接入真实认证服务并移除 Demo 模式。
|
package/package.json
CHANGED
|
@@ -1,9 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@origen-ui/admin-cli",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.0.
|
|
4
|
+
"version": "2.0.2",
|
|
5
5
|
"description": "Project creation CLI for the Origen UI Admin scaffold",
|
|
6
6
|
"license": "MIT",
|
|
7
|
+
"homepage": "https://gitee.com/zapcenter/origen-ui",
|
|
8
|
+
"repository": {
|
|
9
|
+
"type": "git",
|
|
10
|
+
"url": "git+https://gitee.com/zapcenter/origen-ui.git"
|
|
11
|
+
},
|
|
12
|
+
"bugs": {
|
|
13
|
+
"url": "https://gitee.com/zapcenter/origen-ui/issues"
|
|
14
|
+
},
|
|
7
15
|
"bin": {
|
|
8
16
|
"og-admin": "./bin/og-admin.mjs",
|
|
9
17
|
"admin-cli": "./bin/og-admin.mjs"
|
|
@@ -19,20 +27,20 @@
|
|
|
19
27
|
"access": "public"
|
|
20
28
|
},
|
|
21
29
|
"devDependencies": {
|
|
22
|
-
"@origen-ui/dialog": "2.0.
|
|
23
|
-
"@origen-ui/
|
|
24
|
-
"@origen-ui/
|
|
25
|
-
"@origen-ui/
|
|
26
|
-
"@origen-ui/form": "2.0.
|
|
27
|
-
"@origen-ui/
|
|
28
|
-
"@origen-ui/
|
|
29
|
-
"@origen-ui/
|
|
30
|
-
"@origen-ui/
|
|
31
|
-
"@origen-ui/upload": "2.0.
|
|
32
|
-
"@origen-ui/
|
|
33
|
-
"@origen-ui/
|
|
34
|
-
"
|
|
35
|
-
"origen-ui": "2.0.
|
|
30
|
+
"@origen-ui/dialog": "2.0.2",
|
|
31
|
+
"@origen-ui/http": "2.0.2",
|
|
32
|
+
"@origen-ui/permission": "2.0.2",
|
|
33
|
+
"@origen-ui/form-table": "2.0.2",
|
|
34
|
+
"@origen-ui/form": "2.0.2",
|
|
35
|
+
"@origen-ui/editor": "2.0.2",
|
|
36
|
+
"@origen-ui/router": "2.0.2",
|
|
37
|
+
"@origen-ui/shared": "2.0.2",
|
|
38
|
+
"@origen-ui/table": "2.0.2",
|
|
39
|
+
"@origen-ui/upload": "2.0.2",
|
|
40
|
+
"@origen-ui/table-search": "2.0.2",
|
|
41
|
+
"@origen-ui/search": "2.0.2",
|
|
42
|
+
"origen-ui": "2.0.2",
|
|
43
|
+
"@origen-ui/tabs": "2.0.2"
|
|
36
44
|
},
|
|
37
45
|
"scripts": {
|
|
38
46
|
"build": "node --check bin/og-admin.mjs && pnpm run templates:check",
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
22.23.2
|
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# @origen-ui/admin
|
|
2
2
|
|
|
3
|
+
## 1.0.7
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies
|
|
8
|
+
- Updated dependencies [98175de]
|
|
9
|
+
- Updated dependencies [fc5a6b3]
|
|
10
|
+
- @origen-ui/shared@2.0.2
|
|
11
|
+
- @origen-ui/permission@2.0.2
|
|
12
|
+
- @origen-ui/http@2.0.2
|
|
13
|
+
- @origen-ui/dialog@2.0.2
|
|
14
|
+
- @origen-ui/editor@2.0.2
|
|
15
|
+
- @origen-ui/upload@2.0.2
|
|
16
|
+
- @origen-ui/search@2.0.2
|
|
17
|
+
- @origen-ui/table@2.0.2
|
|
18
|
+
- @origen-ui/tabs@2.0.2
|
|
19
|
+
- @origen-ui/router@2.0.2
|
|
20
|
+
- @origen-ui/form@2.0.2
|
|
21
|
+
- @origen-ui/form-table@2.0.2
|
|
22
|
+
- @origen-ui/table-search@2.0.2
|
|
23
|
+
- origen-ui@2.0.2
|
|
24
|
+
|
|
3
25
|
## 1.0.6
|
|
4
26
|
|
|
5
27
|
### Patch Changes
|
|
@@ -13,7 +13,8 @@ Use `pnpm admin:dev` for normal development. Requests to `/api` are proxied to
|
|
|
13
13
|
|
|
14
14
|
Use `pnpm admin:demo` to run the Admin with its local, in-memory development
|
|
15
15
|
API. This mode does not proxy `/api`; it resets its seed data on every server
|
|
16
|
-
restart. Sign in with `admin` / `
|
|
16
|
+
restart. Sign in with `demo-admin` / `demo-password`. These credentials are
|
|
17
|
+
mock-only and must never be used in production.
|
|
17
18
|
|
|
18
19
|
`apps/admin` 是一个 Vue 3 + Pinia 生产管理后台。它只在应用层组合仓库现有的 `@origen-ui/router`、`@origen-ui/http`、独立 Pro 组件包、`origen-ui` 样式子路径与 Element Plus API,不修改任何 `packages/*` 源码。
|
|
19
20
|
|
|
@@ -54,15 +54,15 @@ test('admin demo logs in, registers remote routes, and persists mutations for th
|
|
|
54
54
|
request,
|
|
55
55
|
}) => {
|
|
56
56
|
const login = await demoRequest<DemoLogin>(request, 'POST', '/api/auth/login', undefined, {
|
|
57
|
-
username: 'admin',
|
|
58
|
-
password: '
|
|
57
|
+
username: 'demo-admin',
|
|
58
|
+
password: 'demo-password',
|
|
59
59
|
})
|
|
60
60
|
expect(login.permissions).toContain('system:user:write')
|
|
61
61
|
|
|
62
62
|
await page.goto('/login')
|
|
63
63
|
const loginInputs = page.locator('.login-page input')
|
|
64
|
-
await loginInputs.nth(0).fill('admin')
|
|
65
|
-
await loginInputs.nth(1).fill('
|
|
64
|
+
await loginInputs.nth(0).fill('demo-admin')
|
|
65
|
+
await loginInputs.nth(1).fill('demo-password')
|
|
66
66
|
await Promise.all([
|
|
67
67
|
page.waitForURL('**/dashboard'),
|
|
68
68
|
page.locator('button.login-card__submit').click(),
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@origen-ui/admin-scaffold",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.0.
|
|
4
|
+
"version": "2.0.2",
|
|
5
5
|
"private": true,
|
|
6
6
|
"engines": {
|
|
7
7
|
"node": ">=22.0.0"
|
|
@@ -27,39 +27,39 @@
|
|
|
27
27
|
"dependencies": {
|
|
28
28
|
"@element-plus/icons-vue": "2.3.2",
|
|
29
29
|
"@noble/ciphers": "2.3.0",
|
|
30
|
-
"@origen-ui/dialog": "2.0.
|
|
31
|
-
"@origen-ui/editor": "2.0.
|
|
32
|
-
"@origen-ui/form": "2.0.
|
|
33
|
-
"@origen-ui/form-table": "2.0.
|
|
34
|
-
"@origen-ui/http": "2.0.
|
|
35
|
-
"@origen-ui/permission": "2.0.
|
|
36
|
-
"@origen-ui/router": "2.0.
|
|
37
|
-
"@origen-ui/search": "2.0.
|
|
38
|
-
"@origen-ui/shared": "2.0.
|
|
39
|
-
"@origen-ui/table": "2.0.
|
|
40
|
-
"@origen-ui/table-search": "2.0.
|
|
41
|
-
"@origen-ui/tabs": "2.0.
|
|
42
|
-
"@origen-ui/upload": "2.0.
|
|
30
|
+
"@origen-ui/dialog": "2.0.2",
|
|
31
|
+
"@origen-ui/editor": "2.0.2",
|
|
32
|
+
"@origen-ui/form": "2.0.2",
|
|
33
|
+
"@origen-ui/form-table": "2.0.2",
|
|
34
|
+
"@origen-ui/http": "2.0.2",
|
|
35
|
+
"@origen-ui/permission": "2.0.2",
|
|
36
|
+
"@origen-ui/router": "2.0.2",
|
|
37
|
+
"@origen-ui/search": "2.0.2",
|
|
38
|
+
"@origen-ui/shared": "2.0.2",
|
|
39
|
+
"@origen-ui/table": "2.0.2",
|
|
40
|
+
"@origen-ui/table-search": "2.0.2",
|
|
41
|
+
"@origen-ui/tabs": "2.0.2",
|
|
42
|
+
"@origen-ui/upload": "2.0.2",
|
|
43
43
|
"@vue/devtools-api": "8.2.1",
|
|
44
44
|
"@vueuse/core": "15.0.0",
|
|
45
45
|
"axios": "1.20.0",
|
|
46
46
|
"element-plus": "2.14.7",
|
|
47
|
-
"origen-ui": "2.0.
|
|
48
|
-
"pinia": "4.0
|
|
47
|
+
"origen-ui": "2.0.2",
|
|
48
|
+
"pinia": "4.1.0",
|
|
49
49
|
"sortablejs": "1.15.7",
|
|
50
|
-
"vue": "3.5.
|
|
51
|
-
"vue-i18n": "11.4.
|
|
52
|
-
"vue-router": "5.
|
|
50
|
+
"vue": "3.5.44",
|
|
51
|
+
"vue-i18n": "11.4.16",
|
|
52
|
+
"vue-router": "5.4.0"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@origen-ui/admin-cli": "2.0.
|
|
55
|
+
"@origen-ui/admin-cli": "2.0.2",
|
|
56
56
|
"@playwright/test": "1.62.1",
|
|
57
57
|
"@types/node": "22.20.1",
|
|
58
58
|
"@vitejs/plugin-vue": "6.0.8",
|
|
59
59
|
"@vitejs/plugin-vue-jsx": "5.1.6",
|
|
60
60
|
"@vitest/coverage-v8": "4.1.11",
|
|
61
|
-
"@vue/compiler-sfc": "3.5.
|
|
62
|
-
"@vue/test-utils": "2.
|
|
61
|
+
"@vue/compiler-sfc": "3.5.44",
|
|
62
|
+
"@vue/test-utils": "2.5.1",
|
|
63
63
|
"jsdom": "30.0.1",
|
|
64
64
|
"sass": "1.103.0",
|
|
65
65
|
"swagger-typescript-api": "^13.12.6",
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
allowBuilds:
|
|
2
|
+
'@parcel/watcher': true
|
|
3
|
+
esbuild: true
|
|
4
|
+
msw: false
|
|
5
|
+
vue-demi: true
|
|
6
|
+
|
|
7
|
+
strictPeerDependencies: true
|
|
8
|
+
|
|
9
|
+
overrides:
|
|
10
|
+
# The npm braces line has no published fixed release; use the maintained patched fork.
|
|
11
|
+
braces: npm:@zklogic/braces@3.0.7
|
|
12
|
+
dompurify: 3.4.14
|
|
13
|
+
fast-uri: 3.1.5
|
|
14
|
+
js-yaml: 4.3.1
|
|
15
|
+
source-map-js: 1.2.2
|
|
16
|
+
unplugin-element-plus>@nuxt/kit: 4.4.2
|
|
17
|
+
vitepress>@vue/shared: 3.5.44
|
|
18
|
+
vitepress>vue: 3.5.44
|
|
@@ -6,7 +6,11 @@ import process from 'node:process'
|
|
|
6
6
|
import { parse } from '@vue/compiler-sfc'
|
|
7
7
|
import ts from 'typescript'
|
|
8
8
|
|
|
9
|
-
const
|
|
9
|
+
const rootFlagIndex = process.argv.indexOf('--root')
|
|
10
|
+
const root =
|
|
11
|
+
rootFlagIndex >= 0
|
|
12
|
+
? resolve(process.cwd(), process.argv[rootFlagIndex + 1] || '.')
|
|
13
|
+
: resolve(process.cwd())
|
|
10
14
|
const source = existsSync(join(root, 'apps', 'admin', 'scaffold', 'agent-contracts'))
|
|
11
15
|
? join(root, 'apps', 'admin', 'scaffold', 'agent-contracts')
|
|
12
16
|
: root
|
|
@@ -250,7 +250,7 @@ function initialState() {
|
|
|
250
250
|
const users: DemoUser[] = [
|
|
251
251
|
{
|
|
252
252
|
id: 'user-admin',
|
|
253
|
-
username: 'admin',
|
|
253
|
+
username: 'demo-admin',
|
|
254
254
|
name: 'Demo Administrator',
|
|
255
255
|
email: 'admin@example.test',
|
|
256
256
|
department: 'Platform',
|
|
@@ -477,7 +477,7 @@ export function createDemoApi(): DemoApi {
|
|
|
477
477
|
const body = asRecord(request.body)
|
|
478
478
|
|
|
479
479
|
if (method === 'POST' && path === '/auth/login') {
|
|
480
|
-
if (body.username !== 'admin' || body.password !== '
|
|
480
|
+
if (body.username !== 'demo-admin' || body.password !== 'demo-password')
|
|
481
481
|
return failure('Invalid demo credentials.', 40101)
|
|
482
482
|
return envelope({
|
|
483
483
|
accessToken: ADMIN_TOKEN,
|
|
@@ -485,7 +485,7 @@ export function createDemoApi(): DemoApi {
|
|
|
485
485
|
refreshToken: REFRESH_TOKEN,
|
|
486
486
|
user: {
|
|
487
487
|
id: 'user-admin',
|
|
488
|
-
username: 'admin',
|
|
488
|
+
username: 'demo-admin',
|
|
489
489
|
displayName: 'Demo Administrator',
|
|
490
490
|
email: 'admin@example.test',
|
|
491
491
|
},
|
|
@@ -503,7 +503,7 @@ export function createDemoApi(): DemoApi {
|
|
|
503
503
|
return envelope({
|
|
504
504
|
user: {
|
|
505
505
|
id: 'user-admin',
|
|
506
|
-
username: 'admin',
|
|
506
|
+
username: 'demo-admin',
|
|
507
507
|
displayName: 'Demo Administrator',
|
|
508
508
|
email: 'admin@example.test',
|
|
509
509
|
},
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { existsSync } from 'node:fs'
|
|
3
3
|
import { cp, rm } from 'node:fs/promises'
|
|
4
|
-
import {
|
|
4
|
+
import { resolve } from 'node:path'
|
|
5
5
|
import process from 'node:process'
|
|
6
|
-
import {
|
|
6
|
+
import { REPOSITORY_ROOT } from '../../lib/repository-root.mjs'
|
|
7
7
|
|
|
8
8
|
const args = new Set(process.argv.slice(2))
|
|
9
9
|
const rootIndex = process.argv.indexOf('--root')
|
|
10
10
|
const root = rootIndex >= 0 ? resolve(process.argv[rootIndex + 1] || '.') : process.cwd()
|
|
11
11
|
const dryRun = args.has('--dry-run')
|
|
12
12
|
const overlayIndex = process.argv.indexOf('--overlay')
|
|
13
|
+
const repositoryRoot = REPOSITORY_ROOT
|
|
13
14
|
const repositoryOverlay = resolve(
|
|
14
|
-
|
|
15
|
-
'..',
|
|
15
|
+
repositoryRoot,
|
|
16
16
|
'apps',
|
|
17
17
|
'admin',
|
|
18
18
|
'scaffold',
|
|
@@ -32,7 +32,7 @@ describe('admin demo API', () => {
|
|
|
32
32
|
api.handle({
|
|
33
33
|
method: 'POST',
|
|
34
34
|
path: '/api/auth/login',
|
|
35
|
-
body: { username: 'admin', password: 'wrong' },
|
|
35
|
+
body: { username: 'demo-admin', password: 'wrong' },
|
|
36
36
|
}).body,
|
|
37
37
|
).toMatchObject({ code: 40101, data: null })
|
|
38
38
|
const login = data<{
|
|
@@ -43,7 +43,7 @@ describe('admin demo API', () => {
|
|
|
43
43
|
api.handle({
|
|
44
44
|
method: 'POST',
|
|
45
45
|
path: '/auth/login',
|
|
46
|
-
body: { username: 'admin', password: '
|
|
46
|
+
body: { username: 'demo-admin', password: 'demo-password' },
|
|
47
47
|
}),
|
|
48
48
|
)
|
|
49
49
|
expect(login.accessToken).toBe('demo-admin-token')
|
|
@@ -52,7 +52,7 @@ describe('admin demo API', () => {
|
|
|
52
52
|
expect(api.handle({ method: 'GET', path: '/auth/profile' }).body.code).toBe(40101)
|
|
53
53
|
expect(
|
|
54
54
|
data<{ user: { username: string } }>(request(api, 'GET', '/auth/profile')).user.username,
|
|
55
|
-
).toBe('admin')
|
|
55
|
+
).toBe('demo-admin')
|
|
56
56
|
expect(
|
|
57
57
|
data<{ token: string }>(
|
|
58
58
|
api.handle({
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
<script setup lang="ts">
|
|
2
|
+
import { getRouteQueryString } from '@origen-ui/router'
|
|
2
3
|
import { ElAlert, ElButton, ElCard, ElForm, ElFormItem, ElInput } from 'element-plus'
|
|
3
4
|
import { reactive, shallowRef } from 'vue'
|
|
4
5
|
import { useI18n } from 'vue-i18n'
|
|
@@ -26,7 +27,7 @@ async function submit(): Promise<void> {
|
|
|
26
27
|
errorMessage.value = ''
|
|
27
28
|
try {
|
|
28
29
|
await auth.login(form)
|
|
29
|
-
const redirect =
|
|
30
|
+
const redirect = getRouteQueryString(route.query.redirect) ?? HOME_ROUTE
|
|
30
31
|
await router.push(redirect)
|
|
31
32
|
} catch (error: unknown) {
|
|
32
33
|
errorMessage.value = translateAdminError(error, {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { RouteRecordRaw } from 'vue-router'
|
|
2
2
|
import { gcm } from '@noble/ciphers/aes.js'
|
|
3
|
-
import { createRouterAdapter } from '@origen-ui/router'
|
|
3
|
+
import { createRouterAdapter, getRouteQueryString } from '@origen-ui/router'
|
|
4
4
|
import { describe, expect, it } from 'vitest'
|
|
5
5
|
import { defineComponent } from 'vue'
|
|
6
6
|
import { createMemoryHistory } from 'vue-router'
|
|
@@ -70,6 +70,15 @@ describe('route query encryption', () => {
|
|
|
70
70
|
expect(codec.parseQuery(`${encoded}&_q=${encodeURIComponent('v2.invalid.ciphertext')}`)).toEqual({})
|
|
71
71
|
})
|
|
72
72
|
|
|
73
|
+
it('normalizes encrypted single-value arrays without choosing duplicate values', () => {
|
|
74
|
+
const codec = createRouteQueryEncryption({ enabled: true, key })!
|
|
75
|
+
const single = codec.parseQuery(codec.stringifyQuery({ redirect: ['/dashboard'] }))
|
|
76
|
+
const duplicate = codec.parseQuery(codec.stringifyQuery({ redirect: ['/a', '/b'] }))
|
|
77
|
+
|
|
78
|
+
expect(getRouteQueryString(single.redirect)).toBe('/dashboard')
|
|
79
|
+
expect(getRouteQueryString(duplicate.redirect)).toBeUndefined()
|
|
80
|
+
})
|
|
81
|
+
|
|
73
82
|
it('rejects authenticated JSON values that are not a route query shape', () => {
|
|
74
83
|
const codec = createRouteQueryEncryption({ enabled: true, key })!
|
|
75
84
|
|
|
@@ -5,7 +5,8 @@ describe('route query helpers', () => {
|
|
|
5
5
|
it('accepts only supported status values', () => {
|
|
6
6
|
expect(routeStatus('active')).toBe('active')
|
|
7
7
|
expect(routeStatus('suspended')).toBe('suspended')
|
|
8
|
-
expect(routeStatus(['suspended'])).
|
|
8
|
+
expect(routeStatus(['suspended'])).toBe('suspended')
|
|
9
|
+
expect(routeStatus(['active', 'suspended'])).toBeUndefined()
|
|
9
10
|
expect(routeStatus('unknown')).toBeUndefined()
|
|
10
11
|
})
|
|
11
12
|
})
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { getRouteQueryString } from '@origen-ui/router'
|
|
2
|
+
|
|
1
3
|
export function routeStatus(value: unknown): 'active' | 'suspended' | undefined {
|
|
2
|
-
|
|
4
|
+
const normalized = getRouteQueryString(value)
|
|
5
|
+
return normalized === 'active' || normalized === 'suspended' ? normalized : undefined
|
|
3
6
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
22.23.2
|
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# @origen-ui/admin
|
|
2
2
|
|
|
3
|
+
## 1.0.7
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies
|
|
8
|
+
- Updated dependencies [98175de]
|
|
9
|
+
- Updated dependencies [fc5a6b3]
|
|
10
|
+
- @origen-ui/shared@2.0.2
|
|
11
|
+
- @origen-ui/permission@2.0.2
|
|
12
|
+
- @origen-ui/http@2.0.2
|
|
13
|
+
- @origen-ui/dialog@2.0.2
|
|
14
|
+
- @origen-ui/editor@2.0.2
|
|
15
|
+
- @origen-ui/upload@2.0.2
|
|
16
|
+
- @origen-ui/search@2.0.2
|
|
17
|
+
- @origen-ui/table@2.0.2
|
|
18
|
+
- @origen-ui/tabs@2.0.2
|
|
19
|
+
- @origen-ui/router@2.0.2
|
|
20
|
+
- @origen-ui/form@2.0.2
|
|
21
|
+
- @origen-ui/form-table@2.0.2
|
|
22
|
+
- @origen-ui/table-search@2.0.2
|
|
23
|
+
- origen-ui@2.0.2
|
|
24
|
+
|
|
3
25
|
## 1.0.6
|
|
4
26
|
|
|
5
27
|
### Patch Changes
|
|
@@ -13,7 +13,8 @@ Use `pnpm admin:dev` for normal development. Requests to `/api` are proxied to
|
|
|
13
13
|
|
|
14
14
|
Use `pnpm admin:demo` to run the Admin with its local, in-memory development
|
|
15
15
|
API. This mode does not proxy `/api`; it resets its seed data on every server
|
|
16
|
-
restart. Sign in with `admin` / `
|
|
16
|
+
restart. Sign in with `demo-admin` / `demo-password`. These credentials are
|
|
17
|
+
mock-only and must never be used in production.
|
|
17
18
|
|
|
18
19
|
`apps/admin` 是一个 Vue 3 + Pinia 生产管理后台。它只在应用层组合仓库现有的 `@origen-ui/router`、`@origen-ui/http`、独立 Pro 组件包、`origen-ui` 样式子路径与 Element Plus API,不修改任何 `packages/*` 源码。
|
|
19
20
|
|
|
@@ -54,15 +54,15 @@ test('admin demo logs in, registers remote routes, and persists mutations for th
|
|
|
54
54
|
request,
|
|
55
55
|
}) => {
|
|
56
56
|
const login = await demoRequest<DemoLogin>(request, 'POST', '/api/auth/login', undefined, {
|
|
57
|
-
username: 'admin',
|
|
58
|
-
password: '
|
|
57
|
+
username: 'demo-admin',
|
|
58
|
+
password: 'demo-password',
|
|
59
59
|
})
|
|
60
60
|
expect(login.permissions).toContain('system:user:write')
|
|
61
61
|
|
|
62
62
|
await page.goto('/login')
|
|
63
63
|
const loginInputs = page.locator('.login-page input')
|
|
64
|
-
await loginInputs.nth(0).fill('admin')
|
|
65
|
-
await loginInputs.nth(1).fill('
|
|
64
|
+
await loginInputs.nth(0).fill('demo-admin')
|
|
65
|
+
await loginInputs.nth(1).fill('demo-password')
|
|
66
66
|
await Promise.all([
|
|
67
67
|
page.waitForURL('**/dashboard'),
|
|
68
68
|
page.locator('button.login-card__submit').click(),
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@origen-ui/admin-scaffold",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.0.
|
|
4
|
+
"version": "2.0.2",
|
|
5
5
|
"private": true,
|
|
6
6
|
"engines": {
|
|
7
7
|
"node": ">=22.0.0"
|
|
@@ -27,39 +27,39 @@
|
|
|
27
27
|
"dependencies": {
|
|
28
28
|
"@element-plus/icons-vue": "2.3.2",
|
|
29
29
|
"@noble/ciphers": "2.3.0",
|
|
30
|
-
"@origen-ui/dialog": "2.0.
|
|
31
|
-
"@origen-ui/editor": "2.0.
|
|
32
|
-
"@origen-ui/form": "2.0.
|
|
33
|
-
"@origen-ui/form-table": "2.0.
|
|
34
|
-
"@origen-ui/http": "2.0.
|
|
35
|
-
"@origen-ui/permission": "2.0.
|
|
36
|
-
"@origen-ui/router": "2.0.
|
|
37
|
-
"@origen-ui/search": "2.0.
|
|
38
|
-
"@origen-ui/shared": "2.0.
|
|
39
|
-
"@origen-ui/table": "2.0.
|
|
40
|
-
"@origen-ui/table-search": "2.0.
|
|
41
|
-
"@origen-ui/tabs": "2.0.
|
|
42
|
-
"@origen-ui/upload": "2.0.
|
|
30
|
+
"@origen-ui/dialog": "2.0.2",
|
|
31
|
+
"@origen-ui/editor": "2.0.2",
|
|
32
|
+
"@origen-ui/form": "2.0.2",
|
|
33
|
+
"@origen-ui/form-table": "2.0.2",
|
|
34
|
+
"@origen-ui/http": "2.0.2",
|
|
35
|
+
"@origen-ui/permission": "2.0.2",
|
|
36
|
+
"@origen-ui/router": "2.0.2",
|
|
37
|
+
"@origen-ui/search": "2.0.2",
|
|
38
|
+
"@origen-ui/shared": "2.0.2",
|
|
39
|
+
"@origen-ui/table": "2.0.2",
|
|
40
|
+
"@origen-ui/table-search": "2.0.2",
|
|
41
|
+
"@origen-ui/tabs": "2.0.2",
|
|
42
|
+
"@origen-ui/upload": "2.0.2",
|
|
43
43
|
"@vue/devtools-api": "8.2.1",
|
|
44
44
|
"@vueuse/core": "15.0.0",
|
|
45
45
|
"axios": "1.20.0",
|
|
46
46
|
"element-plus": "2.14.7",
|
|
47
|
-
"origen-ui": "2.0.
|
|
48
|
-
"pinia": "4.0
|
|
47
|
+
"origen-ui": "2.0.2",
|
|
48
|
+
"pinia": "4.1.0",
|
|
49
49
|
"sortablejs": "1.15.7",
|
|
50
|
-
"vue": "3.5.
|
|
51
|
-
"vue-i18n": "11.4.
|
|
52
|
-
"vue-router": "5.
|
|
50
|
+
"vue": "3.5.44",
|
|
51
|
+
"vue-i18n": "11.4.16",
|
|
52
|
+
"vue-router": "5.4.0"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@origen-ui/admin-cli": "2.0.
|
|
55
|
+
"@origen-ui/admin-cli": "2.0.2",
|
|
56
56
|
"@playwright/test": "1.62.1",
|
|
57
57
|
"@types/node": "22.20.1",
|
|
58
58
|
"@vitejs/plugin-vue": "6.0.8",
|
|
59
59
|
"@vitejs/plugin-vue-jsx": "5.1.6",
|
|
60
60
|
"@vitest/coverage-v8": "4.1.11",
|
|
61
|
-
"@vue/compiler-sfc": "3.5.
|
|
62
|
-
"@vue/test-utils": "2.
|
|
61
|
+
"@vue/compiler-sfc": "3.5.44",
|
|
62
|
+
"@vue/test-utils": "2.5.1",
|
|
63
63
|
"jsdom": "30.0.1",
|
|
64
64
|
"sass": "1.103.0",
|
|
65
65
|
"swagger-typescript-api": "^13.12.6",
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
allowBuilds:
|
|
2
|
+
'@parcel/watcher': true
|
|
3
|
+
esbuild: true
|
|
4
|
+
msw: false
|
|
5
|
+
vue-demi: true
|
|
6
|
+
|
|
7
|
+
strictPeerDependencies: true
|
|
8
|
+
|
|
9
|
+
overrides:
|
|
10
|
+
# The npm braces line has no published fixed release; use the maintained patched fork.
|
|
11
|
+
braces: npm:@zklogic/braces@3.0.7
|
|
12
|
+
dompurify: 3.4.14
|
|
13
|
+
fast-uri: 3.1.5
|
|
14
|
+
js-yaml: 4.3.1
|
|
15
|
+
source-map-js: 1.2.2
|
|
16
|
+
unplugin-element-plus>@nuxt/kit: 4.4.2
|
|
17
|
+
vitepress>@vue/shared: 3.5.44
|
|
18
|
+
vitepress>vue: 3.5.44
|
|
@@ -6,7 +6,11 @@ import process from 'node:process'
|
|
|
6
6
|
import { parse } from '@vue/compiler-sfc'
|
|
7
7
|
import ts from 'typescript'
|
|
8
8
|
|
|
9
|
-
const
|
|
9
|
+
const rootFlagIndex = process.argv.indexOf('--root')
|
|
10
|
+
const root =
|
|
11
|
+
rootFlagIndex >= 0
|
|
12
|
+
? resolve(process.cwd(), process.argv[rootFlagIndex + 1] || '.')
|
|
13
|
+
: resolve(process.cwd())
|
|
10
14
|
const source = existsSync(join(root, 'apps', 'admin', 'scaffold', 'agent-contracts'))
|
|
11
15
|
? join(root, 'apps', 'admin', 'scaffold', 'agent-contracts')
|
|
12
16
|
: root
|
|
@@ -250,7 +250,7 @@ function initialState() {
|
|
|
250
250
|
const users: DemoUser[] = [
|
|
251
251
|
{
|
|
252
252
|
id: 'user-admin',
|
|
253
|
-
username: 'admin',
|
|
253
|
+
username: 'demo-admin',
|
|
254
254
|
name: 'Demo Administrator',
|
|
255
255
|
email: 'admin@example.test',
|
|
256
256
|
department: 'Platform',
|
|
@@ -477,7 +477,7 @@ export function createDemoApi(): DemoApi {
|
|
|
477
477
|
const body = asRecord(request.body)
|
|
478
478
|
|
|
479
479
|
if (method === 'POST' && path === '/auth/login') {
|
|
480
|
-
if (body.username !== 'admin' || body.password !== '
|
|
480
|
+
if (body.username !== 'demo-admin' || body.password !== 'demo-password')
|
|
481
481
|
return failure('Invalid demo credentials.', 40101)
|
|
482
482
|
return envelope({
|
|
483
483
|
accessToken: ADMIN_TOKEN,
|
|
@@ -485,7 +485,7 @@ export function createDemoApi(): DemoApi {
|
|
|
485
485
|
refreshToken: REFRESH_TOKEN,
|
|
486
486
|
user: {
|
|
487
487
|
id: 'user-admin',
|
|
488
|
-
username: 'admin',
|
|
488
|
+
username: 'demo-admin',
|
|
489
489
|
displayName: 'Demo Administrator',
|
|
490
490
|
email: 'admin@example.test',
|
|
491
491
|
},
|
|
@@ -503,7 +503,7 @@ export function createDemoApi(): DemoApi {
|
|
|
503
503
|
return envelope({
|
|
504
504
|
user: {
|
|
505
505
|
id: 'user-admin',
|
|
506
|
-
username: 'admin',
|
|
506
|
+
username: 'demo-admin',
|
|
507
507
|
displayName: 'Demo Administrator',
|
|
508
508
|
email: 'admin@example.test',
|
|
509
509
|
},
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { existsSync } from 'node:fs'
|
|
3
3
|
import { cp, rm } from 'node:fs/promises'
|
|
4
|
-
import {
|
|
4
|
+
import { resolve } from 'node:path'
|
|
5
5
|
import process from 'node:process'
|
|
6
|
-
import {
|
|
6
|
+
import { REPOSITORY_ROOT } from '../../lib/repository-root.mjs'
|
|
7
7
|
|
|
8
8
|
const args = new Set(process.argv.slice(2))
|
|
9
9
|
const rootIndex = process.argv.indexOf('--root')
|
|
10
10
|
const root = rootIndex >= 0 ? resolve(process.argv[rootIndex + 1] || '.') : process.cwd()
|
|
11
11
|
const dryRun = args.has('--dry-run')
|
|
12
12
|
const overlayIndex = process.argv.indexOf('--overlay')
|
|
13
|
+
const repositoryRoot = REPOSITORY_ROOT
|
|
13
14
|
const repositoryOverlay = resolve(
|
|
14
|
-
|
|
15
|
-
'..',
|
|
15
|
+
repositoryRoot,
|
|
16
16
|
'apps',
|
|
17
17
|
'admin',
|
|
18
18
|
'scaffold',
|
|
@@ -32,7 +32,7 @@ describe('admin demo API', () => {
|
|
|
32
32
|
api.handle({
|
|
33
33
|
method: 'POST',
|
|
34
34
|
path: '/api/auth/login',
|
|
35
|
-
body: { username: 'admin', password: 'wrong' },
|
|
35
|
+
body: { username: 'demo-admin', password: 'wrong' },
|
|
36
36
|
}).body,
|
|
37
37
|
).toMatchObject({ code: 40101, data: null })
|
|
38
38
|
const login = data<{
|
|
@@ -43,7 +43,7 @@ describe('admin demo API', () => {
|
|
|
43
43
|
api.handle({
|
|
44
44
|
method: 'POST',
|
|
45
45
|
path: '/auth/login',
|
|
46
|
-
body: { username: 'admin', password: '
|
|
46
|
+
body: { username: 'demo-admin', password: 'demo-password' },
|
|
47
47
|
}),
|
|
48
48
|
)
|
|
49
49
|
expect(login.accessToken).toBe('demo-admin-token')
|
|
@@ -52,7 +52,7 @@ describe('admin demo API', () => {
|
|
|
52
52
|
expect(api.handle({ method: 'GET', path: '/auth/profile' }).body.code).toBe(40101)
|
|
53
53
|
expect(
|
|
54
54
|
data<{ user: { username: string } }>(request(api, 'GET', '/auth/profile')).user.username,
|
|
55
|
-
).toBe('admin')
|
|
55
|
+
).toBe('demo-admin')
|
|
56
56
|
expect(
|
|
57
57
|
data<{ token: string }>(
|
|
58
58
|
api.handle({
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
<script setup lang="ts">
|
|
2
|
+
import { getRouteQueryString } from '@origen-ui/router'
|
|
2
3
|
import { ElAlert, ElButton, ElCard, ElForm, ElFormItem, ElInput } from 'element-plus'
|
|
3
4
|
import { reactive, shallowRef } from 'vue'
|
|
4
5
|
import { useI18n } from 'vue-i18n'
|
|
@@ -26,7 +27,7 @@ async function submit(): Promise<void> {
|
|
|
26
27
|
errorMessage.value = ''
|
|
27
28
|
try {
|
|
28
29
|
await auth.login(form)
|
|
29
|
-
const redirect =
|
|
30
|
+
const redirect = getRouteQueryString(route.query.redirect) ?? HOME_ROUTE
|
|
30
31
|
await router.push(redirect)
|
|
31
32
|
} catch (error: unknown) {
|
|
32
33
|
errorMessage.value = translateAdminError(error, {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { RouteRecordRaw } from 'vue-router'
|
|
2
2
|
import { gcm } from '@noble/ciphers/aes.js'
|
|
3
|
-
import { createRouterAdapter } from '@origen-ui/router'
|
|
3
|
+
import { createRouterAdapter, getRouteQueryString } from '@origen-ui/router'
|
|
4
4
|
import { describe, expect, it } from 'vitest'
|
|
5
5
|
import { defineComponent } from 'vue'
|
|
6
6
|
import { createMemoryHistory } from 'vue-router'
|
|
@@ -70,6 +70,15 @@ describe('route query encryption', () => {
|
|
|
70
70
|
expect(codec.parseQuery(`${encoded}&_q=${encodeURIComponent('v2.invalid.ciphertext')}`)).toEqual({})
|
|
71
71
|
})
|
|
72
72
|
|
|
73
|
+
it('normalizes encrypted single-value arrays without choosing duplicate values', () => {
|
|
74
|
+
const codec = createRouteQueryEncryption({ enabled: true, key })!
|
|
75
|
+
const single = codec.parseQuery(codec.stringifyQuery({ redirect: ['/dashboard'] }))
|
|
76
|
+
const duplicate = codec.parseQuery(codec.stringifyQuery({ redirect: ['/a', '/b'] }))
|
|
77
|
+
|
|
78
|
+
expect(getRouteQueryString(single.redirect)).toBe('/dashboard')
|
|
79
|
+
expect(getRouteQueryString(duplicate.redirect)).toBeUndefined()
|
|
80
|
+
})
|
|
81
|
+
|
|
73
82
|
it('rejects authenticated JSON values that are not a route query shape', () => {
|
|
74
83
|
const codec = createRouteQueryEncryption({ enabled: true, key })!
|
|
75
84
|
|
|
@@ -5,7 +5,8 @@ describe('route query helpers', () => {
|
|
|
5
5
|
it('accepts only supported status values', () => {
|
|
6
6
|
expect(routeStatus('active')).toBe('active')
|
|
7
7
|
expect(routeStatus('suspended')).toBe('suspended')
|
|
8
|
-
expect(routeStatus(['suspended'])).
|
|
8
|
+
expect(routeStatus(['suspended'])).toBe('suspended')
|
|
9
|
+
expect(routeStatus(['active', 'suspended'])).toBeUndefined()
|
|
9
10
|
expect(routeStatus('unknown')).toBeUndefined()
|
|
10
11
|
})
|
|
11
12
|
})
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { getRouteQueryString } from '@origen-ui/router'
|
|
2
|
+
|
|
1
3
|
export function routeStatus(value: unknown): 'active' | 'suspended' | undefined {
|
|
2
|
-
|
|
4
|
+
const normalized = getRouteQueryString(value)
|
|
5
|
+
return normalized === 'active' || normalized === 'suspended' ? normalized : undefined
|
|
3
6
|
}
|