@lingxiteam/assets 0.11.30-alpha.6 → 0.11.30-alpha.7
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/es/error/errorCatch/index.js +39 -0
- package/es/error/errorDisplay/Mobile/defaultGlobalConfig.js +1 -1
- package/es/error/errorDisplay/Web/Drawer/Drawer.js +1 -1
- package/es/error/errorDisplay/Web/ErrorMsg/index.js +6 -5
- package/es/error/errorDisplay/compUtils.js +22 -1
- package/es/error/errorDisplay/const.js +25 -1
- package/es/error/index.js +3 -1
- package/es/index.d.ts +2 -2
- package/es/index.js +2 -2
- package/lib/index.js +12 -0
- package/package.json +1 -1
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
// TODO
|
|
2
|
+
import ErrorMsg from '../errorDisplay/Web/ErrorMsg';
|
|
3
|
+
var errorDisplayComp = ErrorMsg;
|
|
4
|
+
var info = {};
|
|
5
|
+
// eslint-disable-next-line
|
|
6
|
+
var errorHandler = function errorHandler(msg, url, row, col, error) {
|
|
7
|
+
errorDisplayComp.open({
|
|
8
|
+
code: "02-".concat(info.code, "-1-000-00000"),
|
|
9
|
+
msg: "\u7A0B\u5E8F\u53D1\u751F\u5F02\u5E38: ".concat(msg),
|
|
10
|
+
stack: error
|
|
11
|
+
});
|
|
12
|
+
return true;
|
|
13
|
+
};
|
|
14
|
+
var rejectHandler = function rejectHandler(e) {
|
|
15
|
+
e.preventDefault();
|
|
16
|
+
// errorDisplayComp.open({
|
|
17
|
+
// code: `02-${info.code}-1-000-00000`,
|
|
18
|
+
// msg: `程序发生异常: ${msg}`,
|
|
19
|
+
// stack: error,
|
|
20
|
+
// });
|
|
21
|
+
return true;
|
|
22
|
+
};
|
|
23
|
+
var start = function start(_ref) {
|
|
24
|
+
var errorDisplay = _ref.errorDisplay,
|
|
25
|
+
_ref$projectInfo = _ref.projectInfo,
|
|
26
|
+
projectInfo = _ref$projectInfo === void 0 ? {} : _ref$projectInfo;
|
|
27
|
+
if (errorDisplay) errorDisplayComp = errorDisplay;
|
|
28
|
+
info = projectInfo;
|
|
29
|
+
window.addEventListener('error', errorHandler, true);
|
|
30
|
+
window.addEventListener('unhandledrejection', rejectHandler);
|
|
31
|
+
};
|
|
32
|
+
var stop = function stop() {
|
|
33
|
+
window.removeEventListener('error', errorHandler);
|
|
34
|
+
window.removeEventListener('unhandledrejection', rejectHandler);
|
|
35
|
+
};
|
|
36
|
+
export default {
|
|
37
|
+
start: start,
|
|
38
|
+
stop: stop
|
|
39
|
+
};
|
|
@@ -5,7 +5,7 @@ export var defaultGlobalConfig = {
|
|
|
5
5
|
maxLen: null,
|
|
6
6
|
showType: 'modal',
|
|
7
7
|
maxCount: null,
|
|
8
|
-
resolve: process.env.
|
|
8
|
+
resolve: process.env.LingXi_ERROR_RESOLVE || resolveRequestPath('/lcdp/error/queryErrorInfoByCodeOrMsg')
|
|
9
9
|
};
|
|
10
10
|
export var setGlobalConfig = function setGlobalConfig() {
|
|
11
11
|
var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
@@ -176,7 +176,7 @@ var Drawer = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
176
176
|
href: item.url,
|
|
177
177
|
target: "_blank",
|
|
178
178
|
rel: "noreferrer"
|
|
179
|
-
}, "\
|
|
179
|
+
}, "\u6587\u6863\u94FE\u63A5"))));
|
|
180
180
|
})));
|
|
181
181
|
}
|
|
182
182
|
return isDomEle(tabsCont) ? tabsCont : null;
|
|
@@ -24,7 +24,7 @@ var renderErrList = function renderErrList(errList, opts) {
|
|
|
24
24
|
var erorrListShowType = opts.erorrListShowType;
|
|
25
25
|
if (Array.isArray(errList) && errList.length > 0) {
|
|
26
26
|
return errList.map(function (item) {
|
|
27
|
-
var _item$guidance;
|
|
27
|
+
var _item$guidance, _item$guidance2;
|
|
28
28
|
return {
|
|
29
29
|
key: item === null || item === void 0 ? void 0 : item.errorInfoId,
|
|
30
30
|
title: item === null || item === void 0 ? void 0 : item.errorTypeName,
|
|
@@ -32,9 +32,10 @@ var renderErrList = function renderErrList(errList, opts) {
|
|
|
32
32
|
content: item === null || item === void 0 ? void 0 : item.errorMsg,
|
|
33
33
|
status: statusClrMap[item === null || item === void 0 ? void 0 : item.errorType],
|
|
34
34
|
subContent: erorrListShowType === 'innerWindow' && (item === null || item === void 0 ? void 0 : (_item$guidance = item.guidance) === null || _item$guidance === void 0 ? void 0 : _item$guidance.content),
|
|
35
|
-
|
|
35
|
+
url: item === null || item === void 0 ? void 0 : (_item$guidance2 = item.guidance) === null || _item$guidance2 === void 0 ? void 0 : _item$guidance2.guidanceUrl,
|
|
36
|
+
extra: (item === null || item === void 0 ? void 0 : item.guidance) && erorrListShowType === 'openDrawer' && /*#__PURE__*/React.createElement("a", {
|
|
36
37
|
onClick: function onClick() {
|
|
37
|
-
var _item$
|
|
38
|
+
var _item$guidance3;
|
|
38
39
|
drawerHandel.open({
|
|
39
40
|
title: item === null || item === void 0 ? void 0 : item.errorTypeName,
|
|
40
41
|
status: statusClrMap[item === null || item === void 0 ? void 0 : item.errorType],
|
|
@@ -42,12 +43,12 @@ var renderErrList = function renderErrList(errList, opts) {
|
|
|
42
43
|
content: /*#__PURE__*/React.createElement("div", {
|
|
43
44
|
// eslint-disable-next-line react/no-danger
|
|
44
45
|
dangerouslySetInnerHTML: {
|
|
45
|
-
__html: item === null || item === void 0 ? void 0 : (_item$
|
|
46
|
+
__html: item === null || item === void 0 ? void 0 : (_item$guidance3 = item.guidance) === null || _item$guidance3 === void 0 ? void 0 : _item$guidance3.content
|
|
46
47
|
}
|
|
47
48
|
})
|
|
48
49
|
});
|
|
49
50
|
}
|
|
50
|
-
}, "\u8BE6\u60C5")
|
|
51
|
+
}, "\u8BE6\u60C5")
|
|
51
52
|
};
|
|
52
53
|
});
|
|
53
54
|
}
|
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
5
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
6
|
+
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
7
|
+
import { httpErrorMap } from './const';
|
|
1
8
|
function getChildren(obj) {
|
|
2
9
|
var objChild = [];
|
|
3
10
|
var objs = obj.getElementsByTagName('*');
|
|
@@ -20,4 +27,18 @@ var resolveRequestPath = function resolveRequestPath(path) {
|
|
|
20
27
|
}
|
|
21
28
|
return '';
|
|
22
29
|
};
|
|
23
|
-
|
|
30
|
+
|
|
31
|
+
// eslint-disable-next-line
|
|
32
|
+
var getHttpErrorByCode = function getHttpErrorByCode(code, url, params, response) {
|
|
33
|
+
if (httpErrorMap[code]) {
|
|
34
|
+
var _err$msg;
|
|
35
|
+
var err = _objectSpread({}, httpErrorMap[code]);
|
|
36
|
+
// eslint-disable-next-line
|
|
37
|
+
err.msg = (_err$msg = err.msg) === null || _err$msg === void 0 ? void 0 : _err$msg.replace(/\$\{[\w.]+\}/g, function (varPath) {
|
|
38
|
+
return eval(varPath.slice(2, -1));
|
|
39
|
+
});
|
|
40
|
+
return err;
|
|
41
|
+
}
|
|
42
|
+
return null;
|
|
43
|
+
};
|
|
44
|
+
export { getChildren, resolveRequestPath, getHttpErrorByCode };
|
|
@@ -12,6 +12,25 @@ export var statusClrMap = {
|
|
|
12
12
|
config: 'purple',
|
|
13
13
|
platform: 'blue'
|
|
14
14
|
};
|
|
15
|
+
export var httpErrorMap = {
|
|
16
|
+
404: {
|
|
17
|
+
code: '01-00-2-000-000404',
|
|
18
|
+
msg: '服务请求失败,请求资源不存在(404): ${url}'
|
|
19
|
+
},
|
|
20
|
+
// eslint-disable-line
|
|
21
|
+
413: {
|
|
22
|
+
code: '01-00-2-000-000413',
|
|
23
|
+
msg: '服务请求失败,请求报文体超过网关限制'
|
|
24
|
+
},
|
|
25
|
+
502: {
|
|
26
|
+
code: '06-00-3-000-000502',
|
|
27
|
+
msg: '服务请求失败,请稍后再试或者联系系统管理员'
|
|
28
|
+
},
|
|
29
|
+
504: {
|
|
30
|
+
code: '06-00-3-000-000504',
|
|
31
|
+
msg: '服务请求失败,请稍后再试或者联系系统管理员'
|
|
32
|
+
}
|
|
33
|
+
};
|
|
15
34
|
|
|
16
35
|
// 预留更新‘解决方案’
|
|
17
36
|
var localArticles = {};
|
|
@@ -36,10 +55,15 @@ export var articleMap = {
|
|
|
36
55
|
title: '服务请求失败,请求资源不存在(404)',
|
|
37
56
|
content: "<dl>\n <dt>\u8BF7\u6C42\u5931\u8D25\u53EF\u80FD\u539F\u56E0\uFF1A</dt>\n <dd>\n <ol>\n <li>\u8D44\u6E90\u5730\u5740\u4E0D\u6B63\u786E\uFF1B</li>\n <li>\u8D44\u6E90\u5DF2\u88AB\u5220\u9664\uFF0C\u6D4F\u89C8\u5668\u7F13\u5B58\u5BFC\u81F4\u8D44\u6E90\u5730\u5740\u6CA1\u66F4\u65B0\uFF1B</li>\n <li>\u9875\u9762\u7248\u672C\u8DDF\u670D\u52A1\u7248\u672C\u4E0D\u4E00\u81F4\uFF1B</li>\n </ol>\n </dd>\n </dl>\n <dt>\u89E3\u51B3\u65B9\u6CD5\uFF1A</dt>\n <dd>\n <ol>\n <li>\u6E05\u9664\u6D4F\u89C8\u5668\u7F13\u5B58\u518D\u91CD\u8BD5\uFF1B</li>\n <li>\u8054\u7CFB\u7CFB\u7EDF\u7BA1\u7406\u5458\u6392\u67E5\u8D44\u6E90\u5730\u5740\u548C\u7248\u672C\u4FE1\u606F\uFF1B</li>\n </ol>\n </dd>\n </dl>\n "
|
|
38
57
|
},
|
|
58
|
+
// 请求413
|
|
59
|
+
'01-00-2-000-000413': localArticles['01-00-2-000-000413'] || {
|
|
60
|
+
title: '服务请求失败,请求报文体超过网关限制',
|
|
61
|
+
content: "<dl>\n <dt>\u8BF7\u6C42\u5931\u8D25\u539F\u56E0\uFF1A</dt>\n <dd>\n <ol>\n <li>\u8BF7\u6C42\u62A5\u6587\u4F53\u8FC7\u5927\u5F15\u8D77\u7684\uFF0C\u8BF7\u6C42\u957F\u5EA6\u8D85\u8FC7\u4E86\u7F51\u5173\u9ED8\u8BA4\u7684\u7F13\u5B58\u5927\u5C0F\u548C\u6700\u5927\u5BA2\u6237\u7AEF\u6700\u5927\u8BF7\u6C42\u5927\u5C0F\uFF1B</li>\n </ol>\n </dd>\n </dl>\n <dt>\u89E3\u51B3\u65B9\u6CD5\uFF1A</dt>\n <dd>\n <ol>\n <li>\u8BF7\u8054\u7CFB\u7CFB\u7EDF\u7BA1\u7406\u5458\uFF0C\u8C03\u6574\u7F51\u5173\u914D\u7F6E</li>\n </ol>\n </dd>\n </dl>\n "
|
|
62
|
+
},
|
|
39
63
|
// 网关错误
|
|
40
64
|
'06-00-3-000-000502': localArticles['06-00-3-000-000502'] || {
|
|
41
65
|
title: '服务请求失败,请稍后再试或者联系系统管理员',
|
|
42
|
-
content: "<dl>\n <dt>\u8BF7\u6C42\u5931\u8D25\u53EF\u80FD\u539F\u56E0\uFF1A</dt>\n <dd>\n <ol>\n <li>\u5F53\u524D\u7CFB\u7EDF\u5904\u4E8E\u4F7F\u7528\u9AD8\u5CF0\u671F\uFF0C\u54CD\u5E94\u8F83\u6162\uFF1B</li>\n <li>\u7CFB\u7EDF\u5B58\u5728\u5185\u90E8\u9519\u8BEF\uFF1B</li>\n
|
|
66
|
+
content: "<dl>\n <dt>\u8BF7\u6C42\u5931\u8D25\u53EF\u80FD\u539F\u56E0\uFF1A</dt>\n <dd>\n <ol>\n <li>\u7CFB\u7EDF\u6B63\u5728\u53D1\u7248\uFF1B</li>\n <li>\u5F53\u524D\u7CFB\u7EDF\u5904\u4E8E\u4F7F\u7528\u9AD8\u5CF0\u671F\uFF0C\u54CD\u5E94\u8F83\u6162\uFF1B</li>\n <li>\u7CFB\u7EDF\u5B58\u5728\u5185\u90E8\u9519\u8BEF\uFF1B</li>\n </ol>\n </dd>\n </dl>\n <dt>\u89E3\u51B3\u65B9\u6CD5\uFF1A</dt>\n <dd>\n <ol>\n <li>\u8BF7\u7A0D\u540E\u518D\u8BD5\uFF1B</li>\n <li>\u8BF7\u8054\u7CFB\u7CFB\u7EDF\u7BA1\u7406\u5458\uFF0C\u6838\u67E5\uFF1A<br />\n - \u4ECE\u670D\u52A1\u7AEF\u541E\u5410\u91CF\u627F\u8F7D\u8003\u8651\uFF0C\u662F\u5426\u9700\u8981\u8FDB\u884C\u7CFB\u7EDF\u6269\u5BB9\uFF1B<br />\n - \u4ECE\u670D\u52A1\u7AEF\u7A0B\u5E8F\u95EE\u9898\u65B9\u9762\u8003\u8651\uFF0C\u662F\u5426\u9700\u8981\u8FDB\u884C\u7A0B\u5E8F\u4F18\u5316\uFF1B<br />\n - \u4ECE\u7F51\u7EDC\u95EE\u9898\u65B9\u9762\u8003\u8651\uFF0C\u662F\u5426\u9700\u8981\u68C0\u67E5\u7F51\u7EDC\u6D88\u8017\u3001\u8D1F\u8F7D\u5747\u8861\u914D\u7F6E\u662F\u5426\u6B63\u786E\u3002\n </li>\n </ol>\n </dd>\n </dl>\n "
|
|
43
67
|
},
|
|
44
68
|
// 网关超时
|
|
45
69
|
'06-00-3-000-000504': localArticles['06-00-3-000-000504'] || {
|
package/es/error/index.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import ErrorMsg from './errorDisplay/Web/ErrorMsg';
|
|
2
2
|
import MobileErrorMsg from './errorDisplay/Mobile/ErrorMsg';
|
|
3
|
-
|
|
3
|
+
import { getHttpErrorByCode } from './errorDisplay/compUtils';
|
|
4
|
+
import errorCatch from './errorCatch';
|
|
5
|
+
export { ErrorMsg, MobileErrorMsg, getHttpErrorByCode, errorCatch };
|
package/es/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import security from './security';
|
|
2
|
-
import { ErrorMsg, MobileErrorMsg } from './error';
|
|
2
|
+
import { ErrorMsg, MobileErrorMsg, getHttpErrorByCode, errorCatch } from './error';
|
|
3
3
|
export declare const IconCheckSvg: string;
|
|
4
4
|
export declare const IconNormalCheckSvg: string;
|
|
5
|
-
export { security, ErrorMsg, MobileErrorMsg };
|
|
5
|
+
export { security, ErrorMsg, MobileErrorMsg, getHttpErrorByCode, errorCatch };
|
package/es/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getSvgImageBase64 } from './utils/img';
|
|
2
2
|
import security from './security';
|
|
3
|
-
import { ErrorMsg, MobileErrorMsg } from './error';
|
|
3
|
+
import { ErrorMsg, MobileErrorMsg, getHttpErrorByCode, errorCatch } from './error';
|
|
4
4
|
export var IconCheckSvg = getSvgImageBase64("<?xml version=\"1.0\" encoding=\"UTF-8\"?><svg width=\"22px\" height=\"22px\" viewBox=\"0 0 22 22\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"><title>\u5168\u5C40\u6837\u5F0F:20/\u539F\u5B50\u7EA7\u63A7\u4EF6/\u590D\u9009/\u72B6\u6001:#\u9009\u4E2D</title><g id=\"\u63A7\u4EF6\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\"><g id=\"system-complete\"><path d=\"M11,0 C17.075904,0 22,4.92409598 22,11 C22,17.075904 17.0734732,22 11,22 C4.92652679,22 0,17.0734732 0,11 C0,4.92652679 4.92409598,0 11,0 Z\" id=\"Shape\" fill=\"#1890FF\"></path><path d=\"M9.42871875,12.9681652 L7.2069029,10.7463493 C6.90006126,10.4395077 6.40257267,10.4395077 6.09573103,10.7463493 C5.78889035,11.05319 5.78889035,11.550677 6.09573103,11.8575177 C6.09573161,11.8575183 6.0957322,11.8575189 6.09573278,11.8575195 L8.72212536,14.4838955 C9.11265701,14.8744045 9.74581424,14.874407 10.136349,14.483901 L10.5404063,14.0798527 L10.5404063,14.0798527 L16.2813591,8.33795955 C16.588183,8.03108543 16.5881626,7.53359119 16.2813136,7.22674219 C15.974472,6.91990055 15.4769834,6.91990055 15.1701417,7.22674219 L9.42871875,12.9681652 L9.42871875,12.9681652 Z\" id=\"Path\" fill=\"#FFFFFF\"></path></g></g></svg>");
|
|
5
5
|
export var IconNormalCheckSvg = getSvgImageBase64("<?xml version=\"1.0\" encoding=\"UTF-8\"?><svg width=\"22px\" height=\"22px\" viewBox=\"0 0 22 22\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"><title>\u5168\u5C40\u6837\u5F0F:20/\u539F\u5B50\u7EA7\u63A7\u4EF6/\u590D\u9009/\u72B6\u6001:\u672A\u9009\u4E2D</title><g id=\"\u63A7\u4EF6\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\"><g id=\"\u5143\u7D20/\u9009\u62E9/\u672A\u9009\u4E2D\"><path d=\"M11,22 C4.93492502,22 0,17.0653546 0,10.999496 C0,4.9337633 4.93492502,0 11,0 C17.065075,0 22,4.93464539 22,10.999496 C22,17.0644725 17.0660846,22 11,22\" id=\"Fill\" fill=\"#FFFFFF\"></path><path d=\"M11,0.5 C13.8998633,0.5 16.5248731,1.67505184 18.4249106,3.57508938 C20.3249482,5.47512693 21.5,8.10013672 21.5,11 C21.5,13.8995696 20.3245821,16.5243277 18.4245965,18.4243132 C16.5242275,20.3246822 13.8989967,21.5 11,21.5 C8.10129687,21.5 5.47631792,20.324316 3.57600094,18.4239991 C1.67568396,16.5236821 0.5,13.8987031 0.5,11 C0.5,8.10100334 1.67531776,5.47577251 3.57568679,3.57540349 C5.47567234,1.67541793 8.10043037,0.5 11,0.5 Z\" id=\"Shape\" stroke=\"#CCCCCC\"></path></g></g></svg>");
|
|
6
|
-
export { security, ErrorMsg, MobileErrorMsg };
|
|
6
|
+
export { security, ErrorMsg, MobileErrorMsg, getHttpErrorByCode, errorCatch };
|
package/lib/index.js
CHANGED
|
@@ -16,6 +16,18 @@ Object.defineProperty(exports, "MobileErrorMsg", {
|
|
|
16
16
|
return _error.MobileErrorMsg;
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
|
+
Object.defineProperty(exports, "errorCatch", {
|
|
20
|
+
enumerable: true,
|
|
21
|
+
get: function get() {
|
|
22
|
+
return _error.errorCatch;
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
Object.defineProperty(exports, "getHttpErrorByCode", {
|
|
26
|
+
enumerable: true,
|
|
27
|
+
get: function get() {
|
|
28
|
+
return _error.getHttpErrorByCode;
|
|
29
|
+
}
|
|
30
|
+
});
|
|
19
31
|
Object.defineProperty(exports, "security", {
|
|
20
32
|
enumerable: true,
|
|
21
33
|
get: function get() {
|