diff --git a/src/amis/registerUserTransferPicker.ts b/src/amis/registerUserTransferPicker.ts new file mode 100644 index 0000000..0d0e30d --- /dev/null +++ b/src/amis/registerUserTransferPicker.ts @@ -0,0 +1,30 @@ +import { UserTransferPicker } from '../components/UserTransferPicker'; + +type AmisRendererRegistry = { + registerRenderer?: (config: Record) => unknown; + getRendererByName?: (name: string) => unknown; +}; + +let registered = false; + +export function registerUserTransferPicker(amisCore: AmisRendererRegistry | undefined | null): boolean { + if (registered) return true; + if (!amisCore || typeof amisCore.registerRenderer !== 'function') return false; + if (typeof amisCore.getRendererByName === 'function' && amisCore.getRendererByName('user-transfer-picker')) { + registered = true; + return true; + } + + amisCore.registerRenderer({ + type: 'user-transfer-picker', + name: 'user-transfer-picker', + isFormItem: true, + component: UserTransferPicker, + }); + registered = true; + return true; +} + +export function __resetUserTransferPickerForTest(): void { + registered = false; +} diff --git a/src/components/AmisRenderer.tsx b/src/components/AmisRenderer.tsx index 62c7772..ef52291 100644 --- a/src/components/AmisRenderer.tsx +++ b/src/components/AmisRenderer.tsx @@ -14,6 +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 { getProfile } from '../auth/token'; interface AmisRendererProps { @@ -58,6 +59,11 @@ export function AmisRenderer({ schema }: AmisRendererProps) { } catch { // amis-core 未暴露 registerAction 时静默降级(审批抽屉入口不可用,不阻断渲染) } + try { + registerUserTransferPicker(amisRequire('amis-core')) || registerUserTransferPicker(amisRequire('amis')); + } catch { + // amis-core 未暴露 registerRenderer 时静默降级,schema 会显示未知控件,测试会覆盖该问题。 + } // 自定义 fetcher:复用宿主 axios(已带 Bearer 注入 + 401 跳登录拦截) const fetcher = (options: AmisFetcherOptions) => { diff --git a/src/components/UserTransferPicker.tsx b/src/components/UserTransferPicker.tsx new file mode 100644 index 0000000..e307a68 --- /dev/null +++ b/src/components/UserTransferPicker.tsx @@ -0,0 +1,513 @@ +import { Component, type ChangeEvent, type MouseEvent } from 'react'; +import { http } from '../api/http'; + +const ALL_VALUE = 'ALL '; + +type Option = { + label: string; + value: string; + type?: string; + groupKind?: string; + groupId?: string; +}; + +type BootstrapData = { + departGroups: Option[]; + positionTypes: Option[]; + categories: Option[]; + allUsers?: Option[]; + orgs?: Option[]; + departs?: Option[]; +}; + +type PaneKey = + | 'all' + | 'depart' + | 'positionType' + | 'category' + | 'allUsers' + | 'orgs' + | 'departs' + | 'positionTypes'; + +type UserTransferPickerProps = { + value?: string | string[] | Option | Option[]; + onChange?: (value: string | string[] | undefined) => void; + multiple?: boolean; + delimiter?: string; + mode?: string; + disabled?: boolean; + readOnly?: boolean; + placeholder?: string; + clearable?: boolean; +}; + +type UserTransferPickerState = { + open: boolean; + labels: Option[]; + draft: Option[]; + bootstrap: BootstrapData; + activePane: PaneKey; + available: Option[]; + availableSearch: string; + selectedSearch: string; + groupSearch: string; + selectedGroup: Record; + leftPicked: string[]; + rightPicked: string[]; + loading: boolean; +}; + +const BASE_PANES: Array<{ key: PaneKey; label: string }> = [ + { key: 'all', label: '全部人员' }, + { key: 'depart', label: '按公司、部门选择人员' }, + { key: 'positionType', label: '按岗位类别选择人员' }, + { key: 'category', label: '按用户类别选择人员' }, +]; + +const ORG_PANES: Array<{ key: PaneKey; label: string }> = [ + { key: 'allUsers', label: '全体人员' }, + { key: 'orgs', label: '选择公司' }, + { key: 'departs', label: '选择部门' }, + { key: 'positionTypes', label: '选择岗位类别' }, +]; + +function optionKey(value: string): string { + return value.trim().toUpperCase() === 'ALL' ? ALL_VALUE : value; +} + +function normalizeValue(value: UserTransferPickerProps['value'], delimiter: string): string[] { + if (Array.isArray(value)) { + return value + .map((item) => (typeof item === 'string' ? item : item?.value)) + .filter((item): item is string => Boolean(item)) + .map(optionKey); + } + if (typeof value === 'object' && value?.value) { + return [optionKey(String(value.value))]; + } + if (typeof value !== 'string' || value.length === 0) { + return []; + } + return value + .split(delimiter) + .map((item) => item.trim()) + .filter(Boolean) + .map(optionKey); +} + +function getOptions(payload: unknown): Option[] { + const data = (payload as { data?: { data?: { options?: Option[]; items?: Option[] } } })?.data?.data; + return data?.options ?? data?.items ?? []; +} + +function getBootstrap(payload: unknown): BootstrapData { + const data = (payload as { data?: { data?: Partial } })?.data?.data ?? {}; + return { + departGroups: data.departGroups ?? [], + positionTypes: data.positionTypes ?? [], + categories: data.categories ?? [], + allUsers: data.allUsers ?? [], + orgs: data.orgs ?? [], + departs: data.departs ?? [], + }; +} + +function dedupeOptions(items: Option[]): Option[] { + const map = new Map(); + for (const item of items) { + map.set(optionKey(item.value), { ...item, value: optionKey(item.value) }); + } + return Array.from(map.values()); +} + +function filterOptions(items: Option[], keyword: string): Option[] { + const q = keyword.trim().toLowerCase(); + if (!q) return items; + return items.filter((item) => `${item.label} ${item.value}`.toLowerCase().includes(q)); +} + +function selectedValues(event: ChangeEvent): string[] { + return Array.from(event.currentTarget.selectedOptions).map((option) => option.value); +} + +export class UserTransferPicker extends Component { + override state: UserTransferPickerState = { + open: false, + labels: [], + draft: [], + bootstrap: { departGroups: [], positionTypes: [], categories: [] }, + activePane: 'all', + available: [], + availableSearch: '', + selectedSearch: '', + groupSearch: '', + selectedGroup: {}, + leftPicked: [], + rightPicked: [], + loading: false, + }; + + override componentDidMount() { + void this.resolveCurrentValue(); + } + + override componentDidUpdate(prevProps: UserTransferPickerProps) { + const delimiter = this.delimiter(); + const before = normalizeValue(prevProps.value, delimiter).join('\u0000'); + const after = normalizeValue(this.props.value, delimiter).join('\u0000'); + if (before !== after || prevProps.mode !== this.props.mode) { + void this.resolveCurrentValue(); + } + } + + private delimiter() { + return this.props.delimiter ?? ','; + } + + private mode() { + return this.props.mode ?? 'controlled'; + } + + private valueIds() { + return normalizeValue(this.props.value, this.delimiter()); + } + + private panes() { + return this.mode() === 'org' ? [...BASE_PANES, ...ORG_PANES] : BASE_PANES; + } + + private async resolveCurrentValue() { + const ids = this.valueIds(); + if (ids.length === 0) { + this.setState({ labels: [] }); + return; + } + try { + const resp = await http.get('/api/user-select/resolve', { + params: { mode: this.mode(), ids: ids.join(this.delimiter()) }, + }); + const resolved = dedupeOptions(getOptions(resp)); + const byValue = new Map(resolved.map((item) => [optionKey(item.value), item])); + this.setState({ + labels: ids.map((id) => byValue.get(optionKey(id)) ?? { label: id.trim(), value: id }), + }); + } catch { + this.setState({ labels: ids.map((id) => ({ label: id.trim(), value: id })) }); + } + } + + private async loadBootstrap() { + const resp = await http.get('/api/user-select/bootstrap', { params: { mode: this.mode() } }); + const data = getBootstrap(resp); + this.setState((current) => ({ + 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}` : ''), + }, + })); + } + + private objectPaneOptions(pane: PaneKey): Option[] { + const { bootstrap } = this.state; + if (pane === 'allUsers') return bootstrap.allUsers ?? []; + if (pane === 'orgs') return bootstrap.orgs ?? []; + if (pane === 'departs') return bootstrap.departs ?? []; + if (pane === 'positionTypes') return bootstrap.positionTypes ?? []; + return []; + } + + private async loadAvailable() { + const { activePane, availableSearch, selectedGroup } = this.state; + this.setState({ loading: true, leftPicked: [] }); + try { + if (activePane === 'all') { + const resp = await http.get('/api/user-select/search', { + params: { mode: this.mode(), term: availableSearch, limit: 500 }, + }); + this.setState({ available: getOptions(resp) }); + return; + } + + if (activePane === 'depart' || activePane === 'positionType' || activePane === 'category') { + const group = selectedGroup[activePane]; + if (!group) { + this.setState({ available: [] }); + return; + } + const resp = await http.get('/api/user-select/group-users', { + params: { mode: this.mode(), group, term: availableSearch, limit: 500 }, + }); + this.setState({ available: getOptions(resp) }); + return; + } + + this.setState({ available: filterOptions(this.objectPaneOptions(activePane), availableSearch) }); + } finally { + this.setState({ loading: false }); + } + } + + private currentGroups(): Option[] { + const { activePane, bootstrap } = this.state; + if (activePane === 'depart') return bootstrap.departGroups; + if (activePane === 'positionType') { + return bootstrap.positionTypes.map((item) => ({ ...item, value: `positionType:${item.value}` })); + } + if (activePane === 'category') { + return bootstrap.categories.map((item) => ({ ...item, value: `category:${item.value}` })); + } + return []; + } + + private availableWithoutSelected(): Option[] { + const selectedKeys = new Set(this.state.draft.map((item) => optionKey(item.value))); + return this.state.available.filter((item) => !selectedKeys.has(optionKey(item.value))); + } + + private openDialog = async () => { + if (this.props.disabled || this.props.readOnly) return; + this.setState({ + open: true, + draft: this.state.labels, + availableSearch: '', + selectedSearch: '', + groupSearch: '', + leftPicked: [], + rightPicked: [], + }, async () => { + await this.loadBootstrap(); + await this.loadAvailable(); + }); + }; + + private closeDialog = () => { + this.setState({ open: false }); + }; + + private commit = () => { + const selected = dedupeOptions(this.state.draft); + const ids = selected.map((item) => optionKey(item.value)); + this.setState({ labels: selected, open: false }); + if (!this.props.multiple) { + this.props.onChange?.(ids[0] || undefined); + } else { + this.props.onChange?.(ids.join(this.delimiter())); + } + }; + + private addOptions(items: Option[]) { + const normalized = dedupeOptions(items); + if (!this.props.multiple) { + this.setState({ draft: normalized.slice(0, 1) }); + return; + } + this.setState((current) => ({ draft: dedupeOptions([...current.draft, ...normalized]) })); + } + + private addPicked = () => { + const picked = this.state.available.filter((item) => this.state.leftPicked.includes(optionKey(item.value))); + this.addOptions(picked); + }; + + private addAll = () => { + this.addOptions(this.availableWithoutSelected()); + }; + + private removePicked = () => { + this.setState((current) => ({ + draft: current.draft.filter((item) => !current.rightPicked.includes(optionKey(item.value))), + rightPicked: [], + })); + }; + + private removeAll = () => { + this.setState({ draft: [], rightPicked: [] }); + }; + + private clearValue = (event: MouseEvent) => { + event.stopPropagation(); + this.setState({ labels: [] }); + this.props.onChange?.(this.props.multiple ? '' : undefined); + }; + + private changePane = (activePane: PaneKey) => { + this.setState({ + activePane, + availableSearch: '', + groupSearch: '', + leftPicked: [], + }, () => { + void this.loadAvailable(); + }); + }; + + private setGroupValue = (value: string) => { + this.setState((current) => ({ + selectedGroup: { ...current.selectedGroup, [current.activePane]: value }, + }), () => { + void this.loadAvailable(); + }); + }; + + private setAvailableSearch = (availableSearch: string) => { + this.setState({ availableSearch }, () => { + void this.loadAvailable(); + }); + }; + + override render() { + const { + disabled, + readOnly, + placeholder = '请选择', + clearable = true, + } = this.props; + const { + activePane, + availableSearch, + selectedSearch, + groupSearch, + selectedGroup, + leftPicked, + rightPicked, + draft, + labels, + loading, + open, + } = this.state; + + const currentGroups = this.currentGroups(); + const filteredGroups = filterOptions(currentGroups, groupSearch); + const availableWithoutSelected = this.availableWithoutSelected(); + const selectedFiltered = filterOptions(draft, selectedSearch); + const displayText = labels.length > 0 ? labels.map((item) => item.label).join(', ') : placeholder; + + return ( + <> +
+ {displayText} + {clearable && labels.length > 0 && !disabled && !readOnly ? ( + + ) : null} +
+ + {open ? ( +
{ + if (event.target === event.currentTarget) this.closeDialog(); + }} + > +
+
+

用户选择框

+ +
+
+
+
-可选项-
+
+ {this.panes().map((pane) => ( + + ))} +
+ {currentGroups.length > 0 ? ( +
+ this.setState({ groupSearch: event.target.value })} + placeholder={activePane === 'depart' ? '搜索公司或部门' : '搜索分类'} + /> + +
+ ) : null} + this.setAvailableSearch(event.target.value)} + placeholder="输入关键字过滤可选项" + /> + +
+ {loading ? '加载中...' : `共${availableWithoutSelected.length}条`} +
+
+ +
+ + + + +
+ +
+
-已选项-
+ this.setState({ selectedSearch: event.target.value })} + placeholder="输入关键字可过滤已选项" + /> + +
共{draft.length}条
+
+
+
+ + +
+
+
+ ) : null} + + ); + } +} diff --git a/src/shell/amis-theme.css b/src/shell/amis-theme.css index b4c0d22..2355db4 100644 --- a/src/shell/amis-theme.css +++ b/src/shell/amis-theme.css @@ -450,6 +450,233 @@ --Form-input-fontSize: 13px; /* 与表格正文 13px 一致(原 14px) */ } +/* ============================================================================ + 15. 旧 UserSelectWindow 等价选人弹窗 + 左侧分组 + 双列穿梭 + 右侧已选过滤,替代普通 tabs-transfer-picker 的树选择误差。 + ============================================================================ */ +.eip4-user-transfer-control { + min-height: 32px; + border: 1px solid #d7dde8; + border-radius: 6px; + background: #fff; + color: #1f2937; + display: flex; + align-items: center; + gap: 8px; + padding: 5px 9px; + cursor: pointer; + max-width: 100%; +} + +.eip4-user-transfer-control.is-empty { + color: #9aa3b2; +} + +.eip4-user-transfer-control.is-disabled { + background: #f3f5f8; + cursor: not-allowed; +} + +.eip4-user-transfer-control > span { + flex: 1 1 auto; + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.eip4-user-transfer-control > button, +.eip4-user-transfer-head > button { + border: 0; + background: transparent; + color: #667085; + cursor: pointer; + font-size: 18px; + line-height: 1; +} + +.eip4-user-transfer-mask { + position: fixed; + inset: 0; + z-index: 2600; + background: rgba(17, 24, 39, .38); + display: flex; + align-items: center; + justify-content: center; +} + +.eip4-user-transfer-dialog { + width: min(1120px, calc(100vw - 40px)); + height: min(720px, calc(100vh - 40px)); + background: #fff; + border-radius: 8px; + box-shadow: 0 24px 72px rgba(15, 23, 42, .26); + display: flex; + flex-direction: column; + overflow: hidden; +} + +.eip4-user-transfer-head, +.eip4-user-transfer-foot { + flex: 0 0 auto; + display: flex; + align-items: center; + justify-content: space-between; + padding: 12px 16px; + border-bottom: 1px solid #e5eaf2; +} + +.eip4-user-transfer-head h3 { + margin: 0; + font-size: 16px; + font-weight: 600; + color: #1f2937; +} + +.eip4-user-transfer-foot { + justify-content: flex-end; + gap: 10px; + border-top: 1px solid #e5eaf2; + border-bottom: 0; +} + +.eip4-user-transfer-foot button, +.eip4-user-transfer-actions button { + min-width: 72px; + height: 34px; + border: 1px solid #cfd6e3; + border-radius: 6px; + background: #fff; + color: #344054; + cursor: pointer; +} + +.eip4-user-transfer-foot button.primary { + border-color: #2f63e6; + background: #2f63e6; + color: #fff; +} + +.eip4-user-transfer-foot button:disabled, +.eip4-user-transfer-actions button:disabled { + opacity: .45; + cursor: not-allowed; +} + +.eip4-user-transfer-body { + flex: 1 1 auto; + min-height: 0; + display: grid; + grid-template-columns: minmax(0, 1fr) 104px minmax(0, 1fr); + gap: 16px; + padding: 16px; +} + +.eip4-user-transfer-panel { + min-width: 0; + min-height: 0; + display: flex; + flex-direction: column; +} + +.eip4-user-transfer-title, +.eip4-user-transfer-count { + color: #344054; + font-size: 13px; + line-height: 24px; +} + +.eip4-user-transfer-tabs { + border: 1px solid #d7dde8; + border-radius: 6px; + overflow: hidden; + margin-bottom: 8px; +} + +.eip4-user-transfer-tabs button { + width: 100%; + min-height: 34px; + border: 0; + border-bottom: 1px solid #e5eaf2; + background: #fff; + color: #344054; + display: block; + text-align: left; + padding: 7px 10px; + cursor: pointer; +} + +.eip4-user-transfer-tabs button:last-child { + border-bottom: 0; +} + +.eip4-user-transfer-tabs button.is-active { + background: #eef4ff; + color: #1f54d7; + font-weight: 600; +} + +.eip4-user-transfer-group { + display: grid; + grid-template-columns: minmax(0, .8fr) minmax(0, 1.2fr); + gap: 8px; + margin-bottom: 8px; +} + +.eip4-user-transfer-group input, +.eip4-user-transfer-group select, +.eip4-user-transfer-search { + height: 32px; + border: 1px solid #d7dde8; + border-radius: 6px; + padding: 0 9px; + color: #1f2937; + background: #fff; + min-width: 0; +} + +.eip4-user-transfer-search { + margin-bottom: 8px; +} + +.eip4-user-transfer-list { + flex: 1 1 auto; + min-height: 220px; + width: 100%; + border: 1px solid #cfd6e3; + border-radius: 6px; + padding: 4px; + font-size: 13px; + color: #1f2937; +} + +.eip4-user-transfer-list option { + padding: 5px 8px; +} + +.eip4-user-transfer-actions { + display: flex; + flex-direction: column; + justify-content: center; + align-items: stretch; + gap: 14px; +} + +@media (max-width: 760px) { + .eip4-user-transfer-dialog { + width: calc(100vw - 20px); + height: calc(100vh - 20px); + } + + .eip4-user-transfer-body { + grid-template-columns: 1fr; + } + + .eip4-user-transfer-actions { + flex-direction: row; + } +} + /* ============================================================================ 14. 查看(只读/静态)态隐藏必填星号 * — 2026-06-15 只读页的红 * 无意义(不可填、不校验)。静态渲染的必填项 value 部分是静态文本、