Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev-wiki

client/containers/Project/Setting/ProjectData/ProjectData.js

@@ -191,7 +191,8 @@ class ProjectData extends Component {
 
   handleImportType = val => {
     this.setState({
-      curImportType: val
+      curImportType: val,
+      isSwaggerUrl: false
     });
   };
 

exts/yapi-plugin-wiki/controller.js

@@ -205,7 +205,9 @@ class wikiController extends baseController {
 
   // socket 结束链接
   async endFunc(result) {
-    await this.Model.upEditUid(result._id, 0);
+    if(result) {
+      await this.Model.upEditUid(result._id, 0);
+    }
   }
 
   // 正在编辑