fix(web): keep user picker label inline

This commit is contained in:
2026-06-17 22:57:49 +08:00
parent 045d522ea0
commit f96d3a2ea4
3 changed files with 52 additions and 15 deletions

View File

@@ -17,6 +17,7 @@ export function registerUserTransferPicker(amisCore: AmisRendererRegistry | unde
type: 'user-transfer-picker', type: 'user-transfer-picker',
name: 'user-transfer-picker', name: 'user-transfer-picker',
component: UserTransferPicker, component: UserTransferPicker,
renderLabel: false,
strictMode: false, strictMode: false,
override: true, override: true,
}); });

View File

@@ -38,6 +38,7 @@ type UserTransferPickerProps = {
data?: Record<string, unknown>; data?: Record<string, unknown>;
name?: string; name?: string;
label?: string | false; label?: string | false;
required?: boolean;
className?: string; className?: string;
style?: CSSProperties; style?: CSSProperties;
onChange?: (value: string | string[] | undefined) => void; onChange?: (value: string | string[] | undefined) => void;
@@ -437,9 +438,11 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
const { const {
className, className,
disabled, disabled,
label,
readOnly, readOnly,
placeholder = '请选择', placeholder = '请选择',
clearable = true, clearable = true,
required,
style, style,
} = this.props; } = this.props;
const { const {
@@ -462,8 +465,11 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
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(', ');
const controlClassName = [ const fieldClassName = [
className, className,
'eip4-user-transfer-field',
].filter(Boolean).join(' ');
const controlClassName = [
'eip4-user-transfer-control', 'eip4-user-transfer-control',
disabled || readOnly ? 'is-disabled' : '', disabled || readOnly ? 'is-disabled' : '',
labels.length ? '' : 'is-empty', labels.length ? '' : 'is-empty',
@@ -471,11 +477,17 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
return ( return (
<> <>
<div className={fieldClassName} style={style}>
{label !== false && label ? (
<label className="eip4-user-transfer-label">
{label}
{required ? <span className="eip4-user-transfer-star">*</span> : null}
</label>
) : null}
<div <div
className={controlClassName} className={controlClassName}
onClick={this.openDialog} onClick={this.openDialog}
role="button" role="button"
style={style}
tabIndex={disabled || readOnly ? -1 : 0} tabIndex={disabled || readOnly ? -1 : 0}
title={fullTitle || undefined} title={fullTitle || undefined}
> >
@@ -487,6 +499,7 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
) : null} ) : null}
<span className="eip4-user-transfer-icon" aria-hidden="true" /> <span className="eip4-user-transfer-icon" aria-hidden="true" />
</div> </div>
</div>
{open ? ( {open ? (
<div className="eip4-user-transfer-mask" onMouseDown={(event) => { <div className="eip4-user-transfer-mask" onMouseDown={(event) => {

View File

@@ -454,6 +454,29 @@
15. 旧 UserSelectWindow 等价选人弹窗 15. 旧 UserSelectWindow 等价选人弹窗
左侧分组 + 双列穿梭 + 右侧已选过滤,替代普通 tabs-transfer-picker 的树选择误差。 左侧分组 + 双列穿梭 + 右侧已选过滤,替代普通 tabs-transfer-picker 的树选择误差。
============================================================================ */ ============================================================================ */
.eip4-user-transfer-field {
width: 100%;
min-width: 0;
display: grid;
grid-template-columns: 76px minmax(0, 1fr);
align-items: center;
gap: 12px;
}
.eip4-user-transfer-label {
min-width: 0;
color: #344054;
font-size: 14px;
line-height: 32px;
text-align: right;
white-space: nowrap;
}
.eip4-user-transfer-star {
color: #e5484d;
margin-left: 2px;
}
.eip4-user-transfer-control { .eip4-user-transfer-control {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;