dlt-for-react 1.1.8 → 1.1.10
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.
- package/README.md +5 -1
- package/lib/utils/NHFetch.js +124 -118
- package/lib/utils/index.js +38 -2
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -8,7 +8,7 @@ npm publish
|
|
|
8
8
|
|
|
9
9
|
## 前端 dlt-for-react 依赖包版本更新记录
|
|
10
10
|
|
|
11
|
-
##### 当前最新版本:1.1.
|
|
11
|
+
##### 当前最新版本:1.1.10
|
|
12
12
|
|
|
13
13
|
##### 安装依赖
|
|
14
14
|
|
|
@@ -16,6 +16,10 @@ npm publish
|
|
|
16
16
|
|
|
17
17
|
##### 版本修改记录
|
|
18
18
|
|
|
19
|
+
#### V1.1.10—2024 年 1 月 24 日
|
|
20
|
+
|
|
21
|
+
1. 解决NHFetch表单提交的问题
|
|
22
|
+
|
|
19
23
|
#### V1.1.8—2023 年 12 月 29 日
|
|
20
24
|
|
|
21
25
|
1. 解决table查询强制重置了分页加载量的问题
|
package/lib/utils/NHFetch.js
CHANGED
|
@@ -1,35 +1,35 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.getDifferDate = exports.userLogout = exports.refreshToken = undefined;
|
|
7
7
|
|
|
8
|
-
var _typeof2 = require(
|
|
8
|
+
var _typeof2 = require("babel-runtime/helpers/typeof");
|
|
9
9
|
|
|
10
10
|
var _typeof3 = _interopRequireDefault(_typeof2);
|
|
11
11
|
|
|
12
|
-
var _stringify = require(
|
|
12
|
+
var _stringify = require("babel-runtime/core-js/json/stringify");
|
|
13
13
|
|
|
14
14
|
var _stringify2 = _interopRequireDefault(_stringify);
|
|
15
15
|
|
|
16
|
-
var _message2 = require(
|
|
16
|
+
var _message2 = require("antd/lib/message");
|
|
17
17
|
|
|
18
18
|
var _message3 = _interopRequireDefault(_message2);
|
|
19
19
|
|
|
20
|
-
require(
|
|
20
|
+
require("antd/lib/message/style");
|
|
21
21
|
|
|
22
|
-
require(
|
|
22
|
+
require("isomorphic-fetch");
|
|
23
23
|
|
|
24
|
-
var _NHCore = require(
|
|
24
|
+
var _NHCore = require("./NHCore");
|
|
25
25
|
|
|
26
|
-
var _MD = require(
|
|
26
|
+
var _MD = require("./MD5");
|
|
27
27
|
|
|
28
|
-
var _createHashHistory = require(
|
|
28
|
+
var _createHashHistory = require("history/createHashHistory");
|
|
29
29
|
|
|
30
30
|
var _createHashHistory2 = _interopRequireDefault(_createHashHistory);
|
|
31
31
|
|
|
32
|
-
var _moment = require(
|
|
32
|
+
var _moment = require("moment");
|
|
33
33
|
|
|
34
34
|
var _moment2 = _interopRequireDefault(_moment);
|
|
35
35
|
|
|
@@ -38,10 +38,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
38
38
|
var hashHistory = (0, _createHashHistory2.default)();
|
|
39
39
|
var hasClass = function hasClass(node, className) {
|
|
40
40
|
var exist = false;
|
|
41
|
-
if (node.getAttribute(
|
|
41
|
+
if (node.getAttribute("class")) {
|
|
42
42
|
// 存class属性
|
|
43
43
|
// 式1
|
|
44
|
-
if (node.getAttribute(
|
|
44
|
+
if (node.getAttribute("class").indexOf(className) > -1) {
|
|
45
45
|
exist = true;
|
|
46
46
|
}
|
|
47
47
|
// 式2
|
|
@@ -53,7 +53,7 @@ var hasClass = function hasClass(node, className) {
|
|
|
53
53
|
};
|
|
54
54
|
|
|
55
55
|
var parents = function parents(obj, className) {
|
|
56
|
-
if (obj.tagName ===
|
|
56
|
+
if (obj.tagName === "BODY") {
|
|
57
57
|
return undefined;
|
|
58
58
|
}
|
|
59
59
|
if (hasClass(obj, className)) {
|
|
@@ -64,11 +64,11 @@ var parents = function parents(obj, className) {
|
|
|
64
64
|
};
|
|
65
65
|
|
|
66
66
|
var getTitles = function getTitles(fields) {
|
|
67
|
-
var errorInfo =
|
|
67
|
+
var errorInfo = "";
|
|
68
68
|
var errorInfoMap = {};
|
|
69
69
|
for (var i = 0; i < fields.length; i++) {
|
|
70
70
|
//先对动态表单中的字段做判断,如果不是动态表单才最常规的判断
|
|
71
|
-
var objs = document.getElementsByClassName(
|
|
71
|
+
var objs = document.getElementsByClassName("dynamic-label-" + fields[i].toUpperCase());
|
|
72
72
|
if (objs && objs.length > 0) {
|
|
73
73
|
//说明此时是动态表单
|
|
74
74
|
for (var _i = 0; _i < objs.length; _i++) {
|
|
@@ -78,15 +78,15 @@ var getTitles = function getTitles(fields) {
|
|
|
78
78
|
var obj = document.getElementById(fields[i]);
|
|
79
79
|
if (obj) {
|
|
80
80
|
//获取标签的上级第一个存在ant-form-item-control-wrapper类的标签
|
|
81
|
-
var parentObj = parents(obj,
|
|
81
|
+
var parentObj = parents(obj, "ant-form-item-control-wrapper");
|
|
82
82
|
if (parentObj) {
|
|
83
83
|
var prevObj = parentObj.previousSibling;
|
|
84
84
|
if (prevObj) {
|
|
85
|
-
var labelObj = prevObj.getElementsByTagName(
|
|
85
|
+
var labelObj = prevObj.getElementsByTagName("label");
|
|
86
86
|
if (labelObj && labelObj.length > 0) {
|
|
87
|
-
var title = labelObj[0].attributes[
|
|
87
|
+
var title = labelObj[0].attributes["title"].nodeValue;
|
|
88
88
|
if (title) {
|
|
89
|
-
errorInfo +=
|
|
89
|
+
errorInfo += "," + title;
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
}
|
|
@@ -95,9 +95,9 @@ var getTitles = function getTitles(fields) {
|
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
97
|
for (var _title in errorInfoMap) {
|
|
98
|
-
errorInfo +=
|
|
98
|
+
errorInfo += "," + _title;
|
|
99
99
|
}
|
|
100
|
-
return errorInfo.length > 0 ? errorInfo.substring(1) :
|
|
100
|
+
return errorInfo.length > 0 ? errorInfo.substring(1) : "";
|
|
101
101
|
};
|
|
102
102
|
|
|
103
103
|
/**
|
|
@@ -105,12 +105,12 @@ var getTitles = function getTitles(fields) {
|
|
|
105
105
|
*/
|
|
106
106
|
var onlyDataErrorTip = function onlyDataErrorTip(res) {
|
|
107
107
|
var fieldStr = res.message.substring(14, res.message.length - 1);
|
|
108
|
-
var fields = fieldStr.split(
|
|
108
|
+
var fields = fieldStr.split(",");
|
|
109
109
|
var errorInfo = getTitles(fields);
|
|
110
110
|
if (errorInfo.length > 0) {
|
|
111
|
-
_message3.default.info(errorInfo +
|
|
111
|
+
_message3.default.info(errorInfo + "已经存在!");
|
|
112
112
|
} else {
|
|
113
|
-
_message3.default.info(
|
|
113
|
+
_message3.default.info("存在数据违反了唯一性约束,请检查之后再提交!");
|
|
114
114
|
}
|
|
115
115
|
};
|
|
116
116
|
|
|
@@ -119,12 +119,12 @@ var onlyDataErrorTip = function onlyDataErrorTip(res) {
|
|
|
119
119
|
*/
|
|
120
120
|
var dataToLongErrorTip = function dataToLongErrorTip(res) {
|
|
121
121
|
var fieldStr = res.message.substring(16, res.message.length - 1);
|
|
122
|
-
var fields = fieldStr.split(
|
|
122
|
+
var fields = fieldStr.split(",");
|
|
123
123
|
var errorInfo = getTitles([fields[0]]);
|
|
124
124
|
if (errorInfo.length > 0) {
|
|
125
|
-
_message3.default.info(errorInfo +
|
|
125
|
+
_message3.default.info(errorInfo + "数据太长(要求长度:" + fields[2] + ",实际长度:" + fields[1] + ")!");
|
|
126
126
|
} else {
|
|
127
|
-
_message3.default.info(
|
|
127
|
+
_message3.default.info("存在数据值太长,请检查之后再提交!");
|
|
128
128
|
}
|
|
129
129
|
};
|
|
130
130
|
|
|
@@ -133,12 +133,12 @@ var dataToLongErrorTip = function dataToLongErrorTip(res) {
|
|
|
133
133
|
*/
|
|
134
134
|
var columnNotNullTip = function columnNotNullTip(res) {
|
|
135
135
|
var fieldStr = res.message.substring(14, res.message.length - 1);
|
|
136
|
-
var fields = fieldStr.split(
|
|
136
|
+
var fields = fieldStr.split(",");
|
|
137
137
|
var errorInfo = getTitles(fields);
|
|
138
138
|
if (errorInfo.length > 0) {
|
|
139
|
-
_message3.default.info(errorInfo +
|
|
139
|
+
_message3.default.info(errorInfo + "不能为空!");
|
|
140
140
|
} else {
|
|
141
|
-
_message3.default.info(
|
|
141
|
+
_message3.default.info("存在数据不能为空,请检查之后再提交!");
|
|
142
142
|
}
|
|
143
143
|
};
|
|
144
144
|
|
|
@@ -148,19 +148,19 @@ var columnNotNullTip = function columnNotNullTip(res) {
|
|
|
148
148
|
* @param callback 回调方法
|
|
149
149
|
*/
|
|
150
150
|
var refreshToken = exports.refreshToken = function refreshToken(_refreshToken, callback) {
|
|
151
|
-
fetch(
|
|
152
|
-
method:
|
|
153
|
-
credentials:
|
|
151
|
+
fetch("api/refreshToken?refreshToken=" + _refreshToken, {
|
|
152
|
+
method: "GET",
|
|
153
|
+
credentials: "include",
|
|
154
154
|
headers: {
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
appId:
|
|
155
|
+
"Content-Type": "application/x-www-form-urlencoded",
|
|
156
|
+
"X-Requested-With": "XMLHttpRequest",
|
|
157
|
+
appId: "ly-hq"
|
|
158
158
|
}
|
|
159
159
|
}).then(function (response) {
|
|
160
160
|
return response.json();
|
|
161
161
|
}).then(function (res) {
|
|
162
162
|
if (res.meta && res.meta.statusCode === 200) {
|
|
163
|
-
if (callback && typeof callback ===
|
|
163
|
+
if (callback && typeof callback === "function") {
|
|
164
164
|
callback(res.data);
|
|
165
165
|
}
|
|
166
166
|
} else {
|
|
@@ -175,35 +175,35 @@ var refreshToken = exports.refreshToken = function refreshToken(_refreshToken, c
|
|
|
175
175
|
};
|
|
176
176
|
|
|
177
177
|
var userLogout = exports.userLogout = function userLogout() {
|
|
178
|
-
fetch(
|
|
179
|
-
method:
|
|
180
|
-
credentials:
|
|
178
|
+
fetch("logout", {
|
|
179
|
+
method: "GET",
|
|
180
|
+
credentials: "include",
|
|
181
181
|
headers: {
|
|
182
|
-
|
|
183
|
-
|
|
182
|
+
"Content-Type": "application/x-www-form-urlencoded",
|
|
183
|
+
"X-Requested-With": "XMLHttpRequest"
|
|
184
184
|
}
|
|
185
185
|
}).then(function (response) {
|
|
186
186
|
return response.json();
|
|
187
187
|
}).then(function (res) {
|
|
188
188
|
if (res.meta && res.meta.statusCode === 200) {
|
|
189
|
-
sessionStorage.removeItem(
|
|
190
|
-
sessionStorage.removeItem(
|
|
191
|
-
sessionStorage.removeItem(
|
|
192
|
-
sessionStorage.removeItem(
|
|
193
|
-
if (window.casStatus && window.casLogoutUrl && window.casLogoutUrl !=
|
|
189
|
+
sessionStorage.removeItem("userLogin");
|
|
190
|
+
sessionStorage.removeItem("access_token");
|
|
191
|
+
sessionStorage.removeItem("refresh_token");
|
|
192
|
+
sessionStorage.removeItem("user_last_operation_time");
|
|
193
|
+
if (window.casStatus && window.casLogoutUrl && window.casLogoutUrl != "") {
|
|
194
194
|
window.location = window.casLogoutUrl;
|
|
195
195
|
} else {
|
|
196
196
|
hashHistory.push({
|
|
197
|
-
pathname:
|
|
197
|
+
pathname: "/login"
|
|
198
198
|
});
|
|
199
199
|
}
|
|
200
200
|
} else {
|
|
201
|
-
_message3.default.error(
|
|
201
|
+
_message3.default.error("退出登陆失败,请稍后再试一次!");
|
|
202
202
|
}
|
|
203
203
|
return res;
|
|
204
204
|
}).catch(function (error) {
|
|
205
205
|
// 网络请求失败返回执行该回调函数,得到错误信息
|
|
206
|
-
_message3.default.error(
|
|
206
|
+
_message3.default.error("网络请求异常,请联系管理员");
|
|
207
207
|
return error;
|
|
208
208
|
});
|
|
209
209
|
};
|
|
@@ -221,54 +221,59 @@ var getDifferDate = exports.getDifferDate = function getDifferDate(firstDate, se
|
|
|
221
221
|
|
|
222
222
|
var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
|
|
223
223
|
var opts = {};
|
|
224
|
-
var tmpHeader =
|
|
224
|
+
var tmpHeader = "";
|
|
225
225
|
var url = pUrl;
|
|
226
|
-
var method =
|
|
226
|
+
var method = "";
|
|
227
227
|
|
|
228
|
-
if (url.startsWith(
|
|
228
|
+
if (url.startsWith("/")) {
|
|
229
229
|
url = window.baseUrl + url;
|
|
230
230
|
}
|
|
231
231
|
|
|
232
232
|
//默认的请求方式是POST
|
|
233
|
-
if (pMethod === undefined || pMethod ===
|
|
234
|
-
method =
|
|
233
|
+
if (pMethod === undefined || pMethod === "") {
|
|
234
|
+
method = "POST";
|
|
235
235
|
} else {
|
|
236
236
|
method = pMethod;
|
|
237
237
|
}
|
|
238
238
|
|
|
239
|
-
if (method.toLowerCase() ===
|
|
239
|
+
if (method.toLowerCase() === "get") {
|
|
240
240
|
//如果是get方式,则把参数拼凑到url路径上面
|
|
241
|
-
if (params !== undefined && params !==
|
|
241
|
+
if (params !== undefined && params !== "" && (0, _stringify2.default)(params) !== "{}") {
|
|
242
242
|
//如果params是Map对象,则需要先转换成字符串
|
|
243
|
-
if (typeof params ===
|
|
244
|
-
url = url +
|
|
243
|
+
if (typeof params === "string") {
|
|
244
|
+
url = url + "?" + params;
|
|
245
245
|
} else {
|
|
246
246
|
//不是字符串就一定是map对象
|
|
247
|
-
var paramsStr =
|
|
247
|
+
var paramsStr = "";
|
|
248
248
|
for (var key in params) {
|
|
249
|
-
if ((0, _typeof3.default)(params[key]) ===
|
|
249
|
+
if ((0, _typeof3.default)(params[key]) === "object") {
|
|
250
250
|
var params2 = params[key];
|
|
251
251
|
for (var key2 in params2) {
|
|
252
|
-
paramsStr +=
|
|
252
|
+
paramsStr += "&" + key + "." + key2 + "=" + params2[key2];
|
|
253
253
|
}
|
|
254
254
|
} else {
|
|
255
|
-
paramsStr +=
|
|
255
|
+
paramsStr += "&" + key + "=" + params[key];
|
|
256
256
|
}
|
|
257
257
|
}
|
|
258
258
|
|
|
259
|
-
url = paramsStr ? url +
|
|
259
|
+
url = paramsStr ? url + "?" + paramsStr : url;
|
|
260
260
|
//+"&time="+new Date().getTime();
|
|
261
261
|
}
|
|
262
262
|
} else {
|
|
263
263
|
//url = url + "?time="+new Date().getTime();
|
|
264
264
|
}
|
|
265
|
-
tmpHeader =
|
|
265
|
+
tmpHeader = "application/x-www-form-urlencoded;charset=UTF-8";
|
|
266
266
|
} else {
|
|
267
267
|
//除了get,所有方法改为post
|
|
268
|
-
method =
|
|
269
|
-
tmpHeader =
|
|
270
|
-
if (params !== undefined && params !==
|
|
268
|
+
method = "POST";
|
|
269
|
+
tmpHeader = "application/json;charset=UTF-8";
|
|
270
|
+
if (params !== undefined && params !== "") {
|
|
271
271
|
if (params.constructor === FormData) {
|
|
272
|
+
// 头像上传
|
|
273
|
+
opts.body = params;
|
|
274
|
+
} else if (params.constructor === String) {
|
|
275
|
+
// 表单提交
|
|
276
|
+
tmpHeader = "application/x-www-form-urlencoded;charset=UTF-8";
|
|
272
277
|
opts.body = params;
|
|
273
278
|
} else {
|
|
274
279
|
opts.body = (0, _stringify2.default)(params);
|
|
@@ -277,53 +282,54 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
|
|
|
277
282
|
}
|
|
278
283
|
opts.method = method;
|
|
279
284
|
// credentials: 'include',
|
|
280
|
-
opts.headers = {
|
|
285
|
+
opts.headers = { "Content-Type": tmpHeader };
|
|
281
286
|
if (params && params.constructor === FormData) {
|
|
287
|
+
// 解决头像上传问题
|
|
282
288
|
opts.headers = {};
|
|
283
289
|
}
|
|
284
290
|
|
|
285
291
|
//设置网关加密串
|
|
286
292
|
var timestemp = new Date().valueOf();
|
|
287
|
-
var csrfToken = (0, _MD.hex_md5)(
|
|
293
|
+
var csrfToken = (0, _MD.hex_md5)("timestamp=" + timestemp + ",key=" + "lianyi2019" //这个就是与网关约定的秘钥
|
|
288
294
|
);
|
|
289
|
-
if (url.indexOf(
|
|
290
|
-
url = url +
|
|
295
|
+
if (url.indexOf("?") > -1 && url.indexOf("=") > -1 && url.indexOf("?") < url.indexOf("=")) {
|
|
296
|
+
url = url + "&csrfTimestamp=" + timestemp + "&csrfToken=" + csrfToken;
|
|
291
297
|
} else {
|
|
292
|
-
url = url +
|
|
298
|
+
url = url + "?csrfTimestamp=" + timestemp + "&csrfToken=" + csrfToken;
|
|
293
299
|
}
|
|
294
300
|
|
|
295
|
-
var token = window.sessionStorage.getItem(
|
|
301
|
+
var token = window.sessionStorage.getItem("access_token");
|
|
296
302
|
if (token) {
|
|
297
303
|
opts.headers.Authorization = token;
|
|
298
304
|
}
|
|
299
|
-
var nodeEnv = process.env.NODE_ENV ||
|
|
300
|
-
if (nodeEnv ===
|
|
305
|
+
var nodeEnv = process.env.NODE_ENV || "development";
|
|
306
|
+
if (nodeEnv === "development") {
|
|
301
307
|
opts.headers.loginUserId = (0, _NHCore.getLoginUser)().userId;
|
|
302
308
|
}
|
|
303
309
|
|
|
304
|
-
opts.credentials =
|
|
310
|
+
opts.credentials = "include";
|
|
305
311
|
return fetch(url, opts).then(function (response) {
|
|
306
312
|
if (response.status === 200) {
|
|
307
|
-
if (pMethod ===
|
|
313
|
+
if (pMethod === "nbpost" || pMethod === "NBPOST") {
|
|
308
314
|
return response.blob();
|
|
309
315
|
} else {
|
|
310
|
-
if (window.gateway_version ===
|
|
316
|
+
if (window.gateway_version === "2") {
|
|
311
317
|
//新网关
|
|
312
|
-
sessionStorage.removeItem(
|
|
318
|
+
sessionStorage.removeItem("user_last_operation_time");
|
|
313
319
|
//记录用户最后一次操作时间
|
|
314
|
-
var userLastOperationTime = (0, _moment2.default)().format(
|
|
315
|
-
sessionStorage.setItem(
|
|
320
|
+
var userLastOperationTime = (0, _moment2.default)().format("YYYY-MM-DD HH:mm:ss");
|
|
321
|
+
sessionStorage.setItem("user_last_operation_time", userLastOperationTime);
|
|
316
322
|
}
|
|
317
323
|
return response.json();
|
|
318
324
|
}
|
|
319
325
|
} else if (response.status === 302) {
|
|
320
|
-
if (window.gateway_version ===
|
|
326
|
+
if (window.gateway_version === "2") {
|
|
321
327
|
//新网关
|
|
322
|
-
var userLogin = sessionStorage.getItem(
|
|
323
|
-
var _token = sessionStorage.getItem(
|
|
324
|
-
var _userLastOperationTime = sessionStorage.getItem(
|
|
328
|
+
var userLogin = sessionStorage.getItem("userLogin") ? JSON.parse(sessionStorage.getItem("userLogin")) : {};
|
|
329
|
+
var _token = sessionStorage.getItem("refresh_token");
|
|
330
|
+
var _userLastOperationTime = sessionStorage.getItem("user_last_operation_time");
|
|
325
331
|
var expiresIn = userLogin.expiresIn || 1800;
|
|
326
|
-
var userLastOperationTimeStr = _userLastOperationTime.replace(
|
|
332
|
+
var userLastOperationTimeStr = _userLastOperationTime.replace("/-/g", "/");
|
|
327
333
|
//用户最后一次操作时间
|
|
328
334
|
var userLastOperationTimeDate = new Date(userLastOperationTimeStr);
|
|
329
335
|
//当前时间
|
|
@@ -335,19 +341,19 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
|
|
|
335
341
|
} else {
|
|
336
342
|
//在token超时阈值范围内用户有操作,则重新生成accessToken
|
|
337
343
|
refreshToken(_token, function (newAccessToken) {
|
|
338
|
-
sessionStorage.removeItem(
|
|
339
|
-
sessionStorage.setItem(
|
|
340
|
-
var userLastOperationTime = (0, _moment2.default)().format(
|
|
341
|
-
sessionStorage.setItem(
|
|
344
|
+
sessionStorage.removeItem("access_token");
|
|
345
|
+
sessionStorage.setItem("access_token", newAccessToken);
|
|
346
|
+
var userLastOperationTime = (0, _moment2.default)().format("YYYY-MM-DD HH:mm:ss");
|
|
347
|
+
sessionStorage.setItem("user_last_operation_time", userLastOperationTime);
|
|
342
348
|
});
|
|
343
349
|
}
|
|
344
350
|
} else {
|
|
345
|
-
_message3.default.error(
|
|
346
|
-
sessionStorage.removeItem(
|
|
347
|
-
sessionStorage.removeItem(
|
|
351
|
+
_message3.default.error("未登录或登录已过期,请刷新页面重新登录!");
|
|
352
|
+
sessionStorage.removeItem("userLogin");
|
|
353
|
+
sessionStorage.removeItem("access_token");
|
|
348
354
|
}
|
|
349
355
|
} else if (response.status === 401) {
|
|
350
|
-
_message3.default.warning(
|
|
356
|
+
_message3.default.warning("您正在尝试访问未授权的功能!");
|
|
351
357
|
} else {
|
|
352
358
|
//如果存在错误的回调方法,则调用回调方法,否则提示网络请求异常
|
|
353
359
|
if (errorFunc) {
|
|
@@ -362,41 +368,41 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
|
|
|
362
368
|
}
|
|
363
369
|
}).then(function (res) {
|
|
364
370
|
if (res === undefined) {
|
|
365
|
-
_message3.default.error(
|
|
371
|
+
_message3.default.error("系统出现异常,请联系管理员!");
|
|
366
372
|
return undefined;
|
|
367
373
|
} else if (res.meta && res.meta.statusCode === 401 || res.code === 302) {
|
|
368
374
|
//判断是否没有权限
|
|
369
|
-
_message3.default.warning(
|
|
375
|
+
_message3.default.warning("您正在尝试访问未授权的功能!");
|
|
370
376
|
return undefined;
|
|
371
377
|
} else if (res.meta && res.meta.statusCode === 500) {
|
|
372
378
|
var msg = res.meta.message;
|
|
373
379
|
if (null !== msg) {
|
|
374
|
-
if (msg.startsWith(
|
|
380
|
+
if (msg.startsWith("businessLogicError[")) {
|
|
375
381
|
//自定义的提示(错误)
|
|
376
382
|
_message3.default.error(msg.substring(19, msg.length - 1));
|
|
377
383
|
// Modal.error({ title: '错误提示', content: res.message.substring(19,res.message.length-1),});
|
|
378
|
-
} else if (msg.startsWith(
|
|
384
|
+
} else if (msg.startsWith("businessLogicWarm[")) {
|
|
379
385
|
//自定义的提示(警告)
|
|
380
386
|
_message3.default.warning(msg.substring(18, msg.length - 1));
|
|
381
387
|
// Modal.warning({ title: '警告提示', content: res.message.substring(18,res.message.length-1),});
|
|
382
|
-
} else if (msg.startsWith(
|
|
388
|
+
} else if (msg.startsWith("businessLogicInfo[")) {
|
|
383
389
|
//自定义的提示(消息)
|
|
384
390
|
_message3.default.info(msg.substring(18, msg.length - 1));
|
|
385
391
|
// Modal.info({ title: '消息提示', content: res.message.substring(18,res.message.length-1),});
|
|
386
|
-
} else if (msg.startsWith(
|
|
392
|
+
} else if (msg.startsWith("onlyDataError[")) {
|
|
387
393
|
//数据唯一性异常
|
|
388
394
|
onlyDataErrorTip(res.meta);
|
|
389
|
-
} else if (msg.startsWith(
|
|
395
|
+
} else if (msg.startsWith("dataToLongError[")) {
|
|
390
396
|
//数据太长
|
|
391
397
|
dataToLongErrorTip(res.meta);
|
|
392
|
-
} else if (msg.startsWith(
|
|
398
|
+
} else if (msg.startsWith("columnNotNull[")) {
|
|
393
399
|
//数据不能为空异常
|
|
394
400
|
columnNotNullTip(res.meta);
|
|
395
401
|
} else {
|
|
396
|
-
_message3.default.error(
|
|
402
|
+
_message3.default.error("系统出现异常,请联系管理员!");
|
|
397
403
|
}
|
|
398
404
|
} else {
|
|
399
|
-
_message3.default.error(
|
|
405
|
+
_message3.default.error("系统出现异常,请联系管理员!");
|
|
400
406
|
}
|
|
401
407
|
// Modal.error({ title: '错误提示', content:'系统出现异常,请联系管理员!'});
|
|
402
408
|
return undefined;
|
|
@@ -404,37 +410,37 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
|
|
|
404
410
|
//判断出现的问题
|
|
405
411
|
var _msg = res.message;
|
|
406
412
|
if (!_msg) {
|
|
407
|
-
_message3.default.error(
|
|
408
|
-
} else if (_msg.startsWith(
|
|
413
|
+
_message3.default.error("系统出现异常,请联系管理员!");
|
|
414
|
+
} else if (_msg.startsWith("businessLogicError[")) {
|
|
409
415
|
//自定义的提示(错误)
|
|
410
416
|
_message3.default.error(_msg.substring(19, _msg.length - 1));
|
|
411
417
|
// Modal.error({ title: '错误提示', content: msg.substring(19,msg.length-1),});
|
|
412
|
-
} else if (_msg.startsWith(
|
|
418
|
+
} else if (_msg.startsWith("businessLogicWarm[")) {
|
|
413
419
|
//自定义的提示(警告)
|
|
414
420
|
_message3.default.warning(_msg.substring(18, _msg.length - 1));
|
|
415
421
|
// Modal.warning({ title: '警告提示', content: msg.substring(18,msg.length-1),});
|
|
416
|
-
} else if (_msg.startsWith(
|
|
422
|
+
} else if (_msg.startsWith("businessLogicInfo[")) {
|
|
417
423
|
//自定义的提示(消息)
|
|
418
424
|
_message3.default.info(_msg.substring(18, _msg.length - 1));
|
|
419
425
|
// Modal.info({ title: '消息提示', content: msg.substring(18,msg.length-1),});
|
|
420
|
-
} else if (_msg.startsWith(
|
|
426
|
+
} else if (_msg.startsWith("onlyDataError[")) {
|
|
421
427
|
//数据唯一性异常
|
|
422
428
|
onlyDataErrorTip(res);
|
|
423
|
-
} else if (_msg.startsWith(
|
|
429
|
+
} else if (_msg.startsWith("dataToLongError[")) {
|
|
424
430
|
//数据太长
|
|
425
431
|
dataToLongErrorTip(res);
|
|
426
|
-
} else if (_msg.startsWith(
|
|
432
|
+
} else if (_msg.startsWith("columnNotNull[")) {
|
|
427
433
|
//数据不能为空异常
|
|
428
434
|
columnNotNullTip(res);
|
|
429
435
|
} else if (res.code == 10002) {
|
|
430
|
-
_message3.default.warn(
|
|
436
|
+
_message3.default.warn("\u53C2\u6570\u6709\u8BEF\uFF1A" + res.message);
|
|
431
437
|
} else {
|
|
432
|
-
_message3.default.error(
|
|
438
|
+
_message3.default.error("系统出现异常,请联系管理员!");
|
|
433
439
|
// Modal.error({ title: '错误提示', content:'系统出现异常,请联系管理员!'});
|
|
434
440
|
}
|
|
435
441
|
return undefined;
|
|
436
442
|
} else if (res.status && res.status === 404) {
|
|
437
|
-
_message3.default.error(
|
|
443
|
+
_message3.default.error("系统出现异常,请联系管理员!");
|
|
438
444
|
// Modal.error({ title: '错误提示', content:'系统出现异常,请联系管理员!'});
|
|
439
445
|
return undefined;
|
|
440
446
|
} else if (res && res.code && res.code === 200) {
|
|
@@ -445,14 +451,14 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
|
|
|
445
451
|
return res;
|
|
446
452
|
} else {
|
|
447
453
|
//剩下的情况都是有错误
|
|
448
|
-
_message3.default.error(
|
|
454
|
+
_message3.default.error("系统出现异常,请联系管理员!");
|
|
449
455
|
// Modal.error({ title: '错误提示', content:'系统出现异常,请联系管理员!'});
|
|
450
456
|
}
|
|
451
457
|
//在此处统一对后台抛出来的异常进行处理
|
|
452
458
|
return undefined;
|
|
453
459
|
}).catch(function (error) {
|
|
454
|
-
console.log(
|
|
455
|
-
_message3.default.error(
|
|
460
|
+
console.log("请求异常:", error.message);
|
|
461
|
+
_message3.default.error("系统出现异常,请联系管理员!");
|
|
456
462
|
return;
|
|
457
463
|
});
|
|
458
464
|
};
|
package/lib/utils/index.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.getTitleConfig = exports.keyToLower = exports.randomNumEnum = exports.getValueFromArray = exports.getLabelValueTree = exports.cutArray = exports.arrayMove = exports.arrayMoveMutate = exports.checkPassword = exports.matchParamsPath = exports.urlToList = exports.getHashParam = exports.isUrl = exports.getRouterAuthority = exports.transformDate = exports.getStrLength = exports.DateUtil = exports._utf8_encode = exports.encode = exports.decode = undefined;
|
|
6
|
+
exports.createUuid = exports.getTitleConfig = exports.keyToLower = exports.randomNumEnum = exports.getValueFromArray = exports.getLabelValueTree = exports.cutArray = exports.arrayMove = exports.arrayMoveMutate = exports.checkPassword = exports.matchParamsPath = exports.urlToList = exports.getHashParam = exports.isUrl = exports.getRouterAuthority = exports.transformDate = exports.getStrLength = exports.DateUtil = exports._utf8_encode = exports.encode = exports.decode = undefined;
|
|
7
7
|
|
|
8
8
|
var _promise = require('babel-runtime/core-js/promise');
|
|
9
9
|
|
|
@@ -68,7 +68,7 @@ var decode = exports.decode = function decode(input) {
|
|
|
68
68
|
* @Author: admin
|
|
69
69
|
* @Date: 2020-03-06 09:45:52
|
|
70
70
|
* @LastEditors: jiangzhongxin
|
|
71
|
-
* @LastEditTime: 2023-
|
|
71
|
+
* @LastEditTime: 2023-12-29 17:33:26
|
|
72
72
|
*/
|
|
73
73
|
var encode = exports.encode = function encode(input) {
|
|
74
74
|
var _keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
|
|
@@ -629,4 +629,40 @@ var getTitleConfig = exports.getTitleConfig = function getTitleConfig(document)
|
|
|
629
629
|
return res;
|
|
630
630
|
}).catch(function (error) {});
|
|
631
631
|
}
|
|
632
|
+
};
|
|
633
|
+
|
|
634
|
+
//获取UUID
|
|
635
|
+
var createUuid = exports.createUuid = function createUuid() {
|
|
636
|
+
var len = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 32;
|
|
637
|
+
var radix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 16;
|
|
638
|
+
|
|
639
|
+
var chars = '0123456789abcdefghijklmnopqrstuvwxyz'.split('');
|
|
640
|
+
var uuid = [],
|
|
641
|
+
i;
|
|
642
|
+
radix = radix || chars.length;
|
|
643
|
+
|
|
644
|
+
if (len) {
|
|
645
|
+
// Compact form
|
|
646
|
+
for (i = 0; i < len; i++) {
|
|
647
|
+
uuid[i] = chars[0 | Math.random() * radix];
|
|
648
|
+
}
|
|
649
|
+
} else {
|
|
650
|
+
// rfc4122, version 4 form
|
|
651
|
+
var r;
|
|
652
|
+
|
|
653
|
+
// rfc4122 requires these characters
|
|
654
|
+
uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
|
|
655
|
+
uuid[14] = '4';
|
|
656
|
+
|
|
657
|
+
// Fill in random data. At i==19 set the high bits of clock sequence as
|
|
658
|
+
// per rfc4122, sec. 4.1.5
|
|
659
|
+
for (i = 0; i < 36; i++) {
|
|
660
|
+
if (!uuid[i]) {
|
|
661
|
+
r = 0 | Math.random() * 16;
|
|
662
|
+
uuid[i] = chars[i == 19 ? r & 0x3 | 0x8 : r];
|
|
663
|
+
}
|
|
664
|
+
}
|
|
665
|
+
}
|
|
666
|
+
|
|
667
|
+
return uuid.join('');
|
|
632
668
|
};
|