From d0e9eef9c2fa8146c93869e5656502a62ff1411f Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sun, 23 Feb 2025 22:25:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=B8=8E=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/support/job/job-list.vue        | 47 ++++++++++---------
 .../role-tree/role-tree-checkbox.vue          |  2 +-
 .../components/role-tree/role-tree-menu.vue   |  2 +-
 .../components/role-tree/role-tree-point.vue  |  2 +-
 .../src/views/support/job/job-list.vue        | 30 ++++++------
 .../role-tree/role-tree-checkbox.vue          |  2 +-
 .../components/role-tree/role-tree-menu.vue   |  2 +-
 .../components/role-tree/role-tree-point.vue  |  2 +-
 8 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/smart-admin-web-javascript/src/views/support/job/job-list.vue b/smart-admin-web-javascript/src/views/support/job/job-list.vue
index dc571bcc..ae5c2397 100644
--- a/smart-admin-web-javascript/src/views/support/job/job-list.vue
+++ b/smart-admin-web-javascript/src/views/support/job/job-list.vue
@@ -107,7 +107,8 @@
               <template v-if="column.dataIndex === 'enabledFlag'">
                 <a-switch
                   v-model:checked="record.enabledFlag"
-                  checked-children="已启用" un-checked-children="已禁用"
+                  checked-children="已启用"
+                  un-checked-children="已禁用"
                   @change="(checked) => handleEnabledUpdate(checked, record)"
                   :loading="record.enabledLoading"
                 />
@@ -117,31 +118,31 @@
                   <a-button v-privilege="'support:job:update'" @click="openUpdateModal(record)" type="link">编辑</a-button>
                   <a-button v-privilege="'support:job:execute'" type="link" @click="openExecuteModal(record)">执行</a-button>
                   <a-button v-privilege="'support:job:log:query'" @click="openJobLogModal(record.jobId, record.jobName)" type="link">记录</a-button>
-                  <a-button danger v-privilege="'support:job:log:delete'" @click="confirmDelete(record.jobId, record.jobName)" type="link">删除</a-button>
+                  <a-button danger v-privilege="'support:job:log:delete'" @click="confirmDelete(record.jobId, record.jobName)" type="link"
+                    >删除</a-button
+                  >
                 </div>
               </template>
             </template>
           </a-table>
           <div class="smart-query-table-page">
             <a-pagination
-                showSizeChanger
-                showQuickJumper
-                show-less-items
-                :pageSizeOptions="PAGE_SIZE_OPTIONS"
-                :defaultPageSize="queryForm.pageSize"
-                v-model:current="queryForm.pageNum"
-                v-model:pageSize="queryForm.pageSize"
-                :total="total"
-                @change="queryJobList"
-                @showSizeChange="queryJobList"
-                :show-total="(total) => `共${total}条`"
+              showSizeChanger
+              showQuickJumper
+              show-less-items
+              :pageSizeOptions="PAGE_SIZE_OPTIONS"
+              :defaultPageSize="queryForm.pageSize"
+              v-model:current="queryForm.pageNum"
+              v-model:pageSize="queryForm.pageSize"
+              :total="total"
+              @change="queryJobList"
+              @showSizeChange="queryJobList"
+              :show-total="(total) => `共${total}条`"
             />
           </div>
         </a-tab-pane>
         <a-tab-pane key="2" tab="已删除任务"><DeletedJobList /></a-tab-pane>
       </a-tabs>
-
-
     </a-card>
 
     <!-- 表单操作 -->
@@ -152,7 +153,7 @@
   </div>
 </template>
 <script setup>
-  import {message, Modal} from 'ant-design-vue';
+  import { message, Modal } from 'ant-design-vue';
   import { onMounted, reactive, ref } from 'vue';
   import { jobApi } from '/@/api/support/job-api';
   import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
@@ -163,7 +164,7 @@
   import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const.js';
   import JobFormModal from './components/job-form-modal.vue';
   import JobLogListModal from './components/job-log-list-modal.vue';
-  import {SmartLoading} from "/@/components/framework/smart-loading/index.js";
+  import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
 
   const columns = ref([
     {
@@ -241,6 +242,8 @@
     },
   ]);
 
+  const activeKey = ref('1');
+
   // ---------------- 查询数据 -----------------------
 
   const queryFormState = {
@@ -333,7 +336,7 @@
 
   // ------------------------------------ 删除操作 -------------------------------------
 
-  function confirmDelete(jobId, jobName){
+  function confirmDelete(jobId, jobName) {
     Modal.confirm({
       title: '警告',
       content: `确定要删除【${jobName}】任务吗?`,
@@ -347,15 +350,15 @@
     });
   }
 
-  async function deleteJob(jobId){
-    try{
+  async function deleteJob(jobId) {
+    try {
       SmartLoading.show();
       await jobApi.deleteJob(jobId);
       message.success('删除成功!');
       queryJobList();
-    }catch (e){
+    } catch (e) {
       smartSentry.captureError(e);
-    }finally {
+    } finally {
       SmartLoading.hide();
     }
   }
diff --git a/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-checkbox.vue b/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-checkbox.vue
index c126e42a..c253a885 100644
--- a/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-checkbox.vue
+++ b/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-checkbox.vue
@@ -29,7 +29,7 @@
   let props = defineProps({
     tree: {
       type: Array,
-      default: [],
+      default: () => [],
     },
   });
   defineEmits(['update:value']);
diff --git a/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-menu.vue b/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-menu.vue
index 02e40b7a..4f3bc74f 100644
--- a/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-menu.vue
+++ b/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-menu.vue
@@ -30,7 +30,7 @@
   const props = defineProps({
     tree: {
       type: Array,
-      default: [],
+      default: () => [],
     },
     index: {
       type: Number,
diff --git a/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-point.vue b/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-point.vue
index 3d925064..ace0a5af 100644
--- a/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-point.vue
+++ b/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-point.vue
@@ -21,7 +21,7 @@
   const props = defineProps({
     tree: {
       type: Array,
-      default: [],
+      default: () => [],
     },
     index: {
       type: Number,
diff --git a/smart-admin-web-typescript/src/views/support/job/job-list.vue b/smart-admin-web-typescript/src/views/support/job/job-list.vue
index 519d56f4..585d63bf 100644
--- a/smart-admin-web-typescript/src/views/support/job/job-list.vue
+++ b/smart-admin-web-typescript/src/views/support/job/job-list.vue
@@ -124,24 +124,22 @@
           </a-table>
           <div class="smart-query-table-page">
             <a-pagination
-                showSizeChanger
-                showQuickJumper
-                show-less-items
-                :pageSizeOptions="PAGE_SIZE_OPTIONS"
-                :defaultPageSize="queryForm.pageSize"
-                v-model:current="queryForm.pageNum"
-                v-model:pageSize="queryForm.pageSize"
-                :total="total"
-                @change="queryJobList"
-                @showSizeChange="queryJobList"
-                :show-total="(total) => `共${total}条`"
+              showSizeChanger
+              showQuickJumper
+              show-less-items
+              :pageSizeOptions="PAGE_SIZE_OPTIONS"
+              :defaultPageSize="queryForm.pageSize"
+              v-model:current="queryForm.pageNum"
+              v-model:pageSize="queryForm.pageSize"
+              :total="total"
+              @change="queryJobList"
+              @showSizeChange="queryJobList"
+              :show-total="(total) => `共${total}条`"
             />
           </div>
         </a-tab-pane>
         <a-tab-pane key="2" tab="已删除任务"><DeletedJobList /></a-tab-pane>
       </a-tabs>
-
-
     </a-card>
 
     <!-- 表单操作 -->
@@ -152,7 +150,7 @@
   </div>
 </template>
 <script setup lang="ts">
-  import {message, Modal} from 'ant-design-vue';
+  import { message, Modal } from 'ant-design-vue';
   import { onMounted, reactive, ref } from 'vue';
   import { jobApi } from '/@/api/support/job-api';
   import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
@@ -163,7 +161,7 @@
   import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const.js';
   import JobFormModal from './components/job-form-modal.vue';
   import JobLogListModal from './components/job-log-list-modal.vue';
-  import {SmartLoading} from "/@/components/framework/smart-loading/index.js";
+  import { SmartLoading } from "/@/components/framework/smart-loading/index.js";
 
   const columns = ref([
     {
@@ -241,6 +239,8 @@
     },
   ]);
 
+  const activeKey = ref('1');
+
   // ---------------- 查询数据 -----------------------
 
   const queryFormState = {
diff --git a/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-checkbox.vue b/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-checkbox.vue
index cd077f8f..cfb8d675 100644
--- a/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-checkbox.vue
+++ b/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-checkbox.vue
@@ -29,7 +29,7 @@
   let props = defineProps({
     tree: {
       type: Array,
-      default: [],
+      default: () => [],
     },
   });
   defineEmits(['update:value']);
diff --git a/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-menu.vue b/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-menu.vue
index 3c984398..f212ffa0 100644
--- a/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-menu.vue
+++ b/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-menu.vue
@@ -30,7 +30,7 @@
   const props = defineProps({
     tree: {
       type: Array,
-      default: [],
+      default: () => [],
     },
     index: {
       type: Number,
diff --git a/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-point.vue b/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-point.vue
index ebe53928..9fb42e7d 100644
--- a/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-point.vue
+++ b/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-point.vue
@@ -21,7 +21,7 @@
   const props = defineProps({
     tree: {
       type: Array,
-      default: [],
+      default: () => [],
     },
     index: {
       type: Number,