mirror of
https://gitee.com/baidu/amis.git
synced 2024-12-02 20:09:08 +08:00
Merge pull request #1900 from RickCole21/fix-button-group-placeholder
修复弹框ajax行为无效问题
This commit is contained in:
commit
0c79f5813b
@ -76,7 +76,8 @@ export default class ButtonGroupControl extends React.Component<
|
||||
buttons,
|
||||
size,
|
||||
block,
|
||||
vertical
|
||||
vertical,
|
||||
translate: __
|
||||
} = props;
|
||||
|
||||
let body: Array<React.ReactNode> = [];
|
||||
@ -145,7 +146,9 @@ export default class ButtonGroupControl extends React.Component<
|
||||
{body.length ? (
|
||||
body
|
||||
) : (
|
||||
<span className={`${ns}ButtonGroup-placeholder`}>{placeholder}</span>
|
||||
<span className={`${ns}ButtonGroup-placeholder`}>
|
||||
{__(placeholder)}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
|
@ -1596,10 +1596,10 @@ export class FormRenderer extends Form {
|
||||
throwErrors: boolean = false,
|
||||
delegate?: IScopedContext
|
||||
) {
|
||||
// 禁用了不要做任何动作。
|
||||
if (this.props.disabled) {
|
||||
return;
|
||||
}
|
||||
// 禁用了不要做任何动作。@先注释掉,会引起其他问题
|
||||
// if (this.props.disabled) {
|
||||
// return;
|
||||
// }
|
||||
|
||||
if (action.target && action.actionType !== 'reload') {
|
||||
const scoped = this.context as IScopedContext;
|
||||
|
Loading…
Reference in New Issue
Block a user