From b0537f87ae11de5a731bec20935b453f3d100567 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 23:48:39 +0800 Subject: [PATCH] fix(web): normalize legacy user pickers to amis picker --- src/amis/registerUserTransferPicker.test.ts | 34 ++- src/amis/registerUserTransferPicker.ts | 56 ++++- src/components/UserTransferPicker.tsx | 217 +++++++++++--------- src/shell/amis-theme.css | 24 ++- 4 files changed, 218 insertions(+), 113 deletions(-) diff --git a/src/amis/registerUserTransferPicker.test.ts b/src/amis/registerUserTransferPicker.test.ts index 33f5550..7a4ccd5 100644 --- a/src/amis/registerUserTransferPicker.test.ts +++ b/src/amis/registerUserTransferPicker.test.ts @@ -32,7 +32,7 @@ describe('registerUserTransferPicker', () => { }); }); - it('注册 schema filter,把老 schema 的 mode 改成 userSelectMode,避免破坏表单布局', () => { + it('注册 schema filter,把老单选用户框改成标准 picker', () => { let filter: ((schema: Record) => Record) | 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: '请点击右侧的图标', + }, ], }); }); diff --git a/src/amis/registerUserTransferPicker.ts b/src/amis/registerUserTransferPicker.ts index 2b2a771..17e574c 100644 --- a/src/amis/registerUserTransferPicker.ts +++ b/src/amis/registerUserTransferPicker.ts @@ -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 = { + 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, mode: string, multiple: boolean): Record { + 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): Record { 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(node: T): T { diff --git a/src/components/UserTransferPicker.tsx b/src/components/UserTransferPicker.tsx index c14ad65..31048f1 100644 --- a/src/components/UserTransferPicker.tsx +++ b/src/components/UserTransferPicker.tsx @@ -1,4 +1,5 @@ import { Component, type ChangeEvent, type CSSProperties, type MouseEvent } from 'react'; +import { createPortal } from 'react-dom'; import { http } from '../api/http'; const ALL_VALUE = 'ALL '; @@ -273,17 +274,20 @@ export class UserTransferPicker extends Component ({ - bootstrap: data, - selectedGroup: { - ...current.selectedGroup, - depart: current.selectedGroup.depart || '', - positionType: current.selectedGroup.positionType - || (data.positionTypes[0] ? `positionType:${data.positionTypes[0].value}` : ''), - category: current.selectedGroup.category - || (data.categories[0] ? `category:${data.categories[0].value}` : ''), - }, - })); + await new Promise((resolve) => { + this.setState((current) => ({ + bootstrap: data, + selectedGroup: { + ...current.selectedGroup, + depart: current.selectedGroup.depart + || (data.departGroups[0] ? String(data.departGroups[0].value) : ''), + positionType: current.selectedGroup.positionType + || (data.positionTypes[0] ? `positionType:${data.positionTypes[0].value}` : ''), + category: current.selectedGroup.category + || (data.categories[0] ? `category:${data.categories[0].value}` : ''), + }, + }), resolve); + }); } private objectPaneOptions(pane: PaneKey): Option[] { @@ -345,13 +349,14 @@ export class UserTransferPicker extends Component { if (this.props.disabled || this.props.readOnly) return; + const isMultiple = this.props.multiple === true; this.setState({ open: true, draft: this.state.labels, availableSearch: '', selectedSearch: '', groupSearch: '', - leftPicked: [], + leftPicked: isMultiple ? [] : this.state.labels.slice(0, 1).map((item) => optionKey(item.value)), rightPicked: [], }, async () => { await this.loadBootstrap(); @@ -457,9 +462,11 @@ export class UserTransferPicker extends Component item.label).join(', '); @@ -469,93 +476,84 @@ export class UserTransferPicker extends Component -
- {displayText} - {clearable && labels.length > 0 && !disabled && !readOnly ? ( - - ) : null} -
- - {open ? ( -
{ - if (event.target === event.currentTarget) this.closeDialog(); - }} - > -
-
-

用户选择框

- + const dialog = open ? ( +
{ + if (event.target === event.currentTarget) this.closeDialog(); + }} + > +
+
+

{isMultiple ? '用户选择框' : '选择用户'}

+ +
+
+
+
-可选项-
+
+ {this.panes().map((pane) => ( + + ))}
-
-
-
-可选项-
-
- {this.panes().map((pane) => ( - - ))} -
- {currentGroups.length > 0 ? ( -
- this.setState({ groupSearch: event.target.value })} - placeholder={activePane === 'depart' ? '搜索公司或部门' : '搜索分类'} - /> - -
- ) : null} + {currentGroups.length > 0 ? ( +
this.setAvailableSearch(event.target.value)} - placeholder="输入关键字过滤可选项" + value={groupSearch} + onChange={(event) => this.setState({ groupSearch: event.target.value })} + placeholder={activePane === 'depart' ? '搜索公司或部门' : '搜索分类'} /> -
- {loading ? '加载中...' : `共${availableWithoutSelected.length}条`} -
-
+
+ ) : null} + this.setAvailableSearch(event.target.value)} + placeholder="输入关键字过滤可选项" + /> + +
+ {loading ? '加载中...' : `共${availableOptions.length}条`} +
+
+ {isMultiple ? ( + <>
@@ -584,14 +582,37 @@ export class UserTransferPicker extends Component
共{draft.length}条
-
-
- - -
-
+ + ) : null}
- ) : null} +
+ + +
+
+
+ ) : null; + + return ( + <> +
+ {displayText} + {clearable && labels.length > 0 && !disabled && !readOnly ? ( + + ) : null} +
+ + {dialog && typeof document !== 'undefined' ? createPortal(dialog, document.body) : dialog} ); } diff --git a/src/shell/amis-theme.css b/src/shell/amis-theme.css index 317d7c8..724a479 100644 --- a/src/shell/amis-theme.css +++ b/src/shell/amis-theme.css @@ -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 { - 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; min-height: 32px; max-height: 32px; - border: 1px solid #d7dde8; + border: 1px solid var(--Form-input-borderColor, #d7dde8); border-radius: 6px; background: #fff; color: #1f2937; @@ -551,7 +556,7 @@ .eip4-user-transfer-mask { position: fixed; inset: 0; - z-index: 2600; + z-index: 6000; background: rgba(17, 24, 39, .38); display: flex; align-items: center; @@ -569,6 +574,11 @@ 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-foot { flex: 0 0 auto; @@ -625,6 +635,10 @@ padding: 16px; } +.eip4-user-transfer-body.is-single { + grid-template-columns: minmax(0, 1fr); +} + .eip4-user-transfer-panel { min-width: 0; min-height: 0; @@ -703,6 +717,10 @@ color: #1f2937; } +.eip4-user-transfer-body.is-single .eip4-user-transfer-list { + min-height: 280px; +} + .eip4-user-transfer-list option { padding: 5px 8px; }