From b83b212a4f652871c495116e8d8df7da663eac72 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Wed, 18 Oct 2023 15:00:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orion-vue-views-components-table.vue.vm         | 13 ++++++++-----
 .../orion-vue-views-types-table.columns.ts.vm       |  2 +-
 orion-ops-ui/src/assets/style/layout.less           |  8 +++++++-
 orion-ops-ui/src/components/navbar/index.vue        |  2 +-
 .../components/host-identity-table.vue              | 13 ++++++++-----
 .../asset/host-key/components/host-key-table.vue    | 13 ++++++++-----
 .../src/views/asset/host/components/host-table.vue  | 13 ++++++++-----
 .../src/views/system/menu/components/menu-table.vue |  2 +-
 .../src/views/user/role/components/role-table.vue   | 13 ++++++++-----
 .../src/views/user/user/components/user-table.vue   | 13 ++++++++-----
 .../src/views/user/user/types/form.rules.ts         |  2 +-
 11 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-table.vue.vm b/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-table.vue.vm
index 7039b3b0..17a27a85 100644
--- a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-table.vue.vm
+++ b/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-table.vue.vm
@@ -36,12 +36,15 @@
   <!-- 表格 -->
   <a-card class="general-card table-card">
     <template #title>
-      <!-- 左侧标题 -->
-      <div class="table-title">
-        ${table.comment}列表
+      <!-- 左侧操作 -->
+      <div class="table-left-bar-handle">
+        <!-- 标题 -->
+        <div class="table-title">
+          ${table.comment}列表
+        </div>
       </div>
-      <!-- 右侧按钮 -->
-      <div class="table-bar-handle">
+      <!-- 右侧操作 -->
+      <div class="table-right-bar-handle">
         <a-space>
           <!-- 新增 -->
           <a-button type="primary"
diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-types-table.columns.ts.vm b/orion-ops-launch/src/main/resources/templates/orion-vue-views-types-table.columns.ts.vm
index 36997d3d..377cc40c 100644
--- a/orion-ops-launch/src/main/resources/templates/orion-vue-views-types-table.columns.ts.vm
+++ b/orion-ops-launch/src/main/resources/templates/orion-vue-views-types-table.columns.ts.vm
@@ -13,7 +13,7 @@ const columns = [
     title: '${field.comment}',
     dataIndex: '${field.propertyName}',
     slotName: '${field.propertyName}',
-    align: 'center',
+    align: 'left',
     #if(${field.propertyType} == 'String')
     ellipsis: true,
     tooltip: true,
diff --git a/orion-ops-ui/src/assets/style/layout.less b/orion-ops-ui/src/assets/style/layout.less
index d84beca2..71a60418 100644
--- a/orion-ops-ui/src/assets/style/layout.less
+++ b/orion-ops-ui/src/assets/style/layout.less
@@ -15,7 +15,13 @@
   }
 }
 
-.table-bar-handle {
+.table-left-bar-handle {
+  display: flex;
+  align-items: center;
+  justify-content: start;
+}
+
+.table-right-bar-handle {
   display: flex;
   align-items: center;
   justify-content: end
diff --git a/orion-ops-ui/src/components/navbar/index.vue b/orion-ops-ui/src/components/navbar/index.vue
index d4f4acdc..a1400e7a 100644
--- a/orion-ops-ui/src/components/navbar/index.vue
+++ b/orion-ops-ui/src/components/navbar/index.vue
@@ -21,7 +21,7 @@
     <div class="center-side">
       <Menu v-if="topMenu" />
     </div>
-    <!-- 右侧按钮 -->
+    <!-- 右侧操作 -->
     <ul class="right-side">
       <!-- 搜索 -->
       <li v-if="false">
diff --git a/orion-ops-ui/src/views/asset/host-identity/components/host-identity-table.vue b/orion-ops-ui/src/views/asset/host-identity/components/host-identity-table.vue
index 74aa6759..8841781e 100644
--- a/orion-ops-ui/src/views/asset/host-identity/components/host-identity-table.vue
+++ b/orion-ops-ui/src/views/asset/host-identity/components/host-identity-table.vue
@@ -29,12 +29,15 @@
   <!-- 表格 -->
   <a-card class="general-card table-card">
     <template #title>
-      <!-- 左侧标题 -->
-      <div class="table-title">
-        身份列表
+      <!-- 左侧操作 -->
+      <div class="table-left-bar-handle">
+        <!-- 标题 -->
+        <div class="table-title">
+          身份列表
+        </div>
       </div>
-      <!-- 右侧按钮 -->
-      <div class="table-bar-handle">
+      <!-- 右侧操作 -->
+      <div class="table-right-bar-handle">
         <a-space>
           <!-- 新增 -->
           <a-button type="primary"
diff --git a/orion-ops-ui/src/views/asset/host-key/components/host-key-table.vue b/orion-ops-ui/src/views/asset/host-key/components/host-key-table.vue
index d1b525a5..2faf137f 100644
--- a/orion-ops-ui/src/views/asset/host-key/components/host-key-table.vue
+++ b/orion-ops-ui/src/views/asset/host-key/components/host-key-table.vue
@@ -21,12 +21,15 @@
   <!-- 表格 -->
   <a-card class="general-card table-card">
     <template #title>
-      <!-- 左侧标题 -->
-      <div class="table-title">
-        秘钥列表
+      <!-- 左侧操作 -->
+      <div class="table-left-bar-handle">
+        <!-- 标题 -->
+        <div class="table-title">
+          秘钥列表
+        </div>
       </div>
-      <!-- 右侧按钮 -->
-      <div class="table-bar-handle">
+      <!-- 右侧操作 -->
+      <div class="table-right-bar-handle">
         <a-space>
           <!-- 新增 -->
           <a-button type="primary"
diff --git a/orion-ops-ui/src/views/asset/host/components/host-table.vue b/orion-ops-ui/src/views/asset/host/components/host-table.vue
index c76935ff..11de187a 100644
--- a/orion-ops-ui/src/views/asset/host/components/host-table.vue
+++ b/orion-ops-ui/src/views/asset/host/components/host-table.vue
@@ -39,12 +39,15 @@
   <!-- 表格 -->
   <a-card class="general-card table-card">
     <template #title>
-      <!-- 左侧标题 -->
-      <div class="table-title">
-        主机列表
+      <!-- 左侧操作 -->
+      <div class="table-left-bar-handle">
+        <!-- 标题 -->
+        <div class="table-title">
+          主机列表
+        </div>
       </div>
-      <!-- 右侧按钮 -->
-      <div class="table-bar-handle">
+      <!-- 右侧操作 -->
+      <div class="table-right-bar-handle">
         <a-space>
           <!-- 仅看收藏 -->
           <a-checkbox v-model="formModel.favorite" @change="fetchTableData()">
diff --git a/orion-ops-ui/src/views/system/menu/components/menu-table.vue b/orion-ops-ui/src/views/system/menu/components/menu-table.vue
index 399752f7..b6aba119 100644
--- a/orion-ops-ui/src/views/system/menu/components/menu-table.vue
+++ b/orion-ops-ui/src/views/system/menu/components/menu-table.vue
@@ -28,7 +28,7 @@
         </a-form>
       </a-col>
       <!-- 操作 -->
-      <a-col :span="12" class="table-bar-handle">
+      <a-col :span="12" class="table-right-bar-handle">
         <a-space>
           <!-- 新增 -->
           <a-button type="primary"
diff --git a/orion-ops-ui/src/views/user/role/components/role-table.vue b/orion-ops-ui/src/views/user/role/components/role-table.vue
index 403b8831..1f8f73d3 100644
--- a/orion-ops-ui/src/views/user/role/components/role-table.vue
+++ b/orion-ops-ui/src/views/user/role/components/role-table.vue
@@ -25,12 +25,15 @@
   <!-- 表格 -->
   <a-card class="general-card table-card">
     <template #title>
-      <!-- 左侧标题 -->
-      <div class="table-title">
-        角色列表
+      <!-- 左侧操作 -->
+      <div class="table-left-bar-handle">
+        <!-- 标题 -->
+        <div class="table-title">
+          角色列表
+        </div>
       </div>
-      <!-- 右侧按钮 -->
-      <div class="table-bar-handle">
+      <!-- 右侧操作 -->
+      <div class="table-right-bar-handle">
         <a-space>
           <!-- 新增 -->
           <a-button type="primary"
diff --git a/orion-ops-ui/src/views/user/user/components/user-table.vue b/orion-ops-ui/src/views/user/user/components/user-table.vue
index b95efad5..ac265368 100644
--- a/orion-ops-ui/src/views/user/user/components/user-table.vue
+++ b/orion-ops-ui/src/views/user/user/components/user-table.vue
@@ -40,12 +40,15 @@
   <!-- 表格 -->
   <a-card class="general-card table-card">
     <template #title>
-      <!-- 左侧标题 -->
-      <div class="table-title">
-        用户列表
+      <!-- 左侧操作 -->
+      <div class="table-left-bar-handle">
+        <!-- 标题 -->
+        <div class="table-title">
+          用户列表
+        </div>
       </div>
-      <!-- 右侧按钮 -->
-      <div class="table-bar-handle">
+      <!-- 右侧操作 -->
+      <div class="table-right-bar-handle">
         <a-space>
           <!-- 新增 -->
           <a-button type="primary"
diff --git a/orion-ops-ui/src/views/user/user/types/form.rules.ts b/orion-ops-ui/src/views/user/user/types/form.rules.ts
index 1a13eab9..b4c7472b 100644
--- a/orion-ops-ui/src/views/user/user/types/form.rules.ts
+++ b/orion-ops-ui/src/views/user/user/types/form.rules.ts
@@ -8,7 +8,7 @@ export const username = [{
   message: '用户名长度不能大于32位'
 }, {
   match: /^[a-zA-Z0-9]{4,32}$/,
-  message: '用户名只能是 4-32 位的数字以及字母'
+  message: '用户名需要为 4-32 位的数字以及字母'
 }] as FieldRule[];
 
 export const password = [{