test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-12-02 03:58:07 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #6613 from hsm-lv/chore-event

Browse Source 
chore:简化resolveEventData调用
This commit is contained in:
hsm-lv 2023-04-14 10:31:47 +08:00 committed by GitHub
commit 0febbd5af2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 320 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/amis-core/src/renderers/Options.tsx
View File

@ -483,8 +483,7 @@ export function registerOptionsControl(config: OptionsConfig) {
eventName,
resolveEventData(
this.props,
{value: eventData, options, items: options}, // 为了保持名字统一
'value'
{value: eventData, options, items: options} // 为了保持名字统一
)
);
// 返回阻塞标识

6
packages/amis-core/src/utils/renderer-event.ts
View File

@ -252,7 +252,11 @@ export const getRendererEventListeners = () => {
* @param data
* @param valueKey
*/
export const resolveEventData = (props: any, data: any, valueKey?: string) => {
export const resolveEventData = (
props: any,
data: any,
valueKey: string = 'value'
) => {
return createObject(
props.data,
props.name && valueKey

4
packages/amis/src/renderers/Form/ChainedSelect.tsx
View File

@ -190,7 +190,7 @@ export default class ChainedSelectControl extends React.Component<
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(this.props, {value: valueRes}, 'value')
resolveEventData(this.props, {value: valueRes})
);
if (rendererEvent?.prevented) {
@ -244,7 +244,7 @@ export default class ChainedSelectControl extends React.Component<
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(this.props, {value: valueRes}, 'value')
resolveEventData(this.props, {value: valueRes})
);
if (rendererEvent?.prevented) {

2
packages/amis/src/renderers/Form/Checkbox.tsx
View File

@ -83,7 +83,7 @@ export default class CheckboxControl extends React.Component<
const {dispatchEvent, onChange} = this.props;
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(this.props, {value: eventData}, 'value')
resolveEventData(this.props, {value: eventData})
);
if (rendererEvent?.prevented) {

30
packages/amis/src/renderers/Form/Combo.tsx
View File

@ -594,14 +594,10 @@ export default class ComboControl extends React.Component<ComboProps> {
// todo:这里的数据结构与表单项最终类型不一致，需要区分是否多选、是否未input-kv or input-kvs
const rendererEvent = await dispatchEvent(
'add',
resolveEventData(
this.props,
{
value:
flat && joinValues ? value.join(delimiter || ',') : cloneDeep(value)
},
'value'
)
resolveEventData(this.props, {
value:
flat && joinValues ? value.join(delimiter || ',') : cloneDeep(value)
})
);
if (rendererEvent?.prevented) {
@ -652,18 +648,12 @@ export default class ComboControl extends React.Component<ComboProps> {
// todo:这里的数据结构与表单项最终类型不一致，需要区分是否多选、是否未input-kv or input-kvs
const rendererEvent = await dispatchEvent(
'delete',
resolveEventData(
this.props,
{
key,
value:
flat && joinValues
? value.join(delimiter || ',')
: cloneDeep(value),
item: value[key]
},
'value'
)
resolveEventData(this.props, {
key,
value:
flat && joinValues ? value.join(delimiter || ',') : cloneDeep(value),
item: value[key]
})
);
if (rendererEvent?.prevented) {

6
packages/amis/src/renderers/Form/DiffEditor.tsx
View File

@ -143,7 +143,7 @@ export class DiffEditor extends React.Component<DiffEditorProps, any> {
const rendererEvent = await dispatchEvent(
'focus',
resolveEventData(this.props, {value}, 'value')
resolveEventData(this.props, {value})
);
if (rendererEvent?.prevented) {
@ -162,7 +162,7 @@ export class DiffEditor extends React.Component<DiffEditorProps, any> {
const rendererEvent = await dispatchEvent(
'blur',
resolveEventData(this.props, {value}, 'value')
resolveEventData(this.props, {value})
);
if (rendererEvent?.prevented) {
@ -259,7 +259,7 @@ export class DiffEditor extends React.Component<DiffEditorProps, any> {
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(this.props, {value}, 'value')
resolveEventData(this.props, {value})
);
if (rendererEvent?.prevented) {

6
packages/amis/src/renderers/Form/Editor.tsx
View File

@ -191,7 +191,7 @@ export default class EditorControl extends React.Component<EditorProps, any> {
const rendererEvent = await dispatchEvent(
'focus',
resolveEventData(this.props, {value}, 'value')
resolveEventData(this.props, {value})
);
if (rendererEvent?.prevented) {
@ -210,7 +210,7 @@ export default class EditorControl extends React.Component<EditorProps, any> {
const rendererEvent = await dispatchEvent(
'blur',
resolveEventData(this.props, {value}, 'value')
resolveEventData(this.props, {value})
);
if (rendererEvent?.prevented) {
@ -225,7 +225,7 @@ export default class EditorControl extends React.Component<EditorProps, any> {
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(this.props, {value: e}, 'value')
resolveEventData(this.props, {value: e})
);
if (rendererEvent?.prevented) {

4
packages/amis/src/renderers/Form/InputDate.tsx
View File

@ -431,7 +431,7 @@ export default class DateControl extends React.PureComponent<
@autobind
dispatchEvent(e: React.SyntheticEvent<HTMLElement>) {
const {dispatchEvent, value} = this.props;
dispatchEvent(e, resolveEventData(this.props, {value}, 'value'));
dispatchEvent(e, resolveEventData(this.props, {value}));
}
// 动作
@ -454,7 +454,7 @@ export default class DateControl extends React.PureComponent<
const {dispatchEvent} = this.props;
const dispatcher = dispatchEvent(
'change',
resolveEventData(this.props, {value: nextValue}, 'value')
resolveEventData(this.props, {value: nextValue})
);
if (dispatcher?.prevented) {
return;

4
packages/amis/src/renderers/Form/InputDateRange.tsx
View File

@ -202,7 +202,7 @@ export default class DateRangeControl extends React.Component<DateRangeProps> {
dispatchEvent(eventName: string) {
const {dispatchEvent, data, value} = this.props;
dispatchEvent(eventName, resolveEventData(this.props, {value}, 'value'));
dispatchEvent(eventName, resolveEventData(this.props, {value}));
}
// 动作
@ -225,7 +225,7 @@ export default class DateRangeControl extends React.Component<DateRangeProps> {
const {dispatchEvent, data} = this.props;
const dispatcher = dispatchEvent(
'change',
resolveEventData(this.props, {value: nextValue}, 'value')
resolveEventData(this.props, {value: nextValue})
);
if (dispatcher?.prevented) {
return;

2
packages/amis/src/renderers/Form/InputExcel.tsx
View File

@ -168,7 +168,7 @@ export default class ExcelControl extends React.PureComponent<
const {dispatchEvent, data} = this.props;
return await dispatchEvent(
eventName,
resolveEventData(this.props, {value: eventData}, 'value')
resolveEventData(this.props, {value: eventData})
);
}

4
packages/amis/src/renderers/Form/InputNumber.tsx
View File

@ -287,7 +287,7 @@ export default class NumberControl extends React.Component<
async dispatchEvent(eventName: string) {
const {dispatchEvent, value} = this.props;
dispatchEvent(eventName, resolveEventData(this.props, {value}, 'value'));
dispatchEvent(eventName, resolveEventData(this.props, {value}));
}
async handleChange(inputValue: any) {
@ -296,7 +296,7 @@ export default class NumberControl extends React.Component<
const resultValue = clearValueOnEmpty && value === '' ? undefined : value;
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(this.props, {value: resultValue}, 'value')
resolveEventData(this.props, {value: resultValue})
);
if (rendererEvent?.prevented) {
return;

30
packages/amis/src/renderers/Form/InputRange.tsx
View File

@ -392,13 +392,9 @@ export class Input extends React.Component<RangeItemProps, any> {
const rendererEvent = await dispatchEvent(
'blur',
resolveEventData(
this.props,
{
value
},
'value'
)
resolveEventData(this.props, {
value
})
);
if (rendererEvent?.prevented) {
@ -417,13 +413,9 @@ export class Input extends React.Component<RangeItemProps, any> {
const rendererEvent = await dispatchEvent(
'focus',
resolveEventData(
this.props,
{
value
},
'value'
)
resolveEventData(this.props, {
value
})
);
if (rendererEvent?.prevented) {
@ -582,13 +574,9 @@ export default class RangeControl extends React.PureComponent<
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(
this.props,
{
value: result
},
'value'
)
resolveEventData(this.props, {
value: result
})
);
if (rendererEvent?.prevented) {

2
packages/amis/src/renderers/Form/InputRating.tsx
View File

@ -111,7 +111,7 @@ export default class RatingControl extends React.Component<RatingProps, any> {
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(this.props, {value}, 'value')
resolveEventData(this.props, {value})
);
if (rendererEvent?.prevented) {

330
packages/amis/src/renderers/Form/InputTable.tsx
View File

@ -230,7 +230,7 @@ export interface TableState {
}
export type FormTableRendererEvent =
'add'
| 'add'
| 'addConfirm'
| 'addSuccess'
| 'addFail'
@ -315,8 +315,8 @@ export default class FormTable extends React.Component<TableProps, TableState> {
// 如果static为true 或 disabled为true，
// 则删掉正在新增 或 编辑的那一行
if (
props.$schema.disabled !== nextProps.$schema.disabled
|| props.$schema.static !== nextProps.$schema.static
props.$schema.disabled !== nextProps.$schema.disabled ||
props.$schema.static !== nextProps.$schema.static
) {
const items = this.state.items.filter(item => !item.__isPlaceholder);
toUpdate = {
@ -532,10 +532,7 @@ export default class FormTable extends React.Component<TableProps, TableState> {
} else {
return this.addItem(items.length - 1, false);
}
} else if (
actionType === 'remove' ||
actionType === 'delete'
) {
} else if (actionType === 'remove' || actionType === 'delete') {
if (!valueField) {
return env.alert(__('Table.valueField'));
} else if (!action.payload) {
@ -556,11 +553,14 @@ export default class FormTable extends React.Component<TableProps, TableState> {
}
});
this.setState({
this.setState(
{
items
}, () => {
onChange?.(items);
});
},
() => {
onChange?.(items);
}
);
return;
}
@ -692,14 +692,10 @@ export default class FormTable extends React.Component<TableProps, TableState> {
const {items} = this.state;
const rendererEvent = await dispatchEvent(
eventName,
resolveEventData(
this.props,
{
value: [...items],
...eventData
},
'value'
)
resolveEventData(this.props, {
value: [...items],
...eventData
})
);
return !!rendererEvent?.prevented;
@ -747,7 +743,10 @@ export default class FormTable extends React.Component<TableProps, TableState> {
};
const isNew = !!item.__isPlaceholder;
const confirmEventName = isNew ? 'addConfirm' : 'editConfirm';
let isPrevented = await this.dispatchEvent(confirmEventName, {index: this.state.editIndex, item});
let isPrevented = await this.dispatchEvent(confirmEventName, {
index: this.state.editIndex,
item
});
if (isPrevented) {
return;
}
@ -765,7 +764,11 @@ export default class FormTable extends React.Component<TableProps, TableState> {
if (remote && !remote.ok) {
env.notify('error', apiMsg ?? (remote.msg || __('saveFailed')));
const failEventName = isNew ? 'addFail' : 'editFail';
this.dispatchEvent(failEventName, {index: this.state.editIndex, item, error: remote});
this.dispatchEvent(failEventName, {
index: this.state.editIndex,
item,
error: remote
});
return;
} else if (remote && remote.ok) {
item = merge(
@ -790,7 +793,10 @@ export default class FormTable extends React.Component<TableProps, TableState> {
return;
}
const successEventName = isNew ? 'addSuccess' : 'editSuccess';
this.dispatchEvent(successEventName, {index: this.state.editIndex, item});
this.dispatchEvent(successEventName, {
index: this.state.editIndex,
item
});
}
);
}
@ -993,7 +999,10 @@ export default class FormTable extends React.Component<TableProps, TableState> {
}
};
});
} else if (isStatic !== true && (props.addable || props.editable || isCreateMode)) {
} else if (
isStatic !== true &&
(props.addable || props.editable || isCreateMode)
) {
columns = columns.map(column => {
const quickEdit =
!isCreateMode && column.hasOwnProperty('quickEditOnUpdate')
@ -1017,7 +1026,8 @@ export default class FormTable extends React.Component<TableProps, TableState> {
};
});
!isStatic && props.editable &&
!isStatic &&
props.editable &&
btns.push({
children: ({
key,
@ -1068,79 +1078,84 @@ export default class FormTable extends React.Component<TableProps, TableState> {
)
});
!isStatic && btns.push({
children: ({
key,
rowIndex,
offset
}: {
key: any;
rowIndex: number;
offset: number;
}) =>
this.state.editIndex === rowIndex + offset ? (
<Button
classPrefix={ns}
size="sm"
key={key}
level="link"
tooltip={__('save')}
tooltipContainer={
env && env.getModalContainer ? env.getModalContainer : undefined
}
onClick={this.confirmEdit}
>
{props.confirmBtnIcon ? (
typeof props.confirmBtnIcon === 'string' ? (
<Icon icon={props.confirmBtnIcon} className="icon" />
) : (
generateIcon(props.classnames, props.confirmBtnIcon)
)
) : null}
{props.confirmBtnLabel ? (
<span>{props.confirmBtnLabel}</span>
) : null}
</Button>
) : null
});
!isStatic &&
btns.push({
children: ({
key,
rowIndex,
offset
}: {
key: any;
rowIndex: number;
offset: number;
}) =>
this.state.editIndex === rowIndex + offset ? (
<Button
classPrefix={ns}
size="sm"
key={key}
level="link"
tooltip={__('save')}
tooltipContainer={
env && env.getModalContainer
? env.getModalContainer
: undefined
}
onClick={this.confirmEdit}
>
{props.confirmBtnIcon ? (
typeof props.confirmBtnIcon === 'string' ? (
<Icon icon={props.confirmBtnIcon} className="icon" />
) : (
generateIcon(props.classnames, props.confirmBtnIcon)
)
) : null}
{props.confirmBtnLabel ? (
<span>{props.confirmBtnLabel}</span>
) : null}
</Button>
) : null
});
!isStatic && btns.push({
children: ({
key,
rowIndex,
offset
}: {
key: any;
rowIndex: number;
offset: number;
}) =>
this.state.editIndex === rowIndex + offset ? (
<Button
classPrefix={ns}
size="sm"
key={key}
level="link"
tooltip={__('cancel')}
tooltipContainer={
env && env.getModalContainer ? env.getModalContainer : undefined
}
onClick={this.cancelEdit}
>
{props.cancelBtnIcon ? (
typeof props.cancelBtnIcon === 'string' ? (
<Icon icon={props.cancelBtnIcon} className="icon" />
) : (
generateIcon(props.classnames, props.cancelBtnIcon)
)
) : null}
{props.cancelBtnLabel ? (
<span>{props.cancelBtnLabel}</span>
) : null}
</Button>
) : null
});
}
else {
!isStatic &&
btns.push({
children: ({
key,
rowIndex,
offset
}: {
key: any;
rowIndex: number;
offset: number;
}) =>
this.state.editIndex === rowIndex + offset ? (
<Button
classPrefix={ns}
size="sm"
key={key}
level="link"
tooltip={__('cancel')}
tooltipContainer={
env && env.getModalContainer
? env.getModalContainer
: undefined
}
onClick={this.cancelEdit}
>
{props.cancelBtnIcon ? (
typeof props.cancelBtnIcon === 'string' ? (
<Icon icon={props.cancelBtnIcon} className="icon" />
) : (
generateIcon(props.classnames, props.cancelBtnIcon)
)
) : null}
{props.cancelBtnLabel ? (
<span>{props.cancelBtnLabel}</span>
) : null}
</Button>
) : null
});
} else {
columns = columns.map(column => {
const render = getRendererByName(column?.type);
if (!!render?.isFormItem) {
@ -1150,7 +1165,7 @@ export default class FormTable extends React.Component<TableProps, TableState> {
...column,
isFormMode: true
}
}
};
}
return column;
});
@ -1316,25 +1331,31 @@ export default class FormTable extends React.Component<TableProps, TableState> {
}
});
const data = mergeWith({}, origin, diff, (
objValue: any,
srcValue: any,
key: string,
object: any,
source: any,
stack: any
) => {
// 只对第一层做处理，如果不是combo，并且是数组，直接采用diff的值
if (
stack.size === 0
&& comboNames.indexOf(key) === -1
&& Array.isArray(objValue)
&& Array.isArray(srcValue)) {
return srcValue;
const data = mergeWith(
{},
origin,
diff,
(
objValue: any,
srcValue: any,
key: string,
object: any,
source: any,
stack: any
) => {
// 只对第一层做处理，如果不是combo，并且是数组，直接采用diff的值
if (
stack.size === 0 &&
comboNames.indexOf(key) === -1 &&
Array.isArray(objValue) &&
Array.isArray(srcValue)
) {
return srcValue;
}
// 直接return，默认走的mergeWith自身的merge
return;
}
// 直接return，默认走的mergeWith自身的merge
return;
});
);
items = spliceTree(items, indexes, 1, data);
this.entries.set(data, this.entries.get(origin) || this.entityId++);
@ -1482,7 +1503,9 @@ export default class FormTable extends React.Component<TableProps, TableState> {
label: __('Table.add'),
icon: 'fa fa-plus',
disabled: footerAddBtnDisabled,
...(footerAddBtnDisabled ? {disabledTip: __('Table.addButtonDisabledTip')} : {})
...(footerAddBtnDisabled
? {disabledTip: __('Table.addButtonDisabledTip')}
: {})
};
if (footerAddBtn !== undefined) {
@ -1530,16 +1553,17 @@ export default class FormTable extends React.Component<TableProps, TableState> {
// onPristineChange: this.handlePristineChange
}
)}
{(!isStatic && addable &&
{(!isStatic &&
addable &&
showFooterAddBtn !== false &&
(!maxLength || maxLength > items.length)) ||
showPager ? (
<div className={cx('InputTable-toolbar')}>
{addable && showFooterAddBtn !== false ? (
render('button', footerAddBtnSchema, {
onClick: () => this.addItem(this.state.items.length)
})
) : null}
{addable && showFooterAddBtn !== false
? render('button', footerAddBtnSchema, {
onClick: () => this.addItem(this.state.items.length)
})
: null}
{showPager
? render(
@ -1571,12 +1595,19 @@ export class TableControlRenderer extends FormTable {
// 如果setValue动作传入了index，更新指定索引的值
const items = [...this.state.items];
items.splice(index, 1, value);
this.setState({items}, () => {this.emitValue()});
this.setState({items}, () => {
this.emitValue();
});
} else {
// 如果setValue动作没有传入index，则直接替换组件数据
this.setState({
items: [...value]
}, () => {this.emitValue()});
this.setState(
{
items: [...value]
},
() => {
this.emitValue();
}
);
}
}
@ -1635,7 +1666,8 @@ export class TableControlRenderer extends FormTable {
!valueField ||
!find(
items,
item => item[valueField as string] == toAdd[i - 1][valueField as string]
item =>
item[valueField as string] == toAdd[i - 1][valueField as string]
)
) {
items.splice(pushIndex, 0, toAdd[i - 1]);
@ -1683,7 +1715,10 @@ export class TableControlRenderer extends FormTable {
}
// 删除api
if (isEffectiveApi(deleteApi, createObject(ctx, {deletedItems}))) {
const payload = await env.fetcher(deleteApi, createObject(ctx, {deletedItems}));
const payload = await env.fetcher(
deleteApi,
createObject(ctx, {deletedItems})
);
if (payload && !payload.ok) {
env.notify(
'error',
@ -1693,26 +1728,35 @@ export class TableControlRenderer extends FormTable {
return;
}
}
this.setState({
items: rawItems
}, () => {
onChange?.(rawItems);
});
this.setState(
{
items: rawItems
},
() => {
onChange?.(rawItems);
}
);
return;
} else if (actionType === 'clear') {
this.setState({
items: []
}, () => {
onChange?.([]);
});
this.setState(
{
items: []
},
() => {
onChange?.([]);
}
);
return;
} else if (actionType === 'reset') {
const newItems = Array.isArray(resetValue) ? resetValue : [];
this.setState({
items: newItems
}, () => {
onChange?.(newItems);
});
this.setState(
{
items: newItems
},
() => {
onChange?.(newItems);
}
);
return;
}
return super.doAction(action as ActionObject, ctx, ...rest);

14
packages/amis/src/renderers/Form/InputTag.tsx
View File

@ -148,15 +148,11 @@ export default class TagControl extends React.PureComponent<
const {dispatchEvent, options} = this.props;
const rendererEvent = await dispatchEvent(
eventName,
resolveEventData(
this.props,
{
options,
items: options, // 为了保持名字统一
...eventData
},
'value'
)
resolveEventData(this.props, {
options,
items: options, // 为了保持名字统一
...eventData
})
);
// 返回阻塞标识
return !!rendererEvent?.prevented;

36
packages/amis/src/renderers/Form/InputText.tsx
View File

@ -310,13 +310,9 @@ export default class TextControl extends React.PureComponent<
const {dispatchEvent, value} = this.props;
const rendererEvent = await dispatchEvent(
'click',
resolveEventData(
this.props,
{
value
},
'value'
)
resolveEventData(this.props, {
value
})
);
if (rendererEvent?.prevented) {
@ -338,13 +334,9 @@ export default class TextControl extends React.PureComponent<
const rendererEvent = await dispatchEvent(
'focus',
resolveEventData(
this.props,
{
value
},
'value'
)
resolveEventData(this.props, {
value
})
);
if (rendererEvent?.prevented) {
@ -370,13 +362,9 @@ export default class TextControl extends React.PureComponent<
const rendererEvent = await dispatchEvent(
'blur',
resolveEventData(
this.props,
{
value
},
'value'
)
resolveEventData(this.props, {
value
})
);
if (rendererEvent?.prevented) {
@ -391,7 +379,7 @@ export default class TextControl extends React.PureComponent<
const {creatable, multiple, onChange, dispatchEvent} = this.props;
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(this.props, {value}, 'value')
resolveEventData(this.props, {value})
);
if (rendererEvent?.prevented) {
@ -455,7 +443,7 @@ export default class TextControl extends React.PureComponent<
const rendererEvent = await dispatchEvent(
'enter',
resolveEventData(this.props, {value}, 'value')
resolveEventData(this.props, {value})
);
if (rendererEvent?.prevented) {
@ -571,7 +559,7 @@ export default class TextControl extends React.PureComponent<
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(this.props, {value}, 'value')
resolveEventData(this.props, {value})
);
if (rendererEvent?.prevented) {

2
packages/amis/src/renderers/Form/InputTree.tsx
View File

@ -266,7 +266,7 @@ export default class TreeControl extends React.Component<TreeProps, TreeState> {
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(this.props, {value}, 'value')
resolveEventData(this.props, {value})
);
if (rendererEvent?.prevented) {

2
packages/amis/src/renderers/Form/MatrixCheckboxes.tsx
View File

@ -281,7 +281,7 @@ export default class MatrixCheckbox extends React.Component<
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(this.props, {value: value.concat()}, 'value')
resolveEventData(this.props, {value: value.concat()})
);
if (rendererEvent?.prevented) {
return;

19
packages/amis/src/renderers/Form/NestedSelect.tsx
View File

@ -1,8 +1,19 @@
import React from 'react';
import {ResultBox, Spinner,Icon, PopUp, Checkbox, Cascader, SpinnerExtraProps} from 'amis-ui';
import {
Overlay, resolveEventData,
PopOver, Option, Options,
ResultBox,
Spinner,
Icon,
PopUp,
Checkbox,
Cascader,
SpinnerExtraProps
} from 'amis-ui';
import {
Overlay,
resolveEventData,
PopOver,
Option,
Options,
autobind,
flattenTree,
filterTree,
@ -136,7 +147,7 @@ export default class NestedSelectControl extends React.Component<
const {dispatchEvent} = this.props;
const rendererEvent = await dispatchEvent(
eventName,
resolveEventData(this.props, eventData, 'value')
resolveEventData(this.props, eventData)
);
// 返回阻塞标识
return !!rendererEvent?.prevented;

6
packages/amis/src/renderers/Form/Picker.tsx
View File

@ -288,11 +288,7 @@ export default class PickerControl extends React.PureComponent<
const option = multiple ? items : items[0];
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(
this.props,
{value, option, selectedItems: option},
'value'
)
resolveEventData(this.props, {value, option, selectedItems: option})
);
if (rendererEvent?.prevented) {
return;

16
packages/amis/src/renderers/Form/Radios.tsx
View File

@ -73,16 +73,12 @@ export default class RadiosControl extends React.Component<RadiosProps, any> {
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(
this.props,
{
value,
options,
items: options, // 为了保持名字统一
selectedItems: option
},
'value'
)
resolveEventData(this.props, {
value,
options,
items: options, // 为了保持名字统一
selectedItems: option
})
);
if (rendererEvent?.prevented) {
return;

36
packages/amis/src/renderers/Form/Select.tsx
View File

@ -274,18 +274,14 @@ export default class SelectControl extends React.Component<SelectProps, any> {
// 触发渲染器事件
const rendererEvent = await dispatchEvent(
eventName,
resolveEventData(
this.props,
{
options,
items: options, // 为了保持名字统一
value: ['onEdit', 'onDelete'].includes(event)
? eventData
: eventData && eventData.value,
selectedItems: multiple ? selectedOptions : selectedOptions[0]
},
'value'
)
resolveEventData(this.props, {
options,
items: options, // 为了保持名字统一
value: ['onEdit', 'onDelete'].includes(event)
? eventData
: eventData && eventData.value,
selectedItems: multiple ? selectedOptions : selectedOptions[0]
})
);
if (rendererEvent?.prevented) {
return;
@ -308,16 +304,12 @@ export default class SelectControl extends React.Component<SelectProps, any> {
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(
this.props,
{
value: newValue,
options,
items: options, // 为了保持名字统一
selectedItems: value
},
'value'
)
resolveEventData(this.props, {
value: newValue,
options,
items: options, // 为了保持名字统一
selectedItems: value
})
);
if (rendererEvent?.prevented) {
return;

23
packages/amis/src/renderers/Form/Switch.tsx
View File

@ -73,7 +73,7 @@ export default class SwitchControl extends React.Component<SwitchProps, any> {
const {dispatchEvent, onChange} = this.props;
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(this.props, {value: checked}, 'value')
resolveEventData(this.props, {value: checked})
);
if (rendererEvent?.prevented) {
return;
@ -83,11 +83,7 @@ export default class SwitchControl extends React.Component<SwitchProps, any> {
}
getResult() {
const {
classnames: cx,
onText,
offText,
} = this.props;
const {classnames: cx, onText, offText} = this.props;
const on = isObject(onText)
? generateIcon(cx, onText.icon, 'Switch-icon')
: onText;
@ -98,11 +94,7 @@ export default class SwitchControl extends React.Component<SwitchProps, any> {
}
renderBody(children: any) {
const {
classnames: cx,
option,
optionAtLeft
} = this.props;
const {classnames: cx, option, optionAtLeft} = this.props;
const Option = <span className={cx('Switch-option')}>{option}</span>;
return (
@ -115,11 +107,8 @@ export default class SwitchControl extends React.Component<SwitchProps, any> {
}
renderStatic() {
const {
value,
trueValue,
} = this.props;
const {value, trueValue} = this.props;
const {on = '开', off = '关'} = this.getResult();
const body = <span>{value === trueValue ? on : off}</span>;
return this.renderBody(body);
@ -137,7 +126,7 @@ export default class SwitchControl extends React.Component<SwitchProps, any> {
trueValue,
falseValue,
onChange,
disabled,
disabled
} = this.props;
const {on, off} = this.getResult();

14
packages/amis/src/renderers/Form/TabsTransfer.tsx
View File

@ -218,15 +218,11 @@ export class BaseTabsTransferRenderer<
// 触发渲染器事件
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(
this.props,
{
value: newValue,
options,
items: options // 为了保持名字统一
},
'value'
)
resolveEventData(this.props, {
value: newValue,
options,
items: options // 为了保持名字统一
})
);
if (rendererEvent?.prevented) {
return;

2
packages/amis/src/renderers/Form/TabsTransferPicker.tsx
View File

@ -47,7 +47,7 @@ export class TabsTransferPickerRenderer extends BaseTabsTransferRenderer<TabsTra
@autobind
dispatchEvent(name: string) {
const {dispatchEvent, value} = this.props;
dispatchEvent(name, resolveEventData(this.props, {value}, 'value'));
dispatchEvent(name, resolveEventData(this.props, {value}));
}
@autobind

6
packages/amis/src/renderers/Form/Textarea.tsx
View File

@ -109,7 +109,7 @@ export default class TextAreaControl extends React.Component<
handleChange(e: React.ChangeEvent<HTMLTextAreaElement>) {
const {onChange, dispatchEvent} = this.props;
dispatchEvent('change', resolveEventData(this.props, {value: e}, 'value'));
dispatchEvent('change', resolveEventData(this.props, {value: e}));
onChange && onChange(e);
}
@ -125,7 +125,7 @@ export default class TextAreaControl extends React.Component<
async () => {
const rendererEvent = await dispatchEvent(
'focus',
resolveEventData(this.props, {value}, 'value')
resolveEventData(this.props, {value})
);
if (rendererEvent?.prevented) {
@ -151,7 +151,7 @@ export default class TextAreaControl extends React.Component<
const rendererEvent = await dispatchEvent(
'blur',
resolveEventData(this.props, {value}, 'value')
resolveEventData(this.props, {value})
);
if (rendererEvent?.prevented) {

14
packages/amis/src/renderers/Form/Transfer.tsx
View File

@ -277,15 +277,11 @@ export class BaseTransferRenderer<
// 触发渲染器事件
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(
this.props,
{
value: newValue,
options,
items: options // 为了保持名字统一
},
'value'
)
resolveEventData(this.props, {
value: newValue,
options,
items: options // 为了保持名字统一
})
);
if (rendererEvent?.prevented) {
return;

2
packages/amis/src/renderers/Form/TransferPicker.tsx
View File

@ -44,7 +44,7 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
@autobind
dispatchEvent(name: string) {
const {dispatchEvent, value} = this.props;
dispatchEvent(name, resolveEventData(this.props, {value}, 'value'));
dispatchEvent(name, resolveEventData(this.props, {value}));
}
// 动作

6
packages/amis/src/renderers/Form/TreeSelect.tsx
View File

@ -236,12 +236,12 @@ export default class TreeSelectControl extends React.Component<
handleFocus(e: any) {
const {dispatchEvent, value} = this.props;
dispatchEvent('focus', resolveEventData(this.props, {value}, 'value'));
dispatchEvent('focus', resolveEventData(this.props, {value}));
}
handleBlur(e: any) {
const {dispatchEvent, value, data} = this.props;
dispatchEvent('blur', resolveEventData(this.props, {value}, 'value'));
dispatchEvent('blur', resolveEventData(this.props, {value}));
}
handleKeyPress(e: React.KeyboardEvent) {
@ -486,7 +486,7 @@ export default class TreeSelectControl extends React.Component<
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(this.props, {value}, 'value')
resolveEventData(this.props, {value})
);
if (rendererEvent?.prevented) {

14
packages/amis/src/renderers/Form/UserSelect.tsx
View File

@ -191,15 +191,11 @@ export default class UserSelectControl extends React.Component<
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(
this.props,
{
value: newValue,
options,
items: options // 为了保持名字统一
},
'value'
)
resolveEventData(this.props, {
value: newValue,
options,
items: options // 为了保持名字统一
})
);
if (rendererEvent?.prevented) {
return;

12
packages/amis/src/renderers/SearchBox.tsx
View File

@ -119,13 +119,9 @@ export class SearchBoxRenderer extends React.Component<
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(
this.props,
{
value
},
'value'
)
resolveEventData(this.props, {
value
})
);
if (rendererEvent?.prevented) {
@ -171,7 +167,7 @@ export class SearchBoxRenderer extends React.Component<
const {dispatchEvent} = this.props;
dispatchEvent(
name,
resolveEventData(this.props, {value: this.state.value}, 'value')
resolveEventData(this.props, {value: this.state.value})
);
}

10
packages/amis/src/renderers/Tabs.tsx
View File

@ -640,13 +640,9 @@ export default class Tabs extends React.Component<TabsProps, TabsState> {
const rendererEvent = await dispatchEvent(
'change',
resolveEventData(
this.props,
{
value: tab?.hash ? tab?.hash : key + 1
},
'value'
)
resolveEventData(this.props, {
value: tab?.hash ? tab?.hash : key + 1
})
);
if (rendererEvent?.prevented) {
return;