openxiangda-cli 2.0.0-alpha.61 → 2.0.0-alpha.62
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/dist/create-workspace.d.ts.map +1 -1
- package/dist/create-workspace.js +1 -0
- package/dist/create-workspace.js.map +1 -1
- package/package.json +4 -4
- package/template/AGENTS.md +1 -1
- package/template/README.md +7 -7
- package/template/apps/server/package.json +1 -1
- package/template/apps/server/src/app.module.ts +1 -3
- package/template/apps/server/test/smoke.test.ts +6 -23
- package/template/apps/web/e2e/resources.spec.ts +20 -0
- package/template/apps/web/index.html +1 -1
- package/template/apps/web/package.json +1 -1
- package/template/apps/web/src/AuthoritativeSelector.tsx +38 -29
- package/template/apps/web/src/Shell.tsx +39 -211
- package/template/apps/web/src/components/platform-fields/AttachmentFileList.tsx +1 -1
- package/template/apps/web/src/components/resource/GeneratedResourceCrud.tsx +26 -5
- package/template/apps/web/src/components/resource/SurfaceFields.tsx +32 -1
- package/template/apps/web/src/data-provider.ts +23 -102
- package/template/apps/web/src/main.tsx +22 -82
- package/template/apps/web/src/platform-client.ts +71 -415
- package/template/apps/web/src/runtime-meta.ts +1 -1
- package/template/apps/web/src/styles.css +3 -3
- package/template/apps/web/test/contracts.test.ts +31 -769
- package/template/openxiangda.config.ts +14 -81
- package/template/package.json +3 -3
- package/template/packages/contracts/src/generated.ts +7 -804
- package/template/apps/server/src/instrument-context.controller.ts +0 -25
- package/template/apps/web/e2e/instruments.spec.ts +0 -1338
- package/template/apps/web/src/CollegePage.tsx +0 -181
- package/template/apps/web/src/InstrumentDetailPage.tsx +0 -176
- package/template/apps/web/src/InstrumentForm.tsx +0 -380
- package/template/apps/web/src/InstrumentFormPage.tsx +0 -82
- package/template/apps/web/src/InstrumentListPage.tsx +0 -457
- package/template/apps/web/src/fields.ts +0 -18
- package/template/apps/web/src/instrument.ts +0 -56
- package/template/platform/data/colleges.ts +0 -21
- package/template/platform/data/instrument-surface.ts +0 -125
- package/template/platform/data/instruments.ts +0 -83
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../src/create-workspace.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,sBAAsB,GAAG,SAAS,GAAG,SAAS,CAAC;AAE3D,MAAM,WAAW,uBAAuB;IACtC,aAAa,CAAC,EAAE,sBAAsB,CAAC;CACxC;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,oBAAoB;;;;;;;;
|
|
1
|
+
{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../src/create-workspace.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,sBAAsB,GAAG,SAAS,GAAG,SAAS,CAAC;AAE3D,MAAM,WAAW,uBAAuB;IACtC,aAAa,CAAC,EAAE,sBAAsB,CAAC;CACxC;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,oBAAoB;;;;;;;;GAmDhE;AAED,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,uBAA4B;;;;;eAoBtC"}
|
package/dist/create-workspace.js
CHANGED
|
@@ -31,6 +31,7 @@ export async function createWorkspace(input) {
|
|
|
31
31
|
["instrument-center", input.appCode],
|
|
32
32
|
["仪器资源管理", input.name],
|
|
33
33
|
["openxiangda-application", input.appCode],
|
|
34
|
+
["OpenXiangda 应用", input.name],
|
|
34
35
|
]);
|
|
35
36
|
normalizePublishedDependencies(target, resolveTemplateDependencyVersions(template));
|
|
36
37
|
const localSdkRoot = input.localSdkRoot
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-workspace.js","sourceRoot":"","sources":["../src/create-workspace.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"create-workspace.js","sourceRoot":"","sources":["../src/create-workspace.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "openxiangda-cli",
|
|
3
|
-
"version": "2.0.0-alpha.
|
|
3
|
+
"version": "2.0.0-alpha.62",
|
|
4
4
|
"description": "Thin application-level CLI for OpenXiangda 2.0.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -23,9 +23,9 @@
|
|
|
23
23
|
],
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@oclif/core": "4.13.3",
|
|
26
|
-
"openxiangda-contracts": "2.0.0-alpha.
|
|
27
|
-
"openxiangda-devkit-core": "2.0.0-alpha.
|
|
28
|
-
"openxiangda-mcp": "2.0.0-alpha.
|
|
26
|
+
"openxiangda-contracts": "2.0.0-alpha.30",
|
|
27
|
+
"openxiangda-devkit-core": "2.0.0-alpha.38",
|
|
28
|
+
"openxiangda-mcp": "2.0.0-alpha.38"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
31
|
"tsx": "4.23.12",
|
package/template/AGENTS.md
CHANGED
|
@@ -4,5 +4,5 @@
|
|
|
4
4
|
- Keep CRUD in the replaceable browser Data API adapter under `/service`.
|
|
5
5
|
- Put only real transactional or integration actions in Nest under `/api`.
|
|
6
6
|
- Read current-user role/capability unions from the platform. UI guards are presentation only; server authorization is authoritative.
|
|
7
|
-
-
|
|
7
|
+
- Use the declared `reference` mapping for members, departments, and related resources; persist stable IDs, not display labels.
|
|
8
8
|
- Run `openxiangda check` before delivery.
|
package/template/README.md
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
# OpenXiangda 2.0
|
|
1
|
+
# OpenXiangda 2.0 应用模板
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
这是干净的资源 CRUD 模板:Vite + React Router + Refine Core + Ant Design 前端、NestJS 平台启动层,以及平台 Data/AuthZ 声明。
|
|
4
4
|
|
|
5
5
|
```bash
|
|
6
6
|
openxiangda login --base-url https://platform.example.com
|
|
7
|
-
openxiangda create
|
|
8
|
-
cd
|
|
7
|
+
openxiangda create visitor-reservations
|
|
8
|
+
cd visitor-reservations
|
|
9
9
|
openxiangda dev
|
|
10
10
|
```
|
|
11
11
|
|
|
12
|
-
`
|
|
12
|
+
在 `platform/data` 中声明 `DataResource` 和字段即可生成标准后台列表、筛选、表单、详情、审计、文件上传和独立移动端页面。成员、部门和资源关系分别使用 `reference: { kind: 'directory-user' }`、`directory-department`、`resource`,只保存稳定 ID,不复制目录数据。
|
|
13
13
|
|
|
14
|
-
所有 CRUD 位于 `apps/web/src/platform-client.ts` 的 Data API adapter;Nest
|
|
14
|
+
所有 CRUD 位于 `apps/web/src/platform-client.ts` 的 Data API adapter;Nest 只在需要复杂事务或外部集成时增加 App API。选择器显式携带当前环境、使用同源 Cookie,浏览器不读取 Token,也不发送 RoleSession header。
|
|
15
15
|
|
|
16
16
|
前端读取平台 current-user 的角色/能力并集进行展示保护,服务端始终权威。字段策略区分 create/update;无权字段在提交前从 payload 删除。
|
|
17
17
|
|
|
@@ -22,4 +22,4 @@ openxiangda status
|
|
|
22
22
|
openxiangda logs
|
|
23
23
|
```
|
|
24
24
|
|
|
25
|
-
`deploy` 使用本模板的 `apps/server/Dockerfile` 自动构建并推送 `linux/amd64` 镜像,再把不可变 digest 写入 AppPackage
|
|
25
|
+
`deploy` 使用本模板的 `apps/server/Dockerfile` 自动构建并推送 `linux/amd64` 镜像,再把不可变 digest 写入 AppPackage。纯 CRUD 应用可以保持 backend disabled;复杂事务再启用 Nest。
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { Module } from '@nestjs/common';
|
|
2
2
|
import { OpenXiangdaModule } from 'openxiangda-nest';
|
|
3
|
-
import { InstrumentContextController } from './instrument-context.controller.js';
|
|
4
3
|
|
|
5
4
|
@Module({
|
|
6
5
|
imports: [
|
|
7
6
|
OpenXiangdaModule.forRoot({
|
|
8
|
-
appCode: process.env.OPENXIANGDA_APP_CODE || '
|
|
7
|
+
appCode: process.env.OPENXIANGDA_APP_CODE || 'openxiangda-application',
|
|
9
8
|
platformBaseUrl:
|
|
10
9
|
process.env.OPENXIANGDA_PLATFORM_BASE_URL ||
|
|
11
10
|
'http://127.0.0.1:7001/service',
|
|
@@ -27,6 +26,5 @@ import { InstrumentContextController } from './instrument-context.controller.js'
|
|
|
27
26
|
process.env.OPENXIANGDA_CONNECTED_DEV === 'true',
|
|
28
27
|
}),
|
|
29
28
|
],
|
|
30
|
-
controllers: [InstrumentContextController],
|
|
31
29
|
})
|
|
32
30
|
export class AppModule {}
|
|
@@ -1,28 +1,11 @@
|
|
|
1
1
|
import assert from 'node:assert/strict';
|
|
2
2
|
import { readFileSync } from 'node:fs';
|
|
3
3
|
import test from 'node:test';
|
|
4
|
-
import { InstrumentContextController } from '../src/instrument-context.controller.js';
|
|
5
4
|
|
|
6
|
-
test('the
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
isAppSuperAdmin: false,
|
|
13
|
-
capabilityCodes: ['app:instrument-center:data:instruments:read'],
|
|
14
|
-
});
|
|
15
|
-
assert.deepEqual(result.roleCodes, ['college_admin', 'instrument_admin']);
|
|
16
|
-
assert.equal(result.userId, 'user-1');
|
|
17
|
-
});
|
|
18
|
-
|
|
19
|
-
test('the server template owns no CRUD, event, OAuth, or secret implementation', () => {
|
|
20
|
-
const moduleSource = readFileSync(new URL('../src/app.module.ts', import.meta.url), 'utf8');
|
|
21
|
-
const controllerSource = readFileSync(
|
|
22
|
-
new URL('../src/instrument-context.controller.ts', import.meta.url),
|
|
23
|
-
'utf8'
|
|
24
|
-
);
|
|
25
|
-
assert.match(controllerSource, /@CurrentUser\(\)/);
|
|
26
|
-
assert.doesNotMatch(moduleSource + controllerSource, /oauthClient|eventSigning|RuntimeSecrets|Purchase|Workflow/);
|
|
27
|
-
assert.doesNotMatch(controllerSource, /createData|updateData|deleteData|queryData/);
|
|
5
|
+
test('the clean server template only owns platform bootstrap', () => {
|
|
6
|
+
const source = readFileSync(new URL('../src/app.module.ts', import.meta.url), 'utf8');
|
|
7
|
+
assert.match(source, /OpenXiangdaModule\.forRoot/);
|
|
8
|
+
const legacyMarkers = ['oauth' + 'Client', 'event' + 'Signing', 'Workflow', 'instrument' + '-context'];
|
|
9
|
+
assert.doesNotMatch(source, new RegExp(legacyMarkers.join('|')));
|
|
10
|
+
assert.doesNotMatch(source, /createData|updateData|deleteData|queryData/);
|
|
28
11
|
});
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { expect, test } from '@playwright/test';
|
|
2
|
+
|
|
3
|
+
test('clean scaffold renders the shared shell without business fixtures', async ({ page }) => {
|
|
4
|
+
await page.route('**/view/clean-app/**', async route => {
|
|
5
|
+
if (route.request().resourceType() !== 'document') return route.continue();
|
|
6
|
+
const response = await route.fetch();
|
|
7
|
+
const body = (await response.text()).replace('<head>', '<head><meta name="openxiangda-runtime-base" content="/view/clean-app/" /><meta name="openxiangda-app-code" content="clean-app" /><meta name="openxiangda-environment" content="preproduction" />');
|
|
8
|
+
await route.fulfill({ response, body });
|
|
9
|
+
});
|
|
10
|
+
await page.route('**/service/**', async route => {
|
|
11
|
+
const url = new URL(route.request().url());
|
|
12
|
+
if (url.pathname.endsWith('/native/current-user')) {
|
|
13
|
+
return route.fulfill({ contentType: 'application/json', body: JSON.stringify({ code: 200, data: { schemaVersion: 'openxiangda.current-user/v2', appCode: 'clean-app', environment: { id: 'preproduction-id', key: 'preproduction', activeAppVersionId: 'app-version-1', headRevision: 1, authzRevisionId: 'authz-1', authzVersion: 1, scopeDataVersion: 'scope-1' }, principal: { type: 'user', userId: 'user-1', roleCodes: [], capabilityCodes: [], isAppSuperAdmin: false } } }) });
|
|
14
|
+
}
|
|
15
|
+
return route.fulfill({ status: 404, contentType: 'application/json', body: JSON.stringify({ code: 404, message: 'not mocked' }) });
|
|
16
|
+
});
|
|
17
|
+
await page.goto('/view/clean-app/');
|
|
18
|
+
await expect(page.getByText('还没有声明数据资源')).toBeVisible();
|
|
19
|
+
await expect(page.getByText('仪器' + '资源管理')).toHaveCount(0);
|
|
20
|
+
});
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import {
|
|
2
2
|
ApartmentOutlined,
|
|
3
|
-
|
|
3
|
+
DatabaseOutlined,
|
|
4
4
|
UserOutlined,
|
|
5
5
|
} from '@ant-design/icons';
|
|
6
6
|
import { Avatar, Select, Space, Spin, Tag, Typography } from 'antd';
|
|
7
7
|
import { useEffect, useMemo, useRef, useState } from 'react';
|
|
8
8
|
import {
|
|
9
|
-
resolveCollegeScope,
|
|
10
9
|
resolveDirectory,
|
|
11
|
-
|
|
10
|
+
resolveResource,
|
|
12
11
|
searchDirectory,
|
|
12
|
+
searchResource,
|
|
13
13
|
type DirectoryKind,
|
|
14
14
|
} from './platform-client';
|
|
15
15
|
|
|
16
|
-
type Source = DirectoryKind | '
|
|
16
|
+
type Source = DirectoryKind | 'resource';
|
|
17
17
|
type Option = {
|
|
18
18
|
value: string;
|
|
19
19
|
label: string;
|
|
@@ -55,14 +55,14 @@ async function searchSource(
|
|
|
55
55
|
source: Source,
|
|
56
56
|
operation: 'create' | 'update',
|
|
57
57
|
keyword: string,
|
|
58
|
-
cursor?: string
|
|
58
|
+
cursor?: string,
|
|
59
|
+
resourceCode?: string,
|
|
60
|
+
labelField?: string,
|
|
59
61
|
) {
|
|
60
|
-
if (source === '
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
nextCursor: page.nextCursor,
|
|
65
|
-
};
|
|
62
|
+
if (source === 'resource') {
|
|
63
|
+
if (!resourceCode || !labelField) throw new Error('OPENXIANGDA_RESOURCE_REFERENCE_CONFIG_INVALID');
|
|
64
|
+
const page = await searchResource(resourceCode, labelField, { keyword, cursor });
|
|
65
|
+
return { items: page.items.map(item => ({ ...item, value: item.id, source }) as Option), nextCursor: page.nextCursor };
|
|
66
66
|
}
|
|
67
67
|
const page = await searchDirectory(source, { keyword, cursor });
|
|
68
68
|
return {
|
|
@@ -74,12 +74,13 @@ async function searchSource(
|
|
|
74
74
|
async function resolveSource(
|
|
75
75
|
source: Source,
|
|
76
76
|
operation: 'create' | 'update',
|
|
77
|
-
values: string[]
|
|
77
|
+
values: string[],
|
|
78
|
+
resourceCode?: string,
|
|
79
|
+
labelField?: string,
|
|
78
80
|
) {
|
|
79
|
-
if (source === '
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
);
|
|
81
|
+
if (source === 'resource') {
|
|
82
|
+
if (!resourceCode || !labelField) throw new Error('OPENXIANGDA_RESOURCE_REFERENCE_CONFIG_INVALID');
|
|
83
|
+
return (await resolveResource(resourceCode, values, labelField)).items.map(item => ({ ...item, value: item.id, source }) as Option);
|
|
83
84
|
}
|
|
84
85
|
return (await resolveDirectory(source, values)).items.map(item =>
|
|
85
86
|
directoryOption(source, item)
|
|
@@ -94,8 +95,8 @@ function optionIcon(option: Pick<Option, 'source' | 'label'>) {
|
|
|
94
95
|
</Avatar>
|
|
95
96
|
);
|
|
96
97
|
}
|
|
97
|
-
return option.source === '
|
|
98
|
-
<
|
|
98
|
+
return option.source === 'resource' ? (
|
|
99
|
+
<DatabaseOutlined className="oxa-selector-icon" />
|
|
99
100
|
) : (
|
|
100
101
|
<ApartmentOutlined className="oxa-selector-icon" />
|
|
101
102
|
);
|
|
@@ -115,6 +116,8 @@ export function AuthoritativeSelector({
|
|
|
115
116
|
disabled = false,
|
|
116
117
|
id,
|
|
117
118
|
placeholder,
|
|
119
|
+
resourceCode,
|
|
120
|
+
labelField,
|
|
118
121
|
}: {
|
|
119
122
|
value?: string | string[];
|
|
120
123
|
onChange?: (value: string | string[] | undefined) => void;
|
|
@@ -124,6 +127,8 @@ export function AuthoritativeSelector({
|
|
|
124
127
|
disabled?: boolean;
|
|
125
128
|
id?: string;
|
|
126
129
|
placeholder: string;
|
|
130
|
+
resourceCode?: string;
|
|
131
|
+
labelField?: string;
|
|
127
132
|
}) {
|
|
128
133
|
const [options, setOptions] = useState<Option[]>([]);
|
|
129
134
|
const [keyword, setKeyword] = useState('');
|
|
@@ -144,7 +149,7 @@ export function AuthoritativeSelector({
|
|
|
144
149
|
if (missing.length === 0) return;
|
|
145
150
|
let active = true;
|
|
146
151
|
setLoading(true);
|
|
147
|
-
void resolveSource(source, operation, missing)
|
|
152
|
+
void resolveSource(source, operation, missing, resourceCode, labelField)
|
|
148
153
|
.then(items => {
|
|
149
154
|
if (active) setOptions(current => mergeOptions(current, items));
|
|
150
155
|
})
|
|
@@ -158,11 +163,11 @@ export function AuthoritativeSelector({
|
|
|
158
163
|
return () => {
|
|
159
164
|
active = false;
|
|
160
165
|
};
|
|
161
|
-
}, [operation, options, source, values]);
|
|
166
|
+
}, [labelField, operation, options, resourceCode, source, values]);
|
|
162
167
|
|
|
163
168
|
useEffect(() => {
|
|
164
169
|
if (disabled) return;
|
|
165
|
-
if (
|
|
170
|
+
if (keyword.trim().length < 2) {
|
|
166
171
|
setCursor(null);
|
|
167
172
|
return;
|
|
168
173
|
}
|
|
@@ -170,7 +175,7 @@ export function AuthoritativeSelector({
|
|
|
170
175
|
const timer = window.setTimeout(() => {
|
|
171
176
|
setLoading(true);
|
|
172
177
|
setError('');
|
|
173
|
-
void searchSource(source, operation, keyword)
|
|
178
|
+
void searchSource(source, operation, keyword, undefined, resourceCode, labelField)
|
|
174
179
|
.then(page => {
|
|
175
180
|
if (sequence !== requestSequence.current) return;
|
|
176
181
|
setOptions(current => {
|
|
@@ -192,14 +197,14 @@ export function AuthoritativeSelector({
|
|
|
192
197
|
});
|
|
193
198
|
}, 300);
|
|
194
199
|
return () => window.clearTimeout(timer);
|
|
195
|
-
}, [disabled, keyword, operation, source, values]);
|
|
200
|
+
}, [disabled, keyword, labelField, operation, resourceCode, source, values]);
|
|
196
201
|
|
|
197
202
|
const loadNext = () => {
|
|
198
203
|
if (!cursor || loading) return;
|
|
199
204
|
const nextCursor = cursor;
|
|
200
205
|
setLoading(true);
|
|
201
206
|
setError('');
|
|
202
|
-
void searchSource(source, operation, keyword, nextCursor)
|
|
207
|
+
void searchSource(source, operation, keyword, nextCursor, resourceCode, labelField)
|
|
203
208
|
.then(page => {
|
|
204
209
|
setOptions(current => mergeOptions(current, page.items));
|
|
205
210
|
setCursor(page.nextCursor);
|
|
@@ -230,7 +235,7 @@ export function AuthoritativeSelector({
|
|
|
230
235
|
<Spin size="small" />
|
|
231
236
|
) : error ? (
|
|
232
237
|
<Typography.Text type="danger">{error}</Typography.Text>
|
|
233
|
-
) :
|
|
238
|
+
) : keyword.trim().length < 2 ? (
|
|
234
239
|
'请输入至少 2 个字符'
|
|
235
240
|
) : (
|
|
236
241
|
'无可选数据'
|
|
@@ -275,8 +280,8 @@ export function AuthoritativeSelector({
|
|
|
275
280
|
prefix={
|
|
276
281
|
source === 'user' ? (
|
|
277
282
|
<UserOutlined />
|
|
278
|
-
) : source === '
|
|
279
|
-
<
|
|
283
|
+
) : source === 'resource' ? (
|
|
284
|
+
<DatabaseOutlined />
|
|
280
285
|
) : (
|
|
281
286
|
<ApartmentOutlined />
|
|
282
287
|
)
|
|
@@ -317,9 +322,13 @@ export function AuthoritativeSelector({
|
|
|
317
322
|
export function ResolvedValueText({
|
|
318
323
|
source,
|
|
319
324
|
value,
|
|
325
|
+
resourceCode,
|
|
326
|
+
labelField,
|
|
320
327
|
}: {
|
|
321
328
|
source: Source;
|
|
322
329
|
value?: string | string[];
|
|
330
|
+
resourceCode?: string;
|
|
331
|
+
labelField?: string;
|
|
323
332
|
}) {
|
|
324
333
|
const values = useMemo(
|
|
325
334
|
() => (Array.isArray(value) ? value : value ? [value] : []),
|
|
@@ -334,7 +343,7 @@ export function ResolvedValueText({
|
|
|
334
343
|
}
|
|
335
344
|
let active = true;
|
|
336
345
|
setFailed(false);
|
|
337
|
-
void resolveSource(source, 'update', values)
|
|
346
|
+
void resolveSource(source, 'update', values, resourceCode, labelField)
|
|
338
347
|
.then(next => {
|
|
339
348
|
if (active) setItems(next);
|
|
340
349
|
})
|
|
@@ -344,7 +353,7 @@ export function ResolvedValueText({
|
|
|
344
353
|
return () => {
|
|
345
354
|
active = false;
|
|
346
355
|
};
|
|
347
|
-
}, [source, values]);
|
|
356
|
+
}, [labelField, resourceCode, source, values]);
|
|
348
357
|
if (values.length === 0) return <>-</>;
|
|
349
358
|
if (failed) return <Typography.Text type="danger">目录解析失败</Typography.Text>;
|
|
350
359
|
if (!items.length) return <>读取中…</>;
|