fix(web): normalize legacy user pickers to amis picker
This commit is contained in:
@@ -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;
|
||||
const addSchemaFilter = vi.fn((fn) => {
|
||||
filter = fn;
|
||||
@@ -44,10 +44,15 @@ describe('registerUserTransferPicker', () => {
|
||||
expect(filter).not.toBeNull();
|
||||
|
||||
const normalized = filter!({ type: 'user-transfer-picker', mode: 'controlled', name: 'AGENT' });
|
||||
expect(normalized).toEqual({
|
||||
type: 'user-transfer-picker',
|
||||
userSelectMode: 'controlled',
|
||||
expect(normalized).toMatchObject({
|
||||
type: 'picker',
|
||||
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' });
|
||||
});
|
||||
@@ -81,20 +86,35 @@ describe('registerUserTransferPicker', () => {
|
||||
expect(addSchemaFilter).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('递归规范化页面 schema 中的老 user-transfer-picker mode', () => {
|
||||
it('递归规范化页面 schema 中的老用户选择框', () => {
|
||||
const schema = {
|
||||
type: 'page',
|
||||
body: [
|
||||
{ type: 'select', mode: 'multiple', name: 'OTHER' },
|
||||
{ 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',
|
||||
body: [
|
||||
{ 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: '请点击右侧的图标',
|
||||
},
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
@@ -11,15 +11,61 @@ let rendererRegistered = false;
|
||||
let schemaFilterRegistered = false;
|
||||
|
||||
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> {
|
||||
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;
|
||||
const mode = typeof schema.mode === 'string' ? schema.mode : '';
|
||||
if (USER_SELECT_MODES.has(mode)) {
|
||||
next.userSelectMode = next.userSelectMode ?? mode;
|
||||
delete next.mode;
|
||||
}
|
||||
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 {
|
||||
|
||||
Reference in New Issue
Block a user