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

src/components/common/system-user.vue

@@ -43,7 +43,7 @@ getUserNameList();
 <template>
   <NSelect
     v-model:value="model"
-    :placeholder="$t('page.userManager.form.owerName')"
+    :placeholder="$t('page.userManager.form.ownerName')"
     :options="userNameList"
     value-field="id"
     label-field="username"

src/locales/langs/en-us.ts

@@ -779,7 +779,7 @@ const local: App.I18n.Schema = {
     jobTask: {
       title: 'JobTask List',
       groupName: 'Group name',
-      owerName: 'Ower name',
+      ownerName: 'Ower name',
       jobName: 'Mission name',
       argsStr: 'Method parameters',
       shardNum: 'Reduce shard num',
@@ -802,7 +802,7 @@ const local: App.I18n.Schema = {
       updateDt: 'Update time',
       form: {
         jobStatus: 'Please enter status',
-        owerName: 'Please enter owerName',
+        ownerName: 'Please enter ownerName',
         maxRetryTimes: 'Please enter maximum number of retry',
         description: 'Please enter description',
         triggerType: 'Please enter trigger type',
@@ -873,7 +873,7 @@ const local: App.I18n.Schema = {
       oldPassword: 'Old Password',
       newPassword: 'New Password',
       form: {
-        owerName: 'Please select owername',
+        ownerName: 'Please select ownerName',
         role: 'Please enter role',
         password: 'Please enter password',
         username: 'Please enter username',

src/locales/langs/zh-cn.ts

@@ -786,7 +786,7 @@ const local: App.I18n.Schema = {
     jobTask: {
       title: '定时任务列表',
       groupName: '组名称',
-      owerName: '负责人',
+      ownerName: '负责人',
       jobName: '任务名称',
       argsStr: '方法参数',
       shardNum: 'reduce 分片数',
@@ -809,7 +809,7 @@ const local: App.I18n.Schema = {
       updateDt: '更新时间',
       form: {
         jobStatus: '请输入状态',
-        owerName: '请输入负责人名称',
+        ownerName: '请输入负责人名称',
         maxRetryTimes: '请输入最大重试次数',
         description: '请输入描述',
         triggerType: '请输入触发类型',
@@ -880,7 +880,7 @@ const local: App.I18n.Schema = {
       oldPassword: '旧密码',
       newPassword: '新密码',
       form: {
-        owerName: '请选择负责人',
+        ownerName: '请选择负责人',
         role: '请输入角色',
         password: '请输入密码',
         username: '请输入用户名',

src/typings/api.d.ts

@@ -959,9 +959,9 @@ declare namespace Api {
       /** 组名称 */
       groupName: string;
       /** 负责人id */
-      owerId: string;
+      ownerId: string;
       /** 负责人名 */
-      owerName?: string;
+      ownerName: string;
       /** 通知场景ids */
       notifyIds: number[];
       /** 任务名称 */
@@ -1017,7 +1017,7 @@ declare namespace Api {
         Api.Job.Job,
         | 'groupName'
         | 'jobName'
-        | 'owerName'
+        | 'ownerName'
         | 'argsStr'
         | 'executorInfo'
         | 'argsType'

src/typings/app.d.ts

@@ -986,7 +986,7 @@ declare namespace App {
         jobTask: {
           title: string;
           groupName: string;
-          owerName: string;
+          ownerName: string;
           jobName: string;
           argsStr: string;
           shardNum: string;
@@ -1010,7 +1010,7 @@ declare namespace App {
           form: {
             jobName: string;
             jobStatus: string;
-            owerName: string;
+            ownerName: string;
             maxRetryTimes: string;
             description: string;
             triggerType: string;
@@ -1080,7 +1080,7 @@ declare namespace App {
           oldPassword: string;
           newPassword: string;
           form: {
-            owerName: string;
+            ownerName: string;
             role: string;
             password: string;
             username: string;

src/views/job/task/index.vue

@@ -36,7 +36,7 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
     groupName: null,
     jobName: null,
     jobStatus: null,
-    owerName: null
+    ownerName: null
   },
   columns: () => [
     {
@@ -82,8 +82,8 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
       width: 120
     },
     {
-      key: 'owerName',
+      key: 'ownerName',
-      title: $t('page.jobTask.owerName'),
+      title: $t('page.jobTask.ownerName'),
       align: 'left',
       width: 120
     },
@@ -324,7 +324,7 @@ function body(): Api.Job.ExportJob {
     groupName: searchParams.groupName,
     jobName: searchParams.jobName,
     jobStatus: searchParams.jobStatus,
-    owerName: searchParams.owerName
+    ownerName: searchParams.ownerName
   };
 }
 

src/views/job/task/modules/job-task-operate-drawer.vue

@@ -61,7 +61,8 @@ type Model = Pick<
   Api.Job.Job,
   | 'id'
   | 'groupName'
-  | 'owerId'
+  | 'ownerId'
+  | 'ownerName'
   | 'notifyIds'
   | 'jobName'
   | 'argsStr'
@@ -94,7 +95,7 @@ function createDefaultModel(): Model {
     // @ts-expect-error groupName is required
     groupName: undefined,
     // @ts-expect-error owerId is required
-    owerId: undefined,
+    ownerId: undefined,
     notifyIds: [],
     jobName: '',
     argsStr: '',
@@ -265,7 +266,8 @@ async function handleSubmit() {
   const {
     id,
     groupName,
-    owerId,
+    ownerId,
+    ownerName,
     notifyIds,
     jobName,
     argsType,
@@ -301,7 +303,8 @@ async function handleSubmit() {
   if (props.operateType === 'add') {
     const { error } = await fetchAddJob({
       groupName,
-      owerId,
+      ownerId,
+      ownerName,
       notifyIds,
       jobName,
       argsStr,
@@ -328,7 +331,8 @@ async function handleSubmit() {
     const { error } = await fetchEditJob({
       id,
       groupName,
-      owerId,
+      ownerId,
+      ownerName,
       notifyIds,
       jobName,
       argsStr,
@@ -462,8 +466,8 @@ const scriptMethodOptions = [
       <NFormItem :label="$t('page.jobTask.groupName')" path="groupName">
         <SelectGroup v-model:value="model.groupName" :disabled="props.operateType === 'edit'" />
       </NFormItem>
-      <NFormItem :label="$t('page.jobTask.owerName')" path="owerId">
+      <NFormItem :label="$t('page.jobTask.ownerName')" path="ownerId">
-        <SystemUser v-model:value="model.owerId" />
+        <SystemUser v-model:value="model.ownerId" />
       </NFormItem>
       <NFormItem :label="$t('page.jobTask.jobStatus')" path="jobStatus">
         <NRadioGroup v-model:value="model.jobStatus" name="jobStatus">

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

@@ -51,8 +51,8 @@ function search() {
         clearable
       />
     </NFormItemGi>
-    <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobTask.owerName')" path="owerName" class="pr-24px">
+    <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobTask.ownerName')" path="ownerName" class="pr-24px">
-      <NInput v-model:value="model.owerName" :placeholder="$t('page.jobTask.form.owerName')" clearable />
+      <NInput v-model:value="model.ownerName" :placeholder="$t('page.jobTask.form.ownerName')" clearable />
     </NFormItemGi>
   </SearchForm>
 </template>