@kmkf-fe-packages/kmkf-utils 2.2.31-beta.53 → 2.2.31-beta.60

package/README.md

@@ -1 +1 @@
-112311133111
+1123111331111

package/dist/esm/baseAddressData/baseAddressData.d.ts

@@ -5,5 +5,5 @@ export default abstract class BaseAddressData {
     protected abstract addressOptions: TreeOption[];
     getProCodeByName(proName: string): number | undefined;
     getNameByCode(code: string | number): string;
-    getCodesByNames(names: Array<string>): (string | undefined)[];
+    getCodesByNames(names: Array<string>, isIncludesDistrict?: boolean): (string | undefined)[];
 }

package/dist/esm/baseAddressData/baseAddressData.js

@@ -1,7 +1,4 @@
 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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -27,32 +24,32 @@ var BaseAddressData = /*#__PURE__*/function () {
       var _ref;
       return (_ref = (this.addrData || {})[code] || []) === null || _ref === void 0 ? void 0 : _ref[0];
     }
+
+    // isIncludesDistrict 为true时区县如果未找到全等的就查找包含的<暂时仅jst识别地址需要>
   }, {
     key: "getCodesByNames",
     value: function getCodesByNames(names) {
+      var isIncludesDistrict = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var codes = [];
       var currentData = this.addressOptions;
-      var _iterator = _createForOfIteratorHelper(names),
-        _step;
-      try {
-        var _loop = function _loop() {
-          var name = _step.value;
-          var foundChild = currentData.find(function (item) {
-            return item.label === name;
+      names.forEach(function (name, index) {
+        var _foundChild, _foundChild2;
+        var foundChild = currentData.find(function (item) {
+          return item.label === name;
+        });
+
+        // 区县如果未找到全等的就查找包含的
+        if (!foundChild && isIncludesDistrict && index === 2) {
+          foundChild = currentData.find(function (item) {
+            return item.label.includes(name);
           });
-          codes.push(foundChild === null || foundChild === void 0 ? void 0 : foundChild.value);
-          if (!isEmpty(foundChild === null || foundChild === void 0 ? void 0 : foundChild.children)) {
-            currentData = (foundChild === null || foundChild === void 0 ? void 0 : foundChild.children) || [];
-          }
-        };
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          _loop();
         }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
+        codes.push((_foundChild = foundChild) === null || _foundChild === void 0 ? void 0 : _foundChild.value);
+        if (!isEmpty((_foundChild2 = foundChild) === null || _foundChild2 === void 0 ? void 0 : _foundChild2.children)) {
+          var _foundChild3;
+          currentData = ((_foundChild3 = foundChild) === null || _foundChild3 === void 0 ? void 0 : _foundChild3.children) || [];
+        }
+      });
       return codes.filter(Boolean);
     }
   }]);

package/dist/esm/utils/orderBackFormValues.js

@@ -85,7 +85,7 @@ export default (function (_ref) {
     _ref$fromQNCreateWork = _ref.fromQNCreateWorkOrderByOrderNo,
     fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork;
   var orderValues = !_get_order_fail_ ? ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
-    var _next$componentConfig, _next$componentConfig2, _next$componentConfig3;
+    var _detail$expressLogist, _detail$returnLogisti, _next$componentConfig, _next$componentConfig2, _next$componentConfig3;
     var uniqueKey = next.uniqueKey;
     var config = next.componentConfig;
     var city = null,
@@ -143,13 +143,13 @@ export default (function (_ref) {
       case "EXPRESS_LOGISTICS_SELECT":
         prv[uniqueKey] = {
           company: config.isSingle && config.showField === "EXPRESS_COMPANY" || !config.isSingle ? ExpressData.getInstance().getExpressCodeByName(detail["expressLogisticsCompany"]) : "",
-          order: config.isSingle && config.showField === "EXPRESS_WAYBILL_CODE" || !config.isSingle ? detail["expressLogisticsCode"] : ""
+          order: config.isSingle && config.showField === "EXPRESS_WAYBILL_CODE" || !config.isSingle ? config !== null && config !== void 0 && config.toUpperCase ? (_detail$expressLogist = detail["expressLogisticsCode"]) === null || _detail$expressLogist === void 0 ? void 0 : _detail$expressLogist.toUpperCase() : detail["expressLogisticsCode"] : ""
         };
         break;
       case "RETURN_LOGISTICS_SELECT":
         prv[uniqueKey] = {
           company: ExpressData.getInstance().getExpressCodeByName(detail["returnLogisticsCompany"]),
-          order: detail["returnLogisticsCode"]
+          order: config !== null && config !== void 0 && config.toUpperCase ? (_detail$returnLogisti = detail["returnLogisticsCode"]) === null || _detail$returnLogisti === void 0 ? void 0 : _detail$returnLogisti.toUpperCase() : detail["returnLogisticsCode"]
         };
         break;
       case "ALI_PAY_INPUT":

package/dist/esm/utils/skxOrderBackFormValues.js

@@ -36,11 +36,12 @@ export var skxOrderBackFormValues = function skxOrderBackFormValues() {
     initValue.erpShopName = detail === null || detail === void 0 ? void 0 : detail.erpShopName;
   }
   return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
+    var _detail$onBillNo;
     var uniqueKey = next.uniqueKey;
     var config = next.componentConfig;
     switch (next.workOrderComponentType) {
       case "SKX_OUTBOUND_NOTICE_NO":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.onBillNo;
+        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : (_detail$onBillNo = detail.onBillNo) === null || _detail$onBillNo === void 0 ? void 0 : _detail$onBillNo.toUpperCase();
         break;
       case "SKX_LOGISTICS":
         prv[uniqueKey] = updateSkxItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.skxLogistics, "logistics", config);
@@ -143,6 +144,9 @@ var updateSkxItemListByConfigHandle = function updateSkxItemListByConfigHandle(l
       }
       if (!["logisticsCode", ""].includes(showField || "")) {
         next.logisticsCode = undefined;
+      } else {
+        var _next$logisticsCode;
+        next.logisticsCode = next === null || next === void 0 ? void 0 : (_next$logisticsCode = next.logisticsCode) === null || _next$logisticsCode === void 0 ? void 0 : _next$logisticsCode.toUpperCase();
       }
     }
     prv.push(next);

package/dist/esm/utils/skxReturnOrderBackFormValues.js

@@ -30,11 +30,12 @@ export var skxReturnOrderBackFormValues = function skxReturnOrderBackFormValues(
   var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
+    var _detail$skxReturnBill;
     var uniqueKey = next.uniqueKey;
     var config = next.componentConfig;
     switch (next.workOrderComponentType) {
       case "SKX_RETURN_BILL_NO":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.skxReturnBillNo;
+        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : (_detail$skxReturnBill = detail.skxReturnBillNo) === null || _detail$skxReturnBill === void 0 ? void 0 : _detail$skxReturnBill.toUpperCase();
         break;
       case "SKX_REFUND_BILL_NO":
         prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.skxRefundBillNo;
@@ -127,6 +128,9 @@ var updateSkxItemListByConfigHandle = function updateSkxItemListByConfigHandle(l
       }
       if (!["logisticsCode", ""].includes(showField || "")) {
         next.logisticsCode = undefined;
+      } else {
+        var _next$logisticsCode;
+        next.logisticsCode = next === null || next === void 0 ? void 0 : (_next$logisticsCode = next.logisticsCode) === null || _next$logisticsCode === void 0 ? void 0 : _next$logisticsCode.toUpperCase();
       }
     }
     prv.push(next);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.2.31-beta.53",
+  "version": "2.2.31-beta.60",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "da633abe80f99d28e5ab6d93e38822a002674de0",
+  "gitHead": "fcf46f31b13ccb2f819a42091d8c708986b14ae5",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }

package/dist/esm/utils/dist/gyOrderBackFormValues.js

@@ -1,285 +0,0 @@
-"use strict";
-
-var __assign = this && this.__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-    }
-    return t;
-  };
-  return __assign.apply(this, arguments);
-};
-exports.__esModule = true;
-exports.filterGyOrders = exports.gyOrderBackFormValues = exports.gyOrderTransform = exports.updateGyGoodsHandle = exports.GY_SYSTEM_ORDER_CONFIG = void 0;
-var getUUid_1 = require("./getUUid");
-var deliveryStateMap = {
-  0: "未发货",
-  2: "全部发货"
-};
-exports.GY_SYSTEM_ORDER_CONFIG = {
-  key: "gySystemShowOrder",
-  name: "管易",
-  selectId: "gySystemSelectIds",
-  columns: [{
-    dataIndex: "billType",
-    title: "订单类型",
-    width: 150
-  }, {
-    dataIndex: "billNo",
-    title: "系统订单号",
-    width: 160
-  }, {
-    dataIndex: "tradeTagName",
-    title: "订单标记名称",
-    width: 150
-  }, {
-    dataIndex: "billTag",
-    title: "订单标签",
-    width: 150
-  }, {
-    dataIndex: "deliveryState",
-    title: "发货状态",
-    width: 150
-  }]
-};
-exports.updateGyGoodsHandle = function (orders) {
-  if (orders === void 0) {
-    orders = [];
-  }
-  return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
-    if (Array.isArray(cur.details)) {
-      acc.push.apply(acc, cur.details.map(function (item) {
-        var _a;
-        item.goodName = item.itemName;
-        item.goodShortName = item.itemSimpleName;
-        item.goodNo = item.itemCode;
-        item.specNo = item.skuCode;
-        item.specName = item.skuName;
-        item.canDelete = true;
-        item.uuid = (_a = item.uuid) !== null && _a !== void 0 ? _a : getUUid_1["default"]();
-        return item;
-      }));
-    }
-    return acc;
-  }, []);
-};
-var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList, form) {
-  var _a, _b;
-  if (type === "logistics") {
-    //管易物流信息组件先不做
-    // const currentCom = comList?.find?.(
-    //   (item) => item.workOrderComponentType === "GY_LOGISTICS"
-    // );
-    // const notOrderBack = currentCom?.componentConfig?.notOrderBack || false;
-    // if (notOrderBack) {
-    //   let currentValue = form.getFieldValue(currentCom.uniqueKey);
-    //   currentValue = currentValue?.length
-    //     ? currentValue
-    //     : [{ logisticsCode: "", logisticsCompany: "" }];
-    //   return currentValue;
-    // }
-  } else if (type === "send") {
-    var currentCom = (_a = comList === null || comList === void 0 ? void 0 : comList.find) === null || _a === void 0 ? void 0 : _a.call(comList, function (item) {
-      return item.workOrderComponentType === "GY_SEND_GOOD";
-    });
-    var notOrderBack = ((_b = currentCom === null || currentCom === void 0 ? void 0 : currentCom.componentConfig) === null || _b === void 0 ? void 0 : _b.notOrderBack) || false;
-    if (notOrderBack) {
-      var currentValue = form.getFieldValue(currentCom.uniqueKey);
-      currentValue = (currentValue === null || currentValue === void 0 ? void 0 : currentValue.length) ? currentValue : [{
-        sendId: "",
-        sendName: ""
-      }];
-      return currentValue;
-    }
-  }
-  var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
-    var items = ((next === null || next === void 0 ? void 0 : next.details) || []).map(function (t) {
-      return {
-        title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
-        picUrl: (t === null || t === void 0 ? void 0 : t.picPath) || "",
-        platform: "gy",
-        skuId: (t === null || t === void 0 ? void 0 : t.itemCode) || ""
-      };
-    });
-    var params = {
-      items: items
-    };
-    if (type === "logistics") {
-      // params.logisticsCompany = next?.shippingCode;
-      // params.logisticsCode = next?.shippingSn;
-    } else if (type === "send") {
-      params.sendId = next === null || next === void 0 ? void 0 : next.warehouseCode;
-      //下拉框，取id
-      params.sendName = next === null || next === void 0 ? void 0 : next.warehouseCode;
-      params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
-    }
-    prv.push(params);
-    return prv;
-  }, []);
-  if (!(newList === null || newList === void 0 ? void 0 : newList.length)) {
-    switch (type) {
-      case "logistics":
-        newList = [{
-          logisticsCode: ""
-        }];
-        break;
-      case "supply":
-        newList = [{
-          supplyId: ""
-        }];
-        break;
-      case "send":
-        newList = [{
-          sendId: "",
-          sendName: ""
-        }];
-        break;
-    }
-  }
-  return newList;
-};
-//管易订单信息转换
-exports.gyOrderTransform = function (detail, form) {
-  var _a, _b, _c, _d, _e, _f;
-  var orderNo = detail.orderNo,
-    _g = detail.trades,
-    currentTrades = _g === void 0 ? [] : _g,
-    componentList = detail.componentList;
-  var gyGoodsCom = (componentList || []).find(function (com) {
-    return com.workOrderComponentType === "GY_GOODS";
-  });
-  var isStrict = gyGoodsCom ? (_a = form.getFieldValue(gyGoodsCom.uniqueKey)) === null || _a === void 0 ? void 0 : _a.isStrict : false;
-  var onlyOneSystemOrder = (currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.length) === 1;
-  console.log("触发---getGyOrderList--4");
-  return {
-    gySystemOrder: {
-      orderNo: orderNo,
-      isTest: 4,
-      orders: currentTrades.map(function (item) {
-        return __assign(__assign({}, item), {
-          billNo: item.code,
-          billType: item.orderTypeName,
-          billTag: item.tagName,
-          tradeTagName: item.tradeTagName,
-          deliveryState: deliveryStateMap[item.deliveryState]
-        });
-      }),
-      selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
-        return item.code;
-      }) : [],
-      showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
-        return __assign(__assign({}, item), {
-          billNo: item.code,
-          billType: item.orderTypeName,
-          billTag: item.tagName,
-          tradeTagName: item.tradeTagName,
-          deliveryState: deliveryStateMap[item.deliveryState]
-        });
-      })
-    },
-    gySystemOrderNo: onlyOneSystemOrder ? (_b = currentTrades[0]) === null || _b === void 0 ? void 0 : _b.code : undefined,
-    gyReissueGoods: onlyOneSystemOrder ? exports.updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
-      return !isStrict || !orderNo || good.platformCode === orderNo;
-    }) : [],
-    gyGoods: {
-      // 订单反填，要清空orders，存的是当前系统订单号勾选上的 订单
-      orders: currentTrades,
-      orderNo: orderNo,
-      shopCode: ((_d = (_c = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _c === void 0 ? void 0 : _c.call(currentTrades, function (item) {
-        return item.shopCode;
-      })) === null || _d === void 0 ? void 0 : _d.shopCode) || null,
-      vipCode: ((_f = (_e = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _e === void 0 ? void 0 : _e.call(currentTrades, function (item) {
-        return item.vipCode;
-      })) === null || _f === void 0 ? void 0 : _f.vipCode) || null,
-      gyGoods: exports.updateGyGoodsHandle(currentTrades).filter(function (good) {
-        return !isStrict || !orderNo || good.platformCode === orderNo;
-      })
-    },
-    // gyLogistics: updateGyItemListHandle(
-    //   currentTrades,
-    //   "logistics",
-    //   componentList || [],
-    //   form
-    // ),
-    gySendGood: updateGyItemListHandle(currentTrades, "send", componentList || [], form)
-  };
-};
-exports.gyOrderBackFormValues = function (detail, templateDetail) {
-  if (detail === void 0) {
-    detail = {};
-  }
-  if (templateDetail === void 0) {
-    templateDetail = {};
-  }
-  return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
-    var _a, _b;
-    var uniqueKey = next.uniqueKey;
-    var config = next.componentConfig;
-    switch (next.workOrderComponentType) {
-      case "GY_SYSTEM_ORDER":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gySystemOrder;
-        break;
-      case "GY_GOODS":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gyGoods;
-        break;
-      case "GY_REISSUE_GOODS":
-        prv[uniqueKey] = {
-          gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
-          gyReissueGoods: detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
-          gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
-          gyReissueType: ["1"],
-          shopCode: (_a = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _a === void 0 ? void 0 : _a.shopCode,
-          vipCode: (_b = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _b === void 0 ? void 0 : _b.vipCode
-        };
-        break;
-      case "GY_LOGISTICS":
-        prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gyLogistics, "logistics", config);
-        break;
-      case "GY_SEND_GOOD":
-        prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gySendGood, "send", config);
-    }
-    return prv;
-  }, {});
-};
-var updateGyItemListByConfigHandle = function updateGyItemListByConfigHandle(list, type, config) {
-  if (config === void 0) {
-    config = {};
-  }
-  var showField = config.showField,
-    _a = config.notOrderBack,
-    notOrderBack = _a === void 0 ? false : _a;
-  if (notOrderBack) {
-    return list;
-  }
-  return list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
-    if (type === "logistics") {
-      if (!["logisticsCompany", ""].includes(showField || "")) {
-        next.logisticsCompany = undefined;
-      }
-      if (!["logisticsCode", ""].includes(showField || "")) {
-        next.logisticsCode = undefined;
-      }
-    } else if (type === "send") {
-      if (!["sendId", "all"].includes(showField || "")) {
-        next.sendId = undefined;
-      }
-      if (!["sendName", "all"].includes(showField || "")) {
-        next.sendName = undefined;
-        next.sendSnapshotName = undefined;
-      }
-    }
-    prv.push(next);
-    return prv;
-  }, []);
-};
-// 管易根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的，返回当前订单号
-exports.filterGyOrders = function (trades, order_no) {
-  var currentTrades = (trades || []).filter(function (item) {
-    return (item.platformCode || "").split(",").includes(order_no);
-  });
-  if (currentTrades.length) {
-    return currentTrades;
-  }
-  return [];
-};