diff --git a/src/amis/registerUserTransferPicker.test.ts b/src/amis/registerUserTransferPicker.test.ts index b2c6153..33f5550 100644 --- a/src/amis/registerUserTransferPicker.test.ts +++ b/src/amis/registerUserTransferPicker.test.ts @@ -1,5 +1,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { registerUserTransferPicker, __resetUserTransferPickerForTest } from './registerUserTransferPicker'; +import { + normalizeUserTransferSchemaTree, + registerUserTransferPicker, + __resetUserTransferPickerForTest, +} from './registerUserTransferPicker'; import { UserTransferPicker } from '../components/UserTransferPicker'; describe('registerUserTransferPicker', () => { @@ -28,6 +32,26 @@ describe('registerUserTransferPicker', () => { }); }); + it('注册 schema filter,把老 schema 的 mode 改成 userSelectMode,避免破坏表单布局', () => { + let filter: ((schema: Record) => Record) | null = null; + const addSchemaFilter = vi.fn((fn) => { + filter = fn; + }); + const registerFormItem = vi.fn(); + + expect(registerUserTransferPicker({ addSchemaFilter, registerFormItem })).toBe(true); + expect(addSchemaFilter).toHaveBeenCalledTimes(1); + expect(filter).not.toBeNull(); + + const normalized = filter!({ type: 'user-transfer-picker', mode: 'controlled', name: 'AGENT' }); + expect(normalized).toEqual({ + type: 'user-transfer-picker', + userSelectMode: 'controlled', + name: 'AGENT', + }); + expect(filter!({ type: 'select', mode: 'multiple' })).toEqual({ type: 'select', mode: 'multiple' }); + }); + it('没有 registerFormItem 时退回 renderer 注册(幂等)', () => { const registerRenderer = vi.fn(); @@ -44,4 +68,34 @@ describe('registerUserTransferPicker', () => { expect(registerUserTransferPicker({ registerRenderer })).toBe(true); expect(registerRenderer).toHaveBeenCalledTimes(1); }); + + it('renderer 已注册后仍允许补注册 schema filter', () => { + const registerFormItem = vi.fn(); + const addSchemaFilter = vi.fn(); + + expect(registerUserTransferPicker({ registerFormItem })).toBe(true); + expect(registerFormItem).toHaveBeenCalledTimes(1); + + expect(registerUserTransferPicker({ addSchemaFilter, registerFormItem })).toBe(true); + expect(registerFormItem).toHaveBeenCalledTimes(1); + expect(addSchemaFilter).toHaveBeenCalledTimes(1); + }); + + it('递归规范化页面 schema 中的老 user-transfer-picker mode', () => { + const schema = { + type: 'page', + body: [ + { type: 'select', mode: 'multiple', name: 'OTHER' }, + { type: 'user-transfer-picker', mode: 'controlled', name: 'AGENT' }, + ], + }; + + expect(normalizeUserTransferSchemaTree(schema)).toEqual({ + type: 'page', + body: [ + { type: 'select', mode: 'multiple', name: 'OTHER' }, + { type: 'user-transfer-picker', userSelectMode: 'controlled', name: 'AGENT' }, + ], + }); + }); }); diff --git a/src/amis/registerUserTransferPicker.ts b/src/amis/registerUserTransferPicker.ts index 0eea2b7..2b2a771 100644 --- a/src/amis/registerUserTransferPicker.ts +++ b/src/amis/registerUserTransferPicker.ts @@ -3,25 +3,69 @@ import { UserTransferPicker } from '../components/UserTransferPicker'; type AmisRendererRegistry = { registerRenderer?: (config: Record) => unknown; registerFormItem?: (config: Record) => unknown; + addSchemaFilter?: (filter: (schema: Record) => Record) => unknown; getRendererByName?: (name: string) => unknown; }; -let registered = false; +let rendererRegistered = false; +let schemaFilterRegistered = false; + +const USER_SELECT_MODES = new Set(['controlled', 'all', 'org', 'attendance']); + +export function normalizeUserTransferSchema(schema: Record): Record { + if (schema?.type !== 'user-transfer-picker') return schema; + const mode = typeof schema.mode === 'string' ? schema.mode : ''; + if (!USER_SELECT_MODES.has(mode)) return schema; + const next = { ...schema }; + next.userSelectMode = next.userSelectMode ?? mode; + delete next.mode; + return next; +} + +export function normalizeUserTransferSchemaTree(node: T): T { + if (Array.isArray(node)) { + let changed = false; + const next = node.map((item) => { + const normalized = normalizeUserTransferSchemaTree(item); + changed ||= normalized !== item; + return normalized; + }); + return (changed ? next : node) as T; + } + if (!node || typeof node !== 'object') return node; + + const objectNode = node as Record; + let changed = false; + const next: Record = {}; + for (const [key, value] of Object.entries(objectNode)) { + const normalized = normalizeUserTransferSchemaTree(value); + next[key] = normalized; + changed ||= normalized !== value; + } + const normalizedObject = normalizeUserTransferSchema(next); + changed ||= normalizedObject !== next; + return (changed ? normalizedObject : node) as T; +} export function registerUserTransferPicker(amisCore: AmisRendererRegistry | undefined | null): boolean { - if (registered) return true; if (!amisCore) return false; + if (!schemaFilterRegistered && typeof amisCore.addSchemaFilter === 'function') { + amisCore.addSchemaFilter(normalizeUserTransferSchema); + schemaFilterRegistered = true; + } + + if (rendererRegistered) return true; + if (typeof amisCore.registerFormItem === 'function') { amisCore.registerFormItem({ type: 'user-transfer-picker', name: 'user-transfer-picker', component: UserTransferPicker, - renderLabel: false, strictMode: false, override: true, }); - registered = true; + rendererRegistered = true; return true; } @@ -33,10 +77,11 @@ export function registerUserTransferPicker(amisCore: AmisRendererRegistry | unde component: UserTransferPicker, override: true, }); - registered = true; + rendererRegistered = true; return true; } export function __resetUserTransferPickerForTest(): void { - registered = false; + rendererRegistered = false; + schemaFilterRegistered = false; } diff --git a/src/components/AmisRenderer.tsx b/src/components/AmisRenderer.tsx index ef52291..a35582f 100644 --- a/src/components/AmisRenderer.tsx +++ b/src/components/AmisRenderer.tsx @@ -14,7 +14,7 @@ import { http } from '../api/http'; import { APPROVAL_COMPLETED_EVENT } from '../amis/approvalActionEvents'; import { registerApprovalAction } from '../amis/registerApprovalAction'; import { registerReplayAction } from '../amis/registerReplayAction'; -import { registerUserTransferPicker } from '../amis/registerUserTransferPicker'; +import { normalizeUserTransferSchemaTree, registerUserTransferPicker } from '../amis/registerUserTransferPicker'; import { getProfile } from '../auth/token'; interface AmisRendererProps { @@ -31,6 +31,34 @@ interface AmisFetcherOptions { config?: Record; } +function isRecord(value: unknown): value is Record { + return !!value && typeof value === 'object' && !Array.isArray(value); +} + +function looksLikeSchemaPayload(value: unknown, depth = 0): boolean { + if (!isRecord(value) || depth > 4) return false; + if (typeof value.type === 'string') return true; + if ( + 'schema' in value + || 'schemaApi' in value + || 'body' in value + || 'dialog' in value + || 'actions' in value + ) { + return true; + } + return looksLikeSchemaPayload(value.data, depth + 1); +} + +function normalizeFetcherResponse(response: T): T { + if (!isRecord(response) || !('data' in response) || !looksLikeSchemaPayload(response.data)) { + return response; + } + const normalizedData = normalizeUserTransferSchemaTree(response.data); + if (normalizedData === response.data) return response; + return { ...response, data: normalizedData }; +} + export function AmisRenderer({ schema }: AmisRendererProps) { const rootRef = useRef(null); const instanceRef = useRef<{ unmount?: () => void } | null>(null); @@ -60,7 +88,7 @@ export function AmisRenderer({ schema }: AmisRendererProps) { // amis-core 未暴露 registerAction 时静默降级(审批抽屉入口不可用,不阻断渲染) } try { - registerUserTransferPicker(amisRequire('amis-core')) || registerUserTransferPicker(amisRequire('amis')); + registerUserTransferPicker(amisRequire('amis')) || registerUserTransferPicker(amisRequire('amis-core')); } catch { // amis-core 未暴露 registerRenderer 时静默降级,schema 会显示未知控件,测试会覆盖该问题。 } @@ -69,10 +97,10 @@ export function AmisRenderer({ schema }: AmisRendererProps) { const fetcher = (options: AmisFetcherOptions) => { const { url, method = 'get', data, responseType } = options; const m = method.toLowerCase(); - if (m === 'get') { - return http.get(url, { responseType: responseType as never }); - } - return http.request({ url, method: m as never, data, responseType: responseType as never }); + const request = m === 'get' + ? http.get(url, { responseType: responseType as never }) + : http.request({ url, method: m as never, data, responseType: responseType as never }); + return request.then(normalizeFetcherResponse); }; // F2-9:注入当前用户 org 到 amis 数据域,供 select-tree source 中 ${orgId} 使用。 @@ -93,9 +121,10 @@ export function AmisRenderer({ schema }: AmisRendererProps) { // currentProject 当前 profile 无此字段(会话级概念),注入空串使 ${currentProject} 求值为空而非裸 token amisProps.currentProject = ''; + const normalizedSchema = normalizeUserTransferSchemaTree(schema); const instance = amis.embed( rootRef.current, - schema, + normalizedSchema, amisProps, { fetcher, diff --git a/src/components/UserTransferPicker.tsx b/src/components/UserTransferPicker.tsx index 7d3422e..c14ad65 100644 --- a/src/components/UserTransferPicker.tsx +++ b/src/components/UserTransferPicker.tsx @@ -38,13 +38,13 @@ type UserTransferPickerProps = { data?: Record; name?: string; label?: string | false; - required?: boolean; className?: string; style?: CSSProperties; onChange?: (value: string | string[] | undefined) => void; multiple?: boolean; delimiter?: string; mode?: string; + userSelectMode?: string; disabled?: boolean; readOnly?: boolean; placeholder?: string; @@ -217,7 +217,7 @@ export class UserTransferPicker extends Component item.label).join(', '); - const fieldClassName = [ - className, - 'eip4-user-transfer-field', - ].filter(Boolean).join(' '); const controlClassName = [ + className, 'eip4-user-transfer-control', disabled || readOnly ? 'is-disabled' : '', labels.length ? '' : 'is-empty', @@ -477,28 +472,21 @@ export class UserTransferPicker extends Component -
- {label !== false && label ? ( - +
+ {displayText} + {clearable && labels.length > 0 && !disabled && !readOnly ? ( + ) : null} -
- {displayText} - {clearable && labels.length > 0 && !disabled && !readOnly ? ( - - ) : null} -
+
{open ? ( diff --git a/src/shell/amis-theme.css b/src/shell/amis-theme.css index 07f33ad..154fb91 100644 --- a/src/shell/amis-theme.css +++ b/src/shell/amis-theme.css @@ -454,29 +454,6 @@ 15. 旧 UserSelectWindow 等价选人弹窗 左侧分组 + 双列穿梭 + 右侧已选过滤,替代普通 tabs-transfer-picker 的树选择误差。 ============================================================================ */ -.eip4-user-transfer-field { - width: 100%; - min-width: 0; - display: grid; - grid-template-columns: 76px minmax(0, 1fr); - align-items: center; - gap: 12px; -} - -.eip4-user-transfer-label { - min-width: 0; - color: #344054; - font-size: 14px; - line-height: 32px; - text-align: right; - white-space: nowrap; -} - -.eip4-user-transfer-star { - color: #e5484d; - margin-left: 2px; -} - .eip4-user-transfer-control { width: 100%; box-sizing: border-box; @@ -755,7 +732,7 @@ 后隐藏 *;编辑态必填项 value 含 input/textarea/Select → 不命中,* 照常显示。 (实测查看 5★全隐、修改 5★全显。) ============================================================================ */ -.amis-scope .cxd-Form-item.is-required:not(:has(.cxd-Form-value input, .cxd-Form-value textarea, .cxd-Form-value .cxd-Select)) .cxd-Form-star { +.amis-scope .cxd-Form-item.is-required:not(:has(.cxd-Form-value input, .cxd-Form-value textarea, .cxd-Form-value .cxd-Select, .cxd-Form-value .eip4-user-transfer-control)) .cxd-Form-star { display: none; }