fix(web): keep user picker label inline
This commit is contained in:
@@ -17,6 +17,7 @@ export function registerUserTransferPicker(amisCore: AmisRendererRegistry | unde
|
||||
type: 'user-transfer-picker',
|
||||
name: 'user-transfer-picker',
|
||||
component: UserTransferPicker,
|
||||
renderLabel: false,
|
||||
strictMode: false,
|
||||
override: true,
|
||||
});
|
||||
|
||||
@@ -38,6 +38,7 @@ type UserTransferPickerProps = {
|
||||
data?: Record<string, unknown>;
|
||||
name?: string;
|
||||
label?: string | false;
|
||||
required?: boolean;
|
||||
className?: string;
|
||||
style?: CSSProperties;
|
||||
onChange?: (value: string | string[] | undefined) => void;
|
||||
@@ -437,9 +438,11 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
|
||||
const {
|
||||
className,
|
||||
disabled,
|
||||
label,
|
||||
readOnly,
|
||||
placeholder = '请选择',
|
||||
clearable = true,
|
||||
required,
|
||||
style,
|
||||
} = this.props;
|
||||
const {
|
||||
@@ -462,8 +465,11 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
|
||||
const selectedFiltered = filterOptions(draft, selectedSearch);
|
||||
const displayText = displayTextFor(labels, placeholder);
|
||||
const fullTitle = labels.map((item) => item.label).join(', ');
|
||||
const controlClassName = [
|
||||
const fieldClassName = [
|
||||
className,
|
||||
'eip4-user-transfer-field',
|
||||
].filter(Boolean).join(' ');
|
||||
const controlClassName = [
|
||||
'eip4-user-transfer-control',
|
||||
disabled || readOnly ? 'is-disabled' : '',
|
||||
labels.length ? '' : 'is-empty',
|
||||
@@ -471,21 +477,28 @@ export class UserTransferPicker extends Component<UserTransferPickerProps, UserT
|
||||
|
||||
return (
|
||||
<>
|
||||
<div
|
||||
className={controlClassName}
|
||||
onClick={this.openDialog}
|
||||
role="button"
|
||||
style={style}
|
||||
tabIndex={disabled || readOnly ? -1 : 0}
|
||||
title={fullTitle || undefined}
|
||||
>
|
||||
<span className="eip4-user-transfer-text">{displayText}</span>
|
||||
{clearable && labels.length > 0 && !disabled && !readOnly ? (
|
||||
<button type="button" onClick={this.clearValue} aria-label="清空">
|
||||
×
|
||||
</button>
|
||||
<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}
|
||||
<span className="eip4-user-transfer-icon" aria-hidden="true" />
|
||||
<div
|
||||
className={controlClassName}
|
||||
onClick={this.openDialog}
|
||||
role="button"
|
||||
tabIndex={disabled || readOnly ? -1 : 0}
|
||||
title={fullTitle || undefined}
|
||||
>
|
||||
<span className="eip4-user-transfer-text">{displayText}</span>
|
||||
{clearable && labels.length > 0 && !disabled && !readOnly ? (
|
||||
<button type="button" onClick={this.clearValue} aria-label="清空">
|
||||
×
|
||||
</button>
|
||||
) : null}
|
||||
<span className="eip4-user-transfer-icon" aria-hidden="true" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{open ? (
|
||||
|
||||
@@ -454,6 +454,29 @@
|
||||
15. 旧 UserSelectWindow 等价选人弹窗
|
||||
左侧分组 + 双列穿梭 + 右侧已选过滤,替代普通 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 {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
|
||||
Reference in New Issue
Block a user