Merge branch 'fix' into dev

mock/routers/user.js

@@ -8,8 +8,14 @@ const SECRET = 'SEEC-1919810-OIDC-114514';
 
 router.get('/self',
   (req, res) => {
-    const userinfo = jwt.decode(req.headers.authorization, SECRET);
-    res.json(wrapper(userinfo));
+    const userinfo = (jwt.decode(req.headers.authorization, SECRET)).user_info;
+    res.json(wrapper({
+      email: userinfo.email,
+      id: userinfo.id,
+      phone: userinfo.phone,
+      username: userinfo.name,
+      role: userinfo.role,
+    }));
   });
 module.exports = router;
 

src/components/BugAddDrawer.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-drawer v-model="showDrawer" :size="650" @before-close="(done) => {done()}">
+  <el-drawer v-model="showDrawer" :size="650">
     <template #title>
       <h3>新建缺陷记录</h3>
     </template>

src/components/BugEditDrawer.vue

@@ -2,7 +2,7 @@
   <el-drawer
     v-model="showDrawer"
     :size="650"
-    @before-close="(done) => {
+    :before-close="(done) => {
       isEditing = false;
       done();
     }">

src/components/CommonDrawer.vue

@@ -2,7 +2,7 @@
   <el-drawer
     v-model="showDrawer"
     :size="650"
-    @before-close="(done) => {
+    @="(done) => {
       isEditing = false;
       done();
     }">

src/components/GeneralTable.vue

@@ -8,7 +8,6 @@
   <ElTable
     ref="tableRef"
     :data="data"
-    :default-sort="{prop: 'id', order: 'descending'}"
     @row-click="rowClick"
   >
     <ElTableColumn

src/components/RequirementDrawer.vue

@@ -2,7 +2,7 @@
   <el-drawer
     v-model="showDrawer"
     :size="650"
-    @before-close="(done) => {
+    :before-close="(done) => {
       isEditing = false;
       done();
     }">

src/store/modules/workspace.ts

@@ -6,6 +6,12 @@ import {
   WorkspaceState, RootState, ChangeProjectPayload, UserState,
 } from '../typings';
 
+const NOT_SELECT_PROJECT_HINT = '未选择项目';
+
+const EMPTY_PROJECT_LIST_HINT = '暂无项目';
+
+const NO_SUCH_PROJECT_HINT = '未知项目';
+
 const DEFAULT: WorkspaceState = {
   currentProjectId: -1,
   currentProjectMembers: [],
@@ -14,11 +20,11 @@ const DEFAULT: WorkspaceState = {
 
 const actions: ActionTree<WorkspaceState, RootState> = {
   async refreshProjectList({ commit }) {
-    const projectList = await ProjectAPI.getProjectListByUserId();
+    const projectList = (await ProjectAPI.getProjectListByUserId()) || [];
     commit('updateProjectList', projectList);
   },
   async changeProject({ commit }, payload: ChangeProjectPayload) {
-    const members = await ProjectAPI.getProjectMembersByProjectId(payload.projectId);
+    const members = (await ProjectAPI.getProjectMembersByProjectId(payload.projectId)) || [];
     commit('updateMembers', members);
     commit('changeProject', payload);
   },
@@ -41,11 +47,23 @@ const mutations: MutationTree<WorkspaceState> = {
 
 const getters: GetterTree<WorkspaceState, RootState> = {
   currentProjectInfo(state) {
-    return Array.prototype.find.call(state.projectList, (project) => project.id === state.currentProjectId)
-      || {
+    if (state.projectList.length === 0) {
+      return {
+        id: -1,
+        name: EMPTY_PROJECT_LIST_HINT,
+      };
+    }
+    if (state.currentProjectId === -1) {
+      return {
         id: -1,
-        name: '未选择项目',
+        name: NOT_SELECT_PROJECT_HINT,
       };
+    }
+    const currentProjectInfo = Array.prototype.find.call(state.projectList, (project) => project.id === state.currentProjectId);
+    return currentProjectInfo || {
+      id: -1,
+      name: NO_SUCH_PROJECT_HINT,
+    };
   },
   userOptions(state) {
     return state.currentProjectMembers.map((user) => ({

src/views/Project/Pipeline.vue

@@ -87,9 +87,6 @@
         <template #title>流水线构建历史</template>
         <ElTable
           :data="pipelineHistory"
-          :default-sort="{
-            props: 'id',
-          }"
           height="400"
         >
           <ElTableColumn type="expand">

src/views/Project/Schedule.vue

@@ -39,7 +39,11 @@ export default {
   },
   methods: {
     async getTreeData() {
-      this.requirements = this.addChild2Node(await RequirementAPI.getTreeNodesByProjectId(this.$store.state.workspace.currentProjectId));
+      try {
+        this.requirements = this.addChild2Node(await RequirementAPI.getTreeNodesByProjectId(this.$store.state.workspace.currentProjectId));
+      } catch (e) {
+        console.error(e);
+      }
     },
     addChild2Node(array) {
       const nodeMap = new Map();

src/views/Project/TaskList.vue

@@ -8,7 +8,6 @@
   <RequriementDrawer
     ref="drawer"
     v-bind="requirementInDrawer"
-    @change="handleDrawerContentChange"
     @requirement-update="fetch"
     :showSons="false"
   ></RequriementDrawer>