@kmkf-fe-packages/services-components 2.0.54-beta.3 → 2.0.54-beta.31

package/dist/esm/commonComponents/GlobalContext/index.js

@@ -20,6 +20,7 @@ import { servers, SendDataCenter } from "@kmkf-fe-packages/kmkf-utils";
 import useGetErpLogisticsCompany from "./orderQuery/useGetErpLogisticsCompany";
 import useGetErpSendData from "./orderQuery/useGetErpSendData";
 import useGetErpAddressData from "./orderQuery/useGetErpAddressData";
+import useGetRequest from "./orderQuery/useGetRequest";
 /**
  * 尽量不要直接使用redux，飞鸽项目redux并不会读取最近的store数据，使用redux会有问题，暂时使用从外部传入redux数据的方式
  * **/
@@ -49,6 +50,15 @@ var Global = function Global(_ref) {
     }
     return reduxData;
   }, [JSON.stringify(reduxData)]);
+  useEffect(function () {
+    try {
+      var _reduxData$main2, _reduxData$workOrder2, _reduxData$global2;
+      var userInfo = (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$main2 = reduxData.main) === null || _reduxData$main2 === void 0 ? void 0 : _reduxData$main2.userInfo) || (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$workOrder2 = reduxData.workOrder) === null || _reduxData$workOrder2 === void 0 ? void 0 : _reduxData$workOrder2.userInfo) || (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$global2 = reduxData.global) === null || _reduxData$global2 === void 0 ? void 0 : _reduxData$global2.userInfo) || {};
+      localStorage.setItem("reduxData_userInfo", JSON.stringify(userInfo));
+    } catch (e) {
+      console.error(e);
+    }
+  }, [JSON.stringify(reduxData)]);
   useEffect(function () {
     initDataSource();
   }, []);
@@ -71,12 +81,17 @@ var Global = function Global(_ref) {
     _useGetErpAddressData2 = _slicedToArray(_useGetErpAddressData, 2),
     addressDataState = _useGetErpAddressData2[0],
     reloadGetErpAddressData = _useGetErpAddressData2[1];
+  //获取Erp地址数据
+  var _useGetRequest = useGetRequest(reduxDataMap, notJudgedErp),
+    _useGetRequest2 = _slicedToArray(_useGetRequest, 2),
+    requestState = _useGetRequest2[0],
+    reloadGetRequest = _useGetRequest2[1];
   var allState = useMemo(function () {
-    var allStateList = [globalState, logisticsCompanyState, sendDataState, addressDataState];
+    var allStateList = [globalState, logisticsCompanyState, sendDataState, addressDataState, requestState];
     if (allStateList.includes("loading")) return "loading";
     if (allStateList.includes("failed")) return "failed";
     return "success";
-  }, [globalState, logisticsCompanyState, sendDataState, addressDataState]);
+  }, [globalState, logisticsCompanyState, sendDataState, addressDataState, requestState]);
   var reloadData = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -115,9 +130,17 @@ var Global = function Global(_ref) {
             _context.next = 17;
             return reloadGetErpAddressData();
           case 17:
+            _context.t4 = requestState === "failed";
+            if (!_context.t4) {
+              _context.next = 21;
+              break;
+            }
+            _context.next = 21;
+            return reloadGetRequest();
+          case 21:
             setLoading(false);
             message.success("刷新完成");
-          case 19:
+          case 23:
           case "end":
             return _context.stop();
         }

package/dist/esm/commonComponents/GlobalContext/orderQuery/constants.d.ts

@@ -0,0 +1,5 @@
+export declare const erpMap: Record<string, string>;
+export declare const requestList: {
+    request: () => Promise<any>;
+    erp: string;
+}[];

package/dist/esm/commonComponents/GlobalContext/orderQuery/constants.js

@@ -0,0 +1,8 @@
+import { WdtShopDataCenter } from "@kmkf-fe-packages/kmkf-utils";
+export var erpMap = {
+  wdt: "hasWdt"
+};
+export var requestList = [{
+  request: WdtShopDataCenter.getInstance().fetchData,
+  erp: "wdt"
+}];

package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpLogisticsCompany.js

@@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useEffect, useState } from "react";
 import useGetHasErpData from "../hook/useGetHasErpData";
-import { queryWdtLogisticsCompany, queryBsE3LogisticsCompany, queryJSTLogisticsCompany, queryWLNLogisticsCompany } from "../../../service/api";
+import { queryWdtLogisticsCompany, queryBsE3LogisticsCompany, queryJSTLogisticsCompany, queryWLNLogisticsCompany, queryGYLogisticsCompany } from "../../../service/api";
 function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
   var _useState = useState("loading"),
     _useState2 = _slicedToArray(_useState, 2),
@@ -22,37 +22,38 @@ function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
   }, [hasErpData, notJudgedErp]);
   var asyncQueryData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp, isReload) {
-      var hasWdt, hasE3, hasJst, hasWln, promises;
+      var hasWdt, hasE3, hasJst, hasWln, hasGy, promises;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!isReload) {
               setGlobalState("loading");
             }
-            hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln;
+            hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln, hasGy = hasErpData.hasGy;
             promises = [];
             if (hasWdt || notJudgedErp) promises.push(queryWdtLogisticsCompany);
             if (hasE3 || notJudgedErp) promises.push(queryBsE3LogisticsCompany);
             if (hasJst || notJudgedErp) promises.push(queryJSTLogisticsCompany);
             if (hasWln || notJudgedErp) promises.push(queryWLNLogisticsCompany);
-            _context.prev = 7;
-            _context.next = 10;
+            if (hasGy || notJudgedErp) promises.push(queryGYLogisticsCompany);
+            _context.prev = 8;
+            _context.next = 11;
             return Promise.all(promises.map(function (promise) {
               return promise();
             }));
-          case 10:
+          case 11:
             setGlobalState("success");
-            _context.next = 16;
+            _context.next = 17;
             break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](7);
+          case 14:
+            _context.prev = 14;
+            _context.t0 = _context["catch"](8);
             setGlobalState("failed");
-          case 16:
+          case 17:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[7, 13]]);
+      }, _callee, null, [[8, 14]]);
     }));
     return function asyncQueryData(_x2, _x3, _x4) {
       return _ref.apply(this, arguments);

package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpSendData.js

@@ -18,7 +18,7 @@ function useGetErpSendData(reduxData, notJudgedErp) {
     setGlobalState = _useState2[1];
   var hasErpData = useGetHasErpData(reduxData);
   useEffect(function () {
-    console.log("发货仓--", hasErpData, notJudgedErp);
+    // console.log("发货仓--", hasErpData, notJudgedErp);
     asyncQueryData(hasErpData, notJudgedErp);
   }, [hasErpData, notJudgedErp]);
   var asyncQueryData = /*#__PURE__*/function () {

package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetRequest.d.ts

@@ -0,0 +1,3 @@
+import type { Status } from "./type";
+declare function useGetRequest(reduxData: any, notJudgedErp: boolean): [Status, () => Promise<void>];
+export default useGetRequest;

package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetRequest.js

@@ -0,0 +1,80 @@
+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); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { useEffect, useState } from "react";
+import useGetHasErpData from "../hook/useGetHasErpData";
+import { requestList, erpMap } from "./constants";
+function useGetRequest(reduxData, notJudgedErp) {
+  var _useState = useState("loading"),
+    _useState2 = _slicedToArray(_useState, 2),
+    globalState = _useState2[0],
+    setGlobalState = _useState2[1];
+  var hasErpData = useGetHasErpData(reduxData);
+  useEffect(function () {
+    asyncQueryData(hasErpData, notJudgedErp);
+  }, [hasErpData, notJudgedErp]);
+  var asyncQueryData = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp, isReload) {
+      var promises;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!isReload) {
+              setGlobalState("loading");
+            }
+            _context.prev = 1;
+            promises = [];
+            requestList.map(function (item) {
+              if (hasErpData[erpMap[item.erp]] || notJudgedErp) {
+                promises.push(item.request);
+              }
+            });
+            _context.next = 6;
+            return Promise.all(promises.map(function (promise) {
+              return promise();
+            }));
+          case 6:
+            setGlobalState("success");
+            _context.next = 12;
+            break;
+          case 9:
+            _context.prev = 9;
+            _context.t0 = _context["catch"](1);
+            setGlobalState("failed");
+          case 12:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[1, 9]]);
+    }));
+    return function asyncQueryData(_x2, _x3, _x4) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  var onReload = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return asyncQueryData(hasErpData, notJudgedErp, true);
+          case 2:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onReload() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  return [globalState, onReload];
+}
+export default useGetRequest;

package/dist/esm/components/BS/BsLogistics/index.js

@@ -66,6 +66,14 @@ var typeMap = {
     code: "kmLogisticsCode",
     platformType: "km",
     companyDataType: "whetherItIncludes"
+  },
+  GY_LOGISTICS: {
+    key: "gyLogisticsList",
+    name: "管易",
+    company: "gyLogisticsCompany",
+    code: "gyLogisticsCode",
+    platformType: "gy",
+    companyDataType: "arrayObject"
   }
 };
 var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {

package/dist/esm/components/BS/common/expressCode.js

@@ -33,6 +33,9 @@ var typeMap = {
   },
   KM_LOGISTICS: {
     key: "kmLogisticsItem"
+  },
+  GY_LOGISTICS: {
+    key: "gyLogisticsItem"
   }
 };
 var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {

package/dist/esm/components/BS/common/expressCompany.js

@@ -34,6 +34,9 @@ var typeMap = {
   },
   KM_LOGISTICS: {
     key: "kmLogisticsItem"
+  },
+  GY_LOGISTICS: {
+    key: "gyLogisticsItem"
   }
 };
 var Express = /*#__PURE__*/_createClass(function Express(options) {

package/dist/esm/components/Common/constants/columnsBaseInfoMap.js

@@ -7,13 +7,13 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import system from "./system";
 import bs_e3 from "./bs_e3";
 import bs from "./bs";
-import { getJstColumns, getWlnColumns, getGyColumns, getWdtColumns } from "@kmkf-fe-packages/basic-components";
+import { getJstColumns, getWlnColumns, getGyColumns, getWdtColumns, getKmColumns } from "@kmkf-fe-packages/basic-components";
 import defaultColumns from "./defaultColumns";
 export var getColumnsMap = function getColumnsMap(args) {
   var _ref = args || {},
     _ref$text = _ref.text,
     text = _ref$text === void 0 ? "" : _ref$text;
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, system()), bs({
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, system()), bs({
     text: text
   })), bs_e3()), getWdtColumns({
     text: text,
@@ -24,6 +24,8 @@ export var getColumnsMap = function getColumnsMap(args) {
     disabled: true
   })), getWlnColumns({
     text: text
+  })), getKmColumns({
+    disabled: true
   })), {}, {
     default: defaultColumns({
       text: text

package/dist/esm/components/Common/index.js

@@ -79,10 +79,7 @@ export var showImage = function showImage(_ref2) {
     },
     src: picUrl
   }), /*#__PURE__*/React.createElement("div", {
-    className: styles.options,
-    onClick: function onClick() {
-      console.log("show---", showHeader);
-    }
+    className: styles.options
   }, type === "itemId" && /*#__PURE__*/React.createElement(TextTool, {
     title: "商品id",
     text: item.numIid
@@ -270,7 +267,8 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
   return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
     var logisticsCompany = item.logisticsCompany,
       logisticsCompanyName = item.logisticsCompanyName;
-    var company = platformType === "gy" ? logisticsCompanyName : ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany);
+    // 管易为了兼容之前的补发物流信息，若不存在logisticsCompanyName值则去匹配物流映射列表展示物流公司名称
+    var company = platformType === "gy" ? ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName : ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany);
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
       content: content(item, index),
       overlayStyle: {
@@ -736,7 +734,7 @@ export var MsgContent = function MsgContent(_ref14) {
     var key = item.msgType || "ding";
     var formatMsgContent = /*#__PURE__*/React.createElement("span", {
       key: index
-    }, msgTypeCh[key] || key, "-", item.ruleName ? "".concat(item.ruleName, "-") : "", currentOption ? currentOption.label : (item === null || item === void 0 ? void 0 : item[valueKey]) || "");
+    }, msgTypeCh[key], "-", item.ruleName ? "".concat(item.ruleName, "-") : "", currentOption ? currentOption.label : (item === null || item === void 0 ? void 0 : item[valueKey]) || "");
     return /*#__PURE__*/React.createElement("div", {
       key: "wrap_".concat(index),
       style: {

package/dist/esm/components/CommonHeaderGood/index.js

@@ -903,11 +903,11 @@ var GoodHeaderMap = {
         name: "总金额",
         transformValue: function transformValue(val, record, parentName) {
           if (!record) return "--";
-          return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
+          return ((record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0)).toFixed(2);
         },
         renderExport: function renderExport(val, record, parentName) {
           if (!record) return "--";
-          return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
+          return ((record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0)).toFixed(2);
         }
       },
       batchId: "批次号",
@@ -999,11 +999,11 @@ var GoodHeaderMap = {
         name: "总金额",
         transformValue: function transformValue(val, record, parentName) {
           if (!record) return "--";
-          return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
+          return ((record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0)).toFixed(2);
         },
         renderExport: function renderExport(val, record, parentName) {
           if (!record) return "--";
-          return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
+          return ((record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0)).toFixed(2);
         }
       },
       batchId: "批次号",
@@ -1148,6 +1148,64 @@ var GoodHeaderMap = {
       }
     },
     moneyKey: "money"
+  },
+  KM_GOODS: {
+    headerMap: {
+      sysSkuPropertiesName: {
+        name: "规格名称",
+        width: 250
+      },
+      sysTitle: {
+        name: "系统商品名称",
+        width: 150
+      },
+      title: {
+        name: "平台商品名称",
+        width: 150
+      },
+      shortTitle: {
+        name: "商品简称",
+        width: 150
+      },
+      sysOuterId: {
+        name: "系统商家编码",
+        width: 150
+      },
+      outerId: {
+        name: "商家编码",
+        width: 150
+      },
+      skuSysId: {
+        name: "系统规格ID",
+        width: 150
+      },
+      itemSysId: {
+        name: "系统商品ID",
+        width: 150
+      },
+      sysPicPath: {
+        name: "商品图片",
+        width: 100,
+        component: BsHeaderPic
+      },
+      num: {
+        name: "数量",
+        width: 150
+      },
+      payment: {
+        name: "实付金额",
+        width: 150
+      },
+      price: {
+        name: "商品销售价",
+        width: 150
+      },
+      type: {
+        name: "商品类型",
+        width: 100
+      }
+    },
+    moneyKey: "money"
   }
 };
 GoodHeaderMap["WDT_REISSUE_GOODS"] = GoodHeaderMap["WDT_GOODS"];

package/dist/esm/components/GY/GyReissue/index.js

@@ -186,7 +186,7 @@ var GyReissue = /*#__PURE__*/_createClass(function GyReissue(options) {
     required: isRequired,
     validator: function validator(_, value) {
       var _value, _typeMap$options$type5;
-      if (!value || !(value !== null && value !== void 0 && (_value = value["".concat((_typeMap$options$type5 = typeMap[options.type]) === null || _typeMap$options$type5 === void 0 ? void 0 : _typeMap$options$type5.key)]) !== null && _value !== void 0 && _value.length)) {
+      if (isRequired && (!value || !(value !== null && value !== void 0 && (_value = value["".concat((_typeMap$options$type5 = typeMap[options.type]) === null || _typeMap$options$type5 === void 0 ? void 0 : _typeMap$options$type5.key)]) !== null && _value !== void 0 && _value.length))) {
         var _typeMap$options$type6;
         return Promise.reject(new Error("".concat((_typeMap$options$type6 = typeMap[options.type]) === null || _typeMap$options$type6 === void 0 ? void 0 : _typeMap$options$type6.errMsg)));
       }

package/dist/esm/components/GY/GyReturn/index.js

@@ -178,7 +178,7 @@ var GyReturn = /*#__PURE__*/_createClass(function GyReturn(options) {
     required: isRequired,
     validator: function validator(_, value) {
       var _value, _typeMap$options$type4;
-      if (!value || !(value !== null && value !== void 0 && (_value = value["".concat((_typeMap$options$type4 = typeMap[options.type]) === null || _typeMap$options$type4 === void 0 ? void 0 : _typeMap$options$type4.key)]) !== null && _value !== void 0 && _value.length)) {
+      if (isRequired && (!value || !(value !== null && value !== void 0 && (_value = value["".concat((_typeMap$options$type4 = typeMap[options.type]) === null || _typeMap$options$type4 === void 0 ? void 0 : _typeMap$options$type4.key)]) !== null && _value !== void 0 && _value.length))) {
         var _typeMap$options$type5;
         return Promise.reject(new Error("".concat((_typeMap$options$type5 = typeMap[options.type]) === null || _typeMap$options$type5 === void 0 ? void 0 : _typeMap$options$type5.errMsg)));
       }

package/dist/esm/components/GetFormItem/index.js

@@ -38,7 +38,7 @@ var GetFormItem = function GetFormItem(_ref) {
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                if (!(!value || !value.vipCode)) {
+                if (!(value && !value.vipCode && value.gySystemOrderNo)) {
                   _context.next = 2;
                   break;
                 }

package/dist/esm/components/Logistics/index.d.ts

@@ -18,6 +18,7 @@ declare class Logistics implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    isChange: boolean;
     constructor(options: PickOption);
     editRender: (p: any) => React.JSX.Element;
     renderClient: (record: Record) => React.JSX.Element;

package/dist/esm/components/Logistics/index.js

@@ -32,8 +32,23 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "isChange", void 0);
   _defineProperty(this, "editRender", function (p) {
     var _this$componentConfig, _this$componentConfig2, _this$componentConfig3, _this$componentConfig4;
+    var onExpressLogisticsCodeBlur = function onExpressLogisticsCodeBlur(val) {
+      if (_this.isChange) {
+        var _p$onBlur;
+        p === null || p === void 0 ? void 0 : (_p$onBlur = p.onBlur) === null || _p$onBlur === void 0 ? void 0 : _p$onBlur.call(p, val, "expressLogisticsCode");
+        _this.isChange = false;
+      }
+    };
+    var onExpressLogisticsCodeChange = function onExpressLogisticsCodeChange() {
+      _this.isChange = true;
+      for (var _len = arguments.length, e = new Array(_len), _key = 0; _key < _len; _key++) {
+        e[_key] = arguments[_key];
+      }
+      p === null || p === void 0 ? void 0 : p.onChange.apply(p, e);
+    };
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
       name: _this.id,
@@ -41,11 +56,11 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
       required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
-      tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : '',
+      tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : "",
       component: /*#__PURE__*/React.createElement(ExpressLogistics, _extends({}, _this.componentConfig, {
         options: _this.expressDateInstance.getExpressData(),
-        onBlur: p === null || p === void 0 ? void 0 : p.onBlur,
-        onChange: p === null || p === void 0 ? void 0 : p.onChange
+        onBlur: onExpressLogisticsCodeBlur,
+        onChange: onExpressLogisticsCodeChange
       }))
     });
   });
@@ -114,5 +129,6 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
       return Promise.resolve();
     }
   }] : [];
+  this.isChange = false;
 });
 export default Logistics;

package/dist/esm/components/LogisticsInterception/index.js

@@ -159,7 +159,7 @@ function Logistics(options) {
 
   this.rules = [{
     validator: function validator(_, value) {
-      var _this$componentConfig5, _this$componentConfig6, _value$interceptAddre, _value$interceptSende;
+      var _this$componentConfig5, _this$componentConfig6, _value$interceptAddre;
       if ((_this$componentConfig5 = _this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required && (!(value !== null && value !== void 0 && value.interceptCompany) || !value.interceptCode)) {
         return Promise.reject(new Error("请填写物流信息"));
       }
@@ -170,13 +170,21 @@ function Logistics(options) {
       if (showAddress && (!(value !== null && value !== void 0 && (_value$interceptAddre = value.interceptAddress) !== null && _value$interceptAddre !== void 0 && _value$interceptAddre.length) || !(value !== null && value !== void 0 && value.interceptDetail) || !(value !== null && value !== void 0 && value.interceptReceiverName) || !(value !== null && value !== void 0 && value.interceptReceiverMobile))) {
         return Promise.reject(new Error("请填写派送地址"));
       }
-      var showSender = _this.expressInterceptData.getShowSenderMobileMap()["".concat(value === null || value === void 0 ? void 0 : value.interceptType)];
-      if (showSender && !(value !== null && value !== void 0 && value.interceptSenderMobile)) {
-        return Promise.reject(new Error("请填写发件人手机号"));
-      }
-      if (showSender && value !== null && value !== void 0 && value.interceptSenderMobile && !(value !== null && value !== void 0 && (_value$interceptSende = value.interceptSenderMobile) !== null && _value$interceptSende !== void 0 && _value$interceptSende.match(/^[1][0-9]{10}$/))) {
-        return Promise.reject(new Error("请填写正确的发件人手机号"));
-      }
+
+      // const showSender =
+      //   this.expressInterceptData.getShowSenderMobileMap()[
+      //     `${value?.interceptType}`
+      //   ];
+      // if (showSender && !value?.interceptSenderMobile) {
+      //   return Promise.reject(new Error("请填写发件人手机号"));
+      // }
+      // if (
+      //   showSender &&
+      //   value?.interceptSenderMobile &&
+      //   !value?.interceptSenderMobile?.match(/^[1][0-9]{10}$/)
+      // ) {
+      //   return Promise.reject(new Error("请填写正确的发件人手机号"));
+      // }
       return Promise.resolve();
     }
   }];

package/dist/esm/components/LogisticsMoreInterception/index.js

@@ -188,21 +188,32 @@ function Logistics(options) {
       if (hasNoAddress) {
         return Promise.reject(new Error("\u8BF7\u586B\u5199\u6D3E\u9001\u5730\u5740"));
       }
-      var hasNoSender = value.some(function (t) {
-        var showSender = _this.expressInterceptData.getShowSenderMobileMap()["".concat(t === null || t === void 0 ? void 0 : t.interceptType)];
-        return showSender && !(t !== null && t !== void 0 && t.interceptSenderMobile);
-      });
-      if (hasNoSender) {
-        return Promise.reject(new Error("\u8BF7\u586B\u5199\u53D1\u4EF6\u4EBA\u624B\u673A\u53F7"));
-      }
-      var hasErrorSender = value.some(function (t) {
-        var _t$interceptSenderMob;
-        var showSender = _this.expressInterceptData.getShowSenderMobileMap()["".concat(t === null || t === void 0 ? void 0 : t.interceptType)];
-        return showSender && (t === null || t === void 0 ? void 0 : t.interceptSenderMobile) && !(t !== null && t !== void 0 && (_t$interceptSenderMob = t.interceptSenderMobile) !== null && _t$interceptSenderMob !== void 0 && _t$interceptSenderMob.match(/^[1][0-9]{10}$/));
-      });
-      if (hasErrorSender) {
-        return Promise.reject(new Error("\u8BF7\u586B\u5199\u6B63\u786E\u7684\u53D1\u4EF6\u4EBA\u624B\u673A\u53F7"));
-      }
+
+      // const hasNoSender = value.some((t: any) => {
+      //   const showSender =
+      //     this.expressInterceptData.getShowSenderMobileMap()[
+      //       `${t?.interceptType}`
+      //     ];
+      //   return showSender && !t?.interceptSenderMobile;
+      // });
+      // if (hasNoSender) {
+      //   return Promise.reject(new Error(`请填写发件人手机号`));
+      // }
+      // const hasErrorSender = value.some((t: any) => {
+      //   const showSender =
+      //     this.expressInterceptData.getShowSenderMobileMap()[
+      //       `${t?.interceptType}`
+      //     ];
+      //   return (
+      //     showSender &&
+      //     t?.interceptSenderMobile &&
+      //     !t?.interceptSenderMobile?.match(/^[1][0-9]{10}$/)
+      //   );
+      // });
+      // if (hasErrorSender) {
+      //   return Promise.reject(new Error(`请填写正确的发件人手机号`));
+      // }
+
       return Promise.resolve();
     }
   }] : [];