Merge pull request #104 from sym-666/master

feat: add revive

Author: lyx1213812138

package-lock.json

@@ -51,7 +51,11 @@ export default function request<T = object>(config: AxiosRequestConfig) {
     (err: AxiosError<{ msg: string }>) => {
       const { msg = '' } = err.response!.data!;
       if (msg.includes('authentication failed')) {
-        // 非登录态跳转SSO登录
+        // 非登录态跳转SSO登录（开发环境禁用跳转）
+        if (import.meta.env.DEV) {
+          Message.error(msg || i18n.global.t('request.unknowErr'));
+          return;
+        }
         window.location.href = `//${SSO_DOMAIN}/login?from=${HR_DOMAIN_FE}`;
         return;
       }

src/api/_request.ts

@@ -72,6 +72,7 @@ const formData = ref({
 const form = ref({
   name: '',
   beginning: '',
+  start: '',
   deadline: '',
   end: '',
 });

src/components/navbar/components/create-newrec-modal.vue

@@ -5,6 +5,7 @@ import { Recruitment } from './getRecruitmentMsg';
 export interface CreateRecruitmentRequest {
   name: string;
   beginning: TimeString;
+  start: TimeString;
   deadline: TimeString;
   end: TimeString;
 }

src/constants/httpMsg/recruitment/createRecruitmentMsg.ts

@@ -140,14 +140,9 @@ export const SMSTemplate: {
     match: [Step.OnlineGroupInterview, Step.OnlineTeamInterview],
     required: ['meeting_id'],
   },
-  {
-    i18nKey: 'sms.writtenTest',
-    match: [Step.WrittenTest],
-    required: ['time'],
-  },
   {
     i18nKey: 'sms.base',
-    match: [Step.StressTest],
+    match: [Step.WrittenTest, Step.StressTest],
     restI18nKey: 'sms.rest.test',
     required: ['time', 'place', 'next'],
   },

src/constants/team.ts

@@ -1 +1,5 @@
-export default {};
+export default {
+  'common.operation.confirmTerminate': 'Confirm terminate delivery?',
+  'common.operation.confirmRevive': 'Confirm revive delivery?',
+  'common.result.reviveTodo': 'Revive delivery is not implemented yet',
+};

src/locale/en-US/common.ts

@@ -12,6 +12,7 @@ export default {
   'common.operation.submitComment': '发表评论',
   'common.operation.switchStage': '转移阶段',
   'common.operation.terminate': '终止投递',
+  'common.operation.revive': '复活投递',
   'common.operation.dateManagement': '日程管理',
   'common.operation.addDate': '添加日程',
   'common.operation.deleteDate': '删除日程',
@@ -29,6 +30,7 @@ export default {
   'common.operation.allocate': '分配',
   'common.operation.allocateInterviewTime': '分配面试时间',
   'common.operation.confirmTerminate': '确认终止投递？',
+  'common.operation.confirmRevive': '确认复活投递？',
   'common.operation.confirmDeleteComment': '确认删除该评论？',
   'common.operation.editContent': '编辑内容',
   'common.operation.currentTestFileOrUrl': '当前笔试文件/链接',
@@ -51,6 +53,8 @@ export default {
   'common.result.sendSuccess': '发送成功',
   'common.result.switchStageSuccess': '转移阶段成功',
   'common.result.terminateSuccess': '终止投递成功',
+  'common.result.reviveSuccess': '复活投递成功',
+  'common.result.reviveTodo': '复活投递功能待实现',
   'common.result.commentNotNull': '评论与评价不能同时为空',
   'common.result.uploadFileSuccess': '上传文件/链接成功',
   'common.result.setStressTestTimeSuccess': '设置熬测时间成功',

src/locale/zh-CN/common.ts

@@ -3,12 +3,10 @@ export default {
     '{name}你好，请于{example_time}在启明学院亮胜楼{place}参加{next}，请准时到场。',
   'sms.onlineInterview':
     '{name}你好，欢迎参加{recruitment_name} {group}组{online_interview_type}，面试将于{example_time}进行，请在PC端点击腾讯会议参加面试，会议号{meeting_id}，并提前调试好摄像头和麦克风，祝你面试顺利.',
-  'sms.writtenTest':
-    '{name}你好，你通过了{recruitment_name} {group}组{current}审核，请进入报名系统获取笔试题，并及时完成笔试。笔试的截止时间是{time}，请务必及时将答案发送至招新平台，超时视为弃权，若有特殊情况导致无法准时完成笔试题或者放弃作答请及时联系招新群{group}组管理员。',
   'sms.base':
     '{name}你好，你通过了{recruitment_name} {group}组{current}审核，{rest}',
   'sms.rest.test': '请于{time}在{place}参加{next}，请务必准时到场',
-  'sms.rest.timeSelection': '请进入报名系统选择面试时间',
+  'sms.rest.timeSelection': '请进入选手dashboard系统选择面试时间',
   'sms.rest.pass': '你已成功加入{group}组',
   'sms.reject':
     '{name}你好，你没有通过{recruitment_name} {group}组{current}审核，请你{rest}不要灰心，继续学习。期待与更强大的你的相遇！',

src/locale/zh-CN/sms.ts

@@ -12,7 +12,6 @@ import {
   deleteInterview,
   createInterview,
 } from '@/api';
-import { set } from 'lodash';
 import { getWrittenTestType, setWrittenTestType } from '@/api/recruitment';
 import {
   RecruitmentState,

src/store/modules/recruitment/index.ts

@@ -249,15 +249,6 @@ const preview = computed(() => {
   };
 });
 
-const notifyFormRef = ref<any>(null);
-
-watch(
-  () => formData.value.next,
-  () => {
-    notifyFormRef.value?.clearValidate();
-  },
-);
-
 const generateSMSContent = (candidate: any) => {
   let example_time = `{${t('common.status.waitForDistribution')}}`;
   if (
@@ -308,6 +299,15 @@ const generateSMSContent = (candidate: any) => {
   });
 };
 
+const notifyFormRef = ref<any>(null);
+
+watch(
+  () => formData.value.next,
+  () => {
+    notifyFormRef.value?.clearValidate();
+  },
+);
+
 watch(isCustom, (val) => {
   if (val) {
     props.candidates.forEach((candidate) => {
@@ -336,27 +336,23 @@ const handleNotify = async () => {
     }
   }
 
-  try {
-    const resp = await Promise.all(
-      props.candidates.map((candidate) => {
-        const content = isCustom.value
-          ? customContents.value[candidate.aid]
-          : generateSMSContent(candidate);
-        return sendSms({
-          aid: candidate.aid,
-          content,
-        });
-      }),
-    );
-    if (!resp.every((x) => x)) return false;
-    Message.success(t('common.result.sendSuccess'));
-    notifyFormRef.value?.resetFields();
-    [formData.value.next] = nextValidSteps.value;
-    isCustom.value = false;
-    return true;
-  } catch {
-    return false;
-  }
+  const reqs = props.candidates.map((candidate) => {
+    const content = isCustom.value
+      ? customContents.value[candidate.aid]
+      : generateSMSContent(candidate);
+    return sendSms({
+      aid: candidate.aid,
+      content,
+    });
+  });
+
+  const resp = await Promise.all(reqs);
+  if (!resp.every((x) => x)) return false;
+  Message.success(t('common.result.sendSuccess'));
+  notifyFormRef.value?.resetFields();
+  [formData.value.next] = nextValidSteps.value;
+  isCustom.value = false;
+  return true;
 };
 </script>