From 562052b868150405e234351ff4f998d5db19e2f2 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Thu, 7 Nov 2024 10:46:17 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=AF=AD=E4=B9=89.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orion-server-module-service-impl.java.vm  |  2 +-
 ...rion-vue-views-components-card-list.vue.vm | 13 ++------
 .../orion-vue-views-components-table.vue.vm   | 17 +++-------
 .../templates/orion-vue-views-index.vue.vm    | 33 ++++++-------------
 orion-visor-ui/src/assets/style/global.less   | 16 +++++++++
 .../components/connect-log-table.vue          |  4 +--
 .../sftp-log/components/sftp-log-table.vue    |  4 +--
 .../components/host-identity-card-list.vue    | 13 ++------
 .../components/host-identity-table.vue        | 17 +++-------
 .../src/views/asset/host-identity/index.vue   | 21 ++++--------
 .../components/host-key-card-list.vue         | 13 ++------
 .../host-key/components/host-key-table.vue    | 17 +++-------
 .../src/views/asset/host-key/index.vue        | 21 ++++--------
 .../host-list/components/host-card-list.vue   | 13 ++------
 .../asset/host-list/components/host-table.vue | 17 +++-------
 .../src/views/asset/host-list/index.vue       | 21 ++++--------
 .../components/exec-command-log-table.vue     |  4 +--
 .../components/exec-template-table.vue        | 17 +++-------
 .../src/views/exec/exec-template/index.vue    | 14 ++------
 .../components/upload-task-table.vue          |  4 +--
 .../components/exec-job-log-table.vue         |  4 +--
 .../exec-job/components/exec-job-table.vue    | 17 +++-------
 .../src/views/job/exec-job/index.vue          | 21 ++----------
 .../dict-key/components/dict-key-table.vue    | 18 +++-------
 .../src/views/system/dict-key/index.vue       | 14 ++------
 .../components/dict-value-table.vue           | 17 +++-------
 .../src/views/system/dict-value/index.vue     | 16 ++-------
 .../system/menu/components/menu-table.vue     | 14 ++------
 .../src/views/system/menu/index.vue           |  4 +--
 .../components/operator-log-table.vue         |  4 +--
 .../views/user/role/components/role-table.vue | 13 ++------
 orion-visor-ui/src/views/user/role/index.vue  |  4 +--
 .../views/user/user/components/user-table.vue | 17 +++-------
 orion-visor-ui/src/views/user/user/index.vue  |  4 +--
 34 files changed, 136 insertions(+), 312 deletions(-)

diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm
index 3181fc84..75749bd2 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm
@@ -142,8 +142,8 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
         // 查询
         return ${typeLower}DAO.of(wrapper).list(${type}Convert.MAPPER::to);
     }
-
     #if($meta.enableCache)
+
     @Override
     public List<${type}VO> get${type}ListByCache() {
         // 查询缓存
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
index 09623208..e2935ba9 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
@@ -180,19 +180,12 @@
     });
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchCardData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchCardData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 重置条件
   const reset = () => {
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm
index 13aca6fa..1094f087 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm
@@ -63,7 +63,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['${package.ModuleName}:${typeHyphen}:delete']"
                       type="secondary"
                       status="danger"
@@ -182,7 +182,7 @@
 
   #if($vue.enableRowSelection)
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
@@ -215,19 +215,12 @@
     }
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchTableData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchTableData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 加载数据
   const doFetchTableData = async (request: ${vue.featureEntity}QueryRequest) => {
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-index.vue.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-index.vue.vm
index 06ce09e3..49cb27c8 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-index.vue.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-index.vue.vm
@@ -18,15 +18,15 @@
                   @open-update="(e) =>#if($vue.enableDrawerForm) drawer#else modal#end.openUpdate(e)" />
     #end
     #if($vue.enableDrawerForm)
-    <!-- 添加修改模态框 -->
+    <!-- 添加修改抽屉 -->
     <${vue.feature}-form-drawer ref="drawer"
-                   @added="modalAddCallback"
-                   @updated="modalUpdateCallback" />
+                   @added="reload"
+                   @updated="reload" />
     #else
     <!-- 添加修改模态框 -->
     <${vue.feature}-form-modal ref="modal"
-                   @added="modalAddCallback"
-                   @updated="modalUpdateCallback" />
+                   @added="reload"
+                   @updated="reload" />
     #end
   </div>
 </template>
@@ -81,29 +81,16 @@
   const modal = ref();
   #end
 
-  // 添加回调
-  const modalAddCallback = () => {
+  // 重新加载
+  const reload = () => {
     #if($vue.enableCardView)
     if (renderTable.value) {
-      table.value.addedCallback();
+      table.value.reload();
     } else {
-      card.value.addedCallback();
+      card.value.reload();
     }
     #else
-    table.value.addedCallback();
-    #end
-  };
-
-  // 修改回调
-  const modalUpdateCallback = () => {
-    #if($vue.enableCardView)
-    if (renderTable.value) {
-      table.value.updatedCallback();
-    } else {
-      card.value.updatedCallback();
-    }
-    #else
-    table.value.updatedCallback();
+    table.value.reload();
     #end
   };
 
diff --git a/orion-visor-ui/src/assets/style/global.less b/orion-visor-ui/src/assets/style/global.less
index b8cafb69..a42bcc6b 100644
--- a/orion-visor-ui/src/assets/style/global.less
+++ b/orion-visor-ui/src/assets/style/global.less
@@ -371,6 +371,22 @@ body {
   font-size: 16px;
 }
 
+.fs17 {
+  font-size: 17px;
+}
+
+.fs18 {
+  font-size: 18px;
+}
+
+.fs19 {
+  font-size: 19px;
+}
+
+.fs20 {
+  font-size: 20px;
+}
+
 .text-ellipsis {
   overflow: hidden;
   text-overflow: ellipsis;
diff --git a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
index 03a6a439..72747063 100644
--- a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
+++ b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
@@ -76,7 +76,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['asset:terminal-connect-log:management:delete']"
                       type="primary"
                       status="danger"
@@ -276,7 +276,7 @@
   };
 
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
diff --git a/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue b/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
index 09076199..9ab93c93 100644
--- a/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
+++ b/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
@@ -60,7 +60,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['infra:operator-log:delete', 'asset:terminal-sftp-log:management:delete']"
                       type="primary"
                       status="danger"
@@ -240,7 +240,7 @@
   };
 
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
diff --git a/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue b/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue
index cbd77167..270d787c 100644
--- a/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue
+++ b/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue
@@ -209,19 +209,12 @@
     });
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchCardData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchCardData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 重置条件
   const reset = () => {
diff --git a/orion-visor-ui/src/views/asset/host-identity/components/host-identity-table.vue b/orion-visor-ui/src/views/asset/host-identity/components/host-identity-table.vue
index aed44e99..7bbcef18 100644
--- a/orion-visor-ui/src/views/asset/host-identity/components/host-identity-table.vue
+++ b/orion-visor-ui/src/views/asset/host-identity/components/host-identity-table.vue
@@ -78,7 +78,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['asset:host-identity:delete']"
                       type="primary"
                       status="danger"
@@ -224,7 +224,7 @@
   };
 
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
@@ -239,19 +239,12 @@
     }
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchTableData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchTableData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 加载数据
   const doFetchTableData = async (request: HostIdentityQueryRequest) => {
diff --git a/orion-visor-ui/src/views/asset/host-identity/index.vue b/orion-visor-ui/src/views/asset/host-identity/index.vue
index 04628595..dfc8e018 100644
--- a/orion-visor-ui/src/views/asset/host-identity/index.vue
+++ b/orion-visor-ui/src/views/asset/host-identity/index.vue
@@ -14,8 +14,8 @@
                              @open-key-view="(e) => keyDrawer.openView(e) " />
     <!-- 添加修改模态框 -->
     <host-identity-form-modal ref="modal"
-                              @added="modalAddCallback"
-                              @updated="modalUpdateCallback" />
+                              @added="reload"
+                              @updated="reload" />
     <!-- 主机密钥抽屉 -->
     <host-key-form-drawer ref="keyDrawer" />
   </div>
@@ -45,21 +45,12 @@
 
   const renderTable = computed(() => appStore.hostIdentityView === 'table');
 
-  // 添加回调
-  const modalAddCallback = () => {
+  // 重新加载
+  const reload = () => {
     if (renderTable.value) {
-      table.value.addedCallback();
+      table.value.reload();
     } else {
-      card.value.addedCallback();
-    }
-  };
-
-  // 修改回调
-  const modalUpdateCallback = () => {
-    if (renderTable.value) {
-      table.value.updatedCallback();
-    } else {
-      card.value.updatedCallback();
+      card.value.reload();
     }
   };
 
diff --git a/orion-visor-ui/src/views/asset/host-key/components/host-key-card-list.vue b/orion-visor-ui/src/views/asset/host-key/components/host-key-card-list.vue
index 6652d11d..ef675e2e 100644
--- a/orion-visor-ui/src/views/asset/host-key/components/host-key-card-list.vue
+++ b/orion-visor-ui/src/views/asset/host-key/components/host-key-card-list.vue
@@ -126,19 +126,12 @@
     });
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchCardData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchCardData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 重置条件
   const reset = () => {
diff --git a/orion-visor-ui/src/views/asset/host-key/components/host-key-table.vue b/orion-visor-ui/src/views/asset/host-key/components/host-key-table.vue
index d21fe9d7..b8cfc07c 100644
--- a/orion-visor-ui/src/views/asset/host-key/components/host-key-table.vue
+++ b/orion-visor-ui/src/views/asset/host-key/components/host-key-table.vue
@@ -63,7 +63,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['asset:host-key:delete']"
                       type="primary"
                       status="danger"
@@ -173,7 +173,7 @@
   };
 
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
@@ -188,19 +188,12 @@
     }
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchTableData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchTableData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 加载数据
   const doFetchTableData = async (request: HostKeyQueryRequest) => {
diff --git a/orion-visor-ui/src/views/asset/host-key/index.vue b/orion-visor-ui/src/views/asset/host-key/index.vue
index 352115ff..55fa4afd 100644
--- a/orion-visor-ui/src/views/asset/host-key/index.vue
+++ b/orion-visor-ui/src/views/asset/host-key/index.vue
@@ -14,8 +14,8 @@
                         @open-update="(e) => drawer.openUpdate(e)" />
     <!-- 添加修改模态框 -->
     <host-key-form-drawer ref="drawer"
-                          @added="modalAddCallback"
-                          @updated="modalUpdateCallback" />
+                          @added="reload"
+                          @updated="reload" />
   </div>
 </template>
 
@@ -39,21 +39,12 @@
 
   const renderTable = computed(() => appStore.hostKeyView === 'table');
 
-  // 添加回调
-  const modalAddCallback = () => {
+  // 重新加载
+  const reload = () => {
     if (renderTable.value) {
-      table.value.addedCallback();
+      table.value.reload();
     } else {
-      card.value.addedCallback();
-    }
-  };
-
-  // 修改回调
-  const modalUpdateCallback = () => {
-    if (renderTable.value) {
-      table.value.updatedCallback();
-    } else {
-      card.value.updatedCallback();
+      card.value.reload();
     }
   };
 
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue b/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
index 235389ff..cc632bdb 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
@@ -303,19 +303,12 @@
     });
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchCardData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchCardData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 重置条件
   const reset = () => {
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-table.vue b/orion-visor-ui/src/views/asset/host-list/components/host-table.vue
index d33b6244..fed3e8c8 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-table.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-table.vue
@@ -103,7 +103,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['asset:host:delete']"
                       type="primary"
                       status="danger"
@@ -330,7 +330,7 @@
   };
 
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
@@ -345,19 +345,12 @@
     }
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchTableData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchTableData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 加载数据
   const doFetchTableData = async (request: HostQueryRequest) => {
diff --git a/orion-visor-ui/src/views/asset/host-list/index.vue b/orion-visor-ui/src/views/asset/host-list/index.vue
index 4ff340d3..64fe1745 100644
--- a/orion-visor-ui/src/views/asset/host-list/index.vue
+++ b/orion-visor-ui/src/views/asset/host-list/index.vue
@@ -18,8 +18,8 @@
                     @open-update-config="(e) => hostConfig.open(e)" />
     <!-- 添加修改模态框 -->
     <host-form-modal ref="modal"
-                     @added="modalAddCallback"
-                     @updated="modalUpdateCallback" />
+                     @added="reload"
+                     @updated="reload" />
     <!-- 配置面板 -->
     <host-config-drawer ref="hostConfig" />
     <!-- 分组配置 -->
@@ -54,21 +54,12 @@
 
   const renderTable = computed(() => appStore.hostView === 'table');
 
-  // 添加回调
-  const modalAddCallback = () => {
+  // 重新加载
+  const reload = () => {
     if (renderTable.value) {
-      table.value.addedCallback();
+      table.value.reload();
     } else {
-      card.value.addedCallback();
-    }
-  };
-
-  // 修改回调
-  const modalUpdateCallback = () => {
-    if (renderTable.value) {
-      table.value.updatedCallback();
-    } else {
-      card.value.updatedCallback();
+      card.value.reload();
     }
   };
 
diff --git a/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue b/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
index c5a055e3..f8a5adad 100644
--- a/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
@@ -83,7 +83,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗? 删除后会中断执行!`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['asset:exec-command-log:delete']"
                       type="primary"
                       status="danger"
@@ -255,7 +255,7 @@
   };
 
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
diff --git a/orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue b/orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue
index b93b34ef..9db2755c 100644
--- a/orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue
@@ -53,7 +53,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['asset:exec-template:delete']"
                       type="primary"
                       status="danger"
@@ -168,7 +168,7 @@
   };
 
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
@@ -183,19 +183,12 @@
     }
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchTableData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchTableData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 加载数据
   const doFetchTableData = async (request: ExecTemplateQueryRequest) => {
diff --git a/orion-visor-ui/src/views/exec/exec-template/index.vue b/orion-visor-ui/src/views/exec/exec-template/index.vue
index 11546c52..7215e39b 100644
--- a/orion-visor-ui/src/views/exec/exec-template/index.vue
+++ b/orion-visor-ui/src/views/exec/exec-template/index.vue
@@ -7,8 +7,8 @@
                          @open-exec="(e) => execModal.open(e)" />
     <!-- 添加修改模态框 -->
     <exec-template-form-drawer ref="drawer"
-                               @added="modalAddCallback"
-                               @updated="modalUpdateCallback"
+                               @added="() => table.reload()"
+                               @updated="() => table.reload()"
                                @open-host="(e) => openHostModal('drawer', e)" />
     <!-- 执行模态框 -->
     <exec-template-exec-drawer ref="execModal"
@@ -40,16 +40,6 @@
   const hostModal = ref();
   const lastOpenHostRef = ref();
 
-  // 添加回调
-  const modalAddCallback = () => {
-    table.value.addedCallback();
-  };
-
-  // 修改回调
-  const modalUpdateCallback = () => {
-    table.value.updatedCallback();
-  };
-
   // 打开主机模态框
   const openHostModal = (openRef: string, data: any) => {
     lastOpenHostRef.value = openRef;
diff --git a/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue b/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
index 5ad29e13..5e01f98d 100644
--- a/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
+++ b/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
@@ -83,7 +83,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['asset:upload-task:delete']"
                       type="primary"
                       status="danger"
@@ -231,7 +231,7 @@
   };
 
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
diff --git a/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-log-table.vue b/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-log-table.vue
index 79f1a75f..2e984c8e 100644
--- a/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-log-table.vue
+++ b/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-log-table.vue
@@ -68,7 +68,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗? 删除后会中断执行!`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['asset:exec-job-log:delete']"
                       type="primary"
                       status="danger"
@@ -235,7 +235,7 @@
   };
 
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
diff --git a/orion-visor-ui/src/views/job/exec-job/components/exec-job-table.vue b/orion-visor-ui/src/views/job/exec-job/components/exec-job-table.vue
index 3d8b75b6..e179a903 100644
--- a/orion-visor-ui/src/views/job/exec-job/components/exec-job-table.vue
+++ b/orion-visor-ui/src/views/job/exec-job/components/exec-job-table.vue
@@ -60,7 +60,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['asset:exec-job:delete']"
                       type="primary"
                       status="danger"
@@ -238,7 +238,7 @@
   };
 
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
@@ -253,19 +253,12 @@
     }
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchTableData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchTableData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 修改状态
   const updateStatus = async (id: number, status: number) => {
diff --git a/orion-visor-ui/src/views/job/exec-job/index.vue b/orion-visor-ui/src/views/job/exec-job/index.vue
index 74c1e86d..c04bae0a 100644
--- a/orion-visor-ui/src/views/job/exec-job/index.vue
+++ b/orion-visor-ui/src/views/job/exec-job/index.vue
@@ -8,12 +8,12 @@
                     @test-cron="openNextCron" />
     <!-- 添加修改模态框 -->
     <exec-job-form-drawer ref="drawer"
-                          @added="modalAddCallback"
-                          @updated="modalUpdateCallback"
+                          @added="() => table.reload()"
+                          @updated="() => table.reload()"
                           @open-host="(e) => hostModal.open(e)"
                           @open-template="() => templateModal.open()"
                           @test-cron="openNextCron"
-                          @gen-cron="openGeneratorCron" />
+                          @gen-cron="(e) => genModal.open(e)" />
     <!-- 任务详情模态框 -->
     <exec-job-detail-drawer ref="detail" />
     <!-- cron 执行时间模态框 -->
@@ -58,26 +58,11 @@
   const templateModal = ref();
   const hostModal = ref();
 
-  // 添加回调
-  const modalAddCallback = () => {
-    table.value.addedCallback();
-  };
-
-  // 修改回调
-  const modalUpdateCallback = () => {
-    table.value.updatedCallback();
-  };
-
   // 打开下次执行时间
   const openNextCron = (cron: string) => {
     nextCron.value.open({ expression: cron, times: CronNextTimes });
   };
 
-  // 打开生成表达式
-  const openGeneratorCron = (cron: string) => {
-    genModal.value.open(cron);
-  };
-
   onBeforeMount(async () => {
     const dictStore = useDictStore();
     await dictStore.loadKeys(dictKeys);
diff --git a/orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue b/orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue
index 2ec8454c..102fc7b5 100644
--- a/orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue
+++ b/orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue
@@ -67,7 +67,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['infra:dict-key:delete']"
                       type="primary"
                       status="danger"
@@ -206,7 +206,7 @@
   };
 
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
@@ -222,21 +222,13 @@
     }
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchTableData();
     cacheStore.reset('dictKeys');
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchTableData();
-    cacheStore.reset('dictKeys');
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 打开查看视图
   const openView = async (record: DictKeyQueryResponse) => {
diff --git a/orion-visor-ui/src/views/system/dict-key/index.vue b/orion-visor-ui/src/views/system/dict-key/index.vue
index 737e611b..7ee07d69 100644
--- a/orion-visor-ui/src/views/system/dict-key/index.vue
+++ b/orion-visor-ui/src/views/system/dict-key/index.vue
@@ -7,8 +7,8 @@
                     @open-view="(v, t) => view.open(v, t)" />
     <!-- 添加修改模态框 -->
     <dict-key-form-modal ref="modal"
-                         @added="modalAddCallback"
-                         @updated="modalUpdateCallback" />
+                         @added="() => table.reload()"
+                         @updated="() => table.reload()" />
     <!-- json 查看器模态框 -->
     <json-editor-modal ref="view" />
   </div>
@@ -33,16 +33,6 @@
   const modal = ref();
   const view = ref();
 
-  // 添加回调
-  const modalAddCallback = () => {
-    table.value.addedCallback();
-  };
-
-  // 修改回调
-  const modalUpdateCallback = () => {
-    table.value.updatedCallback();
-  };
-
   onBeforeMount(async () => {
     const dictStore = useDictStore();
     await dictStore.loadKeys(dictKeys);
diff --git a/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue b/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
index f8aeb146..00740b40 100644
--- a/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
+++ b/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
@@ -53,7 +53,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['infra:dict-value:delete']"
                       type="primary"
                       status="danger"
@@ -168,7 +168,7 @@
   });
 
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
@@ -198,19 +198,12 @@
     }
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchTableData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchTableData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 修改 key
   const changeKey = ({ id, keyName }: { id: number, keyName: string }) => {
diff --git a/orion-visor-ui/src/views/system/dict-value/index.vue b/orion-visor-ui/src/views/system/dict-value/index.vue
index d51049a5..600e8273 100644
--- a/orion-visor-ui/src/views/system/dict-value/index.vue
+++ b/orion-visor-ui/src/views/system/dict-value/index.vue
@@ -7,13 +7,13 @@
                       @open-history="(e) => history.open(e.id, e.label)" />
     <!-- 添加修改模态框 -->
     <dict-value-form-modal ref="modal"
-                           @added="modalAddCallback"
-                           @updated="modalUpdateCallback" />
+                           @added="() => table.reload()"
+                           @updated="() => table.reload()" />
     <!-- 历史值模态框 -->
     <history-value-modal ref="history"
                          :type="historyType"
                          :rollback="rollback"
-                         @updated="modalUpdateCallback" />
+                         @updated="() => table.reload()" />
   </div>
 </template>
 
@@ -37,16 +37,6 @@
   const history = ref();
   const cacheStore = useCacheStore();
 
-  // 添加回调
-  const modalAddCallback = () => {
-    table.value.addedCallback();
-  };
-
-  // 修改回调
-  const modalUpdateCallback = () => {
-    table.value.updatedCallback();
-  };
-
   // 回滚
   const rollback = async (id: number, valueId: number) => {
     await rollbackDictValue({ id, valueId });
diff --git a/orion-visor-ui/src/views/system/menu/components/menu-table.vue b/orion-visor-ui/src/views/system/menu/components/menu-table.vue
index cac35309..271ad83a 100644
--- a/orion-visor-ui/src/views/system/menu/components/menu-table.vue
+++ b/orion-visor-ui/src/views/system/menu/components/menu-table.vue
@@ -270,21 +270,13 @@
     }
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     formRef.value.resetFields();
     loadMenuData(true);
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    formRef.value.resetFields();
-    loadMenuData(true);
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 加载菜单
   const loadMenuData = async (all: any = undefined) => {
diff --git a/orion-visor-ui/src/views/system/menu/index.vue b/orion-visor-ui/src/views/system/menu/index.vue
index 134ddf67..f8b472b2 100644
--- a/orion-visor-ui/src/views/system/menu/index.vue
+++ b/orion-visor-ui/src/views/system/menu/index.vue
@@ -6,8 +6,8 @@
                 @open-update="(e) => modal.openUpdate(e)" />
     <!-- 添加修改模态框 -->
     <menu-form-modal ref="modal"
-                     @added="() => table.addedCallback()"
-                     @updated="() => table.updatedCallback()" />
+                     @added="() => table.reload()"
+                     @updated="() => table.reload()" />
   </div>
 </template>
 
diff --git a/orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue b/orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue
index 83a46aad..5f7dfad5 100644
--- a/orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue
+++ b/orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue
@@ -31,7 +31,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['infra:operator-log:delete']"
                       type="primary"
                       status="danger"
@@ -174,7 +174,7 @@
   };
 
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
diff --git a/orion-visor-ui/src/views/user/role/components/role-table.vue b/orion-visor-ui/src/views/user/role/components/role-table.vue
index 9f8f3a9b..62b4e2e7 100644
--- a/orion-visor-ui/src/views/user/role/components/role-table.vue
+++ b/orion-visor-ui/src/views/user/role/components/role-table.vue
@@ -181,19 +181,12 @@
     }
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchTableData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchTableData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 加载数据
   const doFetchTableData = async (request: RoleQueryRequest) => {
diff --git a/orion-visor-ui/src/views/user/role/index.vue b/orion-visor-ui/src/views/user/role/index.vue
index c2bc41ff..22c17399 100644
--- a/orion-visor-ui/src/views/user/role/index.vue
+++ b/orion-visor-ui/src/views/user/role/index.vue
@@ -7,8 +7,8 @@
                 @open-grant="(e) => grantModal.open(e)" />
     <!-- 添加修改模态框 -->
     <role-form-modal ref="modal"
-                     @added="() => table.addedCallback()"
-                     @updated="() => table.updatedCallback()" />
+                     @added="() => table.reload()"
+                     @updated="() => table.reload()" />
     <!-- 分配角色菜单模态框 -->
     <role-menu-grant-modal ref="grantModal" />
   </div>
diff --git a/orion-visor-ui/src/views/user/user/components/user-table.vue b/orion-visor-ui/src/views/user/user/components/user-table.vue
index 8b046e98..e96ef9e8 100644
--- a/orion-visor-ui/src/views/user/user/components/user-table.vue
+++ b/orion-visor-ui/src/views/user/user/components/user-table.vue
@@ -64,7 +64,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['infra:system-user:delete']"
                       type="primary"
                       status="danger"
@@ -226,7 +226,7 @@
   };
 
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
@@ -258,19 +258,12 @@
     });
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchTableData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchTableData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 加载数据
   const doFetchTableData = async (request: UserQueryRequest) => {
diff --git a/orion-visor-ui/src/views/user/user/index.vue b/orion-visor-ui/src/views/user/user/index.vue
index 675c35c3..876d9130 100644
--- a/orion-visor-ui/src/views/user/user/index.vue
+++ b/orion-visor-ui/src/views/user/user/index.vue
@@ -8,8 +8,8 @@
                 @open-grant-role="(e) => grantRoleModal.open(e)" />
     <!-- 添加修改模态框 -->
     <user-form-modal ref="modal"
-                     @added="() => table.addedCallback()"
-                     @updated="() => table.updatedCallback()" />
+                     @added="() => table.reload()"
+                     @updated="() => table.reload()" />
     <!-- 重置密码模态框 -->
     <user-reset-password-form-modal ref="resetModal" />
     <!-- 分配角色模态框 -->