diff --git a/web/src/components/Login.js b/web/src/components/Login.js index 49db17c..807e3ee 100644 --- a/web/src/components/Login.js +++ b/web/src/components/Login.js @@ -128,7 +128,7 @@ class LoginForm extends Component { { this.formRef.current .validateFields() 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 8786549..02507d5 100644 --- a/web/src/components/asset/Asset.js +++ b/web/src/components/asset/Asset.js @@ -926,7 +926,7 @@ class Asset extends Component { } visible={this.state.changeOwnerModalVisible} confirmLoading={this.state.changeOwnerConfirmLoading} - centered={true} + onOk={() => { this.setState({ changeOwnerConfirmLoading: true @@ -989,7 +989,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 8e7f1c1..07a1736 100644 --- a/web/src/components/command/DynamicCommand.js +++ b/web/src/components/command/DynamicCommand.js @@ -663,7 +663,7 @@ class DynamicCommand extends Component { { this.setState({ @@ -691,7 +691,7 @@ class DynamicCommand extends Component { } visible={this.state.changeOwnerModalVisible} confirmLoading={this.state.changeOwnerConfirmLoading} - centered={true} + onOk={() => { this.setState({ changeOwnerConfirmLoading: true @@ -752,7 +752,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..deb776c 100644 --- a/web/src/components/command/DynamicCommandModal.js +++ b/web/src/components/command/DynamicCommandModal.js @@ -21,7 +21,6 @@ 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 12e837d..366adb7 100644 --- a/web/src/components/credential/Credential.js +++ b/web/src/components/credential/Credential.js @@ -606,7 +606,7 @@ class Credential extends Component { } visible={this.state.changeOwnerModalVisible} confirmLoading={this.state.changeOwnerConfirmLoading} - centered={true} + onOk={() => { this.setState({ changeOwnerConfirmLoading: true @@ -665,7 +665,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..874e722 100644 --- a/web/src/components/credential/CredentialModal.js +++ b/web/src/components/credential/CredentialModal.js @@ -47,7 +47,6 @@ 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 3242cb8..eb05738 100644 --- a/web/src/components/devops/Job.js +++ b/web/src/components/devops/Job.js @@ -566,7 +566,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..1246852 100644 --- a/web/src/components/devops/JobModal.js +++ b/web/src/components/devops/JobModal.js @@ -47,7 +47,6 @@ 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..f37f54d 100644 --- a/web/src/components/devops/SecurityModal.js +++ b/web/src/components/devops/SecurityModal.js @@ -1,5 +1,6 @@ import React from 'react'; -import {Form, Input, InputNumber, Modal, Radio} from "antd/lib/index"; +import {Form, Input, InputNumber, Modal, Radio, Tooltip} from "antd/lib/index"; +import {ExclamationCircleOutlined} from "@ant-design/icons"; const formItemLayout = { labelCol: {span: 6}, @@ -19,7 +20,6 @@ const SecurityModal = ({title, visible, handleOk, handleCancel, confirmLoading, title={title} visible={visible} maskClosable={false} - centered={true} onOk={() => { form .validateFields() @@ -54,7 +54,9 @@ const SecurityModal = ({title, visible, handleOk, handleCancel, confirmLoading, - + 优先级  + } name='priority' rules={[{required: true, message: '请输入优先级'}]}> diff --git a/web/src/components/session/OfflineSession.js b/web/src/components/session/OfflineSession.js index a2253d4..dba909f 100644 --- a/web/src/components/session/OfflineSession.js +++ b/web/src/components/session/OfflineSession.js @@ -502,7 +502,7 @@ class OfflineSession extends Component { { @@ -674,7 +674,7 @@ 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 d525f9b..eda592b 100644 --- a/web/src/components/user/UserGroup.js +++ b/web/src/components/user/UserGroup.js @@ -453,7 +453,7 @@ 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()