@kmkf-fe-packages/kmkf-utils 2.7.7-beta.3 → 2.7.7-beta.4

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

@@ -9,6 +9,18 @@ export declare const WLN_SYSTEM_ORDER_CONFIG: {
         width: number;
         render?: undefined;
         renderExport?: undefined;
+    } | {
+        title: string;
+        dataIndex: string;
+        width: number;
+        render: (val: boolean) => "否" | "是";
+        renderExport: (val: boolean) => "否" | "是";
+    } | {
+        title: string;
+        dataIndex: string;
+        width: number;
+        render: (val: string[]) => string;
+        renderExport: (val: string[]) => string;
     } | {
         title: string;
         dataIndex: string;

package/dist/esm/utils/wlnOrderBackFormValues.js

@@ -1,5 +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); }
-var _excluded = ["picPath", "itemId", "itemName", "skuId", "skuName", "isGift", "size", "payment", "price"];
 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); }
@@ -11,12 +10,21 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React from 'react';
 import ExpressData from "../expressData";
 import uuid from "./getUUid";
 import isNull from "./isNull";
+var renderBoolean = function renderBoolean(val) {
+  return typeof val === 'boolean' ? val ? "是" : "否" : val;
+};
+var getRenderOptions = function getRenderOptions(options) {
+  return function (val) {
+    var option = options.find(function (o) {
+      return o.value === val;
+    });
+    return option ? option.label : val;
+  };
+};
 var renderPackageInfos = function renderPackageInfos(val, record, key) {
   var _record$packageInfos;
   var isExport = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
@@ -60,23 +68,43 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
   }, {
     title: "是否拆分订单",
     dataIndex: "splitTrade",
-    width: 150
+    width: 150,
+    render: renderBoolean,
+    renderExport: renderBoolean
   }, {
     title: "是否售后订单",
     dataIndex: "exchangeTrade",
-    width: 150
+    width: 150,
+    render: renderBoolean,
+    renderExport: renderBoolean
   }, {
     title: "是否有退款",
     dataIndex: "hasRefund",
-    width: 150
-  }, {
-    title: "是否预售订单",
-    dataIndex: "preSale",
-    width: 150
-  }, {
+    width: 150,
+    render: function render(value) {
+      return renderBoolean(!!value);
+    },
+    renderExport: function renderExport(value) {
+      return renderBoolean(!!value);
+    }
+  },
+  // {
+  //   title: "是否预售订单",
+  //   dataIndex: "preSale",
+  //   width: 150,
+  //   render: renderBoolean,
+  //   renderExport: renderBoolean,
+  // },
+  {
     title: "合并前系统单号",
     dataIndex: "mergeUids",
-    width: 150
+    width: 150,
+    render: function render(val) {
+      return val !== null && val !== void 0 && val.length ? val.join(",") : "";
+    },
+    renderExport: function renderExport(val) {
+      return val !== null && val !== void 0 && val.length ? val.join(",") : "";
+    }
   }, {
     title: "快递公司名称",
     dataIndex: "logisticName",
@@ -130,7 +158,117 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
   }, {
     title: "单据处理状态",
     dataIndex: "processStatus",
-    width: 150
+    width: 150,
+    render: getRenderOptions([{
+      label: "分销商审核",
+      value: -3
+    }, {
+      label: "到账管理",
+      value: -2
+    }, {
+      label: "未付款",
+      value: -1
+    }, {
+      label: "审核",
+      value: 0
+    }, {
+      label: "打单配货",
+      value: 1
+    }, {
+      label: "验货",
+      value: 2
+    }, {
+      label: "称重",
+      value: 3
+    }, {
+      label: "待发货",
+      value: 4
+    }, {
+      label: "财审",
+      value: 5
+    }, {
+      label: "已发货",
+      value: 8
+    }, {
+      label: "成功",
+      value: 9
+    }, {
+      label: "关闭",
+      value: 10
+    }, {
+      label: "异常结束",
+      value: 11
+    }, {
+      label: "异常处理",
+      value: 12
+    }, {
+      label: "外部系统配货中",
+      value: 13
+    }, {
+      label: "预售",
+      value: 14
+    }, {
+      label: "打包",
+      value: 15
+    }, {
+      label: "拣货",
+      value: 19
+    }]),
+    renderExport: getRenderOptions([{
+      label: "分销商审核",
+      value: -3
+    }, {
+      label: "到账管理",
+      value: -2
+    }, {
+      label: "未付款",
+      value: -1
+    }, {
+      label: "审核",
+      value: 0
+    }, {
+      label: "打单配货",
+      value: 1
+    }, {
+      label: "验货",
+      value: 2
+    }, {
+      label: "称重",
+      value: 3
+    }, {
+      label: "待发货",
+      value: 4
+    }, {
+      label: "财审",
+      value: 5
+    }, {
+      label: "已发货",
+      value: 8
+    }, {
+      label: "成功",
+      value: 9
+    }, {
+      label: "关闭",
+      value: 10
+    }, {
+      label: "异常结束",
+      value: 11
+    }, {
+      label: "异常处理",
+      value: 12
+    }, {
+      label: "外部系统配货中",
+      value: 13
+    }, {
+      label: "预售",
+      value: 14
+    }, {
+      label: "打包",
+      value: 15
+    }, {
+      label: "拣货",
+      value: 19
+    }])
   }, {
     title: "线上单号",
     dataIndex: "tpTid",
@@ -154,10 +292,6 @@ export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesInclud
   };
   var platformCodesSortStr = getSortedList(platformCodes || "");
   var orderNosSortStr = getSortedList(orderNos || "");
-  console.log("***** platformCodesSortStr", {
-    platformCodesSortStr: platformCodesSortStr,
-    orderNosSortStr: orderNosSortStr
-  });
   return platformCodesSortStr.includes(orderNosSortStr);
 };
 export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
@@ -178,10 +312,8 @@ export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
       skuName = item.skuName,
       isGift = item.isGift,
       size = item.size,
-      payment = item.payment,
-      price = item.price,
-      others = _objectWithoutProperties(item, _excluded);
-    return _objectSpread(_objectSpread({}, others), {}, {
+      payment = item.payment;
+    return _objectSpread(_objectSpread({}, item), {}, {
       skuName: skuName,
       pic: picPath,
       name: itemName,
@@ -189,7 +321,6 @@ export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
       sku: skuId,
       money: payment || 0,
       number: size,
-      share: price,
       type: isGift
     });
   };
@@ -258,7 +389,6 @@ var updateWlnItemListHandle = function updateWlnItemListHandle(list, type, comLi
       packageInfos.push(_objectSpread(_objectSpread({}, item), packageInfo));
     });
   });
-  console.log('***** packageInfos', packageInfos);
   var newList = packageInfos === null || packageInfos === void 0 ? void 0 : packageInfos.reduce(function (prv, next) {
     var items = (next.items || []).map(function (t) {
       return {

package/package.json

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