From 0f8eebf53cc761345bbacc71d9616c7129c4e287 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Mon, 4 Mar 2024 12:28:55 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=B7=E5=BC=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orion-vue-views-components-table.vue.vm   | 21 +++++++++---------
 .../asset/host-group/host-group-tree.vue      |  9 ++++----
 .../meta/history/history-value-modal.vue      |  1 -
 .../grant/components/host-identity-grant.vue  |  1 -
 .../asset/grant/components/host-key-grant.vue |  1 -
 .../components/host-identity-table.vue        |  9 ++++----
 .../host-key/components/host-key-table.vue    |  9 ++++----
 .../asset/host-list/components/host-table.vue |  9 ++++----
 .../terminal/components/sftp/sftp-table.vue   |  1 -
 .../dict-key/components/dict-key-table.vue    | 14 ++++++------
 .../components/dict-value-table.vue           | 13 +++++------
 .../system/menu/components/menu-table.vue     | 13 ++++++-----
 .../components/operator-log-query-header.vue  | 10 ++++-----
 .../components/operator-log-table.vue         |  5 +++--
 .../views/user/role/components/role-table.vue |  9 ++++----
 .../views/user/user/components/user-table.vue | 22 +++++++++----------
 16 files changed, 70 insertions(+), 77 deletions(-)

diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm
index bf21b10a..b4280069 100644
--- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm
@@ -2,10 +2,10 @@
   <!-- 搜索 -->
   <a-card class="general-card table-search-card">
     <query-header :model="formModel"
-                    label-align="left"
-                    @submit="fetchTableData"
-                    @reset="fetchTableData"
-                    @keyup.enter="() => fetchTableData()">
+                  label-align="left"
+                  @submit="fetchTableData"
+                  @reset="fetchTableData"
+                  @keyup.enter="() => fetchTableData()">
       #foreach($field in ${table.fields})
       <!-- $field.comment -->
       <a-form-item field="${field.propertyName}" label="${field.comment}" label-col-flex="50px">
@@ -48,8 +48,8 @@
       <div class="table-right-bar-handle">
         <a-space>
           <!-- 新增 -->
-          <a-button type="primary"
-                    v-permission="['${package.ModuleName}:${typeHyphen}:create']"
+          <a-button v-permission="['${package.ModuleName}:${typeHyphen}:create']"
+                    type="primary"
                     @click="emits('openAdd')">
             新增
             <template #icon>
@@ -58,9 +58,9 @@
           </a-button>
           #if($vue.enableRowSelection)
           <!-- 删除 -->
-          <a-popconfirm position="br"
+          <a-popconfirm :content="`确认删除选中的${selectedKeys.length}条记录吗?`"
+                        position="br"
                         type="warning"
-                        :content="`确认删除选中的${selectedKeys.length}条记录吗?`"
                         @ok="deleteSelectRows">
             <a-button v-permission="['${package.ModuleName}:${typeHyphen}:delete']"
                       type="secondary"
@@ -80,7 +80,6 @@
     <a-table row-key="id"
              class="table-wrapper-8"
              ref="tableRef"
-             label-align="left"
              :loading="loading"
              :columns="columns"
              #if($vue.enableRowSelection)
@@ -104,9 +103,9 @@
       <template #handle="{ record }">
         <div class="table-handle-wrapper">
           <!-- 修改 -->
-          <a-button type="text"
+          <a-button v-permission="['${package.ModuleName}:${typeHyphen}:update']"
+                    type="text"
                     size="mini"
-                    v-permission="['${package.ModuleName}:${typeHyphen}:update']"
                     @click="emits('openUpdate', record)">
             修改
           </a-button>
diff --git a/orion-ops-ui/src/components/asset/host-group/host-group-tree.vue b/orion-ops-ui/src/components/asset/host-group/host-group-tree.vue
index e629feae..c42bf643 100644
--- a/orion-ops-ui/src/components/asset/host-group/host-group-tree.vue
+++ b/orion-ops-ui/src/components/asset/host-group/host-group-tree.vue
@@ -58,10 +58,11 @@
                         position="left"
                         type="warning"
                         @ok="deleteNode(node.key)">
-          <span v-permission="['asset:host-group:delete']"
-                class="tree-icon" title="删除">
-            <icon-delete />
-          </span>
+            <span v-permission="['asset:host-group:delete']"
+                  class="tree-icon"
+                  title="删除">
+              <icon-delete />
+            </span>
           </a-popconfirm>
           <!-- 新增 -->
           <span v-permission="['asset:host-group:create']"
diff --git a/orion-ops-ui/src/components/meta/history/history-value-modal.vue b/orion-ops-ui/src/components/meta/history/history-value-modal.vue
index 1015fcd1..f97ac6c0 100644
--- a/orion-ops-ui/src/components/meta/history/history-value-modal.vue
+++ b/orion-ops-ui/src/components/meta/history/history-value-modal.vue
@@ -31,7 +31,6 @@
       <a-table row-key="id"
                class="table-wrapper-8"
                ref="tableRef"
-               label-align="left"
                :loading="loading"
                :columns="columns"
                :data="tableRenderData"
diff --git a/orion-ops-ui/src/views/asset/grant/components/host-identity-grant.vue b/orion-ops-ui/src/views/asset/grant/components/host-identity-grant.vue
index 241cb43f..cbb543c6 100644
--- a/orion-ops-ui/src/views/asset/grant/components/host-identity-grant.vue
+++ b/orion-ops-ui/src/views/asset/grant/components/host-identity-grant.vue
@@ -6,7 +6,6 @@
     <!-- 主机身份表格 -->
     <a-table row-key="id"
              class="host-identity-main-table"
-             label-align="left"
              :columns="hostIdentityColumns"
              v-model:selected-keys="selectedKeys"
              :row-selection="rowSelection"
diff --git a/orion-ops-ui/src/views/asset/grant/components/host-key-grant.vue b/orion-ops-ui/src/views/asset/grant/components/host-key-grant.vue
index 2b7acb00..87532188 100644
--- a/orion-ops-ui/src/views/asset/grant/components/host-key-grant.vue
+++ b/orion-ops-ui/src/views/asset/grant/components/host-key-grant.vue
@@ -6,7 +6,6 @@
     <!-- 主机秘钥表格 -->
     <a-table row-key="id"
              class="host-key-main-table"
-             label-align="left"
              :columns="hostKeyColumns"
              v-model:selected-keys="selectedKeys"
              :row-selection="rowSelection"
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 e762489f..c7d2d1ec 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
@@ -2,10 +2,10 @@
   <!-- 搜索 -->
   <a-card class="general-card table-search-card">
     <query-header :model="formModel"
-                    label-align="left"
-                    @submit="fetchTableData"
-                    @reset="fetchTableData"
-                    @keyup.enter="() => fetchTableData()">
+                  label-align="left"
+                  @submit="fetchTableData"
+                  @reset="fetchTableData"
+                  @keyup.enter="() => fetchTableData()">
       <!-- id -->
       <a-form-item field="id" label="id" label-col-flex="50px">
         <a-input-number v-model="formModel.id"
@@ -74,7 +74,6 @@
     <a-table row-key="id"
              class="table-wrapper-8"
              ref="tableRef"
-             label-align="left"
              :loading="loading"
              :columns="columns"
              :data="tableRenderData"
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 24e062a3..09c69227 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
@@ -2,10 +2,10 @@
   <!-- 搜索 -->
   <a-card class="general-card table-search-card">
     <query-header :model="formModel"
-                    label-align="left"
-                    @submit="fetchTableData"
-                    @reset="fetchTableData"
-                    @keyup.enter="() => fetchTableData()">
+                  label-align="left"
+                  @submit="fetchTableData"
+                  @reset="fetchTableData"
+                  @keyup.enter="() => fetchTableData()">
       <!-- id -->
       <a-form-item field="id" label="id" label-col-flex="30px">
         <a-input-number v-model="formModel.id"
@@ -66,7 +66,6 @@
     <a-table row-key="id"
              class="table-wrapper-8"
              ref="tableRef"
-             label-align="left"
              :loading="loading"
              :columns="columns"
              :data="tableRenderData"
diff --git a/orion-ops-ui/src/views/asset/host-list/components/host-table.vue b/orion-ops-ui/src/views/asset/host-list/components/host-table.vue
index 9ab805b4..9c9d8c2a 100644
--- a/orion-ops-ui/src/views/asset/host-list/components/host-table.vue
+++ b/orion-ops-ui/src/views/asset/host-list/components/host-table.vue
@@ -2,10 +2,10 @@
   <!-- 搜索 -->
   <a-card class="general-card table-search-card">
     <query-header :model="formModel"
-                    label-align="left"
-                    @submit="fetchTableData"
-                    @reset="fetchTableData"
-                    @keyup.enter="() => fetchTableData()">
+                  label-align="left"
+                  @submit="fetchTableData"
+                  @reset="fetchTableData"
+                  @keyup.enter="() => fetchTableData()">
       <!-- id -->
       <a-form-item field="id" label="主机id" label-col-flex="50px">
         <a-input-number v-model="formModel.id"
@@ -93,7 +93,6 @@
     <a-table row-key="id"
              class="table-wrapper-8"
              ref="tableRef"
-             label-align="left"
              :loading="loading"
              :columns="columns"
              :data="tableRenderData"
diff --git a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table.vue b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table.vue
index 04cddbc1..9d210e80 100644
--- a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table.vue
@@ -2,7 +2,6 @@
   <a-table row-key="path"
            ref="tableRef"
            class="sftp-table"
-           label-align="left"
            :columns="columns"
            v-model:selected-keys="selectedKeys"
            :row-selection="rowSelection"
diff --git a/orion-ops-ui/src/views/system/dict-key/components/dict-key-table.vue b/orion-ops-ui/src/views/system/dict-key/components/dict-key-table.vue
index 634a24dc..018efcc1 100644
--- a/orion-ops-ui/src/views/system/dict-key/components/dict-key-table.vue
+++ b/orion-ops-ui/src/views/system/dict-key/components/dict-key-table.vue
@@ -2,10 +2,10 @@
   <!-- 搜索 -->
   <a-card class="general-card table-search-card">
     <query-header :model="formModel"
-                    label-align="left"
-                    @submit="fetchTableData"
-                    @reset="fetchTableData"
-                    @keyup.enter="() => fetchTableData()">
+                  label-align="left"
+                  @submit="fetchTableData"
+                  @reset="fetchTableData"
+                  @keyup.enter="() => fetchTableData()">
       <!-- 配置项 -->
       <a-form-item field="keyName" label="配置项" label-col-flex="50px">
         <a-input v-model="formModel.keyName" placeholder="请输入配置项" allow-clear />
@@ -43,8 +43,9 @@
                         position="left"
                         type="warning"
                         @ok="doRefreshCache">
-            <a-button type="primary" status="warning"
-                      v-permission="['infra:dict-key:management:refresh-cache']">
+            <a-button v-permission="['infra:dict-key:management:refresh-cache']"
+                      type="primary"
+                      status="warning">
               刷新缓存
               <template #icon>
                 <icon-sync />
@@ -58,7 +59,6 @@
     <a-table row-key="id"
              class="table-wrapper-8"
              ref="tableRef"
-             label-align="left"
              :loading="loading"
              :columns="columns"
              :data="tableRenderData"
diff --git a/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue b/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue
index 62c162e1..9201837e 100644
--- a/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue
+++ b/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue
@@ -2,10 +2,10 @@
   <!-- 搜索 -->
   <a-card class="general-card table-search-card">
     <query-header :model="formModel"
-                    label-align="left"
-                    @submit="fetchTableData"
-                    @reset="resetForm"
-                    @keyup.enter="() => fetchTableData()">
+                  label-align="left"
+                  @submit="fetchTableData"
+                  @reset="resetForm"
+                  @keyup.enter="() => fetchTableData()">
       <!-- 配置项 -->
       <a-form-item field="keyId" label="配置项" label-col-flex="50px">
         <dict-key-selector v-model="formModel.keyId"
@@ -46,9 +46,9 @@
             </template>
           </a-button>
           <!-- 删除 -->
-          <a-popconfirm position="br"
+          <a-popconfirm :content="`确认删除选中的${selectedKeys.length}条记录吗?`"
+                        position="br"
                         type="warning"
-                        :content="`确认删除选中的${selectedKeys.length}条记录吗?`"
                         @ok="deleteSelectRows">
             <a-button v-permission="['infra:dict-value:delete']"
                       type="secondary"
@@ -67,7 +67,6 @@
     <a-table row-key="id"
              class="table-wrapper-8"
              ref="tableRef"
-             label-align="left"
              :loading="loading"
              :columns="columns"
              v-model:selected-keys="selectedKeys"
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 d4d99f35..2a59c86f 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
@@ -66,8 +66,9 @@
                         position="left"
                         type="warning"
                         @ok="doRefreshCache">
-            <a-button type="primary" status="warning"
-                      v-permission="['infra:system-menu:management:refresh-cache']">
+            <a-button v-permission="['infra:system-menu:management:refresh-cache']"
+                      type="primary"
+                      status="warning">
               刷新缓存
               <template #icon>
                 <icon-sync />
@@ -83,7 +84,6 @@
     <a-table row-key="id"
              class="table-wrapper-16"
              ref="tableRef"
-             label-align="left"
              :loading="fetchLoading"
              :pagination="false"
              :columns="columns"
@@ -162,9 +162,10 @@
                         position="left"
                         type="warning"
                         @ok="doDeleteMenu(record)">
-            <a-button type="text" size="mini"
-                      status="danger"
-                      v-permission="['infra:system-menu:delete']">
+            <a-button v-permission="['infra:system-menu:delete']"
+                      type="text"
+                      size="mini"
+                      status="danger">
               删除
             </a-button>
           </a-popconfirm>
diff --git a/orion-ops-ui/src/views/user/operator-log/components/operator-log-query-header.vue b/orion-ops-ui/src/views/user/operator-log/components/operator-log-query-header.vue
index aa46eac7..d7051abf 100644
--- a/orion-ops-ui/src/views/user/operator-log/components/operator-log-query-header.vue
+++ b/orion-ops-ui/src/views/user/operator-log/components/operator-log-query-header.vue
@@ -1,10 +1,10 @@
 <template>
   <query-header :model="formModel"
-                  label-align="left"
-                  :itemOptions="{ [visibleUser ? 5 : 4]: { span: 2 } }"
-                  @submit="submit"
-                  @reset="submit"
-                  @keyup.enter="submit">
+                label-align="left"
+                :itemOptions="{ [visibleUser ? 5 : 4]: { span: 2 } }"
+                @submit="submit"
+                @reset="submit"
+                @keyup.enter="submit">
     <!-- 操作用户 -->
     <a-form-item v-if="visibleUser"
                  field="userId"
diff --git a/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue b/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue
index 9e5da56e..dbc5f086 100644
--- a/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue
+++ b/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue
@@ -2,7 +2,6 @@
   <a-table row-key="id"
            class="table-wrapper-8"
            ref="tableRef"
-           label-align="left"
            :loading="loading"
            :columns="tableColumns"
            :data="tableRenderData"
@@ -39,7 +38,9 @@
     <template #handle="{ record }">
       <div class="table-handle-wrapper">
         <!-- 详情 -->
-        <a-button type="text" size="mini" @click="viewDetail(record)">
+        <a-button type="text"
+                  size="mini"
+                  @click="viewDetail(record)">
           详情
         </a-button>
       </div>
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 fd5fb1d3..a8229cc1 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
@@ -2,10 +2,10 @@
   <!-- 搜索 -->
   <a-card class="general-card table-search-card">
     <query-header :model="formModel"
-                    label-align="left"
-                    @submit="fetchTableData"
-                    @reset="fetchTableData"
-                    @keyup.enter="() => fetchTableData()">
+                  label-align="left"
+                  @submit="fetchTableData"
+                  @reset="fetchTableData"
+                  @keyup.enter="() => fetchTableData()">
       <!-- 角色名称 -->
       <a-form-item field="name" label="角色名称" label-col-flex="50px">
         <a-input v-model="formModel.name" placeholder="请输入角色名称" allow-clear />
@@ -52,7 +52,6 @@
     <a-table row-key="id"
              class="table-wrapper-8"
              ref="tableRef"
-             label-align="left"
              :loading="loading"
              :columns="columns"
              :data="tableRenderData"
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 c10d6c4e..bcacbbde 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
@@ -2,10 +2,10 @@
   <!-- 搜索 -->
   <a-card class="general-card table-search-card">
     <query-header :model="formModel"
-                    label-align="left"
-                    @submit="fetchTableData"
-                    @reset="fetchTableData"
-                    @keyup.enter="() => fetchTableData()">
+                  label-align="left"
+                  @submit="fetchTableData"
+                  @reset="fetchTableData"
+                  @keyup.enter="() => fetchTableData()">
       <!-- id -->
       <a-form-item field="id" label="id" label-col-flex="50px">
         <a-input-number v-model="formModel.id"
@@ -67,7 +67,6 @@
     <a-table row-key="id"
              class="table-wrapper-8"
              ref="tableRef"
-             label-align="left"
              :loading="loading"
              :columns="columns"
              :data="tableRenderData"
@@ -92,10 +91,10 @@
                         position="left"
                         type="warning"
                         @ok="updateStatus(record)">
-            <a-button type="text"
+            <a-button v-permission="['infra:system-user:update-status']"
+                      type="text"
                       size="mini"
-                      :disabled="record.id === userStore.id"
-                      v-permission="['infra:system-user:update-status']">
+                      :disabled="record.id === userStore.id">
               {{
                 UserStatus.ENABLED === record.status
                   ? getDictValue(userStatusKey, UserStatus.DISABLED)
@@ -137,10 +136,11 @@
                         position="left"
                         type="warning"
                         @ok="deleteRow(record)">
-            <a-button type="text" size="mini"
+            <a-button v-permission="['infra:system-user:delete']"
+                      type="text"
+                      size="mini"
                       status="danger"
-                      :disabled="record.id === userStore.id"
-                      v-permission="['infra:system-user:delete']">
+                      :disabled="record.id === userStore.id">
               删除
             </a-button>
           </a-popconfirm>