From 2c939fb12dc1a290119c41137f56b0bfc15f57f3 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Wed, 7 Dec 2022 10:15:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8F=82=E6=95=B0=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/vue/package.json                         |  2 +-
 .../model/backgroundJobInfoModel.ts           |  4 +--
 .../src/components/Table/src/types/table.ts   |  3 ++-
 .../components/JobParamter.vue                | 25 +++++++++++++++++--
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/apps/vue/package.json b/apps/vue/package.json
index 49842c7c6..b88d7b3b2 100644
--- a/apps/vue/package.json
+++ b/apps/vue/package.json
@@ -44,7 +44,7 @@
     "@vueuse/core": "^8.3.0",
     "@vueuse/shared": "^8.3.0",
     "@zxcvbn-ts/core": "^2.0.1",
-    "ant-design-vue": "^3.2.0",
+    "ant-design-vue": "^3.2.15",
     "axios": "^0.26.1",
     "codemirror": "^5.65.3",
     "cropperjs": "^1.5.12",
diff --git a/apps/vue/src/api/task-management/model/backgroundJobInfoModel.ts b/apps/vue/src/api/task-management/model/backgroundJobInfoModel.ts
index 3a167edd8..c6b398a88 100644
--- a/apps/vue/src/api/task-management/model/backgroundJobInfoModel.ts
+++ b/apps/vue/src/api/task-management/model/backgroundJobInfoModel.ts
@@ -32,8 +32,8 @@ export enum JobPriority {
 export interface BackgroundJobParamter {
   name: string;
   required: boolean;
-  DisplayName: string;
-  Description?: string;
+  displayName: string;
+  description?: string;
 }
 
 export interface BackgroundJobDefinition {
diff --git a/apps/vue/src/components/Table/src/types/table.ts b/apps/vue/src/components/Table/src/types/table.ts
index 443f71f06..4baf8fc29 100644
--- a/apps/vue/src/components/Table/src/types/table.ts
+++ b/apps/vue/src/components/Table/src/types/table.ts
@@ -1,7 +1,8 @@
 import type { VNodeChild } from 'vue';
 import type { PaginationProps } from './pagination';
 import type { FormProps } from '/@/components/Form';
-import type { TableRowSelection as ITableRowSelection, ColumnProps } from 'ant-design-vue/lib/table/interface';
+import type { ColumnProps } from 'ant-design-vue/lib/table';
+import type { TableRowSelection as ITableRowSelection } from 'ant-design-vue/lib/table/interface';
 import type { AdvanceSearchProps } from './advancedSearch';
 
 import { ComponentType } from './componentType';
diff --git a/apps/vue/src/views/task-management/background-jobs/components/JobParamter.vue b/apps/vue/src/views/task-management/background-jobs/components/JobParamter.vue
index e08dc2c73..bdd195838 100644
--- a/apps/vue/src/views/task-management/background-jobs/components/JobParamter.vue
+++ b/apps/vue/src/views/task-management/background-jobs/components/JobParamter.vue
@@ -10,7 +10,10 @@
         </Button>
       </template>
       <template #bodyCell="{ column, record }">
-        <template v-if="column.key === 'action'">
+        <template v-if="column.key === 'key'">
+          <span>{{ getJobArgKey(record.key) }}</span>
+        </template>
+        <template v-else-if="column.key === 'action'">
           <TableAction
             :stop-button-propagation="true"
             :actions="[
@@ -41,7 +44,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, ref, nextTick, onMounted } from 'vue';
+  import { computed, ref, unref, nextTick, onMounted } from 'vue';
   import { Button, Form, Select } from 'ant-design-vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicModal, useModal } from '/@/components/Modal';
@@ -64,6 +67,7 @@
   });
   const emits = defineEmits(['args-reset']);
   const { L } = useLocalization(['TaskManagement', 'AbpUi']);
+  const crtJobDefinition = ref<BackgroundJobDefinition>();
   const jobDefinitions = ref<BackgroundJobDefinition[]>([]);
   const getJobDefinitionOptions = computed(() => {
     return jobDefinitions.value.map((job) => {
@@ -74,6 +78,19 @@
       };
     });
   });
+  const getJobArgKey = computed(() => {
+    return (key: string) => {
+      const crtJobDef = unref(crtJobDefinition);
+      if (!crtJobDef) {
+        return key;
+      }
+      const findDef = crtJobDef.paramters.find((jobParam) => jobParam.name === key);
+      if (!findDef || !findDef.displayName) {
+        return key;
+      }
+      return `${key}(${findDef.displayName})`;
+    };
+  });
   const [registerTable] = useTable({
     rowKey: 'key',
     columns: [
@@ -153,18 +170,22 @@
   onMounted(fetchDefinitionJobs);
 
   function fetchDefinitionJobs() {
+    crtJobDefinition.value = undefined;
     getDefinitions().then((res) => {
       jobDefinitions.value = res.items;
     });
   }
 
   function handleJobChange(key, job: BackgroundJobDefinition) {
+    crtJobDefinition.value = job;
     if (key) {
       const args: ExtraPropertyDictionary = {};
       job.paramters.forEach((p) => {
         args[p.name] = '';
       });
       emits('args-reset', args);
+    } else {
+      emits('args-reset', []);
     }
   }