From 0cf23cba57a65fb54b00f8801d0207ebbaba64da Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Mon, 10 Dec 2018 11:04:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=81=E5=B9=B3=20mock=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: edb8e0819f6baaf6d19d752916fd746f9062f6fa [formerly edb8e0819f6baaf6d19d752916fd746f9062f6fa [formerly edb8e0819f6baaf6d19d752916fd746f9062f6fa [formerly edb8e0819f6baaf6d19d752916fd746f9062f6fa [formerly 43d43484c561dfb366be8753aa5b461102e522f4 [formerly ce97e5f40c2e049145cace63cdc33c1032d444de]]]]] Former-commit-id: 089a1e97d20d590cd810555ddb5093be36c4927e Former-commit-id: 396e69f142ab127168c1ddc23351700d3f950b10 Former-commit-id: 9d77bdac87df7ec8c2e89a91218039cf4782f7fb [formerly 3c3cb317e3111c161c3e0f7edd33f881c23a56af] Former-commit-id: 594a6423a0489a0c45c995390472f8ccf9aaaa4b Former-commit-id: 2ce9acf12176cdeddbd0abfe54919e4cbdbd046c Former-commit-id: 9fac2de7e4e93f2c107443b2e4cf7d9d15e2c3a7 Former-commit-id: f8fba332b2c45d1249fcf9aa4037262afa6028bb Former-commit-id: 06b541ec993f9fb02646bbb8cc01099a45371c94 --- .../142/index.js => demo.business.issues.142.js} | 0 .../table/1/index.js => demo.business.table.1.js} | 0 .../mock/ajax/index.js => demo.plugins.mock.ajax.js} | 0 src/mock/api/{sys/login/index.js => sys.login.js} | 0 src/mock/index.js | 12 ++++++++---- src/mock/patch/cookie/index.js | 10 ---------- 6 files changed, 8 insertions(+), 14 deletions(-) rename src/mock/api/{demo/business/issues/142/index.js => demo.business.issues.142.js} (100%) rename src/mock/api/{demo/business/table/1/index.js => demo.business.table.1.js} (100%) rename src/mock/api/{demo/plugins/mock/ajax/index.js => demo.plugins.mock.ajax.js} (100%) rename src/mock/api/{sys/login/index.js => sys.login.js} (100%) delete mode 100644 src/mock/patch/cookie/index.js diff --git a/src/mock/api/demo/business/issues/142/index.js b/src/mock/api/demo.business.issues.142.js similarity index 100% rename from src/mock/api/demo/business/issues/142/index.js rename to src/mock/api/demo.business.issues.142.js diff --git a/src/mock/api/demo/business/table/1/index.js b/src/mock/api/demo.business.table.1.js similarity index 100% rename from src/mock/api/demo/business/table/1/index.js rename to src/mock/api/demo.business.table.1.js diff --git a/src/mock/api/demo/plugins/mock/ajax/index.js b/src/mock/api/demo.plugins.mock.ajax.js similarity index 100% rename from src/mock/api/demo/plugins/mock/ajax/index.js rename to src/mock/api/demo.plugins.mock.ajax.js diff --git a/src/mock/api/sys/login/index.js b/src/mock/api/sys.login.js similarity index 100% rename from src/mock/api/sys/login/index.js rename to src/mock/api/sys.login.js diff --git a/src/mock/index.js b/src/mock/index.js index 0a81b2cf..7711bd1f 100644 --- a/src/mock/index.js +++ b/src/mock/index.js @@ -1,9 +1,13 @@ import Mock from 'mockjs' -// 补丁 解决 mock.js 影响 Cookie 携带 -import PatchCookie from './patch/cookie' - -PatchCookie(Mock) +// 解决 Mock 情况下,携带 withCredentials = true,且未被拦截的跨域请求丢失 Cookies 的问题 +Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send +Mock.XHR.prototype.send = function () { + if (this.custom.xhr) { + this.custom.xhr.withCredentials = this.withCredentials || false + } + this.proxy_send(...arguments) +} // 导入所有的接口 const req = context => context.keys().map(context) diff --git a/src/mock/patch/cookie/index.js b/src/mock/patch/cookie/index.js deleted file mode 100644 index 0c101283..00000000 --- a/src/mock/patch/cookie/index.js +++ /dev/null @@ -1,10 +0,0 @@ -export default function (Mock) { - // 解决 Mock 情况下,携带 withCredentials = true,且未被拦截的跨域请求丢失 Cookies 的问题 - Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send - Mock.XHR.prototype.send = function () { - if (this.custom.xhr) { - this.custom.xhr.withCredentials = this.withCredentials || false - } - this.proxy_send(...arguments) - } -}