get，post区分

Author: RexSheng

README.md

@@ -42,10 +42,19 @@ Vue.ajax.config.successStatus=function(status){return status==200;}
 Vue.ajax.config.default={type:"get",headers:{"Content-type":"application/json;charset=UTF-8"}}
 #设置mock请求方法或者指向的文件路径
 Vue.ajax.addMock(`String` mockUrl,function(param){return xxx;})
+Vue.ajax.addMock(`String` mockUrl,"../static/file.json")
+#mock代理请求
+Vue.ajax.addMock(`String` mockUrl,{url:"/api/newurl",data:{},type:"get",success:function(d){},error:function(err){},complete:function(){}})
+#@get: @post: @delete: @put: 用于相同url但是不同请求类型的拦截
 Vue.ajax.addMock(
   {
-    "url1":function(param){return xxx;},
-    "url2":function(param){return xxx;}
+    "/url1":function(param){return {code:0};},
+    "/url2":"../static/file.json",
+    "/url3":{url:"/api/newurl",data:{},type:"get",success:function(d){},error:function(err){},complete:function(){}},
+    //{url:"/user/3",type:"get"}的请求会匹配到
+    "@get:/user/3":"../static/filedetail.json",
+    //{url:"/user/3",type:"delete"}的请求会匹配到
+    "@delete:/user/3":"../static/filedetail.json",
   }
 )
 #全局配置发送socket未开启时数据延迟毫秒
@@ -112,7 +121,7 @@ this.$ajax.send(option)
 |dataType |表明要发送的数据格式         |默认`"json"` `"xml"` `"form"` `"formData"`(使用formdata表单发送数据，通常用于文件上传)|
 |responseType|返回的数据类型|默认`""` `"json"` `"blob"` `"text"` `"arraybuffer"` `"document"`
 |transform |自定义格式化请求前数据的函数         | 参数为当前配置的data数据<br/> 例如`function(data){return JSON.stringify(data);}` |
-|mock|mock模拟数据请求|`true(需调用Vue.ajax.addMock(url,function)来拦截本次请求)` `function(data){//模拟请求，参数data为option的data}` `String请求的json文件地址` |
+|mock|mock模拟数据请求|`true(需调用Vue.ajax.addMock(url,function)来拦截本次请求)` `function(data){//模拟请求，参数data为option的data}` `String请求的json文件地址` `{url:'/newurl',type:'get',data:{},complete:function(){},success:function(d){},error:function(err){}}`|
 |success|请求成功的回调|`function(data,req){}` |
 |error|请求失败的回调|`function(err,req){}` |
 |complete|请求完成的回调|`function(){}` |

package.json

@@ -1,7 +1,7 @@
 {
   "name": "vue-http-rexsheng",
   "description": "A Vue.js plugin for providing http request",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "author": "Rex Sheng <shengxupeng@126.com>",
   "license": "MIT",
   "private": false,

src/App.vue

@@ -4,6 +4,9 @@
 
     <h2>Ajax请求测试</h2>
     <ul>
+      <li>
+        <button @click="cTest">自定义测试</button>
+      </li>
       <li>
         <button @click="getData">Get数据</button>
       </li>
@@ -31,6 +34,9 @@
       <li>
         <button @click="mockStaticFileGlobal()">mock全局静态json</button>
       </li>
+      <li>
+        <button @click="mockProxy()">mock代理</button>
+      </li>
     </ul>
     <ul>
       <li>
@@ -176,11 +182,26 @@ export default {
         ]
       }))
     },
+    cTest(){
+      this.$ajax
+        .send({
+          url:"http://localhost:8762/test",
+          type: "post",
+          data:{"pageIndex":1},
+          headers:{"Authorization":"12"}
+        })
+        .then(d => {
+          console.log("success test", d, this.msg);
+        })
+        .catch(d => {
+          console.log("error test", d);
+        });
+    },
     getData() {
       this.$ajax
         .send({
           url:
-            "http://xconsole.rrslj.com/datacenter/userxw/getCenterData?dateFlag=2018-08-10",
+            "datacenter/userxw/getCenterData?dateFlag=2018-08-10",
           type: "get"
         })
         .then(d => {
@@ -372,6 +393,41 @@ export default {
             console.log("error mockGlobal", d,req);
           }
         })
+    },
+    mockProxy:function(){
+      Vue.ajax
+        .send({
+          url: "/test/mockfile",
+          mock:{
+            url:"/test/aaa",
+            success:function(d){
+              console.log("get proxy", d, this.msg);
+            },
+          },
+          success:function(d){
+            console.log("success mockGlobal", d, this.msg);
+          },
+          error:function(d,req){
+            console.log("error mockGlobal", d,req);
+          }
+        })
+        Vue.ajax
+        .send({
+          url: "/test/mockfile",
+          type:"post",
+          mock:{
+            url:"/test/aaa",
+            success:function(d){
+              console.log("post proxy", d, this.msg);
+            },
+          },
+          success:function(d){
+            console.log("success mockGlobal", d, this.msg);
+          },
+          error:function(d,req){
+            console.log("error mockGlobal", d,req);
+          }
+        })
     }
   }
 };

src/assets/data/01.js renamed to src/assets/data/01.json

@@ -1,4 +1,4 @@
-export default{
+{
     "code":0,
     "message":"消息"
 }

src/config.js

@@ -19,18 +19,21 @@ Vue.ajax.addMock({
     "/test/mock001":function(d){
         var a=Object.assign({},d,{
             "name|+1":["小明",'小花','小春'],
-            "value|+1":[100,89,72,74,98],
+            "value|+2":[100,89,72,74,98],
             "date":new Date(),
             "provider":function(){
                 return d.arr;
             }
         });
-        return a
+        return Vue.ajax.mock(a);
     }
 })
-Vue.ajax.addMock({"/test/mockfile":"../static/mock/test.json"})
-
-
+// Vue.ajax.addMock({"/test/mockfile":"../static/mock/test.json"})
+Vue.ajax.addMock({
+    "/test/mockfile":"../src/assets/data/01.json",
+    "@get:/test/aaa":()=>{return {"dd":1};},
+    "@post:/test/aaa":()=>{return {"dd":"post"};}
+});
 // Vue.ajax.config.successStatus=function(d){return d>300};
 Vue.ajax.config.default={type:"get",headers:{"Content-type":"application/json;charset=UTF-8"}}
 Vue.socket.config.reconnectTimeout=30

src/lib/ajax.js

@@ -55,17 +55,21 @@ let ajax = {
             data: null,
             dataType: "json"
         };
+        this.isNull=function(p){
+            return p===undefined || p===null;
+        };
         this.isMock=function(option){
             var useMock=AJAXCONF.mockMode;
-            // console.log("mockCache",mockCache)
             this.mockInstance=AJAXCONF.mockCache[option.url];
             if(option.mock!==undefined && option.mock!==null){
                 if(option.mock===true){
                     //启用mock
                     useMock=true;
-                    this.mockInstance=AJAXCONF.mockCache[option.url];
-                    if(this.mockInstance==undefined || this.mockInstance==null){
-                        useMock=false;
+                    if(this.isNull(this.mockInstance)){
+                        this.mockInstance=AJAXCONF.mockCache["@"+option.type.toLowerCase()+":"+option.url];
+                        if(this.isNull(this.mockInstance)){
+                            useMock=false;
+                        }
                     }
                 }
                 if(Object.prototype.toString.call(option.mock) === '[object Function]'){
@@ -77,17 +81,46 @@ let ajax = {
                     //指向文件地址，不启用mock
                     useMock=false;
                     option.url=option.mock;
+                    option.type="GET";
+                }
+                if(Object.prototype.toString.call(option.mock) === '[object Object]'){
+                    //启用mock
+                    useMock=false;
+                    this.mockInstance=option.mock;
                 }
             }
             else{
                 //全局使用mock，但是未配置实现方法，设置useMock=false,会直接默认请求option.url
-                if(useMock && (this.mockInstance===undefined || this.mockInstance===null)){
-                    useMock=false;
+                if(useMock){
+                    if(this.isNull(this.mockInstance)){
+                        this.mockInstance=AJAXCONF.mockCache["@"+option.type.toLowerCase()+":"+option.url];
+                        if(this.isNull(this.mockInstance)){
+                            useMock=false;
+                        }
+                    }
                 }
             }
-            if(useMock && (typeof this.mockInstance==="string")){
+            if(useMock && (Object.prototype.toString.call(this.mockInstance) === '[object String]')){
                 useMock=false;
                 option.url=this.mockInstance;
+                option.type="GET";
+            }
+            if(Object.prototype.toString.call(this.mockInstance) === '[object Object]'){
+                option=Object.assign(option,this.mockInstance);
+                option.mock=undefined;
+                return this.isMock(option);
+            }
+            if(option.url.substr(0,5)==="@get:"){
+                option.url=option.url.substr(5);
+            }
+            else if(option.url.substr(0,6)==="@post:"){
+                option.url=option.url.substr(6);
+            }
+            else if(option.url.substr(0,8)==="@delete:"){
+                option.url=option.url.substr(8);
+            }
+            else if(option.url.substr(0,5)==="@put:"){
+                option.url=option.url.substr(5);
             }
             return useMock;
         };
@@ -155,8 +188,9 @@ let ajax = {
                         return;
                     }
                     new Promise(function(res,rej){
-                        var dj=instance.call(scope, option.data,res, rej);
-                        res(new randomPlugin(dj));
+                        var dd=instance.call(scope, option.data,res, rej);
+                        // var dd=new randomPlugin().handle(dj);
+                        res(dd);
                     }).then(function(dd){
                         if(option.success){
                             option.success.call(scope,dd);
@@ -205,11 +239,11 @@ let ajax = {
             var scope=this.scope;
             var formatResult=this.formatResult;
             var opt=Object.assign(this.defaultConfig,AJAXCONF.userDefaultConfig, config);
-            var request = this.createInstance();
-            opt.url = this.formatUrl(opt.url, opt.data);
             if(this.isMock(opt)){
                 return this.mock(opt,scope);
             }
+            var request = this.createInstance();
+            opt.url = this.formatUrl(opt.url, opt.data);
             if(opt.baseUrl!==undefined && opt.baseUrl===false){
                 request.open(opt.type, opt.url, opt.async);
             }
@@ -250,7 +284,7 @@ let ajax = {
             }
             else{
                 if (opt.dataType.toLowerCase() === 'formdata') {
-                    if (opt.data != null) {
+                    if (opt.data != null && Object.prototype.toString.call(opt.data) !=='[object FormData]') {
                         var formData = new FormData();
                         Object.keys(opt.data).forEach(key => {
                             if (opt.data[key].constructor === Array || opt.data[key].constructor === FileList) {

src/lib/index.js

@@ -61,7 +61,7 @@ var ajaxBody={
 
     },
     mock:function(param){
-        return new randomPlugin(param);
+        return new randomPlugin().handle(param);
     }
 }
 var wsBody={