From 33cfb13342a937eaf52ccc3707855bcac2a8a42f Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Thu, 18 Apr 2024 14:56:01 +0800
Subject: [PATCH] =?UTF-8?q?:lipstick:=20=E4=BC=98=E5=8C=96=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E8=A7=86=E8=A7=89=E6=98=BE=E7=A4=BA.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rion-vue-views-components-card-list.vue.vm |  3 +-
 ...on-vue-views-components-form-drawer.vue.vm |  5 +-
 ...ion-vue-views-components-form-modal.vue.vm |  5 +-
 orion-ops-ui/src/assets/style/layout.less     | 12 ++-
 .../user/user/update-password-modal/index.vue |  5 +-
 .../components/connect-log-clear-modal.vue    |  5 +-
 .../components/host-identity-card-list.vue    |  7 +-
 .../components/host-identity-form-modal.vue   |  5 +-
 .../components/host-key-form-drawer.vue       |  9 +-
 .../host-list/components/host-card-list.vue   |  3 +-
 .../host-list/components/host-form-modal.vue  |  5 +-
 .../exec-command-log-clear-modal.vue          |  5 +-
 .../components/exec-command-panel.vue         | 94 +++++++++++--------
 .../components/exec-job-log-clear-modal.vue   |  5 +-
 .../components/exec-job-form-drawer.vue       | 26 +++--
 .../components/exec-template-exec-drawer.vue  | 25 ++---
 .../components/exec-template-form-drawer.vue  | 25 ++---
 .../setting/extra/ssh-setting-form.vue        |  2 +-
 .../components/sftp/sftp-chmod-modal.vue      |  7 +-
 .../components/sftp/sftp-create-modal.vue     | 13 ++-
 .../components/sftp/sftp-move-modal.vue       |  5 +-
 .../components/dict-key-form-modal.vue        |  6 +-
 .../components/dict-value-form-modal.vue      |  5 +-
 .../menu/components/menu-form-modal.vue       |  5 +-
 .../components/operator-log-clear-modal.vue   |  5 +-
 .../user/role/components/role-form-modal.vue  |  5 +-
 .../role/components/role-menu-grant-modal.vue |  2 +-
 .../user/user/components/user-form-modal.vue  |  5 +-
 .../user-grant-roles-form-modal.vue           |  5 +-
 .../user-reset-password-form-modal.vue        |  5 +-
 30 files changed, 163 insertions(+), 151 deletions(-)

diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
index cdc0e27f..e3604341 100644
--- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
@@ -20,8 +20,7 @@
               size="small"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 6 }"
-              :wrapper-col-props="{ span: 18 }"
+              :auto-label-width="true"
               @keyup.enter="() => fetchCardData()">
         #foreach($field in ${table.fields})
         <!-- $field.comment -->
diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm
index b5e4c98c..e4c51c42 100644
--- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm
@@ -8,12 +8,11 @@
             :cancel-button-props="{ disabled: loading }"
             :on-before-ok="handlerOk"
             @cancel="handleClose">
-    <a-spin class="full modal-form" :loading="loading">
+    <a-spin class="full modal-form-small" :loading="loading">
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }"
+              :auto-label-width="true"
               :rules="formRules">
         #foreach($field in ${table.fields})
         #if("$field.propertyName" != "id")
diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
index ebda1055..c69dde87 100644
--- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            :title="title"
            :top="80"
@@ -16,8 +16,7 @@
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }"
+              :auto-label-width="true"
               :rules="formRules">
         #foreach($field in ${table.fields})
         #if("$field.propertyName" != "id")
diff --git a/orion-ops-ui/src/assets/style/layout.less b/orion-ops-ui/src/assets/style/layout.less
index 2cecf0c0..1381a104 100644
--- a/orion-ops-ui/src/assets/style/layout.less
+++ b/orion-ops-ui/src/assets/style/layout.less
@@ -67,8 +67,16 @@
 }
 
 // -- modal
-.modal-form {
-  padding: 24px 20px 4px 20px;
+.modal-form-small {
+  padding: 20px 20px 2px 20px;
+}
+
+.modal-form-medium {
+  padding: 20px 28px 4px 28px;
+}
+
+.modal-form-large {
+  padding: 24px 36px 4px 36px;
 }
 
 // -- card-view
diff --git a/orion-ops-ui/src/components/user/user/update-password-modal/index.vue b/orion-ops-ui/src/components/user/user/update-password-modal/index.vue
index eabca11a..6db8e393 100644
--- a/orion-ops-ui/src/components/user/user/update-password-modal/index.vue
+++ b/orion-ops-ui/src/components/user/user/update-password-modal/index.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            title="重置密码"
            :top="120"
@@ -17,8 +17,7 @@
               ref="formRef"
               label-align="right"
               :rules="rules"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }">
+              :auto-label-width="true">
         <!-- 密码 -->
         <a-form-item field="beforePassword" label="原始密码">
           <a-input-password v-model="formModel.beforePassword" placeholder="请输入原始密码" />
diff --git a/orion-ops-ui/src/views/asset-audit/connect-log/components/connect-log-clear-modal.vue b/orion-ops-ui/src/views/asset-audit/connect-log/components/connect-log-clear-modal.vue
index 6c411f3c..1f7c3ef0 100644
--- a/orion-ops-ui/src/views/asset-audit/connect-log/components/connect-log-clear-modal.vue
+++ b/orion-ops-ui/src/views/asset-audit/connect-log/components/connect-log-clear-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            title="清空主机连接日志"
            :align-center="false"
@@ -15,8 +15,7 @@
     <a-spin class="full" :loading="loading">
       <a-form :model="formModel"
               label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }">
+              :auto-label-width="true">
         <!-- 开始时间 -->
         <a-form-item field="startTimeRange" label="开始时间">
           <a-range-picker v-model="formModel.startTimeRange"
diff --git a/orion-ops-ui/src/views/asset/host-identity/components/host-identity-card-list.vue b/orion-ops-ui/src/views/asset/host-identity/components/host-identity-card-list.vue
index d82ea0e6..671d675e 100644
--- a/orion-ops-ui/src/views/asset/host-identity/components/host-identity-card-list.vue
+++ b/orion-ops-ui/src/views/asset/host-identity/components/host-identity-card-list.vue
@@ -40,8 +40,7 @@
               size="small"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 6 }"
-              :wrapper-col-props="{ span: 18 }"
+              :auto-label-width="true"
               @keyup.enter="() => fetchCardData()">
         <!-- id -->
         <a-form-item field="id" label="id">
@@ -65,8 +64,8 @@
         <a-form-item field="username" label="用户名">
           <a-input v-model="formModel.username" placeholder="请输入用户名" allow-clear />
         </a-form-item>
-        <!-- 主机秘钥 -->
-        <a-form-item field="keyId" label="主机秘钥">
+        <!-- 秘钥 -->
+        <a-form-item field="keyId" label="秘钥">
           <host-key-selector v-model="formModel.keyId" allow-clear />
         </a-form-item>
       </a-form>
diff --git a/orion-ops-ui/src/views/asset/host-identity/components/host-identity-form-modal.vue b/orion-ops-ui/src/views/asset/host-identity/components/host-identity-form-modal.vue
index a2670529..5ae9389e 100644
--- a/orion-ops-ui/src/views/asset/host-identity/components/host-identity-form-modal.vue
+++ b/orion-ops-ui/src/views/asset/host-identity/components/host-identity-form-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            :title="title"
            :top="80"
@@ -16,8 +16,7 @@
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }"
+              :auto-label-width="true"
               :rules="formRules">
         <!-- 名称 -->
         <a-form-item field="name" label="名称">
diff --git a/orion-ops-ui/src/views/asset/host-key/components/host-key-form-drawer.vue b/orion-ops-ui/src/views/asset/host-key/components/host-key-form-drawer.vue
index c6791587..74c44f16 100644
--- a/orion-ops-ui/src/views/asset/host-key/components/host-key-form-drawer.vue
+++ b/orion-ops-ui/src/views/asset/host-key/components/host-key-form-drawer.vue
@@ -8,15 +8,14 @@
             :cancel-button-props="{ disabled: loading }"
             :on-before-ok="handlerOk"
             @cancel="handleClose">
-    <a-spin class="full modal-form" :loading="loading">
+    <a-spin class="full modal-form-small" :loading="loading">
       <a-alert class="keygen-alert">
         请使用 ssh-keygen -m PEM -t rsa 生成秘钥
       </a-alert>
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 4 }"
-              :wrapper-col-props="{ span: 20 }"
+              :auto-label-width="true"
               :rules="formRules">
         <!-- 名称 -->
         <a-form-item field="name" label="名称">
@@ -240,8 +239,8 @@
   }
 
   .keygen-alert {
-    margin: 0 0 12px 16px;
-    width: calc(100% - 16px);
+    margin-bottom: 12px;
+    width: 100%;
   }
 
   .password-input {
diff --git a/orion-ops-ui/src/views/asset/host-list/components/host-card-list.vue b/orion-ops-ui/src/views/asset/host-list/components/host-card-list.vue
index fc364403..99bcfc34 100644
--- a/orion-ops-ui/src/views/asset/host-list/components/host-card-list.vue
+++ b/orion-ops-ui/src/views/asset/host-list/components/host-card-list.vue
@@ -49,8 +49,7 @@
               size="small"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 6 }"
-              :wrapper-col-props="{ span: 18 }"
+              :auto-label-width="true"
               @keyup.enter="() => fetchCardData()">
         <!-- id -->
         <a-form-item field="id" label="主机id">
diff --git a/orion-ops-ui/src/views/asset/host-list/components/host-form-modal.vue b/orion-ops-ui/src/views/asset/host-list/components/host-form-modal.vue
index cd41683c..218a75dd 100644
--- a/orion-ops-ui/src/views/asset/host-list/components/host-form-modal.vue
+++ b/orion-ops-ui/src/views/asset/host-list/components/host-form-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            :title="title"
            :top="80"
@@ -16,8 +16,7 @@
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }"
+              :auto-label-width="true"
               :rules="formRules">
         <!-- 主机名称 -->
         <a-form-item field="name" label="主机名称">
diff --git a/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-log-clear-modal.vue b/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-log-clear-modal.vue
index 2327e19a..4a5efb67 100644
--- a/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-log-clear-modal.vue
+++ b/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-log-clear-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            title="清空批量执行日志"
            :align-center="false"
@@ -16,8 +16,7 @@
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }">
+              :auto-label-width="true">
         <!-- 执行时间 -->
         <a-form-item field="startTimeRange" label="执行时间">
           <a-range-picker v-model="formModel.startTimeRange"
diff --git a/orion-ops-ui/src/views/exec/exec-command/components/exec-command-panel.vue b/orion-ops-ui/src/views/exec/exec-command/components/exec-command-panel.vue
index 38541c9c..988b4109 100644
--- a/orion-ops-ui/src/views/exec/exec-command/components/exec-command-panel.vue
+++ b/orion-ops-ui/src/views/exec/exec-command/components/exec-command-panel.vue
@@ -14,50 +14,64 @@
                 label-align="right"
                 :auto-label-width="true"
                 :rules="formRules">
-          <!-- 执行主机 -->
-          <a-form-item field="hostIdList" label="执行主机">
-            <div class="selected-host">
-              <!-- 已选择数量 -->
-              <span class="usn" v-if="formModel.hostIdList?.length">
+          <a-row :gutter="16">
+            <!-- 执行主机 -->
+            <a-col :span="24">
+              <a-form-item field="hostIdList" label="执行主机">
+                <div class="selected-host">
+                  <!-- 已选择数量 -->
+                  <span class="usn" v-if="formModel.hostIdList?.length">
                 已选择<span class="selected-host-count span-blue">{{ formModel.hostIdList?.length }}</span>台主机
               </span>
-              <span class="usn pointer span-blue" @click="openSelectHost">
+                  <span class="usn pointer span-blue" @click="openSelectHost">
                 {{ formModel.hostIdList?.length ? '重新选择' : '选择主机' }}
               </span>
-            </div>
-          </a-form-item>
-          <!-- 执行描述 -->
-          <a-form-item field="description" label="执行描述">
-            <a-input v-model="formModel.description"
-                     placeholder="请输入执行描述"
-                     allow-clear />
-          </a-form-item>
-          <!-- 超时时间 -->
-          <a-form-item field="timeout" label="超时时间">
-            <a-input-number v-model="formModel.timeout"
-                            placeholder="为0则不超时"
-                            :min="0"
-                            :max="100000"
-                            hide-button>
-              <template #suffix>
-                秒
-              </template>
-            </a-input-number>
-          </a-form-item>
-          <!-- 脚本执行 -->
-          <a-form-item field="scriptExec" label="脚本执行">
-            <div class="flex-center">
-              <a-switch v-model="formModel.scriptExec"
-                        type="round"
-                        :checked-value="EnabledStatus.ENABLED"
-                        :unchecked-value="EnabledStatus.DISABLED" />
-              <div class="question-right ml8">
-                <a-tooltip content="启用后会将命令写入脚本文件 传输到主机后执行">
-                  <icon-question-circle />
-                </a-tooltip>
-              </div>
-            </div>
-          </a-form-item>
+                </div>
+              </a-form-item>
+            </a-col>
+            <!-- 执行描述 -->
+            <a-col :span="24">
+              <a-form-item field="description" label="执行描述">
+                <a-input v-model="formModel.description"
+                         placeholder="请输入执行描述"
+                         allow-clear />
+              </a-form-item>
+            </a-col>
+            <!-- 超时时间 -->
+            <a-col :span="14">
+              <a-form-item field="timeout"
+                           label="超时时间"
+                           :hide-asterisk="true">
+                <a-input-number v-model="formModel.timeout"
+                                placeholder="为0则不超时"
+                                :min="0"
+                                :max="100000"
+                                hide-button>
+                  <template #suffix>
+                    秒
+                  </template>
+                </a-input-number>
+              </a-form-item>
+            </a-col>
+            <!-- 脚本执行 -->
+            <a-col :span="10">
+              <a-form-item field="scriptExec"
+                           label="脚本执行"
+                           :hide-asterisk="true">
+                <div class="flex-center">
+                  <a-switch v-model="formModel.scriptExec"
+                            type="round"
+                            :checked-value="EnabledStatus.ENABLED"
+                            :unchecked-value="EnabledStatus.DISABLED" />
+                  <div class="question-right ml8">
+                    <a-tooltip content="启用后会将命令写入脚本文件 传输到主机后执行">
+                      <icon-question-circle />
+                    </a-tooltip>
+                  </div>
+                </div>
+              </a-form-item>
+            </a-col>
+          </a-row>
         </a-form>
       </template>
       <!-- 参数表单 -->
diff --git a/orion-ops-ui/src/views/exec/exec-job-log/components/exec-job-log-clear-modal.vue b/orion-ops-ui/src/views/exec/exec-job-log/components/exec-job-log-clear-modal.vue
index af70c336..5db945f4 100644
--- a/orion-ops-ui/src/views/exec/exec-job-log/components/exec-job-log-clear-modal.vue
+++ b/orion-ops-ui/src/views/exec/exec-job-log/components/exec-job-log-clear-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            title="清空计划任务日志"
            :align-center="false"
@@ -16,8 +16,7 @@
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }">
+              :auto-label-width="true">
         <!-- 执行时间 -->
         <a-form-item field="startTimeRange" label="执行时间">
           <a-range-picker v-model="formModel.startTimeRange"
diff --git a/orion-ops-ui/src/views/exec/exec-job/components/exec-job-form-drawer.vue b/orion-ops-ui/src/views/exec/exec-job/components/exec-job-form-drawer.vue
index 14fe8477..186da30f 100644
--- a/orion-ops-ui/src/views/exec/exec-job/components/exec-job-form-drawer.vue
+++ b/orion-ops-ui/src/views/exec/exec-job/components/exec-job-form-drawer.vue
@@ -8,7 +8,7 @@
             :cancel-button-props="{ disabled: loading }"
             :on-before-ok="handlerOk"
             @cancel="handleClose">
-    <a-spin class="full spin-wrapper" :loading="loading">
+    <a-spin class="full modal-form-small" :loading="loading">
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
@@ -17,7 +17,9 @@
         <a-row :gutter="16">
           <!-- 任务名称 -->
           <a-col :span="13">
-            <a-form-item field="name" label="任务名称">
+            <a-form-item field="name"
+                         label="任务名称"
+                         :hide-asterisk="true">
               <a-input v-model="formModel.name"
                        placeholder="请输入任务名称"
                        allow-clear />
@@ -25,7 +27,9 @@
           </a-col>
           <!-- 执行主机 -->
           <a-col :span="11">
-            <a-form-item field="hostIdList" label="执行主机">
+            <a-form-item field="hostIdList"
+                         label="执行主机"
+                         :hide-asterisk="true">
               <div class="selected-host">
                 <!-- 已选择数量 -->
                 <span class="usn" v-if="formModel.hostIdList?.length">
@@ -39,7 +43,9 @@
           </a-col>
           <!-- cron -->
           <a-col :span="13">
-            <a-form-item field="expression" label="cron">
+            <a-form-item field="expression"
+                         label="cron"
+                         :hide-asterisk="true">
               <a-input v-model="formModel.expression"
                        placeholder="请输入 cron 表达式"
                        allow-clear>
@@ -55,7 +61,9 @@
           </a-col>
           <!-- 超时时间 -->
           <a-col :span="6">
-            <a-form-item field="timeout" label="超时时间">
+            <a-form-item field="timeout"
+                         label="超时时间"
+                         :hide-asterisk="true">
               <a-input-number v-model="formModel.timeout"
                               placeholder="为0则不超时"
                               :min="0"
@@ -69,7 +77,9 @@
           </a-col>
           <!-- 脚本执行 -->
           <a-col :span="5">
-            <a-form-item field="scriptExec" label="脚本执行">
+            <a-form-item field="scriptExec"
+                         label="脚本执行"
+                         :hide-asterisk="true">
               <div class="flex-center">
                 <a-switch v-model="formModel.scriptExec"
                           type="round"
@@ -89,7 +99,6 @@
                          field="command"
                          label="执行命令"
                          :hide-label="true"
-                         :wrapper-col-props="{ span: 24 }"
                          :help="'使用 @{{ xxx }} 来替换参数, 输入_可以获取全部变量'">
               <template #extra>
                 <span v-permission="['asset:exec-template:query']"
@@ -257,9 +266,6 @@
 </script>
 
 <style lang="less" scoped>
-  .spin-wrapper {
-    padding: 16px 20px;
-  }
 
   .selected-host {
     width: 100%;
diff --git a/orion-ops-ui/src/views/exec/exec-template/components/exec-template-exec-drawer.vue b/orion-ops-ui/src/views/exec/exec-template/components/exec-template-exec-drawer.vue
index 3d46535e..f013f131 100644
--- a/orion-ops-ui/src/views/exec/exec-template/components/exec-template-exec-drawer.vue
+++ b/orion-ops-ui/src/views/exec/exec-template/components/exec-template-exec-drawer.vue
@@ -8,7 +8,7 @@
             :cancel-button-props="{ disabled: loading }"
             :on-before-ok="handlerOk"
             @cancel="handleClose">
-    <a-spin class="full spin-wrapper" :loading="loading">
+    <a-spin class="full modal-form-small" :loading="loading">
       <!-- 命令表单 -->
       <a-form :model="formModel"
               ref="formRef"
@@ -18,16 +18,19 @@
         <a-row :gutter="16">
           <!-- 执行描述 -->
           <a-col :span="16">
-            <a-form-item field="description" label="执行描述">
+            <a-form-item field="description"
+                         label="执行描述"
+                         :hide-asterisk="true">
               <a-input v-model="formModel.description"
                        placeholder="请输入执行描述"
                        allow-clear />
             </a-form-item>
           </a-col>
           <!-- 超时时间 -->
-          <a-col :span="7">
+          <a-col :span="8">
             <a-form-item field="timeout"
-                         label="超时时间">
+                         label="超时时间"
+                         :hide-asterisk="true">
               <a-input-number v-model="formModel.timeout"
                               placeholder="为0则不超时"
                               :min="0"
@@ -41,7 +44,9 @@
           </a-col>
           <!-- 执行主机 -->
           <a-col :span="16">
-            <a-form-item field="hostIdList" label="执行主机">
+            <a-form-item field="hostIdList"
+                         label="执行主机"
+                         :hide-asterisk="true">
               <div class="selected-host">
                 <!-- 已选择数量 -->
                 <span class="usn" v-if="formModel.hostIdList?.length">
@@ -55,7 +60,9 @@
           </a-col>
           <!-- 脚本执行 -->
           <a-col :span="8">
-            <a-form-item field="scriptExec" label="脚本执行">
+            <a-form-item field="scriptExec"
+                         label="脚本执行"
+                         :hide-asterisk="true">
               <div class="flex-center">
                 <a-switch v-model="formModel.scriptExec"
                           type="round"
@@ -74,7 +81,6 @@
             <a-form-item field="command"
                          label="执行命令"
                          :hide-label="true"
-                         :wrapper-col-props="{ span: 24 }"
                          :help="'使用 @{{ xxx }} 来替换参数, 输入_可以获取全部变量'">
               <exec-editor v-model="formModel.command"
                            container-class="command-editor"
@@ -233,9 +239,6 @@
 </script>
 
 <style lang="less" scoped>
-  .spin-wrapper {
-    padding: 16px 20px;
-  }
 
   .selected-host {
     width: 100%;
@@ -262,7 +265,7 @@
 
   .command-editor {
     width: 100%;
-    height: 65vh;
+    height: 62vh;
   }
 
 </style>
diff --git a/orion-ops-ui/src/views/exec/exec-template/components/exec-template-form-drawer.vue b/orion-ops-ui/src/views/exec/exec-template/components/exec-template-form-drawer.vue
index df5d7e74..3fa001a8 100644
--- a/orion-ops-ui/src/views/exec/exec-template/components/exec-template-form-drawer.vue
+++ b/orion-ops-ui/src/views/exec/exec-template/components/exec-template-form-drawer.vue
@@ -8,7 +8,7 @@
             :cancel-button-props="{ disabled: loading }"
             :on-before-ok="handlerOk"
             @cancel="handleClose">
-    <a-spin class="full modal-form" :loading="loading">
+    <a-spin class="full modal-form-small" :loading="loading">
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
@@ -17,15 +17,19 @@
         <a-row :gutter="16">
           <!-- 模板名称 -->
           <a-col :span="12">
-            <a-form-item field="name" label="模板名称">
+            <a-form-item field="name"
+                         label="模板名称"
+                         :hide-asterisk="true">
               <a-input v-model="formModel.name"
                        placeholder="请输入模板名称"
                        allow-clear />
             </a-form-item>
           </a-col>
           <!-- 超时时间 -->
-          <a-col :span="7">
-            <a-form-item field="timeout" label="超时时间">
+          <a-col :span="6">
+            <a-form-item field="timeout"
+                         label="超时时间"
+                         :hide-asterisk="true">
               <a-input-number v-model="formModel.timeout"
                               placeholder="为0则不超时"
                               :min="0"
@@ -38,8 +42,10 @@
             </a-form-item>
           </a-col>
           <!-- 脚本执行 -->
-          <a-col :span="5">
-            <a-form-item field="scriptExec" label="脚本执行">
+          <a-col :span="6">
+            <a-form-item field="scriptExec"
+                         label="脚本执行"
+                         :hide-asterisk="true">
               <div class="flex-center">
                 <a-switch v-model="formModel.scriptExec"
                           type="round"
@@ -58,7 +64,6 @@
             <a-form-item field="command"
                          label="模板命令"
                          :hide-label="true"
-                         :wrapper-col-props="{ span: 24 }"
                          :help="'使用 @{{ xxx }} 来替换参数, 输入_可以获取全部变量'">
               <exec-editor v-model="formModel.command"
                            container-class="command-editor"
@@ -70,9 +75,7 @@
           <a-col :span="24">
             <a-form-item field="parameter"
                          class="parameter-form-item"
-                         label="命令参数"
-                         :label-col-props="{ span: 24 }"
-                         :wrapper-col-props="{ span: 24 }">
+                         label="命令参数">
               <!-- label -->
               <template #label>
                 <span class="span-blue pointer" @click="addParameter">添加参数</span>
@@ -313,7 +316,7 @@
 
   .command-editor {
     width: 100%;
-    height: 65vh;
+    height: 62vh;
   }
 
 </style>
diff --git a/orion-ops-ui/src/views/host/terminal/components/setting/extra/ssh-setting-form.vue b/orion-ops-ui/src/views/host/terminal/components/setting/extra/ssh-setting-form.vue
index 668934f5..7a3bcb83 100644
--- a/orion-ops-ui/src/views/host/terminal/components/setting/extra/ssh-setting-form.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/setting/extra/ssh-setting-form.vue
@@ -2,7 +2,7 @@
   <a-form :model="formModel"
           ref="formRef"
           label-align="right"
-          :label-col-props="{ span: 6 }"
+          :label-col-props="{ span: 5 }"
           :wrapper-col-props="{ span: 18 }">
     <!-- 验证方式 -->
     <a-form-item field="authType" label="验证方式">
diff --git a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-chmod-modal.vue b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-chmod-modal.vue
index 0338e0c0..4890f480 100644
--- a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-chmod-modal.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-chmod-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            title="修改权限"
            :align-center="false"
@@ -10,8 +10,7 @@
     <a-form :model="formModel"
             ref="formRef"
             label-align="right"
-            :label-col-props="{ span: 5 }"
-            :wrapper-col-props="{ span: 18 }">
+            :auto-label-width="true">
       <!-- 文件路径 -->
       <a-form-item field="path"
                    disabled
@@ -65,7 +64,7 @@
   });
 
   // 修改预览
-  const updatePreview = (v: number|undefined) => {
+  const updatePreview = (v: number | undefined) => {
     formModel.value.permission = permission10toString(v as number);
   };
 
diff --git a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-create-modal.vue b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-create-modal.vue
index 2493a27b..d86d622e 100644
--- a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-create-modal.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-create-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            :title="touch ? '创建文件' : '创建文件夹'"
            :align-center="false"
@@ -10,15 +10,14 @@
     <a-form :model="formModel"
             ref="formRef"
             label-align="right"
-            :label-col-props="{ span: 5 }"
-            :wrapper-col-props="{ span: 18 }">
-      <!-- 文件路径 -->
+            :auto-label-width="true">
+      <!-- 路径 -->
       <a-form-item field="path"
-                   label="文件路径"
-                   :rules="[{ required: true, message: '请输入文件路径' }]">
+                   :label="`${touch ? '文件' : '文件夹'}路径`"
+                   :rules="[{ required: true, message: `请输入${touch ? '文件' : '文件夹'}路径` }]">
         <a-input ref="pathRef"
                  v-model="formModel.path"
-                 placeholder="请输入文件路径" />
+                 :placeholder="`请输入${touch ? '文件' : '文件夹'}路径`" />
       </a-form-item>
     </a-form>
   </a-modal>
diff --git a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-move-modal.vue b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-move-modal.vue
index 80b4553d..4c1e143d 100644
--- a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-move-modal.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-move-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            title="移动文件"
            :align-center="false"
@@ -10,8 +10,7 @@
     <a-form :model="formModel"
             ref="formRef"
             label-align="right"
-            :label-col-props="{ span: 5 }"
-            :wrapper-col-props="{ span: 18 }">
+            :auto-label-width="true">
       <!-- 原始路径 -->
       <a-form-item field="path"
                    disabled
diff --git a/orion-ops-ui/src/views/system/dict-key/components/dict-key-form-modal.vue b/orion-ops-ui/src/views/system/dict-key/components/dict-key-form-modal.vue
index 2b5348d7..af642246 100644
--- a/orion-ops-ui/src/views/system/dict-key/components/dict-key-form-modal.vue
+++ b/orion-ops-ui/src/views/system/dict-key/components/dict-key-form-modal.vue
@@ -1,5 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
+           body-class="modal-form-large"
            title-align="start"
            :title="title"
            :top="80"
@@ -15,8 +16,7 @@
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }"
+              :auto-label-width="true"
               :rules="formRules">
         <!-- 配置项 -->
         <a-form-item field="keyName" label="配置项">
@@ -257,7 +257,7 @@
   }
 
   .param-addition {
-    margin-right: 20px;
+    margin-bottom: 20px;
     justify-content: flex-end;
     cursor: pointer;
     user-select: none;
diff --git a/orion-ops-ui/src/views/system/dict-value/components/dict-value-form-modal.vue b/orion-ops-ui/src/views/system/dict-value/components/dict-value-form-modal.vue
index 35db4f36..94719fe7 100644
--- a/orion-ops-ui/src/views/system/dict-value/components/dict-value-form-modal.vue
+++ b/orion-ops-ui/src/views/system/dict-value/components/dict-value-form-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            :title="title"
            :top="80"
@@ -16,8 +16,7 @@
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }"
+              :auto-label-width="true"
               :rules="formRules">
         <!-- 配置项 -->
         <a-form-item v-if="visible"
diff --git a/orion-ops-ui/src/views/system/menu/components/menu-form-modal.vue b/orion-ops-ui/src/views/system/menu/components/menu-form-modal.vue
index 65503a55..37ba7d50 100644
--- a/orion-ops-ui/src/views/system/menu/components/menu-form-modal.vue
+++ b/orion-ops-ui/src/views/system/menu/components/menu-form-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            :title="title"
            :top="30"
@@ -16,8 +16,7 @@
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 7 }"
-              :wrapper-col-props="{ span: 16 }"
+              :auto-label-width="true"
               :rules="formRules">
         <!-- 上级菜单 -->
         <a-form-item field="parentId" label="上级菜单">
diff --git a/orion-ops-ui/src/views/user/operator-log/components/operator-log-clear-modal.vue b/orion-ops-ui/src/views/user/operator-log/components/operator-log-clear-modal.vue
index f53e4bc9..e9e7fc14 100644
--- a/orion-ops-ui/src/views/user/operator-log/components/operator-log-clear-modal.vue
+++ b/orion-ops-ui/src/views/user/operator-log/components/operator-log-clear-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            title="清空操作日志"
            :align-center="false"
@@ -15,8 +15,7 @@
     <a-spin class="full" :loading="loading">
       <a-form :model="formModel"
               label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }">
+              :auto-label-width="true">
         <!-- 执行时间 -->
         <a-form-item field="startTimeRange" label="执行时间">
           <a-range-picker v-model="formModel.startTimeRange"
diff --git a/orion-ops-ui/src/views/user/role/components/role-form-modal.vue b/orion-ops-ui/src/views/user/role/components/role-form-modal.vue
index ddc9da00..014e7ab0 100644
--- a/orion-ops-ui/src/views/user/role/components/role-form-modal.vue
+++ b/orion-ops-ui/src/views/user/role/components/role-form-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            :title="title"
            :top="80"
@@ -16,8 +16,7 @@
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }"
+              :auto-label-width="true"
               :rules="formRules">
         <!-- 角色名称 -->
         <a-form-item field="name" label="角色名称">
diff --git a/orion-ops-ui/src/views/user/role/components/role-menu-grant-modal.vue b/orion-ops-ui/src/views/user/role/components/role-menu-grant-modal.vue
index 7eb224b7..182b460d 100644
--- a/orion-ops-ui/src/views/user/role/components/role-menu-grant-modal.vue
+++ b/orion-ops-ui/src/views/user/role/components/role-menu-grant-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-small"
            title-align="start"
            title="分配菜单"
            width="80%"
diff --git a/orion-ops-ui/src/views/user/user/components/user-form-modal.vue b/orion-ops-ui/src/views/user/user/components/user-form-modal.vue
index 4d1afd27..26ca96e3 100644
--- a/orion-ops-ui/src/views/user/user/components/user-form-modal.vue
+++ b/orion-ops-ui/src/views/user/user/components/user-form-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            :title="title"
            :top="80"
@@ -16,8 +16,7 @@
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }"
+              :auto-label-width="true"
               :rules="formRules">
         <!-- 用户名 -->
         <a-form-item field="username" label="用户名">
diff --git a/orion-ops-ui/src/views/user/user/components/user-grant-roles-form-modal.vue b/orion-ops-ui/src/views/user/user/components/user-grant-roles-form-modal.vue
index 074abe93..e041625d 100644
--- a/orion-ops-ui/src/views/user/user/components/user-grant-roles-form-modal.vue
+++ b/orion-ops-ui/src/views/user/user/components/user-grant-roles-form-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            title="分配角色"
            :top="120"
@@ -16,8 +16,7 @@
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }">
+              :auto-label-width="true">
         <!-- 用户名 -->
         <a-form-item field="username" label="用户名">
           <a-input v-model="updateUser.username" :disabled="true" />
diff --git a/orion-ops-ui/src/views/user/user/components/user-reset-password-form-modal.vue b/orion-ops-ui/src/views/user/user/components/user-reset-password-form-modal.vue
index 50b151cb..44a18a6b 100644
--- a/orion-ops-ui/src/views/user/user/components/user-reset-password-form-modal.vue
+++ b/orion-ops-ui/src/views/user/user/components/user-reset-password-form-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
            title-align="start"
            title="重置密码"
            :top="120"
@@ -16,8 +16,7 @@
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }">
+              :auto-label-width="true">
         <!-- 用户名 -->
         <a-form-item field="username" label="用户名">
           <a-input v-model="updateUser.username" :disabled="true" />