@kmkf-fe-packages/kmkf-utils 2.2.21 → 2.2.24

package/dist/esm/utils/bsOrderBackFormValues.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); }
@@ -7,6 +13,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import ExpressData from "../expressData";
 import ExpressInterceptData from "../expressInterceptData";
 import uuid from "./getUUid";
+import isNull from "./isNull";
 export var BS_SYSTEM_ORDER_CONFIG = {
   key: "bsSystemShowOrder",
   name: "百胜",
@@ -213,13 +220,37 @@ export var bsOrderBackFormValues = function bsOrderBackFormValues() {
         prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.bsGoods;
         break;
       case "BS_EXCHANGE_GOODS":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.bsExchangeGoods;
+        {
+          var _detail$bsGoods, _detail$bsGoods2;
+          var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? Array.isArray(config.initReason) ? config.initReason : [config.initReason] : [];
+          prv[uniqueKey] = _objectSpread(_objectSpread({}, detail === null || detail === void 0 ? void 0 : detail.bsExchangeGoods), {}, {
+            bsExchangeType: initReason,
+            bsExchangeReturnGoods: ["2", "4"].includes(initReason[0]) ? [] : (detail === null || detail === void 0 ? void 0 : (_detail$bsGoods = detail.bsGoods) === null || _detail$bsGoods === void 0 ? void 0 : _detail$bsGoods.bsGoods) || [],
+            bsExchangeSwapOutGoods: ["2", "4"].includes(initReason[0]) ? [] : (detail === null || detail === void 0 ? void 0 : (_detail$bsGoods2 = detail.bsGoods) === null || _detail$bsGoods2 === void 0 ? void 0 : _detail$bsGoods2.bsGoods) || []
+          });
+        }
         break;
       case "BS_REISSUE_GOODS":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.bsReissueGoods;
+        {
+          var _detail$bsGoods3;
+          var _initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? Array.isArray(config.initReason) ? config.initReason : [config.initReason] : [];
+          prv[uniqueKey] = _objectSpread(_objectSpread({}, detail === null || detail === void 0 ? void 0 : detail.bsReissueGoods), {}, {
+            bsReissueType: _initReason,
+            bsReissueGoods: ["2", "4"].includes(_initReason[0]) ? [] : (detail === null || detail === void 0 ? void 0 : (_detail$bsGoods3 = detail.bsGoods) === null || _detail$bsGoods3 === void 0 ? void 0 : _detail$bsGoods3.bsGoods) || []
+          });
+        }
+        // prv[uniqueKey] = detail?.bsReissueGoods;
+
         break;
       case "BS_RETURN_GOODS":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.bsReturnGoods;
+        {
+          var _detail$bsGoods4;
+          var _initReason2 = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? Array.isArray(config.initReason) ? config.initReason : [config.initReason] : [];
+          prv[uniqueKey] = _objectSpread(_objectSpread({}, detail === null || detail === void 0 ? void 0 : detail.bsReturnGoods), {}, {
+            bsReturnType: _initReason2,
+            bsReturnGoods: ["2"].includes(_initReason2[0]) ? [] : (detail === null || detail === void 0 ? void 0 : (_detail$bsGoods4 = detail.bsGoods) === null || _detail$bsGoods4 === void 0 ? void 0 : _detail$bsGoods4.bsGoods) || []
+          });
+        }
         break;
       case "BS_LOGISTICS":
         prv[uniqueKey] = updateBsItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.bsLogistics, "logistics", config);

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

@@ -0,0 +1,10 @@
+declare type ShowHeaderObjType = {
+    title: string;
+    dataIndex: string;
+    show?: boolean;
+};
+declare const getSystemShowHead: ({ columns, showHeader, }: {
+    columns: any[];
+    showHeader: (string | ShowHeaderObjType)[];
+}) => any[];
+export default getSystemShowHead;

package/dist/esm/utils/getSystemShowHead.js

@@ -0,0 +1,25 @@
+var getSystemShowHead = function getSystemShowHead(_ref) {
+  var columns = _ref.columns,
+    showHeader = _ref.showHeader;
+  var initBaseInfoColumns = columns || [];
+  var baseInfoColumns = initBaseInfoColumns || [];
+  var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === "string";
+  var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === "[object Object]";
+  if (isStringArray) {
+    baseInfoColumns = initBaseInfoColumns.filter(function (col) {
+      return showHeader.includes(col.dataIndex);
+    });
+  } else if (isObjectArray) {
+    baseInfoColumns = showHeader.map(function (col) {
+      var currentCol = initBaseInfoColumns.find(function (item) {
+        return item.dataIndex === col.dataIndex;
+      }); // 如果列应该显示（show不为false），则返回对应的列配置
+      if (currentCol && col.show !== false) {
+        return currentCol;
+      }
+      return undefined;
+    }).filter(Boolean);
+  }
+  return baseInfoColumns || [];
+};
+export default getSystemShowHead;

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

@@ -27,3 +27,4 @@ export * as templateFn from "./template";
 export * as tree from "./multidimensionalFindChild";
 export { default as unTransField } from "./unTransField";
 export { fetchAll } from "./FetchAll";
+export { default as getSystemShowHead } from "./getSystemShowHead";

package/dist/esm/utils/index.js

@@ -30,4 +30,5 @@ export { _templateFn as templateFn };
 import * as _tree from "./multidimensionalFindChild";
 export { _tree as tree };
 export { default as unTransField } from "./unTransField";
-export { fetchAll } from "./FetchAll";
+export { fetchAll } from "./FetchAll";
+export { default as getSystemShowHead } from "./getSystemShowHead";

package/dist/esm/utils/jstOrderBackFormValues.js

@@ -112,7 +112,7 @@ var updateJstItemListHandle = function updateJstItemListHandle(list, type, comLi
       params.logisticsCompany = next === null || next === void 0 ? void 0 : next.logisticsCompany;
       params.logisticsCode = next === null || next === void 0 ? void 0 : next.lId;
     } else if (type === "send") {
-      var wmsCoId = (next === null || next === void 0 ? void 0 : next.wmsCoId) === "0" ? "" : next === null || next === void 0 ? void 0 : next.wmsCoId;
+      var wmsCoId = (next === null || next === void 0 ? void 0 : next.wmsCoId) === "0" ? "" : "".concat(next === null || next === void 0 ? void 0 : next.wmsCoId);
       params.sendId = wmsCoId;
       params.sendName = wmsCoId && SendDataCenter.getInstance("jst").getSendNameByCode(wmsCoId);
       params.sendSnapshotId = wmsCoId;

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

@@ -7,6 +7,7 @@ export declare const WDT_SYSTEM_ORDER_CONFIG: {
         title: string;
         dataIndex: string;
         width: number;
+        ellipsis: boolean;
     }[];
 };
 export declare const WDT_ORDER_TYPE_MAP: {

package/dist/esm/utils/wdtOrderBackFormValues.js

@@ -63,6 +63,20 @@ export var tradeStatusMap = {
     105: "部分打款",
     110: "已完成",
     113: "异常发货"
+  },
+  web: {
+    4: "已取消（可恢复）",
+    5: "已取消",
+    25: "特殊单",
+    29: "预订单",
+    30: "待审核（已支付）",
+    35: "待财审",
+    50: "待发货",
+    51: "待推送",
+    52: "推送中",
+    53: "推送失败",
+    55: "已推送",
+    95: "已发货"
   }
 };
 export var WDT_SYSTEM_ORDER_CONFIG = {
@@ -72,19 +86,48 @@ export var WDT_SYSTEM_ORDER_CONFIG = {
   columns: [{
     title: "订单类型",
     dataIndex: "billType",
-    width: 150
+    width: 150,
+    ellipsis: true
   }, {
     title: "系统订单号",
     dataIndex: "billNo",
-    width: 150
+    width: 150,
+    ellipsis: true
   }, {
     title: "订单状态",
     dataIndex: "tradeStatusValue",
-    width: 150
+    width: 150,
+    ellipsis: true
   }, {
     title: "订单标签",
     dataIndex: "billTag",
-    width: 150
+    width: 150,
+    ellipsis: true
+  }, {
+    title: "物流公司名称",
+    dataIndex: "logisticsName",
+    width: 150,
+    ellipsis: true
+  }, {
+    title: "物流公司编码",
+    dataIndex: "logisticsCode",
+    width: 200,
+    ellipsis: true
+  }, {
+    title: "物流单号",
+    dataIndex: "logisticsNo",
+    width: 200,
+    ellipsis: true
+  }, {
+    title: "发货仓名称",
+    dataIndex: "warehouseName",
+    width: 200,
+    ellipsis: true
+  }, {
+    title: "发货仓编码",
+    dataIndex: "warehouseNo",
+    width: 200,
+    ellipsis: true
   }]
 };
 export var WDT_ORDER_TYPE_MAP = {
@@ -114,6 +157,7 @@ export var updateWdtGoodsHandle = function updateWdtGoodsHandle() {
         item.goodId = item.goodsId;
         item.goodName = item.goodsName;
         item.goodNo = item.goodsNo;
+        item.orderPrice = item.orderPrice || item.price;
         item.canDelete = true;
         item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
         item.systemOrderNo = cur === null || cur === void 0 ? void 0 : cur.tradeNo;
@@ -353,19 +397,21 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
         return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-          billTag: item.tagName
+          billTag: item.tagName || item.tags // 网页版取tags，其他版本用tagName
         });
       }),
+
       selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
         return item.tradeNo;
       }) : [],
       showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
-        return {
+        return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-          billTag: item.tagName,
+          billTag: item.tagName || item.tags,
+          // 网页版取tags，其他版本用tagName
           tradeStatusValue: item.tradeStatusValue
-        };
+        });
       })
     },
     wdtSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.tradeNo : undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.2.21",
+  "version": "2.2.24",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1426042144c662d01ea92d1004e75b4b878668e9",
+  "gitHead": "35bc1e4833e1bcb1255c9c43cb3c807d2544e88c",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }