Merge branch 'dev-1.3.0'

CHANGELOG.md

@@ -1,8 +1,18 @@
+### v1.3.11
+* 修复 v1.3.10 websocket 连接问题
+* 修复运行报错问题
+* 修复数据导入 har 文件问题
+
 ### v1.3.9
 #### Feature
 * 增加接口编辑返回数据预览
 * 修复旧的文档链接
 
+#### Bug Fixed
+
+* 导入数据为空提示
+
+
 ### v1.3.8
 
 #### Feature

client/containers/Project/Interface/InterfaceList/Edit.js

@@ -72,7 +72,7 @@ class InterfaceEdit extends Component {
     //因后端 node 仅支持 ws， 暂不支持 wss
     let wsProtocol = location.protocol === 'https' ? 'ws' : 'ws';
     try {
-      s = new WebSocket(wsProtocol + '://dd' + domain + '/api/interface/solve_conflict?id=' + this.props.match.params.actionId);
+      s = new WebSocket(wsProtocol + '://' + domain + '/api/interface/solve_conflict?id=' + this.props.match.params.actionId);
       s.onopen = () => {
         this.WebSocket = s;
       }

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

@@ -145,7 +145,10 @@ class ProjectData extends Component {
     let count = 0;
     let successNum = len;
     let existNum = 0;
-
+    if(len === 0){
+      message.error(`解析数据为空`);
+      return;
+    }
     for (let index = 0; index < res.length; index++) {
       let item = res[index];
       let data = {

exts/yapi-plugin-import-har/client.js

@@ -42,7 +42,8 @@ function postman(importDataModule){
     if(query&&query.length){
       for(let item in query){
         res.push({
-          name: query[item].name
+          name: query[item].name,
+          value: query[item].value
         });
       }
     }
@@ -69,6 +70,7 @@ function postman(importDataModule){
       for(let item in body_form){
         res.push({
           name: body_form[item].name,
+          value: body_form[item].value,
           type: 'text'
         });
       }
@@ -93,11 +95,12 @@ function postman(importDataModule){
     try{
       res = JSON.parse(res);
       res = res.log.entries;
+      
       res = res.filter(item=>{
         if(!item)return false;
         return item.response.content.mimeType.indexOf('application/json') === 0;
       })
-
+      
 
       let interfaceData = {apis: []};
       res = checkInterRepeat.bind(this)(res);
@@ -107,7 +110,7 @@ function postman(importDataModule){
           interfaceData.apis.push(data);
         }
       }
-  
+      
       return interfaceData;
       
     }catch(e){

package-lock.json

@@ -10450,9 +10450,9 @@
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-editor-visual": {
-      "version": "1.0.8",
+      "version": "1.0.9",
-      "resolved": "http://registry.npm.taobao.org/json-schema-editor-visual/download/json-schema-editor-visual-1.0.8.tgz",
+      "resolved": "http://registry.npm.taobao.org/json-schema-editor-visual/download/json-schema-editor-visual-1.0.9.tgz",
-      "integrity": "sha1-i2nWHjdyj6QHudV/iY7Sz4i0He8=",
+      "integrity": "sha1-AOgMJo5lCK2KREj28DHC1YbpFAw=",
       "dev": true,
       "requires": {
         "antd": "3.2.2",

package.json

@@ -108,7 +108,7 @@
     "fast-sass-loader-china": "1.2.5",
     "ghooks": "^2.0.0",
     "happypack": "^4.0.0-beta.5",
-    "json-schema-editor-visual": "^1.0.8",
+    "json-schema-editor-visual": "^1.0.9",
     "less": "^2.7.2",
     "less-loader": "^4.0.5",
     "markdown-it-include": "^1.0.0",

static/prd/assets.js

@@ -1 +1 @@
-window.WEBPACK_ASSETS = {"index.js":{"js":"index@63696174abdd3b922ba5.js","css":"index@63696174abdd3b922ba5.css"},"lib":{"js":"lib@685d1144cc2e519168b2.js"},"lib2":{"js":"lib2@f97b0358ee9bfe96c7d6.js"},"lib3":{"js":"lib3@217d095c690a0c93a5e9.js"},"manifest":{"js":"manifest@f2f4bd774d6c221b3d5f.js"}}
+window.WEBPACK_ASSETS = {"index.js":{"js":"index@c80405cf707042218913.js","css":"index@c80405cf707042218913.css"},"lib":{"js":"lib@685d1144cc2e519168b2.js"},"lib2":{"js":"lib2@f97b0358ee9bfe96c7d6.js"},"lib3":{"js":"lib3@217d095c690a0c93a5e9.js"},"manifest":{"js":"manifest@f2f4bd774d6c221b3d5f.js"}}