Skip to content

Commit

Permalink
release v0.3.3 优化前端页面弹窗不再居中
Browse files Browse the repository at this point in the history
  • Loading branch information
dushixiang committed Mar 11, 2021
1 parent d9da5ab commit bc227ba
Show file tree
Hide file tree
Showing 18 changed files with 23 additions and 27 deletions.
2 changes: 1 addition & 1 deletion web/src/components/Login.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class LoginForm extends Component {

<Modal title="双因素认证" visible={this.state.totpModalVisible} confirmLoading={this.state.confirmLoading}
maskClosable={false}
centered={true}

onOk={() => {
this.formRef.current
.validateFields()
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/access/Access.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ class Access extends Component {
title="剪贴板"
maskClosable={false}
visible={this.state.clipboardVisible}
centered={true}

onOk={() => {
this.clipboardFormRef.current
.validateFields()
Expand Down
6 changes: 3 additions & 3 deletions web/src/components/access/FileSystem.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ class FileSystem extends Component {
<Modal
title="上传文件"
visible={this.state.uploadVisible}
centered={true}

onOk={() => {
this.setState({
uploadVisible: false
Expand All @@ -483,7 +483,7 @@ class FileSystem extends Component {
<Modal
title="创建文件夹"
visible={this.state.mkdirVisible}
centered={true}

onOk={() => {
this.mkdirFormRef.current
.validateFields()
Expand Down Expand Up @@ -535,7 +535,7 @@ class FileSystem extends Component {
<Modal
title="重命名"
visible={this.state.renameVisible}
centered={true}

onOk={() => {
this.renameFormRef.current
.validateFields()
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/asset/Asset.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ class Asset extends Component {
</Text>}
visible={this.state.changeOwnerModalVisible}
confirmLoading={this.state.changeOwnerConfirmLoading}
centered={true}

onOk={() => {
this.setState({
changeOwnerConfirmLoading: true
Expand Down Expand Up @@ -989,7 +989,7 @@ class Asset extends Component {
</Text>}
visible={this.state.changeSharerModalVisible}
confirmLoading={this.state.changeSharerConfirmLoading}
centered={true}

onOk={async () => {
this.setState({
changeSharerConfirmLoading: true
Expand Down
1 change: 0 additions & 1 deletion web/src/components/asset/AssetModal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ const AssetModal = function ({title, visible, handleOk, handleCancel, confirmLoa
title={title}
visible={visible}
maskClosable={false}
centered={true}
onOk={() => {
form
.validateFields()
Expand Down
6 changes: 3 additions & 3 deletions web/src/components/command/DynamicCommand.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ class DynamicCommand extends Component {
<Modal
title="选择资产"
visible={this.state.assetsVisible}
centered={true}

onOk={this.executeCommand}
onCancel={() => {
this.setState({
Expand Down Expand Up @@ -691,7 +691,7 @@ class DynamicCommand extends Component {
</Text>}
visible={this.state.changeOwnerModalVisible}
confirmLoading={this.state.changeOwnerConfirmLoading}
centered={true}

onOk={() => {
this.setState({
changeOwnerConfirmLoading: true
Expand Down Expand Up @@ -752,7 +752,7 @@ class DynamicCommand extends Component {
style={{color: '#1890ff'}}>{this.state.selected['name']}</strong>」的授权人
</Text>}
visible={this.state.changeSharerModalVisible}
centered={true}

confirmLoading={this.state.changeSharerConfirmLoading}
onOk={async () => {
this.setState({
Expand Down
1 change: 0 additions & 1 deletion web/src/components/command/DynamicCommandModal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ const DynamicCommandModal = ({title, visible, handleOk, handleCancel, confirmLoa
title={title}
visible={visible}
maskClosable={false}
centered={true}
onOk={() => {
form
.validateFields()
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/credential/Credential.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ class Credential extends Component {
</Text>}
visible={this.state.changeOwnerModalVisible}
confirmLoading={this.state.changeOwnerConfirmLoading}
centered={true}

onOk={() => {
this.setState({
changeOwnerConfirmLoading: true
Expand Down Expand Up @@ -665,7 +665,7 @@ class Credential extends Component {
</Text>}
visible={this.state.changeSharerModalVisible}
confirmLoading={this.state.changeSharerConfirmLoading}
centered={true}

onOk={async () => {
this.setState({
changeSharerConfirmLoading: true
Expand Down
1 change: 0 additions & 1 deletion web/src/components/credential/CredentialModal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ const CredentialModal = ({title, visible, handleOk, handleCancel, confirmLoading
title={title}
visible={visible}
maskClosable={false}
centered={true}
onOk={() => {
form
.validateFields()
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/devops/Job.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion web/src/components/devops/JobModal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ const JobModal = ({title, visible, handleOk, handleCancel, confirmLoading, model
title={title}
visible={visible}
maskClosable={false}
centered={true}
onOk={() => {
form
.validateFields()
Expand Down
8 changes: 5 additions & 3 deletions web/src/components/devops/SecurityModal.js
View file
Original file line number Diff line number Diff line change
@@ -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},
Expand All @@ -19,7 +20,6 @@ const SecurityModal = ({title, visible, handleOk, handleCancel, confirmLoading,
title={title}
visible={visible}
maskClosable={false}
centered={true}
onOk={() => {
form
.validateFields()
Expand Down Expand Up @@ -54,7 +54,9 @@ const SecurityModal = ({title, visible, handleOk, handleCancel, confirmLoading,
</Radio.Group>
</Form.Item>

<Form.Item label="优先级" name='priority' rules={[{required: true, message: '请输入优先级'}]}>
<Form.Item label={<Tooltip
title="数字越小代表优先级越高。">优先级&nbsp;
<ExclamationCircleOutlined/></Tooltip>} name='priority' rules={[{required: true, message: '请输入优先级'}]}>
<InputNumber min={0} max={100}/>
</Form.Item>

Expand Down
2 changes: 1 addition & 1 deletion web/src/components/session/OfflineSession.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ class OfflineSession extends Component {
<Modal
className='modal-no-padding'
title={`会话回放 来源IP：${this.state.selectedRow['clientIp']} 用户昵称：${this.state.selectedRow['creatorName']} 资产名称：${this.state.selectedRow['assetName']} 网络：${this.state.selectedRow['username']}@${this.state.selectedRow['ip']}:${this.state.selectedRow['port']}`}
centered={true}

visible={this.state.playbackVisible}
onCancel={this.hidePlayback}
width={window.innerWidth * 0.8}
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/session/OnlineSession.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ class OnlineSession extends Component {
<Modal
className='modal-no-padding'
title={this.state.sessionTitle}
centered={true}

maskClosable={false}
visible={this.state.accessVisible}
footer={null}
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/user/User.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ class User extends Component {
width={window.innerWidth * 0.8}
title='已授权资产'
visible={this.state.assetVisible}
centered={true}

maskClosable={false}
destroyOnClose={true}
onOk={() => {
Expand All @@ -674,7 +674,7 @@ class User extends Component {
<Modal title="修改密码" visible={this.state.changePasswordVisible}
confirmLoading={this.state.changePasswordConfirmLoading}
maskClosable={false}
centered={true}

onOk={() => {
this.changePasswordFormRef.current
.validateFields()
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/user/UserGroup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ class UserGroup extends Component {
title='已授权资产'
visible={this.state.assetVisible}
maskClosable={false}
centered={true}

destroyOnClose={true}
onOk={() => {

Expand Down
1 change: 0 additions & 1 deletion web/src/components/user/UserGroupModal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ const UserGroupModal = ({
visible={visible}
maskClosable={false}
destroyOnClose={true}
centered={true}
onOk={() => {
form
.validateFields()
Expand Down
1 change: 0 additions & 1 deletion web/src/components/user/UserModal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const UserModal = ({title, visible, handleOk, handleCancel, confirmLoading, mode
title={title}
visible={visible}
maskClosable={false}
centered={true}
onOk={() => {
form
.validateFields()
Expand Down

0 comments on commit bc227ba

Please sign in to comment.