feat: 大幅度优化首页加载速度

client/containers/Project/Interface/Interface.js

@@ -35,12 +35,17 @@ const InterfaceRoute = props => {
  C = InterfaceColContent;
  } else if (props.match.params.action === 'case') {
  C = InterfaceCaseContent;
+ } else {
+ const params = props.match.params;
+ props.history.replace('/project/' + params.id + '/interface/api');
+ return null;
  }
  return <C {...props} />;
 };
 
 InterfaceRoute.propTypes = {
- match: PropTypes.object
+ match: PropTypes.object,
+ history: PropTypes.object
 };
 
 @connect(

client/reducer/modules/group.js

@@ -48,7 +48,7 @@ export default (state = initialState, action) => {
  case SET_CURR_GROUP: {
  return {
  ...state,
- currGroup: action.payload
+ currGroup: action.payload.data.data
  };
  }
  case FETCH_GROUP_MEMBER: {
@@ -58,6 +58,7 @@ export default (state = initialState, action) => {
  };
  }
  case FETCH_GROUP_MSG: {
+ console.log(action.payload)
  // const {role,group_name,group_desc,} = action.payload.data.data
  return {
  ...state,
@@ -154,6 +155,8 @@ export function fetchGroupList() {
 export function setCurrGroup(group) {
  return {
  type: SET_CURR_GROUP,
- payload: group
+ payload: axios.get('/api/group/get', {
+ params: { id: group._id }
+ })
  };
 }

server/controllers/group.js

@@ -6,6 +6,7 @@ const userModel = require('../models/user.js');
 const interfaceModel = require('../models/interface.js');
 const interfaceColModel = require('../models/interfaceCol.js');
 const interfaceCaseModel = require('../models/interfaceCase.js');
+const _ = require('underscore')
 
 const rolename = {
  owner: '组长',
@@ -400,7 +401,7 @@ class groupController extends baseController {
  async list(ctx) {
  var groupInst = yapi.getInst(groupModel);
  let projectInst = yapi.getInst(projectModel);
- let result = await groupInst.list();
+ let result = await groupInst.getAuthList(this.getUid());
 
  let privateGroup = await groupInst.getByPrivateUid(this.getUid());
  let newResult = [];
@@ -415,28 +416,48 @@ class groupController extends baseController {
  });
  }
 
- if (result && result.length > 0) {
- for (let i = 0; i < result.length; i++) {
+ if(result && result.length > 0 ){
+ for (let i = 0; i < result.length; i++){
  result[i] = result[i].toObject();
- result[i].role = await this.getProjectRole(result[i]._id, 'group');
- if (result[i].role !== 'member') {
- newResult.unshift(result[i]);
- } else {
- let publicCount = await projectInst.countWithPublic(result[i]._id);
- if (publicCount > 0) {
- newResult.push(result[i]);
- } else {
- let projectCountWithAuth = await projectInst.getProjectWithAuth(
- result[i]._id,
- this.getUid()
- );
- if (projectCountWithAuth > 0) {
- newResult.push(result[i]);
- }
- }
- }
+ newResult.unshift(result[i])
  }
  }
+
+ const groupIds = newResult.map(item=> item._id);
+
+ let groupByProject = await projectInst.getAuthList(this.getUid());
+ if(groupByProject && groupByProject.length > 0){
+ groupByProject.forEach( _data=>{
+ if(!_.find(groupIds, id=> id === _data.group_id)){
+ groupIds.push(_data.group_id)
+ }
+ })
+ }
+
+ newResult = await groupInst.findByGroups(groupIds)
+
+ // if (result && result.length > 0) {
+ // for (let i = 0; i < result.length; i++) {
+ // result[i] = result[i].toObject();
+ // result[i].role = await this.getProjectRole(result[i]._id, 'group');
+ // if (result[i].role !== 'member') {
+ // newResult.unshift(result[i]);
+ // } else {
+ // let publicCount = await projectInst.countWithPublic(result[i]._id);
+ // if (publicCount > 0) {
+ // newResult.push(result[i]);
+ // } else {
+ // let projectCountWithAuth = await projectInst.getProjectWithAuth(
+ // result[i]._id,
+ // this.getUid()
+ // );
+ // if (projectCountWithAuth > 0) {
+ // newResult.push(result[i]);
+ // }
+ // }
+ // }
+ // }
+ // }
  if (privateGroup) {
  privateGroup = privateGroup.toObject();
  privateGroup.group_name = '个人空间';

server/models/group.js

@@ -146,6 +146,28 @@ class groupModel extends baseModel {
  .exec();
  }
 
+ getAuthList(uid){
+ return this.model.find({
+ $or: [{
+ 'members.uid': uid,
+ 'type': 'public'
+ }, {
+ 'type': 'public',
+ uid
+ }]
+ }).select(' _id group_desc add_time up_time type uid custom_field1')
+ .exec();
+
+ }
+
+ findByGroups(ids = []){
+ return this.model.find({
+ _id: {
+ $in: ids
+ }
+ })
+ }
+
  del(id) {
  return this.model.remove({
  _id: id

server/models/project.js

@@ -11,6 +11,17 @@ class projectModel extends baseModel {
  this.handleEnvNullData = this.handleEnvNullData.bind(this)
  }
 
+ getAuthList(uid){
+ return this.model.find({
+ $or: [{
+ 'members.uid': uid
+ }, {
+ uid
+ }]
+ }).select('group_id')
+ .exec();
+ }
+
  getSchema() {
  return {
  uid: { type: Number, required: true },