fix(web): normalize legacy user pickers to amis picker

This commit is contained in:
2026-06-17 23:48:39 +08:00
parent 492dad7383
commit b0537f87ae
4 changed files with 218 additions and 113 deletions

View File

@@ -32,7 +32,7 @@ describe('registerUserTransferPicker', () => {
}); });
}); });
it('注册 schema filter,把老 schema 的 mode 改成 userSelectMode,避免破坏表单布局', () => { it('注册 schema filter,把老单选用户框改成标准 picker', () => {
let filter: ((schema: Record<string, unknown>) => Record<string, unknown>) | null = null; let filter: ((schema: Record<string, unknown>) => Record<string, unknown>) | null = null;
const addSchemaFilter = vi.fn((fn) => { const addSchemaFilter = vi.fn((fn) => {
filter = fn; filter = fn;
@@ -44,10 +44,15 @@ describe('registerUserTransferPicker', () => {
expect(filter).not.toBeNull(); expect(filter).not.toBeNull();
const normalized = filter!({ type: 'user-transfer-picker', mode: 'controlled', name: 'AGENT' }); const normalized = filter!({ type: 'user-transfer-picker', mode: 'controlled', name: 'AGENT' });
expect(normalized).toEqual({ expect(normalized).toMatchObject({
type: 'user-transfer-picker', type: 'picker',
userSelectMode: 'controlled',
name: 'AGENT', name: 'AGENT',
source: '/api/picker/76d2f950-ef40-4eff-89ec-98ad9a4976b9/list',
labelField: '_label',
valueField: '_id',
modalMode: 'dialog',
modalSize: 'lg',
placeholder: '请点击右侧的图标',
}); });
expect(filter!({ type: 'select', mode: 'multiple' })).toEqual({ type: 'select', mode: 'multiple' }); expect(filter!({ type: 'select', mode: 'multiple' })).toEqual({ type: 'select', mode: 'multiple' });
}); });
@@ -81,20 +86,35 @@ describe('registerUserTransferPicker', () => {
expect(addSchemaFilter).toHaveBeenCalledTimes(1); expect(addSchemaFilter).toHaveBeenCalledTimes(1);
}); });
it('递归规范化页面 schema 中的老 user-transfer-picker mode', () => { it('递归规范化页面 schema 中的老用户选择框', () => {
const schema = { const schema = {
type: 'page', type: 'page',
body: [ body: [
{ type: 'select', mode: 'multiple', name: 'OTHER' }, { type: 'select', mode: 'multiple', name: 'OTHER' },
{ type: 'user-transfer-picker', mode: 'controlled', name: 'AGENT' }, { type: 'user-transfer-picker', mode: 'controlled', name: 'AGENT' },
{ type: 'user-transfer-picker', mode: 'org', multiple: true, name: 'USERS' },
], ],
}; };
expect(normalizeUserTransferSchemaTree(schema)).toEqual({ expect(normalizeUserTransferSchemaTree(schema)).toMatchObject({
type: 'page', type: 'page',
body: [ body: [
{ type: 'select', mode: 'multiple', name: 'OTHER' }, { type: 'select', mode: 'multiple', name: 'OTHER' },
{ type: 'user-transfer-picker', userSelectMode: 'controlled', name: 'AGENT' }, {
type: 'picker',
name: 'AGENT',
source: '/api/picker/76d2f950-ef40-4eff-89ec-98ad9a4976b9/list',
placeholder: '请点击右侧的图标',
},
{
type: 'picker',
multiple: true,
name: 'USERS',
source: '/api/picker/1b3bad0b-a24b-4347-9466-db78f7432756/list',
labelField: '_label',
valueField: '_id',
placeholder: '请点击右侧的图标',
},
], ],
}); });
}); });

View File

@@ -11,15 +11,61 @@ let rendererRegistered = false;
let schemaFilterRegistered = false; let schemaFilterRegistered = false;
const USER_SELECT_MODES = new Set(['controlled', 'all', 'org', 'attendance']); const USER_SELECT_MODES = new Set(['controlled', 'all', 'org', 'attendance']);
const USER_SELECT_DIALOG_IDS_BY_MODE: Record<string, string> = {
controlled: '76d2f950-ef40-4eff-89ec-98ad9a4976b9',
org: '1b3bad0b-a24b-4347-9466-db78f7432756',
all: '090981ba-0c10-4d84-92dc-80e226594480',
attendance: 'e31ce405-21c4-4892-94bb-e87e07b7f8e7',
};
function userPickerSchema(schema: Record<string, unknown>, mode: string, multiple: boolean): Record<string, unknown> {
const next = { ...schema };
delete next.userSelectMode;
delete next.mode;
delete next.multiple;
delete next.joinValues;
delete next.delimiter;
delete next.valueTpl;
delete next.pickerSize;
delete next.selectTitle;
delete next.resultTitle;
delete next.statistics;
next.type = 'picker';
next.clearable = next.clearable ?? true;
if (multiple) {
next.multiple = true;
}
next.source = `/api/picker/${USER_SELECT_DIALOG_IDS_BY_MODE[mode] ?? USER_SELECT_DIALOG_IDS_BY_MODE.controlled}/list`;
next.labelField = '_label';
next.valueField = '_id';
next.modalMode = 'dialog';
next.modalSize = 'lg';
next.placeholder = next.placeholder === undefined || next.placeholder === '请选择'
? '请点击右侧的图标'
: next.placeholder;
next.pickerSchema = next.pickerSchema ?? {
mode: 'table',
headerToolbar: [{ type: 'search-box', name: 'q', placeholder: '输入关键字搜索' }],
footerToolbar: ['pagination'],
};
return next;
}
export function normalizeUserTransferSchema(schema: Record<string, unknown>): Record<string, unknown> { export function normalizeUserTransferSchema(schema: Record<string, unknown>): Record<string, unknown> {
if (schema?.type !== 'user-transfer-picker') return schema; 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 }; const next = { ...schema };
const mode = typeof schema.mode === 'string' ? schema.mode : '';
if (USER_SELECT_MODES.has(mode)) {
next.userSelectMode = next.userSelectMode ?? mode; next.userSelectMode = next.userSelectMode ?? mode;
delete next.mode; delete next.mode;
return next; }
const userSelectMode = typeof next.userSelectMode === 'string' ? next.userSelectMode : 'controlled';
return userPickerSchema(
next,
USER_SELECT_MODES.has(userSelectMode) ? userSelectMode : 'controlled',
next.multiple === true,
);
} }
export function normalizeUserTransferSchemaTree<T>(node: T): T { export function normalizeUserTransferSchemaTree<T>(node: T): T {

View File

@@ -1,4 +1,5 @@
import { Component, type ChangeEvent, type CSSProperties, type MouseEvent } from 'react'; import { Component, type ChangeEvent, type CSSProperties, type MouseEvent } from 'react';
import { createPortal } from 'react-dom';
import { http } from '../api/http'; import { http } from '../api/http';
const ALL_VALUE = 'ALL '; const ALL_VALUE = 'ALL ';
@@ -273,17 +274,20 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
private async loadBootstrap() { private async loadBootstrap() {
const resp = await http.get('/api/user-select/bootstrap', { params: { mode: this.mode() } }); const resp = await http.get('/api/user-select/bootstrap', { params: { mode: this.mode() } });
const data = getBootstrap(resp); const data = getBootstrap(resp);
await new Promise<void>((resolve) => {
this.setState((current) => ({ this.setState((current) => ({
bootstrap: data, bootstrap: data,
selectedGroup: { selectedGroup: {
...current.selectedGroup, ...current.selectedGroup,
depart: current.selectedGroup.depart || '', depart: current.selectedGroup.depart
|| (data.departGroups[0] ? String(data.departGroups[0].value) : ''),
positionType: current.selectedGroup.positionType positionType: current.selectedGroup.positionType
|| (data.positionTypes[0] ? `positionType:${data.positionTypes[0].value}` : ''), || (data.positionTypes[0] ? `positionType:${data.positionTypes[0].value}` : ''),
category: current.selectedGroup.category category: current.selectedGroup.category
|| (data.categories[0] ? `category:${data.categories[0].value}` : ''), || (data.categories[0] ? `category:${data.categories[0].value}` : ''),
}, },
})); }), resolve);
});
} }
private objectPaneOptions(pane: PaneKey): Option[] { private objectPaneOptions(pane: PaneKey): Option[] {
@@ -345,13 +349,14 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
private openDialog = async () => { private openDialog = async () => {
if (this.props.disabled || this.props.readOnly) return; if (this.props.disabled || this.props.readOnly) return;
const isMultiple = this.props.multiple === true;
this.setState({ this.setState({
open: true, open: true,
draft: this.state.labels, draft: this.state.labels,
availableSearch: '', availableSearch: '',
selectedSearch: '', selectedSearch: '',
groupSearch: '', groupSearch: '',
leftPicked: [], leftPicked: isMultiple ? [] : this.state.labels.slice(0, 1).map((item) => optionKey(item.value)),
rightPicked: [], rightPicked: [],
}, async () => { }, async () => {
await this.loadBootstrap(); await this.loadBootstrap();
@@ -457,9 +462,11 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
open, open,
} = this.state; } = this.state;
const isMultiple = this.props.multiple === true;
const currentGroups = this.currentGroups(); const currentGroups = this.currentGroups();
const filteredGroups = filterOptions(currentGroups, groupSearch); const filteredGroups = filterOptions(currentGroups, groupSearch);
const availableWithoutSelected = this.availableWithoutSelected(); const availableWithoutSelected = this.availableWithoutSelected();
const availableOptions = isMultiple ? availableWithoutSelected : this.state.available;
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(', ');
@@ -469,37 +476,17 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
disabled || readOnly ? 'is-disabled' : '', disabled || readOnly ? 'is-disabled' : '',
labels.length ? '' : 'is-empty', labels.length ? '' : 'is-empty',
].filter(Boolean).join(' '); ].filter(Boolean).join(' ');
const dialog = open ? (
return (
<>
<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}
<span className="eip4-user-transfer-icon" aria-hidden="true" />
</div>
{open ? (
<div className="eip4-user-transfer-mask" onMouseDown={(event) => { <div className="eip4-user-transfer-mask" onMouseDown={(event) => {
if (event.target === event.currentTarget) this.closeDialog(); if (event.target === event.currentTarget) this.closeDialog();
}} }}
> >
<div className="eip4-user-transfer-dialog"> <div className={`eip4-user-transfer-dialog${isMultiple ? '' : ' is-single'}`}>
<div className="eip4-user-transfer-head"> <div className="eip4-user-transfer-head">
<h3>用户选择框</h3> <h3>{isMultiple ? '用户选择框' : '选择用户'}</h3>
<button type="button" onClick={this.closeDialog}>×</button> <button type="button" onClick={this.closeDialog}>×</button>
</div> </div>
<div className="eip4-user-transfer-body"> <div className={`eip4-user-transfer-body${isMultiple ? '' : ' is-single'}`}>
<section className="eip4-user-transfer-panel"> <section className="eip4-user-transfer-panel">
<div className="eip4-user-transfer-title">-可选项-</div> <div className="eip4-user-transfer-title">-可选项-</div>
<div className="eip4-user-transfer-tabs"> <div className="eip4-user-transfer-tabs">
@@ -541,21 +528,32 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
placeholder="输入关键字过滤可选项" placeholder="输入关键字过滤可选项"
/> />
<select <select
multiple multiple={isMultiple}
size={isMultiple ? undefined : 12}
className="eip4-user-transfer-list" className="eip4-user-transfer-list"
value={leftPicked} value={isMultiple ? leftPicked : (leftPicked[0] ?? '')}
onChange={(event) => this.setState({ leftPicked: selectedValues(event) })} onChange={(event) => {
const values = selectedValues(event);
if (isMultiple) {
this.setState({ leftPicked: values });
return;
}
const picked = this.state.available.find((item) => values.includes(optionKey(item.value)));
this.setState({ leftPicked: values, draft: picked ? [picked] : [] });
}}
onDoubleClick={this.addPicked} onDoubleClick={this.addPicked}
> >
{availableWithoutSelected.map((item) => ( {availableOptions.map((item) => (
<option key={optionKey(item.value)} value={optionKey(item.value)}>{item.label}</option> <option key={optionKey(item.value)} value={optionKey(item.value)}>{item.label}</option>
))} ))}
</select> </select>
<div className="eip4-user-transfer-count"> <div className="eip4-user-transfer-count">
{loading ? '加载中...' : `共${availableWithoutSelected.length}条`} {loading ? '加载中...' : `共${availableOptions.length}条`}
</div> </div>
</section> </section>
{isMultiple ? (
<>
<div className="eip4-user-transfer-actions"> <div className="eip4-user-transfer-actions">
<button type="button" onClick={this.addPicked} disabled={leftPicked.length === 0}>&gt;</button> <button type="button" onClick={this.addPicked} disabled={leftPicked.length === 0}>&gt;</button>
<button type="button" onClick={this.removePicked} disabled={rightPicked.length === 0}>&lt;</button> <button type="button" onClick={this.removePicked} disabled={rightPicked.length === 0}>&lt;</button>
@@ -584,6 +582,8 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
</select> </select>
<div className="eip4-user-transfer-count">共{draft.length}条</div> <div className="eip4-user-transfer-count">共{draft.length}条</div>
</section> </section>
</>
) : null}
</div> </div>
<div className="eip4-user-transfer-foot"> <div className="eip4-user-transfer-foot">
<button type="button" className="primary" onClick={this.commit}>确认</button> <button type="button" className="primary" onClick={this.commit}>确认</button>
@@ -591,7 +591,28 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
</div> </div>
</div> </div>
</div> </div>
) : null;
return (
<>
<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} ) : null}
<span className="eip4-user-transfer-icon" aria-hidden="true" />
</div>
{dialog && typeof document !== 'undefined' ? createPortal(dialog, document.body) : dialog}
</> </>
); );
} }

View File

@@ -247,7 +247,12 @@
.amis-scope .cxd-Crud-filter .cxd-Form-item--inline:has(.eip4-user-transfer-control) .cxd-Form-value, .amis-scope .cxd-Crud-filter .cxd-Form-item--inline:has(.eip4-user-transfer-control) .cxd-Form-value,
.amis-scope .cxd-CRUD-filter .cxd-Form-item--inline:has(.eip4-user-transfer-control) .cxd-Form-value { .amis-scope .cxd-CRUD-filter .cxd-Form-item--inline:has(.eip4-user-transfer-control) .cxd-Form-value {
width: 107px; width: var(--Form-control-widthSm);
}
.amis-scope .cxd-Crud-filter .cxd-Form-item--inline > .cxd-Form-value > .eip4-user-transfer-control,
.amis-scope .cxd-CRUD-filter .cxd-Form-item--inline > .cxd-Form-value > .eip4-user-transfer-control {
display: inline-flex;
} }
/* 查询/重置按钮区紧凑 */ /* 查询/重置按钮区紧凑 */
@@ -465,7 +470,7 @@
height: 32px; height: 32px;
min-height: 32px; min-height: 32px;
max-height: 32px; max-height: 32px;
border: 1px solid #d7dde8; border: 1px solid var(--Form-input-borderColor, #d7dde8);
border-radius: 6px; border-radius: 6px;
background: #fff; background: #fff;
color: #1f2937; color: #1f2937;
@@ -551,7 +556,7 @@
.eip4-user-transfer-mask { .eip4-user-transfer-mask {
position: fixed; position: fixed;
inset: 0; inset: 0;
z-index: 2600; z-index: 6000;
background: rgba(17, 24, 39, .38); background: rgba(17, 24, 39, .38);
display: flex; display: flex;
align-items: center; align-items: center;
@@ -569,6 +574,11 @@
overflow: hidden; overflow: hidden;
} }
.eip4-user-transfer-dialog.is-single {
width: min(560px, calc(100vw - 40px));
height: min(560px, calc(100vh - 40px));
}
.eip4-user-transfer-head, .eip4-user-transfer-head,
.eip4-user-transfer-foot { .eip4-user-transfer-foot {
flex: 0 0 auto; flex: 0 0 auto;
@@ -625,6 +635,10 @@
padding: 16px; padding: 16px;
} }
.eip4-user-transfer-body.is-single {
grid-template-columns: minmax(0, 1fr);
}
.eip4-user-transfer-panel { .eip4-user-transfer-panel {
min-width: 0; min-width: 0;
min-height: 0; min-height: 0;
@@ -703,6 +717,10 @@
color: #1f2937; color: #1f2937;
} }
.eip4-user-transfer-body.is-single .eip4-user-transfer-list {
min-height: 280px;
}
.eip4-user-transfer-list option { .eip4-user-transfer-list option {
padding: 5px 8px; padding: 5px 8px;
} }