diff --git a/web/src/components/Login.js b/web/src/components/Login.js index 351b442..04735c8 100644 --- a/web/src/components/Login.js +++ b/web/src/components/Login.js @@ -132,7 +132,7 @@ class LoginForm extends Component { { this.formRef.current diff --git a/web/src/components/access/Access.js b/web/src/components/access/Access.js index 0edb71a..cc67eb7 100644 --- a/web/src/components/access/Access.js +++ b/web/src/components/access/Access.js @@ -652,7 +652,7 @@ class Access extends Component { title="剪贴板" maskClosable={false} visible={this.state.clipboardVisible} - centered={true} + onOk={() => { this.clipboardFormRef.current .validateFields() diff --git a/web/src/components/access/FileSystem.js b/web/src/components/access/FileSystem.js index fad8926..8f407d8 100644 --- a/web/src/components/access/FileSystem.js +++ b/web/src/components/access/FileSystem.js @@ -457,7 +457,7 @@ class FileSystem extends Component { { this.setState({ uploadVisible: false @@ -483,7 +483,7 @@ class FileSystem extends Component { { this.mkdirFormRef.current .validateFields() @@ -535,7 +535,7 @@ class FileSystem extends Component { { this.renameFormRef.current .validateFields() diff --git a/web/src/components/asset/Asset.js b/web/src/components/asset/Asset.js index 4da5233..0c39582 100644 --- a/web/src/components/asset/Asset.js +++ b/web/src/components/asset/Asset.js @@ -900,7 +900,7 @@ class Asset extends Component { } visible={this.state.changeOwnerModalVisible} confirmLoading={this.state.changeOwnerConfirmLoading} - centered={true} + onOk={() => { this.setState({ changeOwnerConfirmLoading: true @@ -963,7 +963,7 @@ class Asset extends Component { } visible={this.state.changeSharerModalVisible} confirmLoading={this.state.changeSharerConfirmLoading} - centered={true} + onOk={async () => { this.setState({ changeSharerConfirmLoading: true diff --git a/web/src/components/asset/AssetModal.js b/web/src/components/asset/AssetModal.js index 797ab7f..75f1276 100644 --- a/web/src/components/asset/AssetModal.js +++ b/web/src/components/asset/AssetModal.js @@ -131,7 +131,6 @@ const AssetModal = function ({title, visible, handleOk, handleCancel, confirmLoa title={title} visible={visible} maskClosable={false} - centered={true} onOk={() => { form .validateFields() diff --git a/web/src/components/command/DynamicCommand.js b/web/src/components/command/DynamicCommand.js index 08ef3c1..08eea4d 100644 --- a/web/src/components/command/DynamicCommand.js +++ b/web/src/components/command/DynamicCommand.js @@ -640,7 +640,7 @@ class DynamicCommand extends Component { { this.setState({ @@ -668,7 +668,7 @@ class DynamicCommand extends Component { } visible={this.state.changeOwnerModalVisible} confirmLoading={this.state.changeOwnerConfirmLoading} - centered={true} + onOk={() => { this.setState({ changeOwnerConfirmLoading: true @@ -729,7 +729,7 @@ class DynamicCommand extends Component { style={{color: '#1890ff'}}>{this.state.selected['name']}」的授权人 } visible={this.state.changeSharerModalVisible} - centered={true} + confirmLoading={this.state.changeSharerConfirmLoading} onOk={async () => { this.setState({ diff --git a/web/src/components/command/DynamicCommandModal.js b/web/src/components/command/DynamicCommandModal.js index 17d54bc..7855292 100644 --- a/web/src/components/command/DynamicCommandModal.js +++ b/web/src/components/command/DynamicCommandModal.js @@ -21,7 +21,7 @@ const DynamicCommandModal = ({title, visible, handleOk, handleCancel, confirmLoa title={title} visible={visible} maskClosable={false} - centered={true} + onOk={() => { form .validateFields() diff --git a/web/src/components/credential/Credential.js b/web/src/components/credential/Credential.js index 15de275..89f0263 100644 --- a/web/src/components/credential/Credential.js +++ b/web/src/components/credential/Credential.js @@ -582,7 +582,7 @@ class Credential extends Component { } visible={this.state.changeOwnerModalVisible} confirmLoading={this.state.changeOwnerConfirmLoading} - centered={true} + onOk={() => { this.setState({ changeOwnerConfirmLoading: true @@ -641,7 +641,7 @@ class Credential extends Component { } visible={this.state.changeSharerModalVisible} confirmLoading={this.state.changeSharerConfirmLoading} - centered={true} + onOk={async () => { this.setState({ changeSharerConfirmLoading: true diff --git a/web/src/components/credential/CredentialModal.js b/web/src/components/credential/CredentialModal.js index 5949bf1..32f06f8 100644 --- a/web/src/components/credential/CredentialModal.js +++ b/web/src/components/credential/CredentialModal.js @@ -47,7 +47,7 @@ const CredentialModal = ({title, visible, handleOk, handleCancel, confirmLoading title={title} visible={visible} maskClosable={false} - centered={true} + onOk={() => { form .validateFields() diff --git a/web/src/components/devops/Job.js b/web/src/components/devops/Job.js index 3072e20..ae42c26 100644 --- a/web/src/components/devops/Job.js +++ b/web/src/components/devops/Job.js @@ -542,7 +542,7 @@ class Job extends Component { title={'日志'} visible={true} maskClosable={false} - centered={true} + onOk={async () => { let result = await request.delete(`/jobs/${this.state.selectedRow['id']}/logs`); if (result['code'] === 1) { diff --git a/web/src/components/devops/JobModal.js b/web/src/components/devops/JobModal.js index 920f3d3..135baba 100644 --- a/web/src/components/devops/JobModal.js +++ b/web/src/components/devops/JobModal.js @@ -47,7 +47,7 @@ const JobModal = ({title, visible, handleOk, handleCancel, confirmLoading, model title={title} visible={visible} maskClosable={false} - centered={true} + onOk={() => { form .validateFields() diff --git a/web/src/components/devops/SecurityModal.js b/web/src/components/devops/SecurityModal.js index ba9ad57..6d54a3f 100644 --- a/web/src/components/devops/SecurityModal.js +++ b/web/src/components/devops/SecurityModal.js @@ -19,7 +19,7 @@ const SecurityModal = ({title, visible, handleOk, handleCancel, confirmLoading, title={title} visible={visible} maskClosable={false} - centered={true} + onOk={() => { form .validateFields() diff --git a/web/src/components/user/User.js b/web/src/components/user/User.js index 4c21b25..44a9ef3 100644 --- a/web/src/components/user/User.js +++ b/web/src/components/user/User.js @@ -628,7 +628,6 @@ class User extends Component { width={window.innerWidth * 0.8} title='已授权资产' visible={this.state.assetVisible} - centered={true} maskClosable={false} destroyOnClose={true} onOk={() => { @@ -649,7 +648,6 @@ class User extends Component { { this.changePasswordFormRef.current .validateFields() diff --git a/web/src/components/user/UserGroup.js b/web/src/components/user/UserGroup.js index 6958b01..fef32e8 100644 --- a/web/src/components/user/UserGroup.js +++ b/web/src/components/user/UserGroup.js @@ -429,7 +429,6 @@ class UserGroup extends Component { title='已授权资产' visible={this.state.assetVisible} maskClosable={false} - centered={true} destroyOnClose={true} onOk={() => { diff --git a/web/src/components/user/UserGroupModal.js b/web/src/components/user/UserGroupModal.js index 0261ab1..008d79e 100644 --- a/web/src/components/user/UserGroupModal.js +++ b/web/src/components/user/UserGroupModal.js @@ -24,7 +24,6 @@ const UserGroupModal = ({ visible={visible} maskClosable={false} destroyOnClose={true} - centered={true} onOk={() => { form .validateFields() diff --git a/web/src/components/user/UserModal.js b/web/src/components/user/UserModal.js index e416202..d83817d 100644 --- a/web/src/components/user/UserModal.js +++ b/web/src/components/user/UserModal.js @@ -15,7 +15,6 @@ const UserModal = ({title, visible, handleOk, handleCancel, confirmLoading, mode title={title} visible={visible} maskClosable={false} - centered={true} onOk={() => { form .validateFields()