wt-enjoy-link-antd-repack 4.1.96 → 4.1.98
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/dist/esm/package/requestWrapper/index.d.ts.map +1 -1
- package/dist/esm/package/requestWrapper/index.js +45 -29
- package/dist/esm/package/requestWrapper/type.d.ts +5 -0
- package/dist/esm/package/requestWrapper/type.d.ts.map +1 -1
- package/dist/esm/utils/sysUtils.d.ts +4 -0
- package/dist/esm/utils/sysUtils.d.ts.map +1 -1
- package/dist/esm/utils/sysUtils.js +30 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAA;AA2RhD,eAAO,MAAM,OAAO,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,kBAAkB,KAAK,OAAO,CAAC,CAAC,CAuCtE,CAAA;AAED,eAAO,MAAM,SAAS,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,kBAAkB,KAAK,OAAO,CAAC,CAAC,CAsBxE,CAAA;AAED,cAAc,QAAQ,CAAA"}
|
|
@@ -17,7 +17,7 @@ import { pick, sortBy } from 'lodash';
|
|
|
17
17
|
import { BasicRequest } from "./baseRequest";
|
|
18
18
|
import { generalRequestURI } from "./utils";
|
|
19
19
|
import { BUBU100_CACHE_WAREINFO_KEY, BUBU100_CACHE_USERINFO_KEY } from "../../constant";
|
|
20
|
-
import { IsSubSYS, cacheDB, clearAuthToken, clearToken, getAuthToken, getToken, setAuthToken } from "../../utils";
|
|
20
|
+
import { IsSubSYS, cacheDB, clearAuthToken, clearToken, compareVersions, getAuthToken, getSystemByUrl, getToken, setAuthToken, updateVersionHandle } from "../../utils";
|
|
21
21
|
|
|
22
22
|
/**
|
|
23
23
|
* 系统触发请求的时候是以模块为单位的,除了登陆到系统进行加载的时候,其他请求都是在模块内部进行的且还是通过手动触发的
|
|
@@ -87,10 +87,28 @@ var GeneralRequestData = function GeneralRequestData(data, beanName) {
|
|
|
87
87
|
return _defineProperty({}, beanName, tmpRequestData);
|
|
88
88
|
};
|
|
89
89
|
|
|
90
|
+
/**
|
|
91
|
+
* current version
|
|
92
|
+
*
|
|
93
|
+
*/
|
|
94
|
+
var versionHandle = function versionHandle() {
|
|
95
|
+
var current = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '0.0.1';
|
|
96
|
+
var url = arguments.length > 1 ? arguments[1] : undefined;
|
|
97
|
+
var system = getSystemByUrl(url);
|
|
98
|
+
// 只判断wms
|
|
99
|
+
var isWms = system === 'wms' ? true : false;
|
|
100
|
+
if (!isWms) return;
|
|
101
|
+
var version = localStorage.getItem("wt-".concat(system, "-app-version"));
|
|
102
|
+
if (compareVersions(current, version) > 0) updateVersionHandle({
|
|
103
|
+
type: 'WMS',
|
|
104
|
+
version: current
|
|
105
|
+
});
|
|
106
|
+
};
|
|
107
|
+
|
|
90
108
|
// 返回中间件
|
|
91
109
|
var middlewareHandler = /*#__PURE__*/function () {
|
|
92
110
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ctx, next) {
|
|
93
|
-
var req, _req$options$params, _req$options$params2, _req$options$params2$, showNotification, _req$options$params2$2, apiName, _req$options$params2$3, getResponse, requestConfig, cache, _ctx$res, _ctx$res2, _ctx$res2$data, data, response, _data$result, result, _data$success, success, _data$msg, msg, _data$code, code, urlKey, key, db, notificationKey;
|
|
111
|
+
var req, _req$options$params, _req$options$params2, _req$options$params2$, showNotification, _req$options$params2$2, apiName, _req$options$params2$3, getResponse, requestConfig, cache, _ctx$res, _ctx$res2, _ctx$res2$data, data, response, url, _data$result, result, _data$success, success, _data$msg, msg, _data$code, code, urlKey, key, db, notificationKey;
|
|
94
112
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
95
113
|
while (1) switch (_context.prev = _context.next) {
|
|
96
114
|
case 0:
|
|
@@ -106,11 +124,10 @@ var middlewareHandler = /*#__PURE__*/function () {
|
|
|
106
124
|
_context.next = 7;
|
|
107
125
|
return next();
|
|
108
126
|
case 7:
|
|
109
|
-
_ctx$res = ctx.res, _ctx$res2 = _ctx$res === void 0 ? {} : _ctx$res, _ctx$res2$data = _ctx$res2.data, data = _ctx$res2$data === void 0 ? {} : _ctx$res2$data, response = _ctx$res2.response;
|
|
127
|
+
_ctx$res = ctx.res, _ctx$res2 = _ctx$res === void 0 ? {} : _ctx$res, _ctx$res2$data = _ctx$res2.data, data = _ctx$res2$data === void 0 ? {} : _ctx$res2$data, response = _ctx$res2.response, url = ctx.req.url;
|
|
110
128
|
_data$result = data.result, result = _data$result === void 0 ? {} : _data$result, _data$success = data.success, success = _data$success === void 0 ? false : _data$success, _data$msg = data.msg, msg = _data$msg === void 0 ? '' : _data$msg, _data$code = data.code, code = _data$code === void 0 ? 9999 : _data$code;
|
|
111
|
-
console.log('ctx', ctx, data);
|
|
112
|
-
console.log('ctxheaders ', ctx.res.headers);
|
|
113
129
|
if (response.headers.get('authToken')) setAuthToken(response.headers.get('authToken'));
|
|
130
|
+
versionHandle(response.headers.get('wt-app-version'), url);
|
|
114
131
|
if (getResponse) {
|
|
115
132
|
ctx.res = {
|
|
116
133
|
result: result,
|
|
@@ -120,11 +137,11 @@ var middlewareHandler = /*#__PURE__*/function () {
|
|
|
120
137
|
ctx.res = result;
|
|
121
138
|
}
|
|
122
139
|
if (!(success && +code === 0)) {
|
|
123
|
-
_context.next =
|
|
140
|
+
_context.next = 22;
|
|
124
141
|
break;
|
|
125
142
|
}
|
|
126
143
|
if (!cache) {
|
|
127
|
-
_context.next =
|
|
144
|
+
_context.next = 21;
|
|
128
145
|
break;
|
|
129
146
|
}
|
|
130
147
|
urlKey = "".concat(requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.GatewayRoute, "?api=").concat(apiName);
|
|
@@ -132,15 +149,15 @@ var middlewareHandler = /*#__PURE__*/function () {
|
|
|
132
149
|
url: urlKey,
|
|
133
150
|
data: sortBy(req.options.data)
|
|
134
151
|
});
|
|
135
|
-
_context.next =
|
|
152
|
+
_context.next = 18;
|
|
136
153
|
return cacheDB();
|
|
137
|
-
case
|
|
154
|
+
case 18:
|
|
138
155
|
db = _context.sent;
|
|
139
|
-
_context.next =
|
|
156
|
+
_context.next = 21;
|
|
140
157
|
return db.put('cache', data, key);
|
|
141
|
-
case
|
|
158
|
+
case 21:
|
|
142
159
|
return _context.abrupt("return");
|
|
143
|
-
case
|
|
160
|
+
case 22:
|
|
144
161
|
notificationKey = "notification_".concat(apiName, "_").concat(code || '9999');
|
|
145
162
|
if (showNotification) {
|
|
146
163
|
if (msg && msg !== '') {
|
|
@@ -195,7 +212,7 @@ var middlewareHandler = /*#__PURE__*/function () {
|
|
|
195
212
|
});
|
|
196
213
|
}
|
|
197
214
|
}
|
|
198
|
-
case
|
|
215
|
+
case 24:
|
|
199
216
|
case "end":
|
|
200
217
|
return _context.stop();
|
|
201
218
|
}
|
|
@@ -318,33 +335,32 @@ export var request = /*#__PURE__*/function () {
|
|
|
318
335
|
url: urlKey,
|
|
319
336
|
data: sortBy(requestData)
|
|
320
337
|
});
|
|
321
|
-
console.log('props', props);
|
|
322
338
|
if (!props.cache) {
|
|
323
|
-
_context3.next =
|
|
339
|
+
_context3.next = 19;
|
|
324
340
|
break;
|
|
325
341
|
}
|
|
326
|
-
_context3.prev =
|
|
327
|
-
_context3.next =
|
|
342
|
+
_context3.prev = 5;
|
|
343
|
+
_context3.next = 8;
|
|
328
344
|
return cacheDB();
|
|
329
|
-
case
|
|
345
|
+
case 8:
|
|
330
346
|
db = _context3.sent;
|
|
331
|
-
_context3.next =
|
|
347
|
+
_context3.next = 11;
|
|
332
348
|
return db.get('cache', key);
|
|
333
|
-
case
|
|
349
|
+
case 11:
|
|
334
350
|
cachedResponse = _context3.sent;
|
|
335
351
|
if (!cachedResponse) {
|
|
336
|
-
_context3.next =
|
|
352
|
+
_context3.next = 14;
|
|
337
353
|
break;
|
|
338
354
|
}
|
|
339
355
|
return _context3.abrupt("return", cachedResponse.result);
|
|
340
|
-
case
|
|
341
|
-
_context3.next =
|
|
356
|
+
case 14:
|
|
357
|
+
_context3.next = 19;
|
|
342
358
|
break;
|
|
343
|
-
case
|
|
344
|
-
_context3.prev =
|
|
345
|
-
_context3.t0 = _context3["catch"](
|
|
359
|
+
case 16:
|
|
360
|
+
_context3.prev = 16;
|
|
361
|
+
_context3.t0 = _context3["catch"](5);
|
|
346
362
|
return _context3.abrupt("return", Promise.reject(_context3.t0));
|
|
347
|
-
case
|
|
363
|
+
case 19:
|
|
348
364
|
return _context3.abrupt("return", BasicRequest({
|
|
349
365
|
options: {
|
|
350
366
|
data: requestData,
|
|
@@ -369,11 +385,11 @@ export var request = /*#__PURE__*/function () {
|
|
|
369
385
|
handler: middlewareHandler
|
|
370
386
|
}
|
|
371
387
|
})(baseUrl));
|
|
372
|
-
case
|
|
388
|
+
case 20:
|
|
373
389
|
case "end":
|
|
374
390
|
return _context3.stop();
|
|
375
391
|
}
|
|
376
|
-
}, _callee3, null, [[
|
|
392
|
+
}, _callee3, null, [[5, 16]]);
|
|
377
393
|
}));
|
|
378
394
|
return function request(_x5) {
|
|
379
395
|
return _ref4.apply(this, arguments);
|
|
@@ -34,3 +34,8 @@ export type GateWayRequestType = {
|
|
|
34
34
|
showNotification?: boolean;
|
|
35
35
|
cache?: boolean;
|
|
36
36
|
} & Partial<Omit<RequestOptionsInit, 'useCache' | 'ttl' | 'timeout' | 'headers' | 'responseType' | 'method'>>;
|
|
37
|
+
export type SystemType = 'MDM' | 'WCOMS' | 'WMS' | 'TMS' | 'WTCRM';
|
|
38
|
+
export interface UpdateVersionData {
|
|
39
|
+
type: SystemType;
|
|
40
|
+
version: string;
|
|
41
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,EACb,mBAAmB,EACpB,MAAM,aAAa,CAAA;AAEpB,MAAM,MAAM,qBAAqB,GAAG;IAAE,OAAO,EAAE,kBAAkB,CAAC;IAAC,OAAO,CAAC,EAAE,YAAY,CAAA;CAAE,CAAA;AAC3F,MAAM,MAAM,sBAAsB,GAAG;IAAE,OAAO,EAAE,mBAAmB,CAAC;IAAC,OAAO,CAAC,EAAE,YAAY,CAAA;CAAE,CAAA;AAC7F,MAAM,MAAM,aAAa,GAAG;IAAE,OAAO,EAAE,eAAe,CAAC;IAAC,OAAO,CAAC,EAAE,YAAY,GAAG,SAAS,CAAA;CAAE,CAAA;AAE5F,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,kBAAkB,CAAA;IAC5B,kBAAkB,CAAC,EAAE,qBAAqB,GAAG,qBAAqB,EAAE,CAAA;IACpE,UAAU,CAAC,EAAE,aAAa,GAAG,aAAa,EAAE,CAAA;IAC5C,mBAAmB,CAAC,EAAE,sBAAsB,GAAG,sBAAsB,EAAE,CAAA;IACvE,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAA;CAC9C,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAED;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,GAAG,OAAO,CACT,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,KAAK,GAAG,SAAS,GAAG,SAAS,GAAG,cAAc,GAAG,QAAQ,CAAC,CACjG,CAAA"}
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,EACb,mBAAmB,EACpB,MAAM,aAAa,CAAA;AAEpB,MAAM,MAAM,qBAAqB,GAAG;IAAE,OAAO,EAAE,kBAAkB,CAAC;IAAC,OAAO,CAAC,EAAE,YAAY,CAAA;CAAE,CAAA;AAC3F,MAAM,MAAM,sBAAsB,GAAG;IAAE,OAAO,EAAE,mBAAmB,CAAC;IAAC,OAAO,CAAC,EAAE,YAAY,CAAA;CAAE,CAAA;AAC7F,MAAM,MAAM,aAAa,GAAG;IAAE,OAAO,EAAE,eAAe,CAAC;IAAC,OAAO,CAAC,EAAE,YAAY,GAAG,SAAS,CAAA;CAAE,CAAA;AAE5F,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,kBAAkB,CAAA;IAC5B,kBAAkB,CAAC,EAAE,qBAAqB,GAAG,qBAAqB,EAAE,CAAA;IACpE,UAAU,CAAC,EAAE,aAAa,GAAG,aAAa,EAAE,CAAA;IAC5C,mBAAmB,CAAC,EAAE,sBAAsB,GAAG,sBAAsB,EAAE,CAAA;IACvE,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAA;CAC9C,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAED;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,GAAG,OAAO,CACT,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,KAAK,GAAG,SAAS,GAAG,SAAS,GAAG,cAAc,GAAG,QAAQ,CAAC,CACjG,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,CAAA;AAElE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;CAChB"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
|
+
import { UpdateVersionData } from '..';
|
|
1
2
|
/**
|
|
2
3
|
* 判断是否为子系统
|
|
3
4
|
*/
|
|
4
5
|
export declare const IsSubSYS: boolean;
|
|
6
|
+
export declare const compareVersions: (version1: string, version2: string | undefined | null) => 0 | 1 | -1;
|
|
7
|
+
export declare const getSystemByUrl: (route: string) => "wms" | "mdm" | "sso" | undefined;
|
|
8
|
+
export declare const updateVersionHandle: (data: UpdateVersionData) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sysUtils.d.ts","sourceRoot":"","sources":["sysUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sysUtils.d.ts","sourceRoot":"","sources":["sysUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAA;AAEtC;;GAEG;AACH,eAAO,MAAM,QAAQ,SAAe,CAAA;AAEpC,eAAO,MAAM,eAAe,aAAc,MAAM,YAAY,MAAM,GAAG,SAAS,GAAG,IAAI,eAgBpF,CAAA;AAED,eAAO,MAAM,cAAc,UAAW,MAAM,sCAK3C,CAAA;AAED,eAAO,MAAM,mBAAmB,SAAU,iBAAiB,SAU1D,CAAA"}
|
|
@@ -1,4 +1,33 @@
|
|
|
1
|
+
import { GATEWAY_ROUTE_MDM, GATEWAY_ROUTE_SSO, GATEWAY_ROUTE_WMS } from "../constant";
|
|
1
2
|
/**
|
|
2
3
|
* 判断是否为子系统
|
|
3
4
|
*/
|
|
4
|
-
export var IsSubSYS = self !== top;
|
|
5
|
+
export var IsSubSYS = self !== top;
|
|
6
|
+
export var compareVersions = function compareVersions(version1, version2) {
|
|
7
|
+
if (!version2) return 1;
|
|
8
|
+
var v1 = version1.split('.');
|
|
9
|
+
var v2 = version2.split('.');
|
|
10
|
+
var maxLength = Math.max(v1.length, v2.length);
|
|
11
|
+
for (var i = 0; i < maxLength; i++) {
|
|
12
|
+
// 将每段转换为数字(空段视为0)
|
|
13
|
+
var num1 = parseInt(v1[i] || '0', 10);
|
|
14
|
+
var num2 = parseInt(v2[i] || '0', 10);
|
|
15
|
+
if (num1 > num2) return 1;
|
|
16
|
+
if (num1 < num2) return -1;
|
|
17
|
+
}
|
|
18
|
+
return 0; // 所有段都相等
|
|
19
|
+
};
|
|
20
|
+
export var getSystemByUrl = function getSystemByUrl(route) {
|
|
21
|
+
if (route.includes(GATEWAY_ROUTE_WMS)) return 'wms';
|
|
22
|
+
if (route.includes(GATEWAY_ROUTE_MDM)) return 'mdm';
|
|
23
|
+
if (route.includes(GATEWAY_ROUTE_SSO)) return 'sso';
|
|
24
|
+
return;
|
|
25
|
+
};
|
|
26
|
+
export var updateVersionHandle = function updateVersionHandle(data) {
|
|
27
|
+
if (IsSubSYS) {
|
|
28
|
+
window.parent.postMessage({
|
|
29
|
+
type: 'KEEP_SUB_VERSION',
|
|
30
|
+
data: data
|
|
31
|
+
}, '*');
|
|
32
|
+
}
|
|
33
|
+
};
|