fix(web): normalize user transfer picker layout

This commit is contained in:
2026-06-17 23:15:35 +08:00
parent f96d3a2ea4
commit 78d859df92
5 changed files with 160 additions and 67 deletions

View File

@@ -1,5 +1,9 @@
import { beforeEach, describe, expect, it, vi } from 'vitest'; import { beforeEach, describe, expect, it, vi } from 'vitest';
import { registerUserTransferPicker, __resetUserTransferPickerForTest } from './registerUserTransferPicker'; import {
normalizeUserTransferSchemaTree,
registerUserTransferPicker,
__resetUserTransferPickerForTest,
} from './registerUserTransferPicker';
import { UserTransferPicker } from '../components/UserTransferPicker'; import { UserTransferPicker } from '../components/UserTransferPicker';
describe('registerUserTransferPicker', () => { describe('registerUserTransferPicker', () => {
@@ -28,6 +32,26 @@ describe('registerUserTransferPicker', () => {
}); });
}); });
it('注册 schema filter,把老 schema 的 mode 改成 userSelectMode,避免破坏表单布局', () => {
let filter: ((schema: Record<string, unknown>) => Record<string, unknown>) | 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 注册(幂等)', () => { it('没有 registerFormItem 时退回 renderer 注册(幂等)', () => {
const registerRenderer = vi.fn(); const registerRenderer = vi.fn();
@@ -44,4 +68,34 @@ describe('registerUserTransferPicker', () => {
expect(registerUserTransferPicker({ registerRenderer })).toBe(true); expect(registerUserTransferPicker({ registerRenderer })).toBe(true);
expect(registerRenderer).toHaveBeenCalledTimes(1); 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' },
],
});
});
}); });

View File

@@ -3,25 +3,69 @@ 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; registerFormItem?: (config: Record<string, unknown>) => unknown;
addSchemaFilter?: (filter: (schema: Record<string, unknown>) => Record<string, unknown>) => unknown;
getRendererByName?: (name: string) => 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<string, unknown>): Record<string, unknown> {
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<T>(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<string, unknown>;
let changed = false;
const next: Record<string, unknown> = {};
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 { export function registerUserTransferPicker(amisCore: AmisRendererRegistry | undefined | null): boolean {
if (registered) return true;
if (!amisCore) return false; if (!amisCore) return false;
if (!schemaFilterRegistered && typeof amisCore.addSchemaFilter === 'function') {
amisCore.addSchemaFilter(normalizeUserTransferSchema);
schemaFilterRegistered = true;
}
if (rendererRegistered) return true;
if (typeof amisCore.registerFormItem === 'function') { if (typeof amisCore.registerFormItem === 'function') {
amisCore.registerFormItem({ amisCore.registerFormItem({
type: 'user-transfer-picker', type: 'user-transfer-picker',
name: 'user-transfer-picker', name: 'user-transfer-picker',
component: UserTransferPicker, component: UserTransferPicker,
renderLabel: false,
strictMode: false, strictMode: false,
override: true, override: true,
}); });
registered = true; rendererRegistered = true;
return true; return true;
} }
@@ -33,10 +77,11 @@ export function registerUserTransferPicker(amisCore: AmisRendererRegistry | unde
component: UserTransferPicker, component: UserTransferPicker,
override: true, override: true,
}); });
registered = true; rendererRegistered = true;
return true; return true;
} }
export function __resetUserTransferPickerForTest(): void { export function __resetUserTransferPickerForTest(): void {
registered = false; rendererRegistered = false;
schemaFilterRegistered = false;
} }

View File

@@ -14,7 +14,7 @@ import { http } from '../api/http';
import { APPROVAL_COMPLETED_EVENT } from '../amis/approvalActionEvents'; import { APPROVAL_COMPLETED_EVENT } from '../amis/approvalActionEvents';
import { registerApprovalAction } from '../amis/registerApprovalAction'; import { registerApprovalAction } from '../amis/registerApprovalAction';
import { registerReplayAction } from '../amis/registerReplayAction'; import { registerReplayAction } from '../amis/registerReplayAction';
import { registerUserTransferPicker } from '../amis/registerUserTransferPicker'; import { normalizeUserTransferSchemaTree, registerUserTransferPicker } from '../amis/registerUserTransferPicker';
import { getProfile } from '../auth/token'; import { getProfile } from '../auth/token';
interface AmisRendererProps { interface AmisRendererProps {
@@ -31,6 +31,34 @@ interface AmisFetcherOptions {
config?: Record<string, unknown>; config?: Record<string, unknown>;
} }
function isRecord(value: unknown): value is Record<string, unknown> {
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<T>(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) { export function AmisRenderer({ schema }: AmisRendererProps) {
const rootRef = useRef<HTMLDivElement>(null); const rootRef = useRef<HTMLDivElement>(null);
const instanceRef = useRef<{ unmount?: () => void } | null>(null); const instanceRef = useRef<{ unmount?: () => void } | null>(null);
@@ -60,7 +88,7 @@ export function AmisRenderer({ schema }: AmisRendererProps) {
// amis-core 未暴露 registerAction 时静默降级(审批抽屉入口不可用,不阻断渲染) // amis-core 未暴露 registerAction 时静默降级(审批抽屉入口不可用,不阻断渲染)
} }
try { try {
registerUserTransferPicker(amisRequire('amis-core')) || registerUserTransferPicker(amisRequire('amis')); registerUserTransferPicker(amisRequire('amis')) || registerUserTransferPicker(amisRequire('amis-core'));
} catch { } catch {
// amis-core 未暴露 registerRenderer 时静默降级,schema 会显示未知控件,测试会覆盖该问题。 // amis-core 未暴露 registerRenderer 时静默降级,schema 会显示未知控件,测试会覆盖该问题。
} }
@@ -69,10 +97,10 @@ export function AmisRenderer({ schema }: AmisRendererProps) {
const fetcher = (options: AmisFetcherOptions) => { const fetcher = (options: AmisFetcherOptions) => {
const { url, method = 'get', data, responseType } = options; const { url, method = 'get', data, responseType } = options;
const m = method.toLowerCase(); const m = method.toLowerCase();
if (m === 'get') { const request = m === 'get'
return http.get(url, { responseType: responseType as never }); ? http.get(url, { responseType: responseType as never })
} : http.request({ url, method: m as never, data, responseType: responseType as never });
return http.request({ url, method: m as never, data, responseType: responseType as never }); return request.then(normalizeFetcherResponse);
}; };
// F2-9:注入当前用户 org 到 amis 数据域,供 select-tree source 中 ${orgId} 使用。 // F2-9:注入当前用户 org 到 amis 数据域,供 select-tree source 中 ${orgId} 使用。
@@ -93,9 +121,10 @@ export function AmisRenderer({ schema }: AmisRendererProps) {
// currentProject 当前 profile 无此字段(会话级概念),注入空串使 ${currentProject} 求值为空而非裸 token // currentProject 当前 profile 无此字段(会话级概念),注入空串使 ${currentProject} 求值为空而非裸 token
amisProps.currentProject = ''; amisProps.currentProject = '';
const normalizedSchema = normalizeUserTransferSchemaTree(schema);
const instance = amis.embed( const instance = amis.embed(
rootRef.current, rootRef.current,
schema, normalizedSchema,
amisProps, amisProps,
{ {
fetcher, fetcher,

View File

@@ -38,13 +38,13 @@ type UserTransferPickerProps = {
data?: Record<string, unknown>; data?: Record<string, unknown>;
name?: string; name?: string;
label?: string | false; label?: string | false;
required?: boolean;
className?: string; className?: string;
style?: CSSProperties; style?: CSSProperties;
onChange?: (value: string | string[] | undefined) => void; onChange?: (value: string | string[] | undefined) => void;
multiple?: boolean; multiple?: boolean;
delimiter?: string; delimiter?: string;
mode?: string; mode?: string;
userSelectMode?: string;
disabled?: boolean; disabled?: boolean;
readOnly?: boolean; readOnly?: boolean;
placeholder?: string; placeholder?: string;
@@ -217,7 +217,7 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
} }
private mode() { private mode() {
return this.props.mode ?? 'controlled'; return this.props.userSelectMode ?? this.props.mode ?? 'controlled';
} }
private effectiveValue(props: UserTransferPickerProps = this.props): PickerValue { private effectiveValue(props: UserTransferPickerProps = this.props): PickerValue {
@@ -438,11 +438,9 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
const { const {
className, className,
disabled, disabled,
label,
readOnly, readOnly,
placeholder = '请选择', placeholder = '请选择',
clearable = true, clearable = true,
required,
style, style,
} = this.props; } = this.props;
const { const {
@@ -465,11 +463,8 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
const selectedFiltered = filterOptions(draft, selectedSearch); const selectedFiltered = filterOptions(draft, selectedSearch);
const displayText = displayTextFor(labels, placeholder); const displayText = displayTextFor(labels, placeholder);
const fullTitle = labels.map((item) => item.label).join(', '); const fullTitle = labels.map((item) => item.label).join(', ');
const fieldClassName = [
className,
'eip4-user-transfer-field',
].filter(Boolean).join(' ');
const controlClassName = [ const controlClassName = [
className,
'eip4-user-transfer-control', 'eip4-user-transfer-control',
disabled || readOnly ? 'is-disabled' : '', disabled || readOnly ? 'is-disabled' : '',
labels.length ? '' : 'is-empty', labels.length ? '' : 'is-empty',
@@ -477,17 +472,11 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
return ( return (
<> <>
<div className={fieldClassName} style={style}>
{label !== false && label ? (
<label className="eip4-user-transfer-label">
{label}
{required ? <span className="eip4-user-transfer-star">*</span> : null}
</label>
) : null}
<div <div
className={controlClassName} className={controlClassName}
onClick={this.openDialog} onClick={this.openDialog}
role="button" role="button"
style={style}
tabIndex={disabled || readOnly ? -1 : 0} tabIndex={disabled || readOnly ? -1 : 0}
title={fullTitle || undefined} title={fullTitle || undefined}
> >
@@ -499,7 +488,6 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
) : null} ) : null}
<span className="eip4-user-transfer-icon" aria-hidden="true" /> <span className="eip4-user-transfer-icon" aria-hidden="true" />
</div> </div>
</div>
{open ? ( {open ? (
<div className="eip4-user-transfer-mask" onMouseDown={(event) => { <div className="eip4-user-transfer-mask" onMouseDown={(event) => {

View File

@@ -454,29 +454,6 @@
15. 旧 UserSelectWindow 等价选人弹窗 15. 旧 UserSelectWindow 等价选人弹窗
左侧分组 + 双列穿梭 + 右侧已选过滤,替代普通 tabs-transfer-picker 的树选择误差。 左侧分组 + 双列穿梭 + 右侧已选过滤,替代普通 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 { .eip4-user-transfer-control {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
@@ -755,7 +732,7 @@
后隐藏 *;编辑态必填项 value 含 input/textarea/Select → 不命中,* 照常显示。 后隐藏 *;编辑态必填项 value 含 input/textarea/Select → 不命中,* 照常显示。
(实测查看 5★全隐、修改 5★全显。) (实测查看 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; display: none;
} }