@kmkf-fe-packages/services-components 2.4.0-rc.0 → 2.4.1

package/dist/esm/Hooks/useGoodsSourceFormat.js

@@ -0,0 +1,441 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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); }
+import { DEFAULT_FIELD_TYPE_LIST, servers, TEMPLATE_ID } from "@kmkf-fe-packages/kmkf-utils";
+import { useEffect, useState } from "react";
+import ShopList from "../commonComponents/ShopList";
+import { factory } from "../factory";
+import { useColumnsConfig } from "./useColumnsConfig";
+var toArray = function toArray(data) {
+  if (Array.isArray(data)) return data;
+  if (data && _typeof(data) === "object") return [data];
+  return [];
+};
+var stringToNumber = function stringToNumber(str) {
+  if (typeof str === 'number') return str;
+  // 检查输入是否为字符串类型
+  if (typeof str !== "string") return null;
+
+  // 去除首尾空白字符
+  str = str.trim();
+
+  // 检查是否为空字符串
+  if (str === "") {
+    return null;
+  }
+  var num = Number(str);
+  if (isNaN(num)) {
+    return null;
+  }
+  return num;
+};
+var getShopList = function getShopList() {
+  return servers.singletonWrap(function () {
+    return servers.queryShopList();
+  }, {
+    name: "getShopList",
+    key: "getShopList",
+    cacheTime: 1000 * 60 * 3
+  });
+};
+var queryCompanyUserSimpleInfoList = function queryCompanyUserSimpleInfoList() {
+  return servers.singletonWrap(function () {
+    return servers.queryCompanyUserSimpleInfoList();
+  }, {
+    name: "queryCompanyUserSimpleInfoList",
+    key: "queryCompanyUserSimpleInfoList",
+    cacheTime: 1000 * 60 * 3
+  });
+};
+var getPublishFlowDetail = function getPublishFlowDetail(flowTemplateKey) {
+  return servers.singletonWrap(function () {
+    return servers.getPublishFlowDetail(flowTemplateKey);
+  }, {
+    name: "getPublishFlowDetail",
+    key: flowTemplateKey,
+    cacheTime: 1000 * 10
+  });
+};
+var getGroupList = function getGroupList() {
+  return servers.singletonWrap(function () {
+    return servers.getGroupList();
+  }, {
+    name: "getGroupList",
+    key: "getGroupList",
+    cacheTime: 1000 * 60 * 3
+  });
+};
+var queryColumnsConfig = function queryColumnsConfig(params) {
+  return servers.singletonWrap(function () {
+    return servers.queryColumnsConfig(_objectSpread({
+      isGroupNode: false
+    }, params));
+  }, {
+    name: "queryColumnsConfig",
+    key: "".concat(params.flowTemplateKey, "_").concat(params.nodeId, "_").concat(params.templateId),
+    cacheTime: 1000 * 10
+  });
+};
+var sortArr = function sortArr(arr) {
+  return arr.sort(function (_ref, _ref2) {
+    var a = _ref.index;
+    var b = _ref2.index;
+    // 检查 a 和 b 是否为数字
+    var aIsNum = typeof a === "number" && !isNaN(a);
+    var bIsNum = typeof b === "number" && !isNaN(b);
+    if (aIsNum && bIsNum) {
+      // 都是数字，按数值大小排序
+      return a - b;
+    } else if (aIsNum) {
+      // a 是数字，b 不是，a 排在前面
+      return -1;
+    } else if (bIsNum) {
+      // b 是数字，a 不是，b 排在前面
+      return 1;
+    } else {
+      // 都不是数字，保持相对顺序（或都排最后）
+      return 0;
+    }
+  });
+};
+var findIndex = function findIndex(field, dataFilterConfig) {
+  var smallest = Number.MAX_VALUE;
+  if (dataFilterConfig) {
+    field.children.forEach(function (child) {
+      var _child$children, _dataFilterConfig;
+      var key = child.dataIndex || child.formField;
+      var index = (_child$children = child.children) !== null && _child$children !== void 0 && _child$children.length ? findIndex(child, dataFilterConfig) : (_dataFilterConfig = dataFilterConfig[key]) === null || _dataFilterConfig === void 0 ? void 0 : _dataFilterConfig.index;
+      if (typeof index === "number" && index < smallest) {
+        smallest = index;
+      }
+    });
+  }
+  return smallest < Number.MAX_VALUE ? smallest : void 0;
+};
+var filterTableColumn = function filterTableColumn(cols, dataFilterConfig) {
+  return cols.filter(function (col) {
+    var _col$children;
+    if ((_col$children = col.children) !== null && _col$children !== void 0 && _col$children.length) {
+      var _col$children2;
+      // 如果是复合组件
+      col.children = filterTableColumn(col.children, dataFilterConfig);
+      return (_col$children2 = col.children) === null || _col$children2 === void 0 ? void 0 : _col$children2.length;
+    } else {
+      var _dataFilterConfig2;
+      var _key = col.formField || col.dataIndex;
+      return dataFilterConfig === null || dataFilterConfig === void 0 ? void 0 : (_dataFilterConfig2 = dataFilterConfig[_key]) === null || _dataFilterConfig2 === void 0 ? void 0 : _dataFilterConfig2.isShow;
+      // return true;
+    }
+  });
+};
+
+export var useGoodsSourceFormat = function useGoodsSourceFormat(goodsSource) {
+  var _goodsSource$sourceSe, _goodsSource$sourceSe2, _goodsSource$sourceSe3;
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    filterItems = _useState2[0],
+    setFilterItems = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    allTableColumns = _useState4[0],
+    setAllTableColumns = _useState4[1];
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    flowTemplateKey = _useState6[0],
+    setFlowTemplateKey = _useState6[1];
+  var _useState7 = useState(),
+    _useState8 = _slicedToArray(_useState7, 2),
+    flowNodeId = _useState8[0],
+    setFlowNodeId = _useState8[1];
+  var _useState9 = useState(),
+    _useState10 = _slicedToArray(_useState9, 2),
+    templateKey = _useState10[0],
+    setTemplateKey = _useState10[1];
+  var _useState11 = useState(),
+    _useState12 = _slicedToArray(_useState11, 2),
+    shopList = _useState12[0],
+    setShopList = _useState12[1];
+  var _useState13 = useState(),
+    _useState14 = _slicedToArray(_useState13, 2),
+    userList = _useState14[0],
+    setUserList = _useState14[1];
+  var _useState15 = useState(),
+    _useState16 = _slicedToArray(_useState15, 2),
+    groupList = _useState16[0],
+    setGroupList = _useState16[1];
+  // 表格展示列头
+  var _useState17 = useState([]),
+    _useState18 = _slicedToArray(_useState17, 2),
+    tableColumns = _useState18[0],
+    setTableColumns = _useState18[1];
+  // console.log(`**** 数据源配置:`, { goodsSource, filterItems });
+
+  var queryComponentsConfig = {
+    filterType: {
+      every: 0,
+      some: 1
+    }[(goodsSource === null || goodsSource === void 0 ? void 0 : (_goodsSource$sourceSe = goodsSource.sourceSettings) === null || _goodsSource$sourceSe === void 0 ? void 0 : _goodsSource$sourceSe.filterMode) || "every"],
+    preQueryComponents: goodsSource === null || goodsSource === void 0 ? void 0 : (_goodsSource$sourceSe2 = goodsSource.sourceSettings) === null || _goodsSource$sourceSe2 === void 0 ? void 0 : (_goodsSource$sourceSe3 = _goodsSource$sourceSe2.filterRules) === null || _goodsSource$sourceSe3 === void 0 ? void 0 : _goodsSource$sourceSe3.map(function (rule) {
+      var _rule$leftValue, _rule$leftValue$split;
+      var key = (_rule$leftValue = rule.leftValue) === null || _rule$leftValue === void 0 ? void 0 : (_rule$leftValue$split = _rule$leftValue.split(".")[2]) === null || _rule$leftValue$split === void 0 ? void 0 : _rule$leftValue$split.replace(/#$/, "");
+      if (key === 'flowCreator') {
+        var _rule$rightValue, _rule$rightValue2;
+        var value = new Set();
+        (((_rule$rightValue = rule.rightValue) === null || _rule$rightValue === void 0 ? void 0 : _rule$rightValue.staffIds) || []).map(function (userKey) {
+          var user = userList === null || userList === void 0 ? void 0 : userList.find(function (item) {
+            return item.value === userKey;
+          });
+          if (user !== null && user !== void 0 && user.label) {
+            value.add(user.label);
+          } else {
+            value.add(userKey);
+          }
+        });
+        (((_rule$rightValue2 = rule.rightValue) === null || _rule$rightValue2 === void 0 ? void 0 : _rule$rightValue2.groupIds) || []).forEach(function (groupId) {
+          var _group$relationUserLi;
+          var group = groupList === null || groupList === void 0 ? void 0 : groupList.find(function (item) {
+            return item.value === groupId;
+          });
+          group === null || group === void 0 ? void 0 : (_group$relationUserLi = group.relationUserList) === null || _group$relationUserLi === void 0 ? void 0 : _group$relationUserLi.map(function (item) {
+            value.add(item.userName);
+          });
+        });
+        return {
+          key: key,
+          symbol: rule.compareSymbol,
+          value: _toConsumableArray(value)
+        };
+      }
+      return {
+        key: key === 'shopName' ? 'shopNameList' : key,
+        symbol: rule.compareSymbol,
+        value: rule.rightValue
+      };
+    })
+  };
+  var _useColumnsConfig = useColumnsConfig({}),
+    tableColumnConfig = _useColumnsConfig.tableColumnConfig;
+  var workOrderDataToGoods = function workOrderDataToGoods(data, erp) {
+    var _goodsSource$sourceSe4;
+    // gy商品 接口返回，和选中的 都是这个
+    // brandName:  "小白熊"
+    // brandNo:  "BRD01"
+    // categoryName:  "03母乳保存"
+    // categoryType:  "18"
+    // companyKey:  "SZF4ZGWZSNW6PYXMCIFEWBXT"
+    // costPrice:  "13.1802"
+    // goodId:  "535367779990"
+    // goodName:  "母乳收集器(2只装)"
+    // goodNo:  "XCP.01.03.20001"
+    // goodPicUrl:  ""
+    // goodShortName:  "08395"
+    // id:  162457
+    // isGift:  false
+    // isSkuItem:  true
+    // isVirtual: false
+    // platform:  "GY_ERP"
+    // retailPrice:  "59.0"
+    // specBarcode:  "6951406983951"
+    // specId:  "535367763578"
+    // specName:  "2入装"
+    // specNo:  "XCP.01.03.20001"
+
+    // 配置的值 keyMap
+    // amount: "adidBRdsfi"
+    // amountAfter: "qzBjJj8sfi"
+    // cancel: "qzBjJj8sfi"
+    // discountFee: "qzBjJj8sfi"
+    // goodName: "qzBjJj8sfi"
+    // goodNo: "Q8ZZHLWlki"
+    // goodShortName: "adidBRdsfi"
+    // isGift: "qzBjJj8sfi"
+    // originAmount: "qzBjJj8sfi"
+    // originPrice: "qzBjJj8sfi"
+    // price: "qzBjJj8sfi"
+    // qty: "qzBjJj8sfi"
+    // skuNote: "qzBjJj8sfi"
+    // specName: "qzBjJj8sfi"
+    // specNo: "qzBjJj8sfi"
+    // console.log("*** 商品 数据转换", {
+    //   data,
+    //   erp,
+    //   keyMap: goodsSource?.sourceSettings.keyMap,
+    // });
+    var goods = {};
+    var keyMap = (goodsSource === null || goodsSource === void 0 ? void 0 : (_goodsSource$sourceSe4 = goodsSource.sourceSettings) === null || _goodsSource$sourceSe4 === void 0 ? void 0 : _goodsSource$sourceSe4.keyMap) || {};
+    var ids = _toConsumableArray(new Set(Object.values(keyMap)));
+    var fieldMap = new Map();
+    ids.forEach(function (id) {
+      var field = allTableColumns.find(function (column) {
+        return column.id === id;
+      });
+      if (field) {
+        fieldMap.set(id, field);
+      }
+    });
+    // console.log(`🚀 ~ 组件 ids:`, ids, allTableColumns, fieldMap);
+    Object.entries(keyMap).forEach(function (_ref3) {
+      var _ref4 = _slicedToArray(_ref3, 2),
+        key = _ref4[0],
+        id = _ref4[1];
+      var field = fieldMap.get(id);
+      if (!field) return;
+      // PS: 当前只有输入框/多行文本框/单选/下拉单选 所以不用考虑复合组件
+      var fillValue = field.formField ? data[field.formField] : void 0;
+      if (field.type === "RADIO" && data["".concat(field.id, "_radioOther")]) {
+        fillValue = data["".concat(field.id, "_radioOther")];
+      }
+      if (["isGift", "cancel"].includes(key)) {
+        fillValue = fillValue === "是" ? 1 : fillValue === "否" ? 0 : void 0;
+      }
+      goods[key] = ["qty", "price", "amount", "originPrice", "originAmount", "discountFee", "amountAfter"].includes(key) ? stringToNumber(fillValue) : fillValue;
+    });
+    goods.id = data.id;
+    // console.log("***** 转换之后的 values", goods);
+    return goods;
+  };
+  useEffect(function () {
+    getShopList().then(function (_ref5) {
+      var data = _ref5.data;
+      setShopList(data);
+    }).catch(console.warn);
+    queryCompanyUserSimpleInfoList().then(function (_ref6) {
+      var data = _ref6.data;
+      setUserList((data || []).map(function (_ref7) {
+        var account = _ref7.account,
+          userKey = _ref7.userKey;
+        return {
+          label: account,
+          value: userKey
+        };
+      }));
+    }).catch(console.warn);
+    getGroupList().then(function (_ref8) {
+      var data = _ref8.data;
+      setGroupList((data || []).map(function (_ref9) {
+        var groupUniqueKey = _ref9.groupUniqueKey,
+          groupName = _ref9.groupName,
+          relationUserList = _ref9.relationUserList;
+        return {
+          label: groupName,
+          value: groupUniqueKey,
+          relationUserList: relationUserList
+        };
+      }));
+    }).catch(console.warn);
+
+    // return () => {
+    //   setShopList(void 0);
+    //   setUserList(void 0);
+    //   setGroupList(void 0);
+    // };
+  }, []);
+  useEffect(function () {
+    var _goodsSource$sourceSe5;
+    var _ref10 = (goodsSource === null || goodsSource === void 0 ? void 0 : (_goodsSource$sourceSe5 = goodsSource.sourceSettings) === null || _goodsSource$sourceSe5 === void 0 ? void 0 : _goodsSource$sourceSe5.workOrder) || {},
+      flowTemplateKey = _ref10.flowTemplateKey,
+      nodeId = _ref10.nodeId;
+    if ((goodsSource === null || goodsSource === void 0 ? void 0 : goodsSource.source) === "workOrder" && flowTemplateKey && nodeId && shopList && userList && groupList) {
+      setFilterItems([]);
+      setAllTableColumns([]);
+      setTemplateKey(undefined);
+      setTableColumns([]);
+      setFlowTemplateKey(flowTemplateKey);
+      setFlowNodeId(nodeId);
+      getPublishFlowDetail(flowTemplateKey).then(function (_ref11) {
+        var _data$flowConfig, _data$flowConfig$node, _currentNodeInfo$rela;
+        var data = _ref11.data;
+        var currentNodeInfo = data === null || data === void 0 ? void 0 : (_data$flowConfig = data.flowConfig) === null || _data$flowConfig === void 0 ? void 0 : (_data$flowConfig$node = _data$flowConfig.nodes) === null || _data$flowConfig$node === void 0 ? void 0 : _data$flowConfig$node.find(function (node) {
+          return node.id === nodeId;
+        });
+        var workOrderTemplateId = currentNodeInfo === null || currentNodeInfo === void 0 ? void 0 : (_currentNodeInfo$rela = currentNodeInfo.relationEvent) === null || _currentNodeInfo$rela === void 0 ? void 0 : _currentNodeInfo$rela.workOrderTemplateId;
+        // console.log("**** in 获取到流程数据", {
+        //   data,
+        //   currentNodeInfo,
+        //   workOrderTemplateId,
+        // });
+        if (workOrderTemplateId) {
+          queryColumnsConfig({
+            flowTemplateKey: flowTemplateKey,
+            nodeId: nodeId,
+            templateId: workOrderTemplateId
+          }).then(function (_ref12) {
+            var _data$fixedColumns, _goodsSource$sourceSe13;
+            var data = _ref12.data;
+            var columnsList = data === null || data === void 0 ? void 0 : (_data$fixedColumns = data.fixedColumns) === null || _data$fixedColumns === void 0 ? void 0 : _data$fixedColumns.concat(data === null || data === void 0 ? void 0 : data.nonFixedColumns);
+            var newFilterItems = [];
+            columnsList === null || columnsList === void 0 ? void 0 : columnsList.forEach(function (l) {
+              var instance = factory(l.type, {
+                id: l.id,
+                name: l.name,
+                type: l.type,
+                componentConfig: _objectSpread(_objectSpread({}, l === null || l === void 0 ? void 0 : l.config), l === null || l === void 0 ? void 0 : l.templateConfig),
+                renderExport: function renderExport() {
+                  return null;
+                },
+                effects: {
+                  shopList: shopList,
+                  userList: userList,
+                  groupList: groupList
+                }
+              });
+              var filterConfigList = toArray(instance === null || instance === void 0 ? void 0 : instance.filterConfig(l)).filter(function (item) {
+                var _goodsSource$sourceSe6, _goodsSource$sourceSe7;
+                return ((_goodsSource$sourceSe6 = goodsSource.sourceSettings) === null || _goodsSource$sourceSe6 === void 0 ? void 0 : (_goodsSource$sourceSe7 = _goodsSource$sourceSe6.dataFilterConfig[item.formField || item.id]) === null || _goodsSource$sourceSe7 === void 0 ? void 0 : _goodsSource$sourceSe7.isFilter) && !(DEFAULT_FIELD_TYPE_LIST.includes(item.type) || item.type === TEMPLATE_ID);
+              });
+              newFilterItems = newFilterItems.concat(filterConfigList.map(function (item) {
+                var _goodsSource$sourceSe8, _goodsSource$sourceSe9;
+                item.index = (_goodsSource$sourceSe8 = goodsSource.sourceSettings) === null || _goodsSource$sourceSe8 === void 0 ? void 0 : (_goodsSource$sourceSe9 = _goodsSource$sourceSe8.dataFilterConfig[item.formField || item.id]) === null || _goodsSource$sourceSe9 === void 0 ? void 0 : _goodsSource$sourceSe9.index;
+                return item;
+              }));
+            });
+            var allTableColumns = sortArr(columnsList.reduce(tableColumnConfig, []).map(function (item) {
+              var _item$children, _goodsSource$sourceSe10, _goodsSource$sourceSe11, _goodsSource$sourceSe12;
+              var _index = (_item$children = item.children) !== null && _item$children !== void 0 && _item$children.length ? findIndex(item, (_goodsSource$sourceSe10 = goodsSource.sourceSettings) === null || _goodsSource$sourceSe10 === void 0 ? void 0 : _goodsSource$sourceSe10.dataFilterConfig) : (_goodsSource$sourceSe11 = goodsSource.sourceSettings) === null || _goodsSource$sourceSe11 === void 0 ? void 0 : (_goodsSource$sourceSe12 = _goodsSource$sourceSe11.dataFilterConfig[item.sortField]) === null || _goodsSource$sourceSe12 === void 0 ? void 0 : _goodsSource$sourceSe12.index;
+              item.index = _index;
+              return item;
+            }));
+            var newTableColumns = filterTableColumn(allTableColumns, (_goodsSource$sourceSe13 = goodsSource.sourceSettings) === null || _goodsSource$sourceSe13 === void 0 ? void 0 : _goodsSource$sourceSe13.dataFilterConfig);
+            setTableColumns(newTableColumns);
+            setFilterItems(sortArr(newFilterItems));
+            setAllTableColumns(allTableColumns);
+            setTemplateKey(workOrderTemplateId);
+            // console.log("**** in 获取到表头信息", {
+            //   newTableColumns,
+            //   data,
+            //   newFilterItems,
+            //   allTableColumns,
+            // });
+          }).catch(function (error) {
+            console.log("**** 获取表头信息 error", error);
+          });
+        }
+      }).catch(function (error) {
+        console.log("**** in 获取流程数据 error", error);
+      });
+    }
+  }, [shopList, userList, groupList]);
+  return {
+    flowTemplateKey: flowTemplateKey,
+    flowNodeId: flowNodeId,
+    templateKey: templateKey,
+    filterItems: filterItems,
+    tableColumns: tableColumns,
+    ShopList: ShopList,
+    workOrderDataToGoods: workOrderDataToGoods,
+    queryComponentsConfig: queryComponentsConfig
+  };
+};

package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.d.ts

@@ -1,3 +1,3 @@
-declare type HasErpDataKeyType = "hasWln" | "hasWdt" | "hasBs" | "hasE3" | "hasJst" | "hasGy";
+declare type HasErpDataKeyType = "hasWln" | "hasWdt" | "hasBs" | "hasE3" | "hasJst" | "hasGy" | "hasJy" | "hasJky";
 declare function useGetHasErpData(reduxData: any): Record<HasErpDataKeyType, boolean>;
 export default useGetHasErpData;

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

@@ -6,14 +6,16 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useEffect, useMemo, useState } from "react";
 var getTemplate = function getTemplate(companyUserConfig) {
-  var _companyUserConfig$pl, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig$pl5, _companyUserConfig$pl6, _companyUserConfig$pl7, _companyUserConfig$pl8, _companyUserConfig$pl9, _companyUserConfig$pl10, _companyUserConfig$pl11, _companyUserConfig$pl12, _companyUserConfig$pl13, _companyUserConfig$pl14, _companyUserConfig$pl15, _companyUserConfig$pl16, _companyUserConfig$pl17, _companyUserConfig$pl18;
+  var _companyUserConfig$pl, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig$pl5, _companyUserConfig$pl6, _companyUserConfig$pl7, _companyUserConfig$pl8, _companyUserConfig$pl9, _companyUserConfig$pl10, _companyUserConfig$pl11, _companyUserConfig$pl12, _companyUserConfig$pl13, _companyUserConfig$pl14, _companyUserConfig$pl15, _companyUserConfig$pl16, _companyUserConfig$pl17, _companyUserConfig$pl18, _companyUserConfig$pl19, _companyUserConfig$pl20, _companyUserConfig$pl21, _companyUserConfig$pl22, _companyUserConfig$pl23, _companyUserConfig$pl24;
   return JSON.stringify({
     hasWln: (_companyUserConfig$pl = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl2 = companyUserConfig.plugins) === null || _companyUserConfig$pl2 === void 0 ? void 0 : (_companyUserConfig$pl3 = _companyUserConfig$pl2.wln) === null || _companyUserConfig$pl3 === void 0 ? void 0 : _companyUserConfig$pl3.show) !== null && _companyUserConfig$pl !== void 0 ? _companyUserConfig$pl : false,
     hasWdt: (_companyUserConfig$pl4 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl5 = companyUserConfig.plugins) === null || _companyUserConfig$pl5 === void 0 ? void 0 : (_companyUserConfig$pl6 = _companyUserConfig$pl5.wdt) === null || _companyUserConfig$pl6 === void 0 ? void 0 : _companyUserConfig$pl6.show) !== null && _companyUserConfig$pl4 !== void 0 ? _companyUserConfig$pl4 : false,
     hasBs: (_companyUserConfig$pl7 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl8 = companyUserConfig.plugins) === null || _companyUserConfig$pl8 === void 0 ? void 0 : (_companyUserConfig$pl9 = _companyUserConfig$pl8.bs) === null || _companyUserConfig$pl9 === void 0 ? void 0 : _companyUserConfig$pl9.show) !== null && _companyUserConfig$pl7 !== void 0 ? _companyUserConfig$pl7 : false,
     hasE3: (_companyUserConfig$pl10 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl11 = companyUserConfig.plugins) === null || _companyUserConfig$pl11 === void 0 ? void 0 : (_companyUserConfig$pl12 = _companyUserConfig$pl11.bse3) === null || _companyUserConfig$pl12 === void 0 ? void 0 : _companyUserConfig$pl12.show) !== null && _companyUserConfig$pl10 !== void 0 ? _companyUserConfig$pl10 : false,
     hasJst: (_companyUserConfig$pl13 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl14 = companyUserConfig.plugins) === null || _companyUserConfig$pl14 === void 0 ? void 0 : (_companyUserConfig$pl15 = _companyUserConfig$pl14.jst) === null || _companyUserConfig$pl15 === void 0 ? void 0 : _companyUserConfig$pl15.show) !== null && _companyUserConfig$pl13 !== void 0 ? _companyUserConfig$pl13 : false,
-    hasGy: (_companyUserConfig$pl16 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl17 = companyUserConfig.plugins) === null || _companyUserConfig$pl17 === void 0 ? void 0 : (_companyUserConfig$pl18 = _companyUserConfig$pl17.gy) === null || _companyUserConfig$pl18 === void 0 ? void 0 : _companyUserConfig$pl18.show) !== null && _companyUserConfig$pl16 !== void 0 ? _companyUserConfig$pl16 : false
+    hasGy: (_companyUserConfig$pl16 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl17 = companyUserConfig.plugins) === null || _companyUserConfig$pl17 === void 0 ? void 0 : (_companyUserConfig$pl18 = _companyUserConfig$pl17.gy) === null || _companyUserConfig$pl18 === void 0 ? void 0 : _companyUserConfig$pl18.show) !== null && _companyUserConfig$pl16 !== void 0 ? _companyUserConfig$pl16 : false,
+    hasJy: (_companyUserConfig$pl19 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl20 = companyUserConfig.plugins) === null || _companyUserConfig$pl20 === void 0 ? void 0 : (_companyUserConfig$pl21 = _companyUserConfig$pl20.juYi) === null || _companyUserConfig$pl21 === void 0 ? void 0 : _companyUserConfig$pl21.show) !== null && _companyUserConfig$pl19 !== void 0 ? _companyUserConfig$pl19 : false,
+    hasJky: (_companyUserConfig$pl22 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl23 = companyUserConfig.plugins) === null || _companyUserConfig$pl23 === void 0 ? void 0 : (_companyUserConfig$pl24 = _companyUserConfig$pl23.jky) === null || _companyUserConfig$pl24 === void 0 ? void 0 : _companyUserConfig$pl24.show) !== null && _companyUserConfig$pl22 !== void 0 ? _companyUserConfig$pl22 : false
   });
 };
 function useGetHasErpData(reduxData) {

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

@@ -1,12 +1,12 @@
 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-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); }
@@ -15,6 +15,7 @@ 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 { cloneDeep } from "lodash";
 import { queryExpressInterceptData, queryLogisticsAddressData, queryPlatData, queryLabel, queryAllLogisticsCompany, queryKMLogisticsCompany } from "../../service/api";
 import { servers, SendDataCenter } from "@kmkf-fe-packages/kmkf-utils";
 import useGetErpLogisticsCompany from "./orderQuery/useGetErpLogisticsCompany";
@@ -48,6 +49,12 @@ var Global = function Global(_ref) {
     try {
       var _reduxData$main, _reduxData$workOrder, _reduxData$global;
       var userInfo = (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$main = reduxData.main) === null || _reduxData$main === void 0 ? void 0 : _reduxData$main.userInfo) || (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$workOrder = reduxData.workOrder) === null || _reduxData$workOrder === void 0 ? void 0 : _reduxData$workOrder.userInfo) || (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$global = reduxData.global) === null || _reduxData$global === void 0 ? void 0 : _reduxData$global.userInfo) || {};
+      var companyUserConfig = cloneDeep(userInfo.companyUserConfig);
+      if (companyUserConfig && typeof companyUserConfig === "string") {
+        userInfo = _objectSpread(_objectSpread({}, userInfo), {}, {
+          companyUserConfig: JSON.parse(companyUserConfig)
+        });
+      }
       localStorage.setItem("reduxData_userInfo", JSON.stringify(userInfo));
     } catch (e) {
       console.error(e);

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

@@ -22,36 +22,39 @@ function useGetErpAddressData(reduxData, notJudgedErp) {
   }, [hasErpData, notJudgedErp]);
   var asyncQueryData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp, isReload) {
-      var hasBs, hasWdt, hasGy, promises;
+      var hasBs, hasWdt, hasGy, hasJst, hasJky, 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;
+            hasBs = hasErpData.hasBs, hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy, hasJst = hasErpData.hasJst, hasJky = hasErpData.hasJky;
             promises = [];
             if (hasBs || notJudgedErp) promises.push(servers.queryBsAddressData);
             if (hasWdt || notJudgedErp) promises.push(servers.queryWdtAddressData);
+            // JKY用的系统的地址，暂时不需要查询
+            // if (hasJky || notJudgedErp) promises.push(servers.queryJkyAddressData);
             if (hasGy || notJudgedErp) promises.push(servers.queryGyAddressData);
-            _context.prev = 6;
-            _context.next = 9;
+            if (hasJst || notJudgedErp) promises.push(servers.queryJstAddressData);
+            _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, _x4) {
       return _ref.apply(this, arguments);