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

@@ -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<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) {
const rootRef = useRef<HTMLDivElement>(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,

View File

@@ -38,13 +38,13 @@ type UserTransferPickerProps = {
data?: Record<string, unknown>;
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<UserTransferPickerProps, UserT
}
private mode() {
return this.props.mode ?? 'controlled';
return this.props.userSelectMode ?? this.props.mode ?? 'controlled';
}
private effectiveValue(props: UserTransferPickerProps = this.props): PickerValue {
@@ -438,11 +438,9 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
const {
className,
disabled,
label,
readOnly,
placeholder = '请选择',
clearable = true,
required,
style,
} = this.props;
const {
@@ -465,11 +463,8 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
const selectedFiltered = filterOptions(draft, selectedSearch);
const displayText = displayTextFor(labels, placeholder);
const fullTitle = labels.map((item) => 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<UserTransferPickerProps, UserT
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>
<div
className={controlClassName}
onClick={this.openDialog}
role="button"
style={style}
tabIndex={disabled || readOnly ? -1 : 0}
title={fullTitle || undefined}
>
<span className="eip4-user-transfer-text">{displayText}</span>
{clearable && labels.length > 0 && !disabled && !readOnly ? (
<button type="button" onClick={this.clearValue} aria-label="清空">
×
</button>
) : null}
<div
className={controlClassName}
onClick={this.openDialog}
role="button"
tabIndex={disabled || readOnly ? -1 : 0}
title={fullTitle || undefined}
>
<span className="eip4-user-transfer-text">{displayText}</span>
{clearable && labels.length > 0 && !disabled && !readOnly ? (
<button type="button" onClick={this.clearValue} aria-label="清空">
×
</button>
) : null}
<span className="eip4-user-transfer-icon" aria-hidden="true" />
</div>
<span className="eip4-user-transfer-icon" aria-hidden="true" />
</div>
{open ? (