fix(web): normalize user transfer picker layout
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
import { registerUserTransferPicker, __resetUserTransferPickerForTest } from './registerUserTransferPicker';
|
||||
import {
|
||||
normalizeUserTransferSchemaTree,
|
||||
registerUserTransferPicker,
|
||||
__resetUserTransferPickerForTest,
|
||||
} from './registerUserTransferPicker';
|
||||
import { UserTransferPicker } from '../components/UserTransferPicker';
|
||||
|
||||
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 注册(幂等)', () => {
|
||||
const registerRenderer = vi.fn();
|
||||
|
||||
@@ -44,4 +68,34 @@ describe('registerUserTransferPicker', () => {
|
||||
expect(registerUserTransferPicker({ registerRenderer })).toBe(true);
|
||||
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' },
|
||||
],
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -3,25 +3,69 @@ import { UserTransferPicker } from '../components/UserTransferPicker';
|
||||
type AmisRendererRegistry = {
|
||||
registerRenderer?: (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;
|
||||
};
|
||||
|
||||
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 {
|
||||
if (registered) return true;
|
||||
if (!amisCore) return false;
|
||||
|
||||
if (!schemaFilterRegistered && typeof amisCore.addSchemaFilter === 'function') {
|
||||
amisCore.addSchemaFilter(normalizeUserTransferSchema);
|
||||
schemaFilterRegistered = true;
|
||||
}
|
||||
|
||||
if (rendererRegistered) return true;
|
||||
|
||||
if (typeof amisCore.registerFormItem === 'function') {
|
||||
amisCore.registerFormItem({
|
||||
type: 'user-transfer-picker',
|
||||
name: 'user-transfer-picker',
|
||||
component: UserTransferPicker,
|
||||
renderLabel: false,
|
||||
strictMode: false,
|
||||
override: true,
|
||||
});
|
||||
registered = true;
|
||||
rendererRegistered = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -33,10 +77,11 @@ export function registerUserTransferPicker(amisCore: AmisRendererRegistry | unde
|
||||
component: UserTransferPicker,
|
||||
override: true,
|
||||
});
|
||||
registered = true;
|
||||
rendererRegistered = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
export function __resetUserTransferPickerForTest(): void {
|
||||
registered = false;
|
||||
rendererRegistered = false;
|
||||
schemaFilterRegistered = false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user