wt-enjoy-link-antd-repack 4.1.97 → 4.1.99

package/dist/esm/package/requestWrapper/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAA;AAuQhD,eAAO,MAAM,OAAO,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,kBAAkB,KAAK,OAAO,CAAC,CAAC,CA2CtE,CAAA;AAED,eAAO,MAAM,SAAS,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,kBAAkB,KAAK,OAAO,CAAC,CAAC,CAsBxE,CAAA;AAED,cAAc,QAAQ,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAA;AA4RhD,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"}

package/dist/esm/package/requestWrapper/index.js

@@ -17,7 +17,7 @@ import { pick, sortBy } from 'lodash';
 import { BasicRequest } from "./baseRequest";
 import { generalRequestURI } from "./utils";
 import { BUBU100_CACHE_WAREINFO_KEY, BUBU100_CACHE_USERINFO_KEY } from "../../constant";
-import { IsSubSYS, cacheDB, clearAuthToken, clearToken, getAuthToken, getToken, setAuthToken } from "../../utils";
+import { IsSubSYS, cacheDB, clearAuthToken, clearToken, compareVersions, getAuthToken, getSystemByUrl, getToken, setAuthToken, updateVersionHandle } from "../../utils";
 
 /**
  * 系统触发请求的时候是以模块为单位的，除了登陆到系统进行加载的时候，其他请求都是在模块内部进行的且还是通过手动触发的
@@ -56,7 +56,8 @@ var generalRequestHeader = function generalRequestHeader() {
   var headers = {
     Authorization: getToken() || '',
     authToken: (_getAuthToken = getAuthToken()) !== null && _getAuthToken !== void 0 ? _getAuthToken : '',
-    terminalType: 'PC'
+    terminalType: 'PC',
+    'wt-company-id': userInfo === null || userInfo === void 0 ? void 0 : userInfo.companyid
   };
   var currentWarehouse = warehouseInfo[userInfo === null || userInfo === void 0 ? void 0 : userInfo.employeecode] || {};
   if (currentWarehouse && currentWarehouse.id) {
@@ -87,10 +88,28 @@ var GeneralRequestData = function GeneralRequestData(data, beanName) {
   return _defineProperty({}, beanName, tmpRequestData);
 };
 
+/**
+ * current version
+ *
+ */
+var versionHandle = function versionHandle() {
+  var current = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '0.0.1';
+  var url = arguments.length > 1 ? arguments[1] : undefined;
+  var system = getSystemByUrl(url);
+  // 只判断wms
+  var isWms = system === 'wms' ? true : false;
+  if (!isWms) return;
+  var version = localStorage.getItem("wt-".concat(system, "-app-version"));
+  if (compareVersions(current, version) > 0) updateVersionHandle({
+    type: 'WMS',
+    version: current
+  });
+};
+
 // 返回中间件
 var middlewareHandler = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ctx, next) {
-    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;
+    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;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -106,11 +125,10 @@ var middlewareHandler = /*#__PURE__*/function () {
           _context.next = 7;
           return next();
         case 7:
-          _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;
+          _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;
           _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;
-          console.log('ctx', ctx, data);
-          console.log('ctxheaders ', ctx.res.headers);
           if (response.headers.get('authToken')) setAuthToken(response.headers.get('authToken'));
+          versionHandle(response.headers.get('wt-app-version'), url);
           if (getResponse) {
             ctx.res = {
               result: result,
@@ -120,11 +138,11 @@ var middlewareHandler = /*#__PURE__*/function () {
             ctx.res = result;
           }
           if (!(success && +code === 0)) {
-            _context.next = 23;
+            _context.next = 22;
             break;
           }
           if (!cache) {
-            _context.next = 22;
+            _context.next = 21;
             break;
           }
           urlKey = "".concat(requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.GatewayRoute, "?api=").concat(apiName);
@@ -132,15 +150,15 @@ var middlewareHandler = /*#__PURE__*/function () {
             url: urlKey,
             data: sortBy(req.options.data)
           });
-          _context.next = 19;
+          _context.next = 18;
           return cacheDB();
-        case 19:
+        case 18:
           db = _context.sent;
-          _context.next = 22;
+          _context.next = 21;
           return db.put('cache', data, key);
-        case 22:
+        case 21:
           return _context.abrupt("return");
-        case 23:
+        case 22:
           notificationKey = "notification_".concat(apiName, "_").concat(code || '9999');
           if (showNotification) {
             if (msg && msg !== '') {
@@ -195,7 +213,7 @@ var middlewareHandler = /*#__PURE__*/function () {
               });
             }
           }
-        case 25:
+        case 24:
         case "end":
           return _context.stop();
       }
@@ -318,33 +336,32 @@ export var request = /*#__PURE__*/function () {
             url: urlKey,
             data: sortBy(requestData)
           });
-          console.log('props', props);
           if (!props.cache) {
-            _context3.next = 20;
+            _context3.next = 19;
             break;
           }
-          _context3.prev = 6;
-          _context3.next = 9;
+          _context3.prev = 5;
+          _context3.next = 8;
           return cacheDB();
-        case 9:
+        case 8:
           db = _context3.sent;
-          _context3.next = 12;
+          _context3.next = 11;
           return db.get('cache', key);
-        case 12:
+        case 11:
           cachedResponse = _context3.sent;
           if (!cachedResponse) {
-            _context3.next = 15;
+            _context3.next = 14;
             break;
           }
           return _context3.abrupt("return", cachedResponse.result);
-        case 15:
-          _context3.next = 20;
+        case 14:
+          _context3.next = 19;
           break;
-        case 17:
-          _context3.prev = 17;
-          _context3.t0 = _context3["catch"](6);
+        case 16:
+          _context3.prev = 16;
+          _context3.t0 = _context3["catch"](5);
           return _context3.abrupt("return", Promise.reject(_context3.t0));
-        case 20:
+        case 19:
           return _context3.abrupt("return", BasicRequest({
             options: {
               data: requestData,
@@ -356,7 +373,6 @@ export var request = /*#__PURE__*/function () {
               handler: function handler(url, _ref5) {
                 var data = _ref5.data,
                   resetOptions = _objectWithoutProperties(_ref5, _excluded2);
-                console.log('xxaa', resetOptions);
                 var iterationData = RequestDataFormat(data);
                 return {
                   url: url,
@@ -370,11 +386,11 @@ export var request = /*#__PURE__*/function () {
               handler: middlewareHandler
             }
           })(baseUrl));
-        case 21:
+        case 20:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[6, 17]]);
+    }, _callee3, null, [[5, 16]]);
   }));
   return function request(_x5) {
     return _ref4.apply(this, arguments);

package/dist/esm/package/requestWrapper/type.d.ts

@@ -34,3 +34,8 @@ export type GateWayRequestType = {
     showNotification?: boolean;
     cache?: boolean;
 } & Partial<Omit<RequestOptionsInit, 'useCache' | 'ttl' | 'timeout' | 'headers' | 'responseType' | 'method'>>;
+export type SystemType = 'MDM' | 'WCOMS' | 'WMS' | 'TMS' | 'WTCRM';
+export interface UpdateVersionData {
+    type: SystemType;
+    version: string;
+}

package/dist/esm/package/requestWrapper/type.d.ts.map

@@ -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"}
+{"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"}

package/dist/esm/utils/sysUtils.d.ts

@@ -1,4 +1,8 @@
+import { UpdateVersionData } from '..';
 /**
  * 判断是否为子系统
  */
 export declare const IsSubSYS: boolean;
+export declare const compareVersions: (version1: string, version2: string | undefined | null) => 0 | 1 | -1;
+export declare const getSystemByUrl: (route: string) => "wms" | "mdm" | "sso" | undefined;
+export declare const updateVersionHandle: (data: UpdateVersionData) => void;

package/dist/esm/utils/sysUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sysUtils.d.ts","sourceRoot":"","sources":["sysUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,QAAQ,SAAe,CAAA"}
+{"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"}

package/dist/esm/utils/sysUtils.js

@@ -1,4 +1,33 @@
+import { GATEWAY_ROUTE_MDM, GATEWAY_ROUTE_SSO, GATEWAY_ROUTE_WMS } from "../constant";
 /**
  * 判断是否为子系统
  */
-export var IsSubSYS = self !== top;
+export var IsSubSYS = self !== top;
+export var compareVersions = function compareVersions(version1, version2) {
+  if (!version2) return 1;
+  var v1 = version1.split('.');
+  var v2 = version2.split('.');
+  var maxLength = Math.max(v1.length, v2.length);
+  for (var i = 0; i < maxLength; i++) {
+    // 将每段转换为数字（空段视为0）
+    var num1 = parseInt(v1[i] || '0', 10);
+    var num2 = parseInt(v2[i] || '0', 10);
+    if (num1 > num2) return 1;
+    if (num1 < num2) return -1;
+  }
+  return 0; // 所有段都相等
+};
+export var getSystemByUrl = function getSystemByUrl(route) {
+  if (route.includes(GATEWAY_ROUTE_WMS)) return 'wms';
+  if (route.includes(GATEWAY_ROUTE_MDM)) return 'mdm';
+  if (route.includes(GATEWAY_ROUTE_SSO)) return 'sso';
+  return;
+};
+export var updateVersionHandle = function updateVersionHandle(data) {
+  if (IsSubSYS) {
+    window.parent.postMessage({
+      type: 'KEEP_SUB_VERSION',
+      data: data
+    }, '*');
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wt-enjoy-link-antd-repack",
-  "version": "4.1.97",
+  "version": "4.1.99",
   "description": "万通业务组件",
   "sideEffects": false,
   "main": "dist/esm/index.js",