Merge branch 'master' of https://github.com/YMFE/yapi

exts/yapi-plugin-statistics/statisMockModel.js

@@ -35,10 +35,11 @@ class statisMockModel extends baseModel {
         return this.model.countDocuments({});
     }
 
-    getDayCount(timeInterval) {
+    async getDayCount(timeInterval) {
         let end = timeInterval[1];
         let start = timeInterval[0];
-        return this.model.aggregate([
+        let data = [];
+        const cursor = this.model.aggregate([
             {
                 $match: {
                     date: { $gt: start, $lte: end }
@@ -53,8 +54,11 @@ class statisMockModel extends baseModel {
             {
                 $sort: { _id: 1 }
             }
-        ]).cursor({}).exec().toArray();
-    }
+        ]).cursor({}).exec();
+		await cursor.eachAsync(doc => data.push(doc));
+		return data;
+
+	}
 
     list() {
         return this.model.find({}).select('date').exec();

exts/yapi-plugin-wiki/wikiPage/index.js

@@ -131,11 +131,11 @@ class WikiPage extends Component {
     };
     this.handleWebsocketAccidentClose(sendEditor, status => {
       // 如果websocket 启动不成功用户依旧可以对wiki 进行编辑
-      if (!status) {
+      // if (!status) {
         this.setState({
           isEditor: !this.state.isEditor
         });
-      }
+      // }
     });
   };