@kmkf-fe-packages/services-components 2.0.2-beta.1 → 2.0.2-beta.2

package/dist/esm/commonComponents/GlobalContext/hook/dist/useGetHasErpData.js

@@ -0,0 +1,52 @@
+"use strict";
+
+exports.__esModule = true;
+var react_1 = require("react");
+var react_redux_1 = require("react-redux");
+var toolkit_1 = require("@reduxjs/toolkit");
+var getTemplate = function getTemplate(companyUserConfig) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+  return JSON.stringify({
+    hasWln: (_c = (_b = (_a = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _a === void 0 ? void 0 : _a.wln) === null || _b === void 0 ? void 0 : _b.show) !== null && _c !== void 0 ? _c : false,
+    hasWdt: (_f = (_e = (_d = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _d === void 0 ? void 0 : _d.wdt) === null || _e === void 0 ? void 0 : _e.show) !== null && _f !== void 0 ? _f : false,
+    hasBs: (_j = (_h = (_g = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _g === void 0 ? void 0 : _g.bs) === null || _h === void 0 ? void 0 : _h.show) !== null && _j !== void 0 ? _j : false,
+    hasE3: (_m = (_l = (_k = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _k === void 0 ? void 0 : _k.bse3) === null || _l === void 0 ? void 0 : _l.show) !== null && _m !== void 0 ? _m : false,
+    hasJst: (_q = (_p = (_o = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _o === void 0 ? void 0 : _o.jst) === null || _p === void 0 ? void 0 : _p.show) !== null && _q !== void 0 ? _q : false,
+    hasGy: (_t = (_s = (_r = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _r === void 0 ? void 0 : _r.gy) === null || _s === void 0 ? void 0 : _s.show) !== null && _t !== void 0 ? _t : false
+  });
+};
+function useGetHasErpData() {
+  var companyUserConfig = react_redux_1.useSelector(toolkit_1.createSelector([function (state) {
+    var _a, _b, _c, _d;
+    console.log("state--useSelector", state);
+    /**
+     * pc main
+     * 端 workOrder
+     * **/
+    return (_d = (_b = (_a = state === null || state === void 0 ? void 0 : state.main) === null || _a === void 0 ? void 0 : _a.userInfo) !== null && _b !== void 0 ? _b : (_c = state === null || state === void 0 ? void 0 : state.workOrder) === null || _c === void 0 ? void 0 : _c.userInfo) !== null && _d !== void 0 ? _d : {};
+  }], function (state) {
+    var _a;
+    var companyUserConfig = (_a = state === null || state === void 0 ? void 0 : state.companyUserConfig) !== null && _a !== void 0 ? _a : {};
+    if (typeof companyUserConfig === "string") {
+      try {
+        companyUserConfig = JSON.parse(companyUserConfig);
+      } catch (e) {
+        console.error("companyUserConfig转换异常", companyUserConfig);
+        companyUserConfig = {};
+      }
+    }
+    return companyUserConfig;
+  }));
+  var _a = react_1.useState(getTemplate({})),
+    hasErpDataJson = _a[0],
+    setHasErpDataJson = _a[1];
+  react_1.useEffect(function () {
+    setHasErpDataJson(getTemplate(companyUserConfig));
+    console.log("companyUserConfig---", companyUserConfig);
+  }, [companyUserConfig]);
+  var hasErpData = react_1.useMemo(function () {
+    return JSON.parse(hasErpDataJson);
+  }, [hasErpDataJson]);
+  return hasErpData;
+}
+exports["default"] = useGetHasErpData;

package/dist/esm/commonComponents/GlobalContext/index.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-declare type RequestType = "queryAddressData" | "queryExpressInterceptData" | "queryLogisticsAddressData" | "queryPlatData" | "queryAllLogisticsCompany" | "queryLabel";
+declare type RequestType = "queryAddressData" | "queryExpressInterceptData" | "queryLogisticsAddressData" | "queryPlatData" | "queryAllLogisticsCompany" | "queryLabel" | "queryKMLogisticsCompany" | "queryKMSendData";
 declare const Global: ({ children, requestList, repeatRequestList, notJudgedErp, }: React.PropsWithChildren<{
     requestList?: RequestType[] | undefined;
     repeatRequestList?: Record<string, () => Promise<any>> | undefined;

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

@@ -15,8 +15,8 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState, useMemo } from "react";
 import { Skeleton, Button, Alert, Space, message } from "antd";
-import { queryExpressInterceptData, queryLogisticsAddressData, queryPlatData, queryLabel, queryAllLogisticsCompany } from "../../service/api";
-import { servers } from "@kmkf-fe-packages/kmkf-utils";
+import { queryExpressInterceptData, queryLogisticsAddressData, queryPlatData, queryLabel, queryAllLogisticsCompany, queryKMLogisticsCompany } from "../../service/api";
+import { servers, SendDataCenter } from "@kmkf-fe-packages/kmkf-utils";
 import useGetErpLogisticsCompany from "./orderQuery/useGetErpLogisticsCompany";
 import useGetErpSendData from "./orderQuery/useGetErpSendData";
 import useGetErpAddressData from "./orderQuery/useGetErpAddressData";
@@ -36,7 +36,13 @@ var Global = function Global(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
+  useEffect(function () {
+    initDataSource();
+  }, []);
 
+  /**
+   * 需要hasErpData判断
+   * **/
   //获取Erp物流公司信息
   var _useGetErpLogisticsCo = useGetErpLogisticsCompany(notJudgedErp),
     _useGetErpLogisticsCo2 = _slicedToArray(_useGetErpLogisticsCo, 2),
@@ -120,7 +126,9 @@ var Global = function Global(_ref) {
               queryLogisticsAddressData: queryLogisticsAddressData,
               queryPlatData: queryPlatData,
               queryAllLogisticsCompany: queryAllLogisticsCompany,
-              queryLabel: queryLabel
+              queryLabel: queryLabel,
+              queryKMLogisticsCompany: queryKMLogisticsCompany,
+              queryKMSendData: SendDataCenter.getInstance("km").fetchData
             };
             mergeMapping = _objectSpread(_objectSpread({}, mapping), repeatRequestList);
             promises = [];
@@ -158,9 +166,6 @@ var Global = function Global(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
-  useEffect(function () {
-    initDataSource();
-  }, []);
   if (allState === "loading") {
     return /*#__PURE__*/React.createElement(Skeleton, {
       active: true,

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

@@ -0,0 +1,180 @@
+"use strict";
+
+var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+var __generator = this && this.__generator || function (thisArg, body) {
+  var _ = {
+      label: 0,
+      sent: function sent() {
+        if (t[0] & 1) throw t[1];
+        return t[1];
+      },
+      trys: [],
+      ops: []
+    },
+    f,
+    y,
+    t,
+    g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+    while (_) try {
+      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+      if (y = 0, t) op = [op[0] & 2, t.value];
+      switch (op[0]) {
+        case 0:
+        case 1:
+          t = op;
+          break;
+        case 4:
+          _.label++;
+          return {
+            value: op[1],
+            done: false
+          };
+        case 5:
+          _.label++;
+          y = op[1];
+          op = [0];
+          continue;
+        case 7:
+          op = _.ops.pop();
+          _.trys.pop();
+          continue;
+        default:
+          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+            _ = 0;
+            continue;
+          }
+          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+            _.label = op[1];
+            break;
+          }
+          if (op[0] === 6 && _.label < t[1]) {
+            _.label = t[1];
+            t = op;
+            break;
+          }
+          if (t && _.label < t[2]) {
+            _.label = t[2];
+            _.ops.push(op);
+            break;
+          }
+          if (t[2]) _.ops.pop();
+          _.trys.pop();
+          continue;
+      }
+      op = body.call(thisArg, _);
+    } catch (e) {
+      op = [6, e];
+      y = 0;
+    } finally {
+      f = t = 0;
+    }
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+exports.__esModule = true;
+var react_1 = require("react");
+var useGetHasErpData_1 = require("../hook/useGetHasErpData");
+var ahooks_1 = require("ahooks");
+var kmkf_utils_1 = require("@kmkf-fe-packages/kmkf-utils");
+function useGetErpAddressData(notJudgedErp) {
+  var _this = this;
+  var _a = react_1.useState("loading"),
+    globalState = _a[0],
+    setGlobalState = _a[1];
+  var hasErpData = useGetHasErpData_1["default"]();
+  ahooks_1.useUpdateEffect(function () {
+    asyncQueryData(hasErpData, notJudgedErp);
+  }, [hasErpData, notJudgedErp]);
+  var asyncQueryData = function asyncQueryData(hasErpData, notJudgedErp) {
+    return __awaiter(_this, void 0, void 0, function () {
+      var hasBs, hasWdt, hasGy, promises, e_1;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            hasBs = hasErpData.hasBs, hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy;
+            promises = [];
+            if (hasBs || notJudgedErp) promises.push(kmkf_utils_1.servers.queryBsAddressData);
+            if (hasWdt || notJudgedErp) promises.push(kmkf_utils_1.servers.queryWdtAddressData);
+            if (hasGy || notJudgedErp) promises.push(kmkf_utils_1.servers.queryGyAddressData);
+            _a.label = 1;
+          case 1:
+            _a.trys.push([1, 3,, 4]);
+            return [4 /*yield*/, Promise.all(promises.map(function (promise) {
+              return promise();
+            }))];
+          case 2:
+            _a.sent();
+            setGlobalState("success");
+            return [3 /*break*/, 4];
+          case 3:
+            e_1 = _a.sent();
+            setGlobalState("failed");
+            return [3 /*break*/, 4];
+          case 4:
+            return [2 /*return*/];
+        }
+      });
+    });
+  };
+
+  var onReload = function onReload() {
+    return __awaiter(_this, void 0, void 0, function () {
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            return [4 /*yield*/, asyncQueryData(hasErpData, notJudgedErp)];
+          case 1:
+            _a.sent();
+            return [2 /*return*/];
+        }
+      });
+    });
+  };
+
+  return [globalState, onReload];
+}
+exports["default"] = useGetErpAddressData;

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

@@ -0,0 +1,186 @@
+"use strict";
+
+var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+var __generator = this && this.__generator || function (thisArg, body) {
+  var _ = {
+      label: 0,
+      sent: function sent() {
+        if (t[0] & 1) throw t[1];
+        return t[1];
+      },
+      trys: [],
+      ops: []
+    },
+    f,
+    y,
+    t,
+    g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+    while (_) try {
+      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+      if (y = 0, t) op = [op[0] & 2, t.value];
+      switch (op[0]) {
+        case 0:
+        case 1:
+          t = op;
+          break;
+        case 4:
+          _.label++;
+          return {
+            value: op[1],
+            done: false
+          };
+        case 5:
+          _.label++;
+          y = op[1];
+          op = [0];
+          continue;
+        case 7:
+          op = _.ops.pop();
+          _.trys.pop();
+          continue;
+        default:
+          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+            _ = 0;
+            continue;
+          }
+          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+            _.label = op[1];
+            break;
+          }
+          if (op[0] === 6 && _.label < t[1]) {
+            _.label = t[1];
+            t = op;
+            break;
+          }
+          if (t && _.label < t[2]) {
+            _.label = t[2];
+            _.ops.push(op);
+            break;
+          }
+          if (t[2]) _.ops.pop();
+          _.trys.pop();
+          continue;
+      }
+      op = body.call(thisArg, _);
+    } catch (e) {
+      op = [6, e];
+      y = 0;
+    } finally {
+      f = t = 0;
+    }
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+exports.__esModule = true;
+var react_1 = require("react");
+var useGetHasErpData_1 = require("../hook/useGetHasErpData");
+var ahooks_1 = require("ahooks");
+var api_1 = require("../../../service/api");
+function useGetErpLogisticsCompany(notJudgedErp) {
+  var _this = this;
+  var _a = react_1.useState("loading"),
+    globalState = _a[0],
+    setGlobalState = _a[1];
+  var hasErpData = useGetHasErpData_1["default"]();
+  ahooks_1.useUpdateEffect(function () {
+    asyncQueryData(hasErpData, notJudgedErp);
+  }, [hasErpData, notJudgedErp]);
+  var asyncQueryData = function asyncQueryData(hasErpData, notJudgedErp) {
+    return __awaiter(_this, void 0, void 0, function () {
+      var hasWdt, hasE3, hasJst, hasWln, promises, e_1;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln;
+            promises = [api_1.queryKMLogisticsCompany];
+            if (hasWdt || notJudgedErp) promises.push(api_1.queryWdtLogisticsCompany);
+            if (hasE3 || notJudgedErp) promises.push(api_1.queryBsE3LogisticsCompany);
+            if (hasJst || notJudgedErp) promises.push(api_1.queryJSTLogisticsCompany);
+            if (hasWln || notJudgedErp) promises.push(api_1.queryWLNLogisticsCompany);
+            if (!hasWdt && !hasE3 && !hasJst && !hasWln && !notJudgedErp) {
+              setGlobalState("success");
+              return [2 /*return*/];
+            }
+
+            _a.label = 1;
+          case 1:
+            _a.trys.push([1, 3,, 4]);
+            return [4 /*yield*/, Promise.all(promises.map(function (promise) {
+              return promise();
+            }))];
+          case 2:
+            _a.sent();
+            setGlobalState("success");
+            return [3 /*break*/, 4];
+          case 3:
+            e_1 = _a.sent();
+            setGlobalState("failed");
+            return [3 /*break*/, 4];
+          case 4:
+            return [2 /*return*/];
+        }
+      });
+    });
+  };
+
+  var onReload = function onReload() {
+    return __awaiter(_this, void 0, void 0, function () {
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            return [4 /*yield*/, asyncQueryData(hasErpData, notJudgedErp)];
+          case 1:
+            _a.sent();
+            return [2 /*return*/];
+        }
+      });
+    });
+  };
+
+  return [globalState, onReload];
+}
+exports["default"] = useGetErpLogisticsCompany;

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

@@ -8,9 +8,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { useState, useEffect } from "react";
+import { useEffect, useState } from "react";
 import useGetHasErpData from "../hook/useGetHasErpData";
-import { useUpdateEffect } from "ahooks";
 import { servers } from "@kmkf-fe-packages/kmkf-utils";
 function useGetErpAddressData(notJudgedErp) {
   var _useState = useState("loading"),
@@ -18,47 +17,43 @@ function useGetErpAddressData(notJudgedErp) {
     globalState = _useState2[0],
     setGlobalState = _useState2[1];
   var hasErpData = useGetHasErpData();
-  useUpdateEffect(function () {
-    if (!notJudgedErp) {
-      asyncQueryData(hasErpData, notJudgedErp);
-    }
-  }, [hasErpData, notJudgedErp]);
   useEffect(function () {
-    if (notJudgedErp) {
-      asyncQueryData({}, notJudgedErp);
-    }
-  }, [notJudgedErp]);
+    asyncQueryData(hasErpData, notJudgedErp);
+  }, [hasErpData, notJudgedErp]);
   var asyncQueryData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp, isReload) {
       var hasBs, hasWdt, hasGy, promises;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            if (!isReload) {
+              setGlobalState("loading");
+            }
             hasBs = hasErpData.hasBs, hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy;
             promises = [];
             if (hasBs || notJudgedErp) promises.push(servers.queryBsAddressData);
             if (hasWdt || notJudgedErp) promises.push(servers.queryWdtAddressData);
             if (hasGy || notJudgedErp) promises.push(servers.queryGyAddressData);
-            _context.prev = 5;
-            _context.next = 8;
+            _context.prev = 6;
+            _context.next = 9;
             return Promise.all(promises.map(function (promise) {
               return promise();
             }));
-          case 8:
+          case 9:
             setGlobalState("success");
-            _context.next = 14;
+            _context.next = 15;
             break;
-          case 11:
-            _context.prev = 11;
-            _context.t0 = _context["catch"](5);
+          case 12:
+            _context.prev = 12;
+            _context.t0 = _context["catch"](6);
             setGlobalState("failed");
-          case 14:
+          case 15:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5, 11]]);
+      }, _callee, null, [[6, 12]]);
     }));
-    return function asyncQueryData(_x2, _x3) {
+    return function asyncQueryData(_x2, _x3, _x4) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -68,7 +63,7 @@ function useGetErpAddressData(notJudgedErp) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return asyncQueryData(hasErpData, notJudgedErp);
+            return asyncQueryData(hasErpData, notJudgedErp, true);
           case 2:
           case "end":
             return _context2.stop();

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

@@ -10,54 +10,51 @@ 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 { useUpdateEffect } from "ahooks";
-import { queryWdtLogisticsCompany, queryBsE3LogisticsCompany, queryJSTLogisticsCompany, queryWLNLogisticsCompany, queryKMLogisticsCompany } from "../../../service/api";
+import { queryWdtLogisticsCompany, queryBsE3LogisticsCompany, queryJSTLogisticsCompany, queryWLNLogisticsCompany } from "../../../service/api";
 function useGetErpLogisticsCompany(notJudgedErp) {
   var _useState = useState("loading"),
     _useState2 = _slicedToArray(_useState, 2),
     globalState = _useState2[0],
     setGlobalState = _useState2[1];
   var hasErpData = useGetHasErpData();
-  useUpdateEffect(function () {
+  useEffect(function () {
     asyncQueryData(hasErpData, notJudgedErp);
   }, [hasErpData, notJudgedErp]);
-  useEffect(function () {
-    if (notJudgedErp) {
-      asyncQueryData({}, notJudgedErp);
-    }
-  }, [notJudgedErp]);
   var asyncQueryData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp, isReload) {
       var hasWdt, hasE3, hasJst, hasWln, 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;
-            promises = [queryKMLogisticsCompany];
+            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 = 6;
-            _context.next = 9;
+            _context.prev = 7;
+            _context.next = 10;
             return Promise.all(promises.map(function (promise) {
               return promise();
             }));
-          case 9:
+          case 10:
             setGlobalState("success");
-            _context.next = 15;
+            _context.next = 16;
             break;
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](6);
+          case 13:
+            _context.prev = 13;
+            _context.t0 = _context["catch"](7);
             setGlobalState("failed");
-          case 15:
+          case 16:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 12]]);
+      }, _callee, null, [[7, 13]]);
     }));
-    return function asyncQueryData(_x2, _x3) {
+    return function asyncQueryData(_x2, _x3, _x4) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -67,7 +64,7 @@ function useGetErpLogisticsCompany(notJudgedErp) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return asyncQueryData(hasErpData, notJudgedErp);
+            return asyncQueryData(hasErpData, notJudgedErp, true);
           case 2:
           case "end":
             return _context2.stop();

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

@@ -10,7 +10,6 @@ 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 { useUpdateEffect } from "ahooks";
 import { SendDataCenter } from "@kmkf-fe-packages/kmkf-utils";
 function useGetErpSendData(notJudgedErp) {
   var _useState = useState("loading"),
@@ -18,41 +17,42 @@ function useGetErpSendData(notJudgedErp) {
     globalState = _useState2[0],
     setGlobalState = _useState2[1];
   var hasErpData = useGetHasErpData();
-  useUpdateEffect(function () {
+  useEffect(function () {
     asyncQueryData(hasErpData, notJudgedErp);
   }, [hasErpData, notJudgedErp]);
-  useEffect(function () {
-    if (notJudgedErp) {
-      asyncQueryData({}, notJudgedErp);
-    }
-  }, [notJudgedErp]);
   var asyncQueryData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp) {
-      var promises;
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp, isReload) {
+      var hasWdt, hasGy, promises;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.prev = 0;
-            promises = SendDataCenter.getPromises(hasErpData, notJudgedErp);
-            _context.next = 4;
+            if (!isReload) {
+              setGlobalState("loading");
+            }
+            _context.prev = 1;
+            hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy;
+            promises = [];
+            if (hasWdt || notJudgedErp) promises.push(SendDataCenter.getInstance("wdt").fetchData);
+            if (hasGy || notJudgedErp) promises.push(SendDataCenter.getInstance("gy").fetchData);
+            _context.next = 8;
             return Promise.all(promises.map(function (promise) {
               return promise();
             }));
-          case 4:
+          case 8:
             setGlobalState("success");
-            _context.next = 10;
+            _context.next = 14;
             break;
-          case 7:
-            _context.prev = 7;
-            _context.t0 = _context["catch"](0);
+          case 11:
+            _context.prev = 11;
+            _context.t0 = _context["catch"](1);
             setGlobalState("failed");
-          case 10:
+          case 14:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 7]]);
+      }, _callee, null, [[1, 11]]);
     }));
-    return function asyncQueryData(_x2, _x3) {
+    return function asyncQueryData(_x2, _x3, _x4) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -62,7 +62,7 @@ function useGetErpSendData(notJudgedErp) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return asyncQueryData(hasErpData, notJudgedErp);
+            return asyncQueryData(hasErpData, notJudgedErp, true);
           case 2:
           case "end":
             return _context2.stop();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "2.0.2-beta.1",
+  "version": "2.0.2-beta.2",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "2.0.2-beta.1",
-    "@kmkf-fe-packages/kmkf-utils": "2.0.2-beta.1",
+    "@kmkf-fe-packages/basic-components": "2.0.2-beta.2",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.2-beta.2",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7a34f469984f073e9d925408a003b5f29106f73b",
+  "gitHead": "7a72cc893f87338d7d7ed03f15f999f29952d011",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }