ls-pro-common 1.0.63 → 1.0.64

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/common.js +1 -1
  2. package/dist/common.min.js +1 -1
  3. package/es/http/index.js +8 -11
  4. package/lib/http/index.js +8 -10
  5. package/package.json +3 -4
package/es/http/index.js CHANGED
@@ -1,6 +1,5 @@
1
1
  import _regeneratorRuntime from "@babel/runtime/regenerator";
2
2
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
3
- import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
3
  import { extend } from 'umi-request';
5
4
  import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, toGatewayUrl, reLogin } from '../utils'; //默认超时时间为1分钟
6
5
 
@@ -11,34 +10,31 @@ var request = extend({
11
10
 
12
11
  request.interceptors.request.use(function (url, options) {
13
12
  var token = getCookie("token");
14
-
15
- var opts = _objectSpread({}, options);
16
-
17
- opts.headers = opts.headers || {}; // 处理 token
13
+ options.headers = options.headers || {}; // 处理 token
18
14
 
19
15
  if (token && url.indexOf('noToken=1') === -1) {
20
- opts.headers.token = token;
16
+ options.headers["token"] = token;
21
17
  } // 处理门店
22
18
 
23
19
 
24
20
  var shopNo = getCache('shopNo', true) || getCache('shopNo');
25
21
 
26
22
  if (shopNo) {
27
- opts.headers.shopNo = shopNo;
23
+ options.headers["shopNo"] = shopNo;
28
24
  } // 处理门店
29
25
 
30
26
 
31
27
  var shopCode = getCache('shopCode', true) || getCache('shopCode');
32
28
 
33
29
  if (shopCode) {
34
- opts.headers.shopCode = shopCode;
30
+ options.headers["shopCode"] = shopCode;
35
31
  } // 处理仓库
36
32
 
37
33
 
38
34
  var storeNo = getCache('storeNo', true) || getCache('storeNo');
39
35
 
40
36
  if (storeNo) {
41
- opts.headers.storeNo = storeNo;
37
+ options.headers["storeNo"] = storeNo;
42
38
  }
43
39
 
44
40
  url = url.replace('noToken=1', '').replace('&&', '&').replace('?&', '?');
@@ -51,9 +47,10 @@ request.interceptors.request.use(function (url, options) {
51
47
  delete param.resCode;
52
48
  }
53
49
 
50
+ url = setUrlQuery(url, param);
54
51
  return {
55
- url: setUrlQuery(url, param),
56
- options: opts
52
+ url: url,
53
+ options: options
57
54
  };
58
55
  });
59
56
  /** 请求返回拦截器,统一处理业务异常 */
package/lib/http/index.js CHANGED
@@ -17,8 +17,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
17
17
 
18
18
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
19
19
 
20
- var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
21
-
22
20
  var _umiRequest = require("umi-request");
23
21
 
24
22
  var _utils = require("../utils");
@@ -31,32 +29,31 @@ var request = (0, _umiRequest.extend)({
31
29
 
32
30
  request.interceptors.request.use(function (url, options) {
33
31
  var token = (0, _utils.getCookie)("token");
34
- var opts = (0, _objectSpread2.default)({}, options);
35
- opts.headers = opts.headers || {}; // 处理 token
32
+ options.headers = options.headers || {}; // 处理 token
36
33
 
37
34
  if (token && url.indexOf('noToken=1') === -1) {
38
- opts.headers.token = token;
35
+ options.headers["token"] = token;
39
36
  } // 处理门店
40
37
 
41
38
 
42
39
  var shopNo = (0, _utils.getCache)('shopNo', true) || (0, _utils.getCache)('shopNo');
43
40
 
44
41
  if (shopNo) {
45
- opts.headers.shopNo = shopNo;
42
+ options.headers["shopNo"] = shopNo;
46
43
  } // 处理门店
47
44
 
48
45
 
49
46
  var shopCode = (0, _utils.getCache)('shopCode', true) || (0, _utils.getCache)('shopCode');
50
47
 
51
48
  if (shopCode) {
52
- opts.headers.shopCode = shopCode;
49
+ options.headers["shopCode"] = shopCode;
53
50
  } // 处理仓库
54
51
 
55
52
 
56
53
  var storeNo = (0, _utils.getCache)('storeNo', true) || (0, _utils.getCache)('storeNo');
57
54
 
58
55
  if (storeNo) {
59
- opts.headers.storeNo = storeNo;
56
+ options.headers["storeNo"] = storeNo;
60
57
  }
61
58
 
62
59
  url = url.replace('noToken=1', '').replace('&&', '&').replace('?&', '?');
@@ -69,9 +66,10 @@ request.interceptors.request.use(function (url, options) {
69
66
  delete param.resCode;
70
67
  }
71
68
 
69
+ url = (0, _utils.setUrlQuery)(url, param);
72
70
  return {
73
- url: (0, _utils.setUrlQuery)(url, param),
74
- options: opts
71
+ url: url,
72
+ options: options
75
73
  };
76
74
  });
77
75
  /** 请求返回拦截器,统一处理业务异常 */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ls-pro-common",
3
- "version": "1.0.63",
3
+ "version": "1.0.64",
4
4
  "description": "ls-pro-common",
5
5
  "keywords": [
6
6
  "antd",
@@ -12,8 +12,7 @@
12
12
  "*.less"
13
13
  ],
14
14
  "license": "MIT",
15
- "main": "lib/index.js",
16
- "module": "es/index.js",
15
+ "main": "lib/index.js",
17
16
  "types": "lib/index.d.ts",
18
17
  "files": [
19
18
  "lib",
@@ -28,7 +27,7 @@
28
27
  ],
29
28
  "dependencies": {
30
29
  "@ant-design/icons": "^4.3.0",
31
- "ls-pro-table": "2.62.46",
30
+ "ls-pro-table": "2.62.47",
32
31
  "ls-pro-form": "1.52.29",
33
32
  "@babel/runtime": "^7.16.3",
34
33
  "classnames": "^2.2.6",