From c56580b44467aa896f7fba0ba83392dbde40be6e Mon Sep 17 00:00:00 2001
From: haml-707 <845831435@qq.com>
Date: Fri, 7 Jun 2024 18:12:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: 去除多余参数

chore: 更新nodejs版本
---
 Dockerfile                             |  2 +-
 src/config/index.ts                    |  1 +
 src/shared/@types/type-quick-issue.ts  |  6 +++---
 src/shared/utils.ts                    |  8 --------
 src/views/TheQuickIssue.vue            | 19 +++++--------------
 src/views/pull-request/PullRequest.vue | 19 ++++---------------
 src/views/submit-issue/SubmitIssue.vue | 23 +++++++++++++++++------
 7 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7e34497..00db09c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.14.1 as Builder
+FROM node:18.20.1 as Builder
 
 RUN mkdir -p /home/quick-isuue/web
 WORKDIR /home/quick-isuue/web
diff --git a/src/config/index.ts b/src/config/index.ts
index 74e0311..4fa5aea 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -109,3 +109,4 @@ export const linksData2 = {
 
 export const defaultIssueRepo = 'openeuler/community-issue';
 export const defaultIssueRepoID = 7392228;
+export const giteeUrl = 'https://gitee.com';
diff --git a/src/shared/@types/type-quick-issue.ts b/src/shared/@types/type-quick-issue.ts
index 2eb93e9..542b9d2 100644
--- a/src/shared/@types/type-quick-issue.ts
+++ b/src/shared/@types/type-quick-issue.ts
@@ -25,11 +25,11 @@ export interface OptionList {
 export interface IssueData {
   title: string;
   issue_type_id: string | number | undefined;
-  sig: string;
+  sig?: string;
   project_id: number;
-  repo: string;
+  repo?: string;
   email: string;
   code: string;
   description: string;
-  privacy: Array<string>;
+  privacy: Array<string> | boolean;
 }
diff --git a/src/shared/utils.ts b/src/shared/utils.ts
index 5733aa4..31160de 100644
--- a/src/shared/utils.ts
+++ b/src/shared/utils.ts
@@ -12,11 +12,3 @@ export function scrollToTop() {
   document.documentElement.scrollTop = 0;
 }
 
-export function hiddenMail(mail: string) {
-  const mailTest = new RegExp(
-    '^[a-z0-9A-Z]+[- | a-z0-9A-Z . _]+@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-z]{2,}$'
-  );
-  if (mailTest.test(mail)) {
-    return `${mail.split('@')[0]}@***${mail.charAt(mail.length - 1)}`;
-  }
-}
diff --git a/src/views/TheQuickIssue.vue b/src/views/TheQuickIssue.vue
index be89d51..1af53d1 100644
--- a/src/views/TheQuickIssue.vue
+++ b/src/views/TheQuickIssue.vue
@@ -9,8 +9,6 @@ import { ISSUE_TYPE } from '@/shared/issue-type';
 
 import { IdentitiesT } from '@/shared/@types/type-login';
 
-import { hiddenMail } from '@/shared/utils';
-
 const { guardAuthClient } = useStoreData();
 
 const isPersonalShown = computed(() => {
@@ -30,7 +28,7 @@ function getNameList(arr: [IdentitiesT]) {
       return giteeName;
     }
   } catch (error) {
-    return false;
+    return '';
   }
 }
 </script>
@@ -41,25 +39,18 @@ function getNameList(arr: [IdentitiesT]) {
       <AppIssue
         v-if="isPersonalShown"
         :issue-type="ISSUE_TYPE.PENDING"
-        :user-name="
-          `${getNameList(guardAuthClient?.identities)}` ||
-          hiddenMail(guardAuthClient?.email)
-        "
+        :user-name="getNameList(guardAuthClient?.identities)"
       />
       <AppIssue
         v-if="isPersonalShown"
         :issue-type="ISSUE_TYPE.SUBMITTED"
-        :user-name="
-          `${getNameList(guardAuthClient?.identities)}` ||
-          hiddenMail(guardAuthClient?.email)
-        "
+        :user-name="getNameList(guardAuthClient?.identities)"
       />
 
       <AppIssue
         :user-name="
-          (guardAuthClient?.identities &&
-            guardAuthClient?.identities[0]?.login_name) ||
-          hiddenMail(guardAuthClient?.email)
+          guardAuthClient?.identities &&
+          guardAuthClient?.identities[0]?.login_name
         "
         :issue-type="ISSUE_TYPE.ALL"
       />
diff --git a/src/views/pull-request/PullRequest.vue b/src/views/pull-request/PullRequest.vue
index 014a4de..39ebc32 100644
--- a/src/views/pull-request/PullRequest.vue
+++ b/src/views/pull-request/PullRequest.vue
@@ -10,8 +10,6 @@ import { ISSUE_TYPE } from '@/shared/issue-type';
 
 import { IdentitiesT } from '@/shared/@types/type-login';
 
-import { hiddenMail } from '@/shared/utils';
-
 const { guardAuthClient } = useStoreData();
 
 const isPersonalShown = computed(() => {
@@ -31,7 +29,7 @@ function getNameList(arr: [IdentitiesT]) {
       return giteeName;
     }
   } catch (error) {
-    return false;
+    return '';
   }
 }
 </script>
@@ -42,25 +40,16 @@ function getNameList(arr: [IdentitiesT]) {
       <AppPull
         v-if="isPersonalShown"
         :issue-type="ISSUE_TYPE.PENDING"
-        :user-name="
-          getNameList(guardAuthClient?.identities) ||
-          hiddenMail(guardAuthClient?.email)
-        "
+        :user-name="getNameList(guardAuthClient?.identities)"
       />
       <AppPull
         v-if="isPersonalShown"
         :issue-type="ISSUE_TYPE.SUBMITTED"
-        :user-name="
-          getNameList(guardAuthClient?.identities) ||
-          hiddenMail(guardAuthClient?.email)
-        "
+        :user-name="getNameList(guardAuthClient?.identities)"
       />
 
       <AppPull
-        :user-name="
-          getNameList(guardAuthClient?.identities) ||
-          hiddenMail(guardAuthClient?.email)
-        "
+        :user-name="getNameList(guardAuthClient?.identities)"
         :issue-type="ISSUE_TYPE.ALL"
       />
     </AppContent>
diff --git a/src/views/submit-issue/SubmitIssue.vue b/src/views/submit-issue/SubmitIssue.vue
index f95714b..04dbeb3 100644
--- a/src/views/submit-issue/SubmitIssue.vue
+++ b/src/views/submit-issue/SubmitIssue.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { ref, reactive, onMounted, watch, computed } from 'vue';
-import { debounce, cloneDeep } from 'lodash-es';
+import { debounce } from 'lodash-es';
 import { useI18n } from 'vue-i18n';
 
 import { useLangStore } from '@/stores';
@@ -23,7 +23,7 @@ import {
 } from '@/api/api-quick-issue';
 
 import { OptionList, IssueData } from '@/shared/@types/type-quick-issue';
-import { defaultIssueRepo, defaultIssueRepoID } from '@/config';
+import { defaultIssueRepo, defaultIssueRepoID, giteeUrl } from '@/config';
 
 import { getSigLandscape } from '@/api/api-sig';
 
@@ -214,7 +214,7 @@ async function goGitee(verify: FormInstance | undefined) {
   rules.privacy = [];
   verify.validate(async (res: boolean) => {
     if (res) {
-      const url = `https://gitee.com/${issueData.repo}/issues/new?title=${issueData.title}&issue%5Bissue_type_id%5D=${issueData.issue_type_id}`;
+      const url = `${giteeUrl}/${issueData.repo}/issues/new?title=${issueData.title}&issue%5Bissue_type_id%5D=${issueData.issue_type_id}`;
       window.open(url);
     }
   });
@@ -232,7 +232,18 @@ async function submitForm(
   rules.code = codeRules;
   verify.validate(async (res: boolean) => {
     if (res) {
-      const parmes = cloneDeep(issueData);
+      const parmes = {
+        title: issueData.title,
+        issue_type_id: issueData.issue_type_id,
+        project_id: issueData.project_id,
+        email: issueData.email,
+        code: issueData.code,
+        description: issueData.description,
+        privacy:
+          Array.isArray(issueData.privacy) && issueData.privacy.length
+            ? true
+            : false,
+      };
       handelCreatIssue(parmes, isGoGitee, verify);
     } else {
       verify.scrollToField('title');
@@ -247,7 +258,7 @@ function handelCreatIssue(
 ) {
   createIssue(parmes).then(async (res) => {
     if (res.code === 200) {
-      const jump_url = `https://gitee.com/${issueData.repo}/issues/${res.data.number}`;
+      const jump_url = `${giteeUrl}/${issueData.repo}/issues/${res.data.number}`;
       if (isGoGitee) {
         window.open(jump_url);
       }
@@ -269,7 +280,7 @@ function handelCreatIssue(
 function resetForm(verify: FormInstance) {
   verify.resetFields();
   repoParams.sig = '';
-  issueData.privacy = ['true'];
+  issueData.privacy = [];
   issueData.description = '';
   issueData.repo = defaultIssueRepo;
   issueData.project_id = defaultIssueRepoID;
-- 
Gitee