@kmkf-fe-packages/kmkf-utils 0.8.15-alpha.1 → 0.8.16-alpha.0

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

@@ -5,7 +5,7 @@ export { default as imgResize } from "./imgResize";
 export { default as isNull } from "./isNull";
 export { default as getExpression } from "./getExpression";
 export { default as formatDisplayConfig } from "./formatDisplayConfig";
-export { default as orderBackFormValues } from "./orderBackFormValues";
+export { orderBackFormValues, jstOrderBackFormValues, bsOrderBackFormValues, } from "./orderBackFormValues";
 export { default as uuid } from "./getUUid";
 export * as filterFn from "./filterFn";
 export * as templateFn from "./template";

package/dist/esm/utils/index.js

@@ -5,7 +5,7 @@ export { default as imgResize } from "./imgResize";
 export { default as isNull } from "./isNull";
 export { default as getExpression } from "./getExpression";
 export { default as formatDisplayConfig } from "./formatDisplayConfig";
-export { default as orderBackFormValues } from "./orderBackFormValues";
+export { orderBackFormValues, jstOrderBackFormValues, bsOrderBackFormValues } from "./orderBackFormValues";
 export { default as uuid } from "./getUUid";
 import * as _filterFn from "./filterFn";
 export { _filterFn as filterFn };

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

@@ -19,5 +19,7 @@ interface OrderBackFormValuesI {
     detail: Record<string, unknown>;
     fromQNCreateWorkOrderByOrderNo: boolean;
 }
-declare const _default: ({ detail, order_no, formValue, templateDetail, type, fromQNCreateWorkOrderByOrderNo, }: OrderBackFormValuesI) => Record<string, any>;
-export default _default;
+export declare const orderBackFormValues: ({ detail, order_no, formValue, templateDetail, type, fromQNCreateWorkOrderByOrderNo, }: OrderBackFormValuesI) => any;
+export declare const jstOrderBackFormValues: (detail?: any[], templateDetail?: any) => any;
+export declare const bsOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
+export {};

package/dist/esm/utils/orderBackFormValues.js

@@ -1,3 +1,9 @@
+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 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 _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 _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); }
@@ -131,6 +137,7 @@ var updateBsGoodsHandle = function updateBsGoodsHandle() {
   return list;
 };
 var updateBsItemListHandle = function updateBsItemListHandle(list, type) {
+  var _newList;
   var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var showField = config.showField;
   var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
@@ -167,7 +174,7 @@ var updateBsItemListHandle = function updateBsItemListHandle(list, type) {
     prv.push.apply(prv, _toConsumableArray(advList));
     return prv;
   }, []);
-  if (!newList.length) {
+  if (!((_newList = newList) !== null && _newList !== void 0 && _newList.length)) {
     switch (type) {
       case "logistics":
         newList = [{
@@ -231,8 +238,7 @@ var taobaoGoodHandle = function taobaoGoodHandle() {
   });
 };
 //订单返填数据重组
-export default (function (_ref) {
-  var _detail$bsOrder, _detail$bsOrder$order, _detail$bsOrder$order2, _detail$bsOrder$order3;
+export var orderBackFormValues = function orderBackFormValues(_ref) {
   var _ref$detail = _ref.detail,
     detail = _ref$detail === void 0 ? {} : _ref$detail,
     _ref$order_no = _ref.order_no,
@@ -245,13 +251,9 @@ export default (function (_ref) {
     type = _ref$type === void 0 ? "add" : _ref$type,
     _ref$fromQNCreateWork = _ref.fromQNCreateWorkOrderByOrderNo,
     fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork;
-  var advItem = ((_detail$bsOrder = detail["bsOrder"]) === null || _detail$bsOrder === void 0 ? void 0 : (_detail$bsOrder$order = _detail$bsOrder.orders) === null || _detail$bsOrder$order === void 0 ? void 0 : (_detail$bsOrder$order2 = _detail$bsOrder$order[0]) === null || _detail$bsOrder$order2 === void 0 ? void 0 : (_detail$bsOrder$order3 = _detail$bsOrder$order2.advancedDistributionInfos) === null || _detail$bsOrder$order3 === void 0 ? void 0 : _detail$bsOrder$order3[0]) || {};
-  return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
-    var _detail$bsOrder2, _detail$bsOrder3, _detail$bsOrder3$orde, _detail$bsOrder3$orde2, _detail$bsOrder3$orde3, _detail$bsOrder4, _detail$bsOrder5, _detail$bsOrder6, _detail$bsOrder7, _detail$bsOrder8, _detail$bsOrder9, _detail$bsOrder10, _detail$bsOrder11, _detail$bsOrder12, _detail$bsOrder13;
+  var orderValues = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
     var uniqueKey = next.uniqueKey;
     var config = next.componentConfig;
-    var weight = 0;
-    var bsPostingAddress = [];
     switch (next.workOrderComponentType) {
       case "TRADE_ID_INPUT":
         prv[uniqueKey] = order_no || detail["orderNo"];
@@ -355,38 +357,203 @@ export default (function (_ref) {
           };
           break;
         }
+      // case "JST_ITEM_SELECT_THIRD":
+      //   prv[uniqueKey] = updateJSTItemListHandle(
+      //     detail["jstItemList"] as any[],
+      //     "itemList",
+      //     config
+      //   );
+      //   break;
+      // case "JST_SUPPLY":
+      //   prv[uniqueKey] = updateJSTItemListHandle(
+      //     detail["jstItemList"] as any[],
+      //     "supply",
+      //     config
+      //   );
+      //   break;
+      // case "JST_SEND_GOOD":
+      //   prv[uniqueKey] = updateJSTItemListHandle(
+      //     detail["jstItemList"] as any[],
+      //     "send",
+      //     config
+      //   );
+      //   break;
+      // case "JST_LOGISTICS":
+      //   prv[uniqueKey] = updateJSTItemListHandle(
+      //     detail["jstItemList"] as any[],
+      //     "logistics",
+      //     config
+      //   );
+      //   break;
+      case "SYSTEM_ORDER_NO":
+        prv[uniqueKey] = detail["sid"];
+        break;
+      // case "BS_SIGNING_TIME":
+      //   prv[uniqueKey] = detail["bsOrder"]?.receiptDate;
+      //   break;
+      // case "BS_SEND_TIME":
+      //   prv[uniqueKey] =
+      //     detail[
+      //       "bsOrder"
+      //     ]?.orders[0]?.advancedDistributionInfos?.[0]?.deliveryDate;
+
+      //   break;
+      // case "BS_TRADE_PAYMENT_TIME":
+      //   prv[uniqueKey] = detail["bsOrder"]?.payDate;
+      //   break;
+      // case "BS_DEPOSIT":
+      //   prv[uniqueKey] = detail["bsOrder"]?.amountPaid;
+      //   break;
+      // case "BS_NET_RECEIPTS":
+      //   prv[uniqueKey] = detail["bsOrder"]?.merchantRealIncome;
+      //   break;
+      // case "BS_PACKAGE_WEIGHT":
+      //   weight = (detail["bsOrder"]?.orders || []).reduce(
+      //     (prv: any, next: any) => {
+      //       const number = (next?.advancedDistributionInfos || []).reduce(
+      //         (p: any, n: any) => {
+      //           p += n.orderWeight || 0;
+      //           return p;
+      //         },
+      //         0
+      //       );
+      //       prv += number || 0;
+      //       return prv;
+      //     },
+      //     0
+      //   );
+      //   prv[uniqueKey] = weight || null;
+      //   break;
+      // case "BS_GOODS":
+      //   prv[uniqueKey] = {
+      //     shopCode: detail["bsOrder"]?.shopCode,
+      //     bsGoods: updateBsGoodsHandle(detail["bsOrder"]?.orders),
+      //   };
+      //   break;
+      // case "BS_EXCHANGE_GOODS":
+      //   prv[uniqueKey] = {
+      //     shopCode: detail["bsOrder"]?.shopCode,
+      //     bsExchangeType: [],
+      //     bsExchangeReturnGoods: [],
+      //     bsExchangeSwapOutGoods: [],
+      //     bsExchangeGiftGoods: [],
+      //   };
+      //   break;
+      // case "BS_REISSUE_GOODS":
+      //   prv[uniqueKey] = {
+      //     shopCode: detail["bsOrder"]?.shopCode,
+      //     bsReissueType: [],
+      //     bsReissueGoods: [],
+      //   };
+      //   break;
+      // case "BS_LOGISTICS":
+      //   prv[uniqueKey] = updateBsItemListHandle(
+      //     detail["bsOrder"]?.orders,
+      //     "logistics",
+      //     config
+      //   );
+      //   break;
+      // case "BS_SEND_GOOD":
+      //   prv[uniqueKey] = updateBsItemListHandle(
+      //     detail["bsOrder"]?.orders,
+      //     "send",
+      //     config
+      //   );
+
+      //   break;
+      // case "BS_POSTING":
+      //   if (advItem?.provinceId) {
+      //     bsPostingAddress = [advItem?.provinceId, advItem?.cityId];
+      //     if (advItem?.districtId) {
+      //       bsPostingAddress.push(advItem?.districtId);
+      //     }
+      //   }
+
+      //   prv[uniqueKey] = {
+      //     postingAddress: bsPostingAddress,
+      //     postingDetail: advItem?.address,
+      //     postingReceiverName: advItem?.receiver,
+      //     postingReceiverMobile: advItem?.receiverTel,
+      //   };
+
+      //   break;
+    }
+
+    return prv;
+  }, {});
+  var jstValues = jstOrderBackFormValues(detail["jstItemList"], templateDetail);
+  var bsValues = bsOrderBackFormValues(detail["bsOrder"], templateDetail);
+  return _objectSpread(_objectSpread(_objectSpread({}, orderValues), jstValues), bsValues);
+};
+//jst订单返填逻辑
+export var jstOrderBackFormValues = function jstOrderBackFormValues() {
+  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 uniqueKey = next.uniqueKey;
+    var config = next.componentConfig;
+    switch (next.workOrderComponentType) {
       case "JST_ITEM_SELECT_THIRD":
-        prv[uniqueKey] = updateJSTItemListHandle(detail["jstItemList"], "itemList", config);
+        prv[uniqueKey] = updateJSTItemListHandle(detail, "itemList", config);
         break;
       case "JST_SUPPLY":
-        prv[uniqueKey] = updateJSTItemListHandle(detail["jstItemList"], "supply", config);
+        prv[uniqueKey] = updateJSTItemListHandle(detail, "supply", config);
         break;
       case "JST_SEND_GOOD":
-        prv[uniqueKey] = updateJSTItemListHandle(detail["jstItemList"], "send", config);
+        prv[uniqueKey] = updateJSTItemListHandle(detail, "send", config);
         break;
       case "JST_LOGISTICS":
-        prv[uniqueKey] = updateJSTItemListHandle(detail["jstItemList"], "logistics", config);
+        prv[uniqueKey] = updateJSTItemListHandle(detail, "logistics", config);
         break;
-      case "SYSTEM_ORDER_NO":
-        prv[uniqueKey] = detail["sid"];
+    }
+    return prv;
+  }, {});
+};
+//bs订单返填逻辑
+export var bsOrderBackFormValues = function bsOrderBackFormValues() {
+  var _detail$orders, _detail$orders$, _detail$orders$$advan;
+  var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  console.log("bsOrderBackFormValues", detail);
+  var advItem = (detail === null || detail === void 0 ? void 0 : (_detail$orders = detail.orders) === null || _detail$orders === void 0 ? void 0 : (_detail$orders$ = _detail$orders[0]) === null || _detail$orders$ === void 0 ? void 0 : (_detail$orders$$advan = _detail$orders$.advancedDistributionInfos) === null || _detail$orders$$advan === void 0 ? void 0 : _detail$orders$$advan[0]) || {};
+  var weight = 0;
+  var bsPostingAddress = [];
+  return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
+    var _ref2, _detail$orders2, _detail$orders2$, _detail$orders2$$adva, _detail$orders2$$adva2;
+    var uniqueKey = next.uniqueKey;
+    var config = next.componentConfig;
+    switch (next.workOrderComponentType) {
+      case "BS_SYSTEM_ORDER":
+        prv[uniqueKey] = {
+          orderNo: detail === null || detail === void 0 ? void 0 : detail.sourceBillNo,
+          orders: (detail === null || detail === void 0 ? void 0 : detail.systemOrders) || [],
+          selectIds: [],
+          showOrderInfo: (_ref2 = (detail === null || detail === void 0 ? void 0 : detail.systemOrders) || []) === null || _ref2 === void 0 ? void 0 : _ref2.map(function (item) {
+            return {
+              billNo: item.billNo,
+              billType: item.billType,
+              billTag: item.billTag
+            };
+          })
+        };
         break;
       case "BS_SIGNING_TIME":
-        prv[uniqueKey] = (_detail$bsOrder2 = detail["bsOrder"]) === null || _detail$bsOrder2 === void 0 ? void 0 : _detail$bsOrder2.receiptDate;
+        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.receiptDate;
         break;
       case "BS_SEND_TIME":
-        prv[uniqueKey] = (_detail$bsOrder3 = detail["bsOrder"]) === null || _detail$bsOrder3 === void 0 ? void 0 : (_detail$bsOrder3$orde = _detail$bsOrder3.orders[0]) === null || _detail$bsOrder3$orde === void 0 ? void 0 : (_detail$bsOrder3$orde2 = _detail$bsOrder3$orde.advancedDistributionInfos) === null || _detail$bsOrder3$orde2 === void 0 ? void 0 : (_detail$bsOrder3$orde3 = _detail$bsOrder3$orde2[0]) === null || _detail$bsOrder3$orde3 === void 0 ? void 0 : _detail$bsOrder3$orde3.deliveryDate;
+        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : (_detail$orders2 = detail.orders) === null || _detail$orders2 === void 0 ? void 0 : (_detail$orders2$ = _detail$orders2[0]) === null || _detail$orders2$ === void 0 ? void 0 : (_detail$orders2$$adva = _detail$orders2$.advancedDistributionInfos) === null || _detail$orders2$$adva === void 0 ? void 0 : (_detail$orders2$$adva2 = _detail$orders2$$adva[0]) === null || _detail$orders2$$adva2 === void 0 ? void 0 : _detail$orders2$$adva2.deliveryDate;
         break;
       case "BS_TRADE_PAYMENT_TIME":
-        prv[uniqueKey] = (_detail$bsOrder4 = detail["bsOrder"]) === null || _detail$bsOrder4 === void 0 ? void 0 : _detail$bsOrder4.payDate;
+        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.payDate;
         break;
       case "BS_DEPOSIT":
-        prv[uniqueKey] = (_detail$bsOrder5 = detail["bsOrder"]) === null || _detail$bsOrder5 === void 0 ? void 0 : _detail$bsOrder5.amountPaid;
+        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.amountPaid;
         break;
       case "BS_NET_RECEIPTS":
-        prv[uniqueKey] = (_detail$bsOrder6 = detail["bsOrder"]) === null || _detail$bsOrder6 === void 0 ? void 0 : _detail$bsOrder6.merchantRealIncome;
+        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.merchantRealIncome;
         break;
       case "BS_PACKAGE_WEIGHT":
-        weight = (((_detail$bsOrder7 = detail["bsOrder"]) === null || _detail$bsOrder7 === void 0 ? void 0 : _detail$bsOrder7.orders) || []).reduce(function (prv, next) {
+        weight = ((detail === null || detail === void 0 ? void 0 : detail.orders) || []).reduce(function (prv, next) {
           var number = ((next === null || next === void 0 ? void 0 : next.advancedDistributionInfos) || []).reduce(function (p, n) {
             p += n.orderWeight || 0;
             return p;
@@ -398,13 +565,13 @@ export default (function (_ref) {
         break;
       case "BS_GOODS":
         prv[uniqueKey] = {
-          shopCode: (_detail$bsOrder8 = detail["bsOrder"]) === null || _detail$bsOrder8 === void 0 ? void 0 : _detail$bsOrder8.shopCode,
-          bsGoods: updateBsGoodsHandle((_detail$bsOrder9 = detail["bsOrder"]) === null || _detail$bsOrder9 === void 0 ? void 0 : _detail$bsOrder9.orders)
+          shopCode: detail === null || detail === void 0 ? void 0 : detail.shopCode,
+          bsGoods: updateBsGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders)
         };
         break;
       case "BS_EXCHANGE_GOODS":
         prv[uniqueKey] = {
-          shopCode: (_detail$bsOrder10 = detail["bsOrder"]) === null || _detail$bsOrder10 === void 0 ? void 0 : _detail$bsOrder10.shopCode,
+          shopCode: detail === null || detail === void 0 ? void 0 : detail.shopCode,
           bsExchangeType: [],
           bsExchangeReturnGoods: [],
           bsExchangeSwapOutGoods: [],
@@ -413,16 +580,16 @@ export default (function (_ref) {
         break;
       case "BS_REISSUE_GOODS":
         prv[uniqueKey] = {
-          shopCode: (_detail$bsOrder11 = detail["bsOrder"]) === null || _detail$bsOrder11 === void 0 ? void 0 : _detail$bsOrder11.shopCode,
+          shopCode: detail === null || detail === void 0 ? void 0 : detail.shopCode,
           bsReissueType: [],
           bsReissueGoods: []
         };
         break;
       case "BS_LOGISTICS":
-        prv[uniqueKey] = updateBsItemListHandle((_detail$bsOrder12 = detail["bsOrder"]) === null || _detail$bsOrder12 === void 0 ? void 0 : _detail$bsOrder12.orders, "logistics", config);
+        prv[uniqueKey] = updateBsItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "logistics", config);
         break;
       case "BS_SEND_GOOD":
-        prv[uniqueKey] = updateBsItemListHandle((_detail$bsOrder13 = detail["bsOrder"]) === null || _detail$bsOrder13 === void 0 ? void 0 : _detail$bsOrder13.orders, "send", config);
+        prv[uniqueKey] = updateBsItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "send", config);
         break;
       case "BS_POSTING":
         if (advItem !== null && advItem !== void 0 && advItem.provinceId) {
@@ -441,4 +608,4 @@ export default (function (_ref) {
     }
     return prv;
   }, {});
-});
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "0.8.15-alpha.1",
+  "version": "0.8.16-alpha.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -42,5 +42,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "7dfa5c1a4e86ef9ab482cd3dd611eb41e7ac2400"
+  "gitHead": "8bd0b6f4781c505566aa77ac1d0170110bf04f2e"
 }