Merge remote-tracking branch 'origin/1.3.0-beta1' into 1.3.0-beta1

src/typings/api.d.ts

@@ -1014,6 +1014,7 @@ declare namespace Api {
         | 'jobName'
         | 'owerName'
         | 'argsStr'
+        | 'executorInfo'
         | 'argsType'
         | 'jobStatus'
         | 'routeKey'

src/views/job/task/index.vue

@@ -70,7 +70,13 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
       key: 'groupName',
       title: $t('page.jobTask.groupName'),
       align: 'left',
-      width: 180
+      width: 150
+    },
+    {
+      key: 'executorInfo',
+      title: $t('page.jobTask.executorInfo'),
+      align: 'left',
+      width: 120
     },
     {
       key: 'owerName',

src/views/job/task/modules/job-task-search.vue

@@ -27,13 +27,22 @@ function search() {
 </script>
 
 <template>
-  <SearchForm :model="model" @search="search" @reset="reset">
+  <SearchForm btn-span="12 s:24 m:24 l:24 xl:24" :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobTask.groupName')" path="groupName" class="pr-24px">
       <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobTask.jobName')" path="jobName" class="pr-24px">
       <NInput v-model:value="model.jobName" :placeholder="$t('page.jobTask.form.jobName')" clearable />
     </NFormItemGi>
+    <NFormItemGi
+      span="24 s:12 m:6"
+      :label="$t('page.jobTask.executorInfo')"
+      path="executorInfo"
+      class="pr-24px"
+      :label-width="100"
+    >
+      <NInput v-model:value="model.executorInfo" :placeholder="$t('page.jobTask.form.executorInfo')" clearable />
+    </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobTask.jobStatus')" path="jobStatus" class="pr-24px">
       <NSelect
         v-model:value="model.jobStatus"

src/views/notify/config/modules/notify-config-search.vue

@@ -27,7 +27,10 @@ function search() {
 </script>
 
 <template>
-  <SearchForm :model="model" @search="search" @reset="reset">
+  <SearchForm btn-span="12 s:24 m:24 1:24 xl:24" :model="model" @search="search" @reset="reset">
+    <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.notifyName')" path="notifyName" class="pr-24px">
+      <NInput v-model:value="model.notifyName" :placeholder="$t('page.notifyConfig.form.notifyName')" clearable />
+    </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.groupName')" path="groupName" class="pr-24px">
       <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
@@ -39,11 +42,6 @@ function search() {
     >
       <SystemTaskType v-model:value="model.systemTaskType" clearable />
     </NFormItemGi>
-    <!--
-<NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.notifyScene')" path="notifyScene" class="pr-24px">
-      <SelectScene v-model:value="model.notifyScene" :group-name="model.groupName as string" clearable/>
-    </NFormItemGi>
--->
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.notifyStatus')" path="notifyStatus" class="pr-24px">
       <NSelect
         v-model:value="model.notifyStatus"
@@ -52,9 +50,6 @@ function search() {
         clearable
       />
     </NFormItemGi>
-    <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.notifyName')" path="notifyName" class="pr-24px">
-      <NInput v-model:value="model.notifyName" :placeholder="$t('page.notifyConfig.form.notifyName')" clearable />
-    </NFormItemGi>
   </SearchForm>
 </template>