ls-pro-common 1.0.38 → 1.0.39

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 (9) hide show
  1. package/dist/common.css +14 -1
  2. package/dist/common.js +1 -1
  3. package/dist/common.min.css +14 -1
  4. package/dist/common.min.js +1 -1
  5. package/es/http/index.js +32 -11
  6. package/es/utils/index.js +4 -4
  7. package/lib/http/index.js +32 -9
  8. package/lib/utils/index.js +4 -4
  9. package/package.json +3 -3
package/es/http/index.js CHANGED
@@ -1,12 +1,15 @@
1
1
  import _regeneratorRuntime from "@babel/runtime/regenerator";
2
+ import "antd/es/modal/style";
3
+ import _Modal from "antd/es/modal";
2
4
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
3
5
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
6
  import { extend } from 'umi-request';
5
- import { getCache, getUrlQuery, setUrlQuery, getResourceProps, showError, toGatewayUrl } from '../utils'; //默认超时时间为1分钟
6
-
7
+ import { getCache, getUrlQuery, setUrlQuery, getResourceProps, showError, toGatewayUrl } from '../utils';
8
+ //默认超时时间为1分钟
7
9
  var request = extend({
8
10
  timeout: 60000
9
11
  });
12
+ var showLogin = false;
10
13
  /** 请求拦截器,统一添加token */
11
14
 
12
15
  request.interceptors.request.use(function (url, options) {
@@ -23,7 +26,8 @@ request.interceptors.request.use(function (url, options) {
23
26
  }
24
27
 
25
28
  var param = {
26
- resCode: getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId')
29
+ resCode: getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId'),
30
+ t: Date.now()
27
31
  };
28
32
  return {
29
33
  url: setUrlQuery(url, param),
@@ -34,7 +38,8 @@ request.interceptors.request.use(function (url, options) {
34
38
 
35
39
  request.interceptors.response.use( /*#__PURE__*/function () {
36
40
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response, options) {
37
- var noMsg, data, flag, status;
41
+ var noMsg, _data$flag, _data$flag2, data, retCode, retMsg, status;
42
+
38
43
  return _regeneratorRuntime.wrap(function _callee$(_context) {
39
44
  while (1) {
40
45
  switch (_context.prev = _context.next) {
@@ -47,12 +52,12 @@ request.interceptors.response.use( /*#__PURE__*/function () {
47
52
  }
48
53
 
49
54
  showError(options.url + response.statusText);
50
- _context.next = 12;
55
+ _context.next = 13;
51
56
  break;
52
57
 
53
58
  case 5:
54
59
  if (!(noMsg != '1')) {
55
- _context.next = 12;
60
+ _context.next = 13;
56
61
  break;
57
62
  }
58
63
 
@@ -61,17 +66,33 @@ request.interceptors.response.use( /*#__PURE__*/function () {
61
66
 
62
67
  case 8:
63
68
  data = _context.sent;
64
- flag = data.flag;
69
+ retCode = (data === null || data === void 0 ? void 0 : (_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retCode) || '0';
70
+ retMsg = ((_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retMsg) || '访问接口出错';
65
71
  status = (getUrlQuery('apiStatus') || '0').split(',');
66
72
 
67
- if (flag && !status.includes(flag.retCode || '')) {
68
- showError(flag.retMsg || '访问接口出错');
73
+ if (retCode && !status.includes(retCode)) {
74
+ if (retCode === 'timeout' || retCode === '4011') {
75
+ if (!showLogin) {
76
+ showLogin = true;
77
+
78
+ _Modal.warning({
79
+ title: '登录状态已过期,请重新登录',
80
+ okText: '重新登录',
81
+ afterClose: function afterClose() {
82
+ location.href = '/login?redirect=' + encodeURI(location.href);
83
+ showLogin = false;
84
+ }
85
+ });
86
+ }
87
+ } else {
88
+ showError(retMsg);
89
+ }
69
90
  }
70
91
 
71
- case 12:
92
+ case 13:
72
93
  return _context.abrupt("return", response);
73
94
 
74
- case 13:
95
+ case 14:
75
96
  case "end":
76
97
  return _context.stop();
77
98
  }
package/es/utils/index.js CHANGED
@@ -109,10 +109,10 @@ export var dateAdd = function dateAdd(dt, addDay) {
109
109
  export var formatMoney = function formatMoney(num) {
110
110
  var dec = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
111
111
 
112
- if (typeof num === 'string') {
113
- try {
114
- num = Number(num);
115
- } catch (e) {
112
+ if (typeof num !== 'number') {
113
+ num = Number(num);
114
+
115
+ if (Number.isNaN(num)) {
116
116
  num = 0;
117
117
  }
118
118
  }
package/lib/http/index.js CHANGED
@@ -15,6 +15,10 @@ exports.httpPut = httpPut;
15
15
 
16
16
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
17
17
 
18
+ require("antd/es/modal/style");
19
+
20
+ var _modal = _interopRequireDefault(require("antd/es/modal"));
21
+
18
22
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
19
23
 
20
24
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -27,6 +31,7 @@ var _utils = require("../utils");
27
31
  var request = (0, _umiRequest.extend)({
28
32
  timeout: 60000
29
33
  });
34
+ var showLogin = false;
30
35
  /** 请求拦截器,统一添加token */
31
36
 
32
37
  request.interceptors.request.use(function (url, options) {
@@ -42,7 +47,8 @@ request.interceptors.request.use(function (url, options) {
42
47
  }
43
48
 
44
49
  var param = {
45
- resCode: (0, _utils.getUrlQuery)('resCode') || (0, _utils.getUrlQuery)('resourceId') || (0, _utils.getResourceProps)('resourceId')
50
+ resCode: (0, _utils.getUrlQuery)('resCode') || (0, _utils.getUrlQuery)('resourceId') || (0, _utils.getResourceProps)('resourceId'),
51
+ t: Date.now()
46
52
  };
47
53
  return {
48
54
  url: (0, _utils.setUrlQuery)(url, param),
@@ -53,7 +59,8 @@ request.interceptors.request.use(function (url, options) {
53
59
 
54
60
  request.interceptors.response.use( /*#__PURE__*/function () {
55
61
  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(response, options) {
56
- var noMsg, data, flag, status;
62
+ var noMsg, _data$flag, _data$flag2, data, retCode, retMsg, status;
63
+
57
64
  return _regenerator.default.wrap(function _callee$(_context) {
58
65
  while (1) {
59
66
  switch (_context.prev = _context.next) {
@@ -66,12 +73,12 @@ request.interceptors.response.use( /*#__PURE__*/function () {
66
73
  }
67
74
 
68
75
  (0, _utils.showError)(options.url + response.statusText);
69
- _context.next = 12;
76
+ _context.next = 13;
70
77
  break;
71
78
 
72
79
  case 5:
73
80
  if (!(noMsg != '1')) {
74
- _context.next = 12;
81
+ _context.next = 13;
75
82
  break;
76
83
  }
77
84
 
@@ -80,17 +87,33 @@ request.interceptors.response.use( /*#__PURE__*/function () {
80
87
 
81
88
  case 8:
82
89
  data = _context.sent;
83
- flag = data.flag;
90
+ retCode = (data === null || data === void 0 ? void 0 : (_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retCode) || '0';
91
+ retMsg = ((_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retMsg) || '访问接口出错';
84
92
  status = ((0, _utils.getUrlQuery)('apiStatus') || '0').split(',');
85
93
 
86
- if (flag && !status.includes(flag.retCode || '')) {
87
- (0, _utils.showError)(flag.retMsg || '访问接口出错');
94
+ if (retCode && !status.includes(retCode)) {
95
+ if (retCode === 'timeout' || retCode === '4011') {
96
+ if (!showLogin) {
97
+ showLogin = true;
98
+
99
+ _modal.default.warning({
100
+ title: '登录状态已过期,请重新登录',
101
+ okText: '重新登录',
102
+ afterClose: function afterClose() {
103
+ location.href = '/login?redirect=' + encodeURI(location.href);
104
+ showLogin = false;
105
+ }
106
+ });
107
+ }
108
+ } else {
109
+ (0, _utils.showError)(retMsg);
110
+ }
88
111
  }
89
112
 
90
- case 12:
113
+ case 13:
91
114
  return _context.abrupt("return", response);
92
115
 
93
- case 13:
116
+ case 14:
94
117
  case "end":
95
118
  return _context.stop();
96
119
  }
package/lib/utils/index.js CHANGED
@@ -178,10 +178,10 @@ exports.dateAdd = dateAdd;
178
178
  var formatMoney = function formatMoney(num) {
179
179
  var dec = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
180
180
 
181
- if (typeof num === 'string') {
182
- try {
183
- num = Number(num);
184
- } catch (e) {
181
+ if (typeof num !== 'number') {
182
+ num = Number(num);
183
+
184
+ if (Number.isNaN(num)) {
185
185
  num = 0;
186
186
  }
187
187
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ls-pro-common",
3
- "version": "1.0.38",
3
+ "version": "1.0.39",
4
4
  "description": "ls-pro-common",
5
5
  "keywords": [
6
6
  "antd",
@@ -28,8 +28,8 @@
28
28
  ],
29
29
  "dependencies": {
30
30
  "@ant-design/icons": "^4.3.0",
31
- "ls-pro-table": "2.62.30",
32
- "ls-pro-form": "1.52.25",
31
+ "ls-pro-table": "2.62.31",
32
+ "ls-pro-form": "1.52.26",
33
33
  "@babel/runtime": "^7.16.3",
34
34
  "classnames": "^2.2.6",
35
35
  "moment": "^2.27.0",