From 9e5ece3640e02d8f08e3353921aaeb613d32c7fb Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 22:46:43 +0800 Subject: [PATCH] fix(web): preserve user transfer form labels --- src/amis/registerUserTransferPicker.test.ts | 47 ++++++++++++++++++ src/amis/registerUserTransferPicker.ts | 15 +++++- src/components/UserTransferPicker.tsx | 28 ++++++++--- src/shell/amis-theme.css | 53 +++++++++++++++++++-- 4 files changed, 131 insertions(+), 12 deletions(-) create mode 100644 src/amis/registerUserTransferPicker.test.ts diff --git a/src/amis/registerUserTransferPicker.test.ts b/src/amis/registerUserTransferPicker.test.ts new file mode 100644 index 0000000..b2c6153 --- /dev/null +++ b/src/amis/registerUserTransferPicker.test.ts @@ -0,0 +1,47 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest'; +import { registerUserTransferPicker, __resetUserTransferPickerForTest } from './registerUserTransferPicker'; +import { UserTransferPicker } from '../components/UserTransferPicker'; + +describe('registerUserTransferPicker', () => { + beforeEach(() => { + __resetUserTransferPickerForTest(); + }); + + it('amis-core 缺注册能力时返回 false(静默降级)', () => { + expect(registerUserTransferPicker(null)).toBe(false); + expect(registerUserTransferPicker({})).toBe(false); + }); + + it('优先按 FormItem 注册,保留 label 和表单值绑定', () => { + const registerFormItem = vi.fn(); + const registerRenderer = vi.fn(); + + expect(registerUserTransferPicker({ registerFormItem, registerRenderer })).toBe(true); + expect(registerFormItem).toHaveBeenCalledTimes(1); + expect(registerRenderer).not.toHaveBeenCalled(); + expect(registerFormItem.mock.calls[0][0]).toMatchObject({ + type: 'user-transfer-picker', + name: 'user-transfer-picker', + component: UserTransferPicker, + strictMode: false, + override: true, + }); + }); + + it('没有 registerFormItem 时退回 renderer 注册(幂等)', () => { + const registerRenderer = vi.fn(); + + expect(registerUserTransferPicker({ registerRenderer })).toBe(true); + expect(registerRenderer).toHaveBeenCalledTimes(1); + expect(registerRenderer.mock.calls[0][0]).toMatchObject({ + type: 'user-transfer-picker', + name: 'user-transfer-picker', + component: UserTransferPicker, + isFormItem: true, + override: true, + }); + + expect(registerUserTransferPicker({ registerRenderer })).toBe(true); + expect(registerRenderer).toHaveBeenCalledTimes(1); + }); +}); diff --git a/src/amis/registerUserTransferPicker.ts b/src/amis/registerUserTransferPicker.ts index 0d0e30d..8f55a48 100644 --- a/src/amis/registerUserTransferPicker.ts +++ b/src/amis/registerUserTransferPicker.ts @@ -2,6 +2,7 @@ import { UserTransferPicker } from '../components/UserTransferPicker'; type AmisRendererRegistry = { registerRenderer?: (config: Record) => unknown; + registerFormItem?: (config: Record) => unknown; getRendererByName?: (name: string) => unknown; }; @@ -9,17 +10,27 @@ let registered = false; export function registerUserTransferPicker(amisCore: AmisRendererRegistry | undefined | null): boolean { if (registered) return true; - if (!amisCore || typeof amisCore.registerRenderer !== 'function') return false; - if (typeof amisCore.getRendererByName === 'function' && amisCore.getRendererByName('user-transfer-picker')) { + if (!amisCore) return false; + + if (typeof amisCore.registerFormItem === 'function') { + amisCore.registerFormItem({ + type: 'user-transfer-picker', + name: 'user-transfer-picker', + component: UserTransferPicker, + strictMode: false, + override: true, + }); registered = true; return true; } + if (typeof amisCore.registerRenderer !== 'function') return false; amisCore.registerRenderer({ type: 'user-transfer-picker', name: 'user-transfer-picker', isFormItem: true, component: UserTransferPicker, + override: true, }); registered = true; return true; diff --git a/src/components/UserTransferPicker.tsx b/src/components/UserTransferPicker.tsx index e307a68..d115908 100644 --- a/src/components/UserTransferPicker.tsx +++ b/src/components/UserTransferPicker.tsx @@ -11,6 +11,8 @@ type Option = { groupId?: string; }; +type PickerValue = string | string[] | Option | Option[] | null | undefined; + type BootstrapData = { departGroups: Option[]; positionTypes: Option[]; @@ -31,7 +33,11 @@ type PaneKey = | 'positionTypes'; type UserTransferPickerProps = { - value?: string | string[] | Option | Option[]; + value?: PickerValue; + defaultValue?: PickerValue; + data?: Record; + name?: string; + label?: string | false; onChange?: (value: string | string[] | undefined) => void; multiple?: boolean; delimiter?: string; @@ -76,7 +82,7 @@ function optionKey(value: string): string { return value.trim().toUpperCase() === 'ALL' ? ALL_VALUE : value; } -function normalizeValue(value: UserTransferPickerProps['value'], delimiter: string): string[] { +function normalizeValue(value: PickerValue, delimiter: string): string[] { if (Array.isArray(value)) { return value .map((item) => (typeof item === 'string' ? item : item?.value)) @@ -154,8 +160,8 @@ export class UserTransferPicker extends Component - {displayText} + {displayText} {clearable && labels.length > 0 && !disabled && !readOnly ? ( ) : null} +