From 21da5b2d025c4ca59c58c4c033d9c7352fe01143 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Wed, 25 May 2022 08:51:35 +0800
Subject: [PATCH] disabled drag modal.

---
 orion-ops-vue/src/components/app/AddAppEnvModal.vue  |  1 -
 orion-ops-vue/src/components/app/AddAppForm.vue      | 12 ++++++------
 orion-ops-vue/src/components/app/AddAppModal.vue     |  3 +--
 .../src/components/app/AddAppProfileModal.vue        |  7 +++----
 orion-ops-vue/src/components/app/AddAppVcsModal.vue  |  1 -
 .../src/components/app/AddPipelineModal.vue          |  1 -
 orion-ops-vue/src/components/app/AppBuildModal.vue   |  1 -
 .../src/components/app/AppPipelineExecAuditModal.vue |  1 -
 .../src/components/app/AppPipelineExecBuildModal.vue |  1 -
 .../src/components/app/AppPipelineExecModal.vue      |  1 -
 .../components/app/AppPipelineExecReleaseModal.vue   |  1 -
 .../src/components/app/AppPipelineExecTimedModal.vue |  1 -
 .../src/components/app/AppReleaseAuditModal.vue      |  1 -
 .../src/components/app/AppReleaseConfigForm.vue      |  2 +-
 orion-ops-vue/src/components/app/AppReleaseModal.vue |  1 -
 .../src/components/app/AppReleaseTimedModal.vue      |  1 -
 .../src/components/exec/ExecTaskDetailModal.vue      |  1 -
 .../src/components/history/EnvHistoryModal.vue       |  1 -
 orion-ops-vue/src/components/layout/Menu.vue         |  8 +++++---
 .../src/components/layout/WebSideMessageDropdown.vue |  2 +-
 orion-ops-vue/src/components/log/AddLogFileModal.vue |  2 +-
 .../src/components/machine/AddMachineEnvModal.vue    |  1 -
 .../src/components/machine/AddMachineKeyModal.vue    |  1 -
 .../src/components/machine/AddMachineModal.vue       |  9 ++++-----
 .../src/components/machine/AddMachineProxyModal.vue  |  1 -
 .../src/components/machine/MachineDetailModal.vue    |  7 +++----
 .../src/components/machine/MachineSelector.vue       | 11 ++++++++++-
 .../components/machine/TempMountMachineKeyModal.vue  |  1 -
 .../src/components/preview/EditorPreview.vue         |  1 -
 orion-ops-vue/src/components/preview/TextPreview.vue |  1 -
 .../src/components/scheduler/AddSchedulerTask.vue    |  1 -
 orion-ops-vue/src/components/sftp/SftpChmodModal.vue |  1 -
 orion-ops-vue/src/components/sftp/SftpMoveModal.vue  |  1 -
 orion-ops-vue/src/components/sftp/SftpTouchModal.vue |  1 -
 .../src/components/system/AddSystemEnvModal.vue      |  1 -
 .../src/components/template/AddTemplateModal.vue     |  1 -
 .../src/components/template/TemplateSelector.vue     |  1 -
 .../src/components/terminal/TerminalMain.vue         |  2 +-
 .../src/components/terminal/TerminalSettingModal.vue |  1 -
 .../src/components/terminal/TerminalXterm.vue        |  2 +-
 orion-ops-vue/src/components/user/AddUserModal.vue   |  1 -
 orion-ops-vue/src/components/user/ResetPassword.vue  |  1 -
 .../src/components/user/WebSideMessageList.vue       | 12 ++++++++----
 .../src/components/user/WebSideMessageModal.vue      |  1 -
 44 files changed, 45 insertions(+), 65 deletions(-)

diff --git a/orion-ops-vue/src/components/app/AddAppEnvModal.vue b/orion-ops-vue/src/components/app/AddAppEnvModal.vue
index b8d14c22..25fc3f5b 100644
--- a/orion-ops-vue/src/components/app/AddAppEnvModal.vue
+++ b/orion-ops-vue/src/components/app/AddAppEnvModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
            :width="500"
            :okButtonProps="{props: {disabled: loading}}"
diff --git a/orion-ops-vue/src/components/app/AddAppForm.vue b/orion-ops-vue/src/components/app/AddAppForm.vue
index 55849c0e..65b47608 100644
--- a/orion-ops-vue/src/components/app/AddAppForm.vue
+++ b/orion-ops-vue/src/components/app/AddAppForm.vue
@@ -4,7 +4,7 @@
       <a-form-item label="名称" hasFeedback>
         <a-input v-decorator="decorators.name" allowClear/>
       </a-form-item>
-      <a-form-item label="标签" hasFeedback>
+      <a-form-item label="唯一标识" hasFeedback>
         <a-input v-decorator="decorators.tag" allowClear/>
       </a-form-item>
       <a-form-item label="版本仓库">
@@ -17,7 +17,7 @@
           <a-icon type="reload"/>
         </a>
       </a-form-item>
-      <a-form-item label="描述">
+      <a-form-item label="描述" style="margin-bottom: 0;">
         <a-textarea v-decorator="decorators.description" allowClear/>
       </a-form-item>
     </a-form>
@@ -41,10 +41,10 @@ function getDecorators() {
     tag: ['tag', {
       rules: [{
         required: true,
-        message: '请输入标签'
+        message: '请输入唯一标识'
       }, {
         max: 32,
-        message: '标签长度不能大于32位'
+        message: '唯一标识长度不能大于32位'
       }]
     }],
     vcsId: ['vcsId'],
@@ -64,8 +64,8 @@ export default {
       type: Object,
       default: () => {
         return {
-          labelCol: { span: 3 },
-          wrapperCol: { span: 19 }
+          labelCol: { span: 4 },
+          wrapperCol: { span: 17 }
         }
       }
     }
diff --git a/orion-ops-vue/src/components/app/AddAppModal.vue b/orion-ops-vue/src/components/app/AddAppModal.vue
index 46247982..de32a1b0 100644
--- a/orion-ops-vue/src/components/app/AddAppModal.vue
+++ b/orion-ops-vue/src/components/app/AddAppModal.vue
@@ -1,8 +1,7 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
-           :width="640"
+           :width="660"
            :okButtonProps="{props: {disabled: loading}}"
            :maskClosable="false"
            :destroyOnClose="true"
diff --git a/orion-ops-vue/src/components/app/AddAppProfileModal.vue b/orion-ops-vue/src/components/app/AddAppProfileModal.vue
index fae23ce1..3fa75b04 100644
--- a/orion-ops-vue/src/components/app/AddAppProfileModal.vue
+++ b/orion-ops-vue/src/components/app/AddAppProfileModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
            :width="650"
            :okButtonProps="{props: {disabled: loading}}"
@@ -13,7 +12,7 @@
         <a-form-item label="环境名称" hasFeedback>
           <a-input v-decorator="decorators.name" allowClear/>
         </a-form-item>
-        <a-form-item label="标签" hasFeedback>
+        <a-form-item label="唯一标识" hasFeedback>
           <a-input v-decorator="decorators.tag" allowClear/>
         </a-form-item>
         <a-form-item label="是否需要审核">
@@ -54,10 +53,10 @@ function getDecorators() {
     tag: ['tag', {
       rules: [{
         required: true,
-        message: '请输入标签'
+        message: '请输入唯一标识'
       }, {
         max: 32,
-        message: '标签长度不能大于32位'
+        message: '唯一标识长度不能大于32位'
       }]
     }],
     releaseAudit: ['releaseAudit', {
diff --git a/orion-ops-vue/src/components/app/AddAppVcsModal.vue b/orion-ops-vue/src/components/app/AddAppVcsModal.vue
index a77c0465..30cdd9b3 100644
--- a/orion-ops-vue/src/components/app/AddAppVcsModal.vue
+++ b/orion-ops-vue/src/components/app/AddAppVcsModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
            :width="560"
            :okButtonProps="{props: {disabled: loading}}"
diff --git a/orion-ops-vue/src/components/app/AddPipelineModal.vue b/orion-ops-vue/src/components/app/AddPipelineModal.vue
index 37a58a17..67873dd1 100644
--- a/orion-ops-vue/src/components/app/AddPipelineModal.vue
+++ b/orion-ops-vue/src/components/app/AddPipelineModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
            :width="578"
            :maskStyle="{opacity: 0.8, animation: 'none'}"
diff --git a/orion-ops-vue/src/components/app/AppBuildModal.vue b/orion-ops-vue/src/components/app/AppBuildModal.vue
index f58879f3..9ec5ed47 100644
--- a/orion-ops-vue/src/components/app/AppBuildModal.vue
+++ b/orion-ops-vue/src/components/app/AppBuildModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :width="550"
            :maskStyle="{opacity: 0.8, animation: 'none'}"
            :dialogStyle="{top: '64px', padding: 0}"
diff --git a/orion-ops-vue/src/components/app/AppPipelineExecAuditModal.vue b/orion-ops-vue/src/components/app/AppPipelineExecAuditModal.vue
index f7f96ada..a19e4b84 100644
--- a/orion-ops-vue/src/components/app/AppPipelineExecAuditModal.vue
+++ b/orion-ops-vue/src/components/app/AppPipelineExecAuditModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            title="执行审核"
            :maskClosable="false"
            :destroyOnClose="true"
diff --git a/orion-ops-vue/src/components/app/AppPipelineExecBuildModal.vue b/orion-ops-vue/src/components/app/AppPipelineExecBuildModal.vue
index fc3e5fff..4aa4050d 100644
--- a/orion-ops-vue/src/components/app/AppPipelineExecBuildModal.vue
+++ b/orion-ops-vue/src/components/app/AppPipelineExecBuildModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
            :width="560"
            :maskStyle="{opacity: 0.4, animation: 'none'}"
diff --git a/orion-ops-vue/src/components/app/AppPipelineExecModal.vue b/orion-ops-vue/src/components/app/AppPipelineExecModal.vue
index 1c876d9d..416d85f8 100644
--- a/orion-ops-vue/src/components/app/AppPipelineExecModal.vue
+++ b/orion-ops-vue/src/components/app/AppPipelineExecModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :width="550"
            :maskStyle="{opacity: 0.8, animation: 'none'}"
            :dialogStyle="{top: '64px', padding: 0}"
diff --git a/orion-ops-vue/src/components/app/AppPipelineExecReleaseModal.vue b/orion-ops-vue/src/components/app/AppPipelineExecReleaseModal.vue
index 910ee85f..5694710e 100644
--- a/orion-ops-vue/src/components/app/AppPipelineExecReleaseModal.vue
+++ b/orion-ops-vue/src/components/app/AppPipelineExecReleaseModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
            :width="560"
            :maskStyle="{opacity: 0.4, animation: 'none'}"
diff --git a/orion-ops-vue/src/components/app/AppPipelineExecTimedModal.vue b/orion-ops-vue/src/components/app/AppPipelineExecTimedModal.vue
index 5efa5a14..00a1edcb 100644
--- a/orion-ops-vue/src/components/app/AppPipelineExecTimedModal.vue
+++ b/orion-ops-vue/src/components/app/AppPipelineExecTimedModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            title="设置定时执行"
            :width="330"
            :okButtonProps="{props: {disabled: !valid}}"
diff --git a/orion-ops-vue/src/components/app/AppReleaseAuditModal.vue b/orion-ops-vue/src/components/app/AppReleaseAuditModal.vue
index 2f07c59a..15dc2ced 100644
--- a/orion-ops-vue/src/components/app/AppReleaseAuditModal.vue
+++ b/orion-ops-vue/src/components/app/AppReleaseAuditModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            title="发布审核"
            :maskClosable="false"
            :destroyOnClose="true"
diff --git a/orion-ops-vue/src/components/app/AppReleaseConfigForm.vue b/orion-ops-vue/src/components/app/AppReleaseConfigForm.vue
index 9c2aa542..5013cbf7 100644
--- a/orion-ops-vue/src/components/app/AppReleaseConfigForm.vue
+++ b/orion-ops-vue/src/components/app/AppReleaseConfigForm.vue
@@ -232,7 +232,7 @@ export default {
         visible: true
       }
       if (this.$enum.RELEASE_ACTION_TYPE.TRANSFER.value === type) {
-        action.command = 'scp @{bundle_path} @{target_username}@@{target_host}:@{transfer_path}'
+        action.command = 'scp "@{bundle_path}" @{target_username}@@{target_host}:"@{transfer_path}"'
       } else {
         action.command = ''
       }
diff --git a/orion-ops-vue/src/components/app/AppReleaseModal.vue b/orion-ops-vue/src/components/app/AppReleaseModal.vue
index c0efdcf4..277b1390 100644
--- a/orion-ops-vue/src/components/app/AppReleaseModal.vue
+++ b/orion-ops-vue/src/components/app/AppReleaseModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :width="550"
            :maskStyle="{opacity: 0.8, animation: 'none'}"
            :dialogStyle="{top: '64px', padding: 0}"
diff --git a/orion-ops-vue/src/components/app/AppReleaseTimedModal.vue b/orion-ops-vue/src/components/app/AppReleaseTimedModal.vue
index 07d5196d..b6835634 100644
--- a/orion-ops-vue/src/components/app/AppReleaseTimedModal.vue
+++ b/orion-ops-vue/src/components/app/AppReleaseTimedModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            title="设置发布定时"
            :width="330"
            :okButtonProps="{props: {disabled: !valid}}"
diff --git a/orion-ops-vue/src/components/exec/ExecTaskDetailModal.vue b/orion-ops-vue/src/components/exec/ExecTaskDetailModal.vue
index e6bdf6d2..7db72c37 100644
--- a/orion-ops-vue/src/components/exec/ExecTaskDetailModal.vue
+++ b/orion-ops-vue/src/components/exec/ExecTaskDetailModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            title="详情"
            width="700px"
            :dialogStyle="{top: '16px'}"
diff --git a/orion-ops-vue/src/components/history/EnvHistoryModal.vue b/orion-ops-vue/src/components/history/EnvHistoryModal.vue
index 8335e63a..dca1e0b7 100644
--- a/orion-ops-vue/src/components/history/EnvHistoryModal.vue
+++ b/orion-ops-vue/src/components/history/EnvHistoryModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :width="1024"
            :dialogStyle="{top: '64px'}"
            :bodyStyle="{padding: '8px'}"
diff --git a/orion-ops-vue/src/components/layout/Menu.vue b/orion-ops-vue/src/components/layout/Menu.vue
index 82551d46..dc5d59f4 100644
--- a/orion-ops-vue/src/components/layout/Menu.vue
+++ b/orion-ops-vue/src/components/layout/Menu.vue
@@ -7,16 +7,18 @@
       <!-- 一级菜单 -->
       <a-menu-item v-if="!menuItem.children" @click="toRoute(menuItem.path)" :key="menuItem.id">
         <a-icon :type="menuItem.icon"/>
-        <span>{{ menuItem.name }}</span>
+        <span class="usn">{{ menuItem.name }}</span>
       </a-menu-item>
       <!-- 二级菜单 -->
       <a-sub-menu v-else :key="menuItem.id">
         <template #title>
           <a-icon :type="menuItem.icon"/>
-          <span>{{ menuItem.name }}</span>
+          <span class="usn">{{ menuItem.name }}</span>
         </template>
         <a-menu-item v-for="subMenuItem in menuItem.children" :key="subMenuItem.id" @click="toRoute(subMenuItem.path)">
-          {{ subMenuItem.name }}
+          <span class="usn">
+            {{ subMenuItem.name }}
+          </span>
         </a-menu-item>
       </a-sub-menu>
     </template>
diff --git a/orion-ops-vue/src/components/layout/WebSideMessageDropdown.vue b/orion-ops-vue/src/components/layout/WebSideMessageDropdown.vue
index dccf7ead..6223707f 100644
--- a/orion-ops-vue/src/components/layout/WebSideMessageDropdown.vue
+++ b/orion-ops-vue/src/components/layout/WebSideMessageDropdown.vue
@@ -180,7 +180,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: space-between;
-      margin-bottom: 6px;
+      margin-bottom: 8px;
       color: rgba(0, 0, 0, .65);
       font-size: 14px;
       line-height: 22px;
diff --git a/orion-ops-vue/src/components/log/AddLogFileModal.vue b/orion-ops-vue/src/components/log/AddLogFileModal.vue
index 561740db..259169ae 100644
--- a/orion-ops-vue/src/components/log/AddLogFileModal.vue
+++ b/orion-ops-vue/src/components/log/AddLogFileModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
            :width="650"
            :dialogStyle="{top: '64px', padding: 0}"
@@ -15,6 +14,7 @@
           <MachineSelector ref="machineSelector"
                            placeholder="请选择"
                            @change="setDefaultConfig"
+                           :query="{status: $enum.ENABLE_STATUS.ENABLE.value}"
                            v-decorator="decorators.machineId"/>
         </a-form-item>
         <!-- 追踪模式 -->
diff --git a/orion-ops-vue/src/components/machine/AddMachineEnvModal.vue b/orion-ops-vue/src/components/machine/AddMachineEnvModal.vue
index 02546b37..93e711f6 100644
--- a/orion-ops-vue/src/components/machine/AddMachineEnvModal.vue
+++ b/orion-ops-vue/src/components/machine/AddMachineEnvModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
            :width="500"
            :okButtonProps="{props: {disabled: loading}}"
diff --git a/orion-ops-vue/src/components/machine/AddMachineKeyModal.vue b/orion-ops-vue/src/components/machine/AddMachineKeyModal.vue
index 07a8497b..dd905b2d 100644
--- a/orion-ops-vue/src/components/machine/AddMachineKeyModal.vue
+++ b/orion-ops-vue/src/components/machine/AddMachineKeyModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
            :width="450"
            :okButtonProps="{props: {disabled: loading}}"
diff --git a/orion-ops-vue/src/components/machine/AddMachineModal.vue b/orion-ops-vue/src/components/machine/AddMachineModal.vue
index fbf2ca79..ac54986d 100644
--- a/orion-ops-vue/src/components/machine/AddMachineModal.vue
+++ b/orion-ops-vue/src/components/machine/AddMachineModal.vue
@@ -2,7 +2,6 @@
   <div class="machine-wrapper">
     <!-- 机器模态框 -->
     <a-modal v-model="visible"
-             v-drag-modal
              :title="title"
              :width="750"
              :zIndex="805"
@@ -18,7 +17,7 @@
             <a-form-item label="名称" hasFeedback>
               <a-input v-decorator="decorators.name" allowClear/>
             </a-form-item>
-            <a-form-item label="标签" hasFeedback>
+            <a-form-item label="唯一标识" hasFeedback>
               <a-input v-decorator="decorators.tag" allowClear/>
             </a-form-item>
             <a-form-item label="ssh信息" style="margin-bottom: 0">
@@ -32,7 +31,7 @@
                          placeholder="主机"
                          v-decorator="decorators.host"/>
               </a-form-item>
-              <a-form-item hasFeedback style="display: inline-block; width: 25%">
+              <a-form-item style="display: inline-block; width: 25%">
                 <a-input addon-before="-p"
                          placeholder="端口"
                          v-decorator="decorators.sshPort"/>
@@ -108,10 +107,10 @@ function getDecorators() {
     tag: ['tag', {
       rules: [{
         required: true,
-        message: '请输入标签'
+        message: '请输入唯一标识'
       }, {
         max: 32,
-        message: '标签长度不能大于32位'
+        message: '唯一标识长度不能大于32位'
       }]
     }],
     username: ['username', {
diff --git a/orion-ops-vue/src/components/machine/AddMachineProxyModal.vue b/orion-ops-vue/src/components/machine/AddMachineProxyModal.vue
index 511c009b..d20ce5b9 100644
--- a/orion-ops-vue/src/components/machine/AddMachineProxyModal.vue
+++ b/orion-ops-vue/src/components/machine/AddMachineProxyModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
            :width="450"
            :okButtonProps="{props: {disabled: loading}}"
diff --git a/orion-ops-vue/src/components/machine/MachineDetailModal.vue b/orion-ops-vue/src/components/machine/MachineDetailModal.vue
index e1b91ac5..317f5a7e 100644
--- a/orion-ops-vue/src/components/machine/MachineDetailModal.vue
+++ b/orion-ops-vue/src/components/machine/MachineDetailModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            title="详情"
            width="700px"
            :maskClosable="false"
@@ -20,10 +19,10 @@
           <a-descriptions-item label="用户名" :span="3">
             {{ detail.username }}
           </a-descriptions-item>
-          <a-descriptions-item label="标签" :span="3">
-            <a-tag color="#5C7CFA">
+          <a-descriptions-item label="唯一标识" :span="3">
+            <span class="span-blue">
               {{ detail.tag }}
-            </a-tag>
+            </span>
           </a-descriptions-item>
           <a-descriptions-item label="认证方式" :span="2">
             <a-tag v-if="detail.authType">
diff --git a/orion-ops-vue/src/components/machine/MachineSelector.vue b/orion-ops-vue/src/components/machine/MachineSelector.vue
index 6bd1517c..61997b2e 100644
--- a/orion-ops-vue/src/components/machine/MachineSelector.vue
+++ b/orion-ops-vue/src/components/machine/MachineSelector.vue
@@ -27,6 +27,12 @@ export default {
     value: {
       type: Number,
       default: undefined
+    },
+    query: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   data() {
@@ -46,7 +52,10 @@ export default {
     }
   },
   async created() {
-    const machineListRes = await this.$api.getMachineList({ limit: 10000 })
+    const machineListRes = await this.$api.getMachineList({
+      limit: 10000,
+      ...this.query
+    })
     if (machineListRes.data && machineListRes.data.rows && machineListRes.data.rows.length) {
       for (const row of machineListRes.data.rows) {
         this.machineList.push({
diff --git a/orion-ops-vue/src/components/machine/TempMountMachineKeyModal.vue b/orion-ops-vue/src/components/machine/TempMountMachineKeyModal.vue
index aa5375c2..7f0f3870 100644
--- a/orion-ops-vue/src/components/machine/TempMountMachineKeyModal.vue
+++ b/orion-ops-vue/src/components/machine/TempMountMachineKeyModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            title="临时挂载"
            :width="450"
            :okButtonProps="{props: {disabled: loading}}"
diff --git a/orion-ops-vue/src/components/preview/EditorPreview.vue b/orion-ops-vue/src/components/preview/EditorPreview.vue
index 57ce00bd..ca2313cb 100644
--- a/orion-ops-vue/src/components/preview/EditorPreview.vue
+++ b/orion-ops-vue/src/components/preview/EditorPreview.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :width="650"
            :footer="null"
            :destroyOnClose="true"
diff --git a/orion-ops-vue/src/components/preview/TextPreview.vue b/orion-ops-vue/src/components/preview/TextPreview.vue
index 4f7937d3..a89dd471 100644
--- a/orion-ops-vue/src/components/preview/TextPreview.vue
+++ b/orion-ops-vue/src/components/preview/TextPreview.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :width="450"
            :footer="null"
            :destroyOnClose="true"
diff --git a/orion-ops-vue/src/components/scheduler/AddSchedulerTask.vue b/orion-ops-vue/src/components/scheduler/AddSchedulerTask.vue
index c977c32b..894d4b5e 100644
--- a/orion-ops-vue/src/components/scheduler/AddSchedulerTask.vue
+++ b/orion-ops-vue/src/components/scheduler/AddSchedulerTask.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
            :width="700"
            :dialogStyle="{top: '32px'}"
diff --git a/orion-ops-vue/src/components/sftp/SftpChmodModal.vue b/orion-ops-vue/src/components/sftp/SftpChmodModal.vue
index a78a72bb..39e410e4 100644
--- a/orion-ops-vue/src/components/sftp/SftpChmodModal.vue
+++ b/orion-ops-vue/src/components/sftp/SftpChmodModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            title="文件提权"
            :width="450"
            :okButtonProps="{props: {disabled: loading}}"
diff --git a/orion-ops-vue/src/components/sftp/SftpMoveModal.vue b/orion-ops-vue/src/components/sftp/SftpMoveModal.vue
index fedd4efa..51f13839 100644
--- a/orion-ops-vue/src/components/sftp/SftpMoveModal.vue
+++ b/orion-ops-vue/src/components/sftp/SftpMoveModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            title="文件移动"
            :width="450"
            okText="移动"
diff --git a/orion-ops-vue/src/components/sftp/SftpTouchModal.vue b/orion-ops-vue/src/components/sftp/SftpTouchModal.vue
index 64acc3a0..e73b8dc7 100644
--- a/orion-ops-vue/src/components/sftp/SftpTouchModal.vue
+++ b/orion-ops-vue/src/components/sftp/SftpTouchModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            title="创建"
            width="450px"
            :maskClosable="false"
diff --git a/orion-ops-vue/src/components/system/AddSystemEnvModal.vue b/orion-ops-vue/src/components/system/AddSystemEnvModal.vue
index 0c917c3f..a05f5a8b 100644
--- a/orion-ops-vue/src/components/system/AddSystemEnvModal.vue
+++ b/orion-ops-vue/src/components/system/AddSystemEnvModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
            :width="500"
            :okButtonProps="{props: {disabled: loading}}"
diff --git a/orion-ops-vue/src/components/template/AddTemplateModal.vue b/orion-ops-vue/src/components/template/AddTemplateModal.vue
index 32324c35..26469d1d 100644
--- a/orion-ops-vue/src/components/template/AddTemplateModal.vue
+++ b/orion-ops-vue/src/components/template/AddTemplateModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
            :width="650"
            :dialogStyle="{top: '64px'}"
diff --git a/orion-ops-vue/src/components/template/TemplateSelector.vue b/orion-ops-vue/src/components/template/TemplateSelector.vue
index 45014d6b..3d2cabd9 100644
--- a/orion-ops-vue/src/components/template/TemplateSelector.vue
+++ b/orion-ops-vue/src/components/template/TemplateSelector.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :width="1000"
            :dialogStyle="{top: '16px'}"
            :bodyStyle="{padding: '8px'}"
diff --git a/orion-ops-vue/src/components/terminal/TerminalMain.vue b/orion-ops-vue/src/components/terminal/TerminalMain.vue
index 3453cebf..66c82c17 100644
--- a/orion-ops-vue/src/components/terminal/TerminalMain.vue
+++ b/orion-ops-vue/src/components/terminal/TerminalMain.vue
@@ -232,7 +232,7 @@ const terminalOperator = {
   disconnect() {
     console.log('disconnect')
     this.pingThread && clearInterval(this.pingThread)
-    this.client.send(this.$enum.TERMINAL_OPERATOR.DISCONNECT.value)
+    this.client && this.client.send(this.$enum.TERMINAL_OPERATOR.DISCONNECT.value)
   },
   ping() {
     console.log('ping')
diff --git a/orion-ops-vue/src/components/terminal/TerminalSettingModal.vue b/orion-ops-vue/src/components/terminal/TerminalSettingModal.vue
index 1c229e75..22e589e4 100644
--- a/orion-ops-vue/src/components/terminal/TerminalSettingModal.vue
+++ b/orion-ops-vue/src/components/terminal/TerminalSettingModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :width="500"
            :okButtonProps="{props: {disabled: loading}}"
            :maskClosable="false"
diff --git a/orion-ops-vue/src/components/terminal/TerminalXterm.vue b/orion-ops-vue/src/components/terminal/TerminalXterm.vue
index 6c5b7113..a0d8bc90 100644
--- a/orion-ops-vue/src/components/terminal/TerminalXterm.vue
+++ b/orion-ops-vue/src/components/terminal/TerminalXterm.vue
@@ -119,7 +119,7 @@ export default {
         this.$refs.terminalMain.init(options, setting)
       } catch (e) {
         this.loading()
-        this.$message.error('初始化失败')
+        this.$message.error(e.msg || '初始化失败')
         this.machine.status = this.$enum.TERMINAL_STATUS.ERROR.value
       }
     }
diff --git a/orion-ops-vue/src/components/user/AddUserModal.vue b/orion-ops-vue/src/components/user/AddUserModal.vue
index f62e5d12..82345988 100644
--- a/orion-ops-vue/src/components/user/AddUserModal.vue
+++ b/orion-ops-vue/src/components/user/AddUserModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :title="title"
            :width="650"
            :okButtonProps="{props: {disabled: loading}}"
diff --git a/orion-ops-vue/src/components/user/ResetPassword.vue b/orion-ops-vue/src/components/user/ResetPassword.vue
index f2a347f9..9bffba93 100644
--- a/orion-ops-vue/src/components/user/ResetPassword.vue
+++ b/orion-ops-vue/src/components/user/ResetPassword.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            title="修改密码"
            :okButtonProps="{props: {disabled: loading}}"
            :maskClosable="false"
diff --git a/orion-ops-vue/src/components/user/WebSideMessageList.vue b/orion-ops-vue/src/components/user/WebSideMessageList.vue
index b846f60a..6e357bdd 100644
--- a/orion-ops-vue/src/components/user/WebSideMessageList.vue
+++ b/orion-ops-vue/src/components/user/WebSideMessageList.vue
@@ -67,7 +67,10 @@
               <!-- 上半部分 标题 -->
               <div class="message-item-container-top">
                 <a-badge class="message-item-dot" :dot="item.status === $enum.READ_STATUS.UNREAD.value">
-                  <span class="message-item-title" v-text="$enum.valueOf($enum.valueOf($enum.MESSAGE_CLASSIFY, item.classify).type, item.type).label"/>
+                  <span class="message-item-title"
+                        title="详情"
+                        @click="openDetail(item)"
+                        v-text="$enum.valueOf($enum.valueOf($enum.MESSAGE_CLASSIFY, item.classify).type, item.type).label"/>
                 </a-badge>
               </div>
               <!-- 下半部分 消息 -->
@@ -79,7 +82,7 @@
                 <div class="message-item-container-right">
                   <!-- 类型 -->
                   <span class="message-item-type span-blue" @click="chooseClassify(item.classify)">
-                      {{ $enum.valueOf($enum.MESSAGE_CLASSIFY, item.classify).label }}
+                    {{ $enum.valueOf($enum.MESSAGE_CLASSIFY, item.classify).label }}
                   </span>
                   <!-- 时间 -->
                   <span class="message-item-date">{{ item.createTime | formatDate }} ({{ item.createTimeAgo }})</span>
@@ -261,13 +264,14 @@ export default {
   width: 100%;
 
   .message-item-dot /deep/ .ant-badge-dot {
-    margin: 4px -6px;
+    margin: 4px -8px;
   }
 
   .message-item-title {
     color: #181E33;
     display: block;
-    margin-bottom: 6px;
+    cursor: pointer;
+    margin-bottom: 8px;
     font-size: 15px;
     line-height: 24px;
   }
diff --git a/orion-ops-vue/src/components/user/WebSideMessageModal.vue b/orion-ops-vue/src/components/user/WebSideMessageModal.vue
index bc5dcafa..e3fc6e6b 100644
--- a/orion-ops-vue/src/components/user/WebSideMessageModal.vue
+++ b/orion-ops-vue/src/components/user/WebSideMessageModal.vue
@@ -1,6 +1,5 @@
 <template>
   <a-modal v-model="visible"
-           v-drag-modal
            :width="500"
            :maskClosable="false"
            :title="$enum.valueOf($enum.valueOf($enum.MESSAGE_CLASSIFY, data.classify).type, data.type).label"