Explorar o código

Merge branch 'dev' of HuangKaiSheng/seecoder-devcloud-frontend into master

HuangKaiSheng %!s(int64=5) %!d(string=hai) anos
pai
achega
099dbf9140
Modificáronse 3 ficheiros con 12 adicións e 3 borrados
  1. 1 1
      src/api/devcloud/project.ts
  2. 1 1
      src/components/Menu.vue
  3. 10 1
      src/store/modules/workspace.ts

+ 1 - 1
src/api/devcloud/project.ts

@@ -3,7 +3,7 @@ import axios from '@/utils/axios';
 import { PROJECT_PREFIX } from './prefix';
 
 interface AddProjectMemberPayload {
-  invitedUserId: number;
+  userId: number;
   projectId: number;
 }
 

+ 1 - 1
src/components/Menu.vue

@@ -138,7 +138,7 @@ export default defineComponent({
 
       await ProjectAPI.addProjectMember({
         projectId: inviteProjectForm.projectId,
-        invitedUserId,
+        userId: invitedUserId,
       });
       showInviteDrawer.value = false;
       if (selectedProject.value.id !== -1) { WorkspaceDispatcher.changeProject(selectedProject.value.id); }

+ 10 - 1
src/store/modules/workspace.ts

@@ -22,6 +22,12 @@ const FROM_LOCAL_STORAGE = JSON.parse(localStorage.getItem('workspace') || '{}')
 
 const INIT = Object.keys(FROM_LOCAL_STORAGE).length > 0 ? FROM_LOCAL_STORAGE : DEFAULT;
 
+const convert = (url: string) => {
+  const u = new URL(url);
+  u.host = 'seecoder-gitlab-gitlab.seec.seecoder.cn';
+  return u.href;
+};
+
 const actions: ActionTree<WorkspaceState, RootState> = {
   clearWorkspace({ commit }) {
     commit('updateProjectList', []);
@@ -29,7 +35,10 @@ const actions: ActionTree<WorkspaceState, RootState> = {
     commit('updateMembers', []);
   },
   async refreshProjectList({ commit }) {
-    const projectList = (await ProjectAPI.getProjectListByUserId()) || [];
+    const projectList = ((await ProjectAPI.getProjectListByUserId()) || []) as unknown as Array<Project>;
+    projectList.forEach((project) => {
+      project.gitRemoteUrl = convert(project.gitRemoteUrl);
+    });
     commit('updateProjectList', projectList);
   },
   async changeProject({ commit }, payload: ChangeProjectPayload) {