fix(web): preserve user transfer form labels

This commit is contained in:
2026-06-17 22:46:43 +08:00
parent ba41a76a70
commit 9e5ece3640
4 changed files with 131 additions and 12 deletions

View File

@@ -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);
});
});

View File

@@ -2,6 +2,7 @@ import { UserTransferPicker } from '../components/UserTransferPicker';
type AmisRendererRegistry = { type AmisRendererRegistry = {
registerRenderer?: (config: Record<string, unknown>) => unknown; registerRenderer?: (config: Record<string, unknown>) => unknown;
registerFormItem?: (config: Record<string, unknown>) => unknown;
getRendererByName?: (name: string) => unknown; getRendererByName?: (name: string) => unknown;
}; };
@@ -9,17 +10,27 @@ let registered = false;
export function registerUserTransferPicker(amisCore: AmisRendererRegistry | undefined | null): boolean { export function registerUserTransferPicker(amisCore: AmisRendererRegistry | undefined | null): boolean {
if (registered) return true; if (registered) return true;
if (!amisCore || typeof amisCore.registerRenderer !== 'function') return false; if (!amisCore) return false;
if (typeof amisCore.getRendererByName === 'function' && amisCore.getRendererByName('user-transfer-picker')) {
if (typeof amisCore.registerFormItem === 'function') {
amisCore.registerFormItem({
type: 'user-transfer-picker',
name: 'user-transfer-picker',
component: UserTransferPicker,
strictMode: false,
override: true,
});
registered = true; registered = true;
return true; return true;
} }
if (typeof amisCore.registerRenderer !== 'function') return false;
amisCore.registerRenderer({ amisCore.registerRenderer({
type: 'user-transfer-picker', type: 'user-transfer-picker',
name: 'user-transfer-picker', name: 'user-transfer-picker',
isFormItem: true, isFormItem: true,
component: UserTransferPicker, component: UserTransferPicker,
override: true,
}); });
registered = true; registered = true;
return true; return true;

View File

@@ -11,6 +11,8 @@ type Option = {
groupId?: string; groupId?: string;
}; };
type PickerValue = string | string[] | Option | Option[] | null | undefined;
type BootstrapData = { type BootstrapData = {
departGroups: Option[]; departGroups: Option[];
positionTypes: Option[]; positionTypes: Option[];
@@ -31,7 +33,11 @@ type PaneKey =
| 'positionTypes'; | 'positionTypes';
type UserTransferPickerProps = { type UserTransferPickerProps = {
value?: string | string[] | Option | Option[]; value?: PickerValue;
defaultValue?: PickerValue;
data?: Record<string, unknown>;
name?: string;
label?: string | false;
onChange?: (value: string | string[] | undefined) => void; onChange?: (value: string | string[] | undefined) => void;
multiple?: boolean; multiple?: boolean;
delimiter?: string; delimiter?: string;
@@ -76,7 +82,7 @@ function optionKey(value: string): string {
return value.trim().toUpperCase() === 'ALL' ? ALL_VALUE : value; 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)) { if (Array.isArray(value)) {
return value return value
.map((item) => (typeof item === 'string' ? item : item?.value)) .map((item) => (typeof item === 'string' ? item : item?.value))
@@ -154,8 +160,8 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
override componentDidUpdate(prevProps: UserTransferPickerProps) { override componentDidUpdate(prevProps: UserTransferPickerProps) {
const delimiter = this.delimiter(); const delimiter = this.delimiter();
const before = normalizeValue(prevProps.value, delimiter).join('\u0000'); const before = normalizeValue(this.effectiveValue(prevProps), delimiter).join('\u0000');
const after = normalizeValue(this.props.value, delimiter).join('\u0000'); const after = normalizeValue(this.effectiveValue(this.props), delimiter).join('\u0000');
if (before !== after || prevProps.mode !== this.props.mode) { if (before !== after || prevProps.mode !== this.props.mode) {
void this.resolveCurrentValue(); void this.resolveCurrentValue();
} }
@@ -169,8 +175,17 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
return this.props.mode ?? 'controlled'; return this.props.mode ?? 'controlled';
} }
private effectiveValue(props: UserTransferPickerProps = this.props): PickerValue {
if (props.value !== undefined) return props.value;
if (props.defaultValue !== undefined) return props.defaultValue;
if (props.name && props.data && Object.prototype.hasOwnProperty.call(props.data, props.name)) {
return props.data[props.name] as PickerValue;
}
return undefined;
}
private valueIds() { private valueIds() {
return normalizeValue(this.props.value, this.delimiter()); return normalizeValue(this.effectiveValue(), this.delimiter());
} }
private panes() { private panes() {
@@ -396,12 +411,13 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
role="button" role="button"
tabIndex={disabled || readOnly ? -1 : 0} tabIndex={disabled || readOnly ? -1 : 0}
> >
<span>{displayText}</span> <span className="eip4-user-transfer-text">{displayText}</span>
{clearable && labels.length > 0 && !disabled && !readOnly ? ( {clearable && labels.length > 0 && !disabled && !readOnly ? (
<button type="button" onClick={this.clearValue} aria-label="清空"> <button type="button" onClick={this.clearValue} aria-label="清空">
× ×
</button> </button>
) : null} ) : null}
<span className="eip4-user-transfer-icon" aria-hidden="true" />
</div> </div>
{open ? ( {open ? (

View File

@@ -455,6 +455,8 @@
左侧分组 + 双列穿梭 + 右侧已选过滤,替代普通 tabs-transfer-picker 的树选择误差。 左侧分组 + 双列穿梭 + 右侧已选过滤,替代普通 tabs-transfer-picker 的树选择误差。
============================================================================ */ ============================================================================ */
.eip4-user-transfer-control { .eip4-user-transfer-control {
width: 100%;
box-sizing: border-box;
min-height: 32px; min-height: 32px;
border: 1px solid #d7dde8; border: 1px solid #d7dde8;
border-radius: 6px; border-radius: 6px;
@@ -462,10 +464,10 @@
color: #1f2937; color: #1f2937;
display: flex; display: flex;
align-items: center; align-items: center;
gap: 8px; padding: 5px 0 5px 9px;
padding: 5px 9px;
cursor: pointer; cursor: pointer;
max-width: 100%; max-width: 100%;
overflow: hidden;
} }
.eip4-user-transfer-control.is-empty { .eip4-user-transfer-control.is-empty {
@@ -477,7 +479,7 @@
cursor: not-allowed; cursor: not-allowed;
} }
.eip4-user-transfer-control > span { .eip4-user-transfer-text {
flex: 1 1 auto; flex: 1 1 auto;
min-width: 0; min-width: 0;
overflow: hidden; overflow: hidden;
@@ -485,7 +487,50 @@
white-space: nowrap; white-space: nowrap;
} }
.eip4-user-transfer-control > button, .eip4-user-transfer-control > button {
flex: 0 0 auto;
margin-left: 8px;
border: 0;
background: transparent;
color: #667085;
cursor: pointer;
font-size: 18px;
line-height: 1;
}
.eip4-user-transfer-icon {
position: relative;
flex: 0 0 34px;
align-self: stretch;
margin: -5px 0 -5px 8px;
border-left: 1px solid #d7dde8;
color: #7a8494;
}
.eip4-user-transfer-icon::before,
.eip4-user-transfer-icon::after {
content: "";
position: absolute;
box-sizing: border-box;
border: 2px solid currentColor;
border-radius: 2px;
background: #fff;
}
.eip4-user-transfer-icon::before {
width: 13px;
height: 13px;
left: 8px;
top: 8px;
}
.eip4-user-transfer-icon::after {
width: 13px;
height: 13px;
left: 13px;
top: 12px;
}
.eip4-user-transfer-head > button { .eip4-user-transfer-head > button {
border: 0; border: 0;
background: transparent; background: transparent;