From 4085677c5a108214317cf7b7327577800e6ccd6c Mon Sep 17 00:00:00 2001
From: dushixiang <798148596@qq.com>
Date: Tue, 9 Feb 2021 15:28:58 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=A2=9E=E5=8A=A0=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=8A=9F=E8=83=BD=20-=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=BC=B9=E7=AA=97=E5=B1=85=E4=B8=AD=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/api/asset.go                                  | 4 ++++
 web/src/components/Login.js                       | 1 +
 web/src/components/access/Access.js               | 1 +
 web/src/components/asset/Asset.js                 | 2 ++
 web/src/components/asset/AssetModal.js            | 9 +++++++--
 web/src/components/command/DynamicCommand.js      | 3 +++
 web/src/components/command/DynamicCommandModal.js | 1 +
 web/src/components/credential/Credential.js       | 2 ++
 web/src/components/credential/CredentialModal.js  | 2 +-
 web/src/components/session/OfflineSession.js      | 3 +--
 web/src/components/session/OnlineSession.js       | 2 +-
 web/src/components/user/User.js                   | 2 ++
 web/src/components/user/UserGroup.js              | 1 +
 web/src/components/user/UserGroupModal.js         | 1 +
 web/src/components/user/UserModal.js              | 1 +
 15 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/pkg/api/asset.go b/pkg/api/asset.go
index ed2074c..9032014 100644
--- a/pkg/api/asset.go
+++ b/pkg/api/asset.go
@@ -97,6 +97,10 @@ func AssetUpdateEndpoint(c echo.Context) error {
 		item.Tags = "-"
 	}
 
+	if item.Description == "" {
+		item.Description = "-"
+	}
+
 	model.UpdateAssetById(&item, id)
 
 	return Success(c, nil)
diff --git a/web/src/components/Login.js b/web/src/components/Login.js
index d0314c0..49db17c 100644
--- a/web/src/components/Login.js
+++ b/web/src/components/Login.js
@@ -128,6 +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()
diff --git a/web/src/components/access/Access.js b/web/src/components/access/Access.js
index 907cdb6..76115fe 100644
--- a/web/src/components/access/Access.js
+++ b/web/src/components/access/Access.js
@@ -621,6 +621,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/asset/Asset.js b/web/src/components/asset/Asset.js
index f90f1a3..499de28 100644
--- a/web/src/components/asset/Asset.js
+++ b/web/src/components/asset/Asset.js
@@ -709,6 +709,7 @@ class Asset extends Component {
                     </Text>}
                            visible={this.state.changeOwnerModalVisible}
                            confirmLoading={this.state.changeOwnerConfirmLoading}
+                           centered={true}
                            onOk={() => {
                                this.setState({
                                    changeOwnerConfirmLoading: true
@@ -771,6 +772,7 @@ class Asset extends Component {
                             </Text>}
                                    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 920ae9c..5eff2fe 100644
--- a/web/src/components/asset/AssetModal.js
+++ b/web/src/components/asset/AssetModal.js
@@ -98,6 +98,7 @@ const AssetModal = function ({title, visible, handleOk, handleCancel, confirmLoa
             title={title}
             visible={visible}
             maskClosable={false}
+            centered={true}
             onOk={() => {
                 form
                     .validateFields()
@@ -137,7 +138,7 @@ const AssetModal = function ({title, visible, handleOk, handleCancel, confirmLoa
                 </Form.Item>
 
                 <Form.Item label="端口号" name='port' rules={[{required: true, message: '请输入资产端口'}]}>
-                    <InputNumber min={1} max={65535}/>
+                    <InputNumber min={1} max={65535} placeholder='TCP端口'/>
                 </Form.Item>
 
                 <Form.Item label="账户类型" name='accountType' rules={[{required: true, message: '请选择接账户类型'}]}>
@@ -198,7 +199,7 @@ const AssetModal = function ({title, visible, handleOk, handleCancel, confirmLoa
                 }
 
                 <Form.Item label="标签" name='tags'>
-                    <Select mode="tags" placeholder="请选择标签">
+                    <Select mode="tags" placeholder="标签可以更加方便的检索资产">
                         {tags.map(tag => {
                             if (tag === '-') {
                                 return undefined;
@@ -207,6 +208,10 @@ const AssetModal = function ({title, visible, handleOk, handleCancel, confirmLoa
                         })}
                     </Select>
                 </Form.Item>
+
+                <Form.Item label="备注" name='description'>
+                    <TextArea rows={4} placeholder='关于资产的一些信息您可以写在这里'/>
+                </Form.Item>
             </Form>
         </Modal>
     )
diff --git a/web/src/components/command/DynamicCommand.js b/web/src/components/command/DynamicCommand.js
index d3cb9b4..4c25a6a 100644
--- a/web/src/components/command/DynamicCommand.js
+++ b/web/src/components/command/DynamicCommand.js
@@ -644,6 +644,7 @@ class DynamicCommand extends Component {
                     <Modal
                         title="选择资产"
                         visible={this.state.assetsVisible}
+                        centered={true}
                         onOk={this.executeCommand}
                         onCancel={() => {
                             this.setState({
@@ -671,6 +672,7 @@ class DynamicCommand extends Component {
                     </Text>}
                            visible={this.state.changeOwnerModalVisible}
                            confirmLoading={this.state.changeOwnerConfirmLoading}
+                           centered={true}
                            onOk={() => {
                                this.setState({
                                    changeOwnerConfirmLoading: true
@@ -731,6 +733,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({
diff --git a/web/src/components/command/DynamicCommandModal.js b/web/src/components/command/DynamicCommandModal.js
index deb776c..17d54bc 100644
--- a/web/src/components/command/DynamicCommandModal.js
+++ b/web/src/components/command/DynamicCommandModal.js
@@ -21,6 +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 96279cc..2310e20 100644
--- a/web/src/components/credential/Credential.js
+++ b/web/src/components/credential/Credential.js
@@ -587,6 +587,7 @@ class Credential extends Component {
                     </Text>}
                            visible={this.state.changeOwnerModalVisible}
                            confirmLoading={this.state.changeOwnerConfirmLoading}
+                           centered={true}
                            onOk={() => {
                                this.setState({
                                    changeOwnerConfirmLoading: true
@@ -645,6 +646,7 @@ class Credential extends Component {
                             </Text>}
                                    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 32f06f8..5949bf1 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/session/OfflineSession.js b/web/src/components/session/OfflineSession.js
index 8e4c8fa..2872bd3 100644
--- a/web/src/components/session/OfflineSession.js
+++ b/web/src/components/session/OfflineSession.js
@@ -479,10 +479,9 @@ class OfflineSession extends Component {
                             <Modal
                                 className='monitor'
                                 title="会话回放"
-                                centered
+                                centered={true}
                                 visible={this.state.playbackVisible}
                                 onCancel={this.hidePlayback}
-
                                 width={window.innerWidth * 0.8}
                                 footer={null}
                                 destroyOnClose
diff --git a/web/src/components/session/OnlineSession.js b/web/src/components/session/OnlineSession.js
index 853c151..cb5a0fe 100644
--- a/web/src/components/session/OnlineSession.js
+++ b/web/src/components/session/OnlineSession.js
@@ -475,7 +475,7 @@ class OnlineSession extends Component {
                             <Modal
                                 className='monitor'
                                 title={this.state.sessionTitle}
-                                centered
+                                centered={true}
                                 maskClosable={false}
                                 visible={this.state.accessVisible}
                                 footer={null}
diff --git a/web/src/components/user/User.js b/web/src/components/user/User.js
index e6d21ea..9266772 100644
--- a/web/src/components/user/User.js
+++ b/web/src/components/user/User.js
@@ -590,6 +590,7 @@ class User extends Component {
                         width={window.innerWidth * 0.8}
                         title='已授权资产'
                         visible={this.state.assetVisible}
+                        centered={true}
                         maskClosable={false}
                         destroyOnClose={true}
                         onOk={() => {
@@ -610,6 +611,7 @@ class User extends Component {
                             <Modal title="修改密码" visible={this.state.changePasswordVisible}
                                    confirmLoading={this.state.changePasswordConfirmLoading}
                                    maskClosable={false}
+                                   centered={true}
                                    onOk={() => {
                                        this.changePasswordFormRef.current
                                            .validateFields()
diff --git a/web/src/components/user/UserGroup.js b/web/src/components/user/UserGroup.js
index f9cb410..7815b07 100644
--- a/web/src/components/user/UserGroup.js
+++ b/web/src/components/user/UserGroup.js
@@ -435,6 +435,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 008d79e..0261ab1 100644
--- a/web/src/components/user/UserGroupModal.js
+++ b/web/src/components/user/UserGroupModal.js
@@ -24,6 +24,7 @@ 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 e8a0fcd..1eba056 100644
--- a/web/src/components/user/UserModal.js
+++ b/web/src/components/user/UserModal.js
@@ -15,6 +15,7 @@ const UserModal = ({title, visible, handleOk, handleCancel, confirmLoading, mode
             title={title}
             visible={visible}
             maskClosable={false}
+            centered={true}
             onOk={() => {
                 form
                     .validateFields()