@kmkf-fe-packages/kmkf-utils 2.0.33 → 2.0.34

package/README.md

@@ -1 +1 @@
-111226333111
+11

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

@@ -3,7 +3,6 @@ interface RequestProps {
     method: string;
     data: any;
     headers?: any;
-    infoLevel?: "error" | "warning" | "quiet";
     handleError?: (m: string) => void;
 }
 export interface serverProps<T = any> {
@@ -13,5 +12,5 @@ export interface serverProps<T = any> {
     traceId: string;
     [key: string]: any;
 }
-declare const requestApi: <T = any>({ url, method, data, headers, handleError, infoLevel, }: RequestProps) => Promise<serverProps<T>>;
+declare const requestApi: <T = any>({ url, method, data, headers, handleError, }: RequestProps) => Promise<serverProps<T>>;
 export default requestApi;

package/dist/esm/request/index.js

@@ -6,7 +6,6 @@
  * @LastEditTime: 2022-11-24 09:11:45
  */
 import { extend } from "umi-request";
-import { message } from "antd";
 var request = extend({});
 var requestApi = function requestApi(_ref) {
   var url = _ref.url,
@@ -14,8 +13,7 @@ var requestApi = function requestApi(_ref) {
     data = _ref.data,
     _ref$headers = _ref.headers,
     headers = _ref$headers === void 0 ? {} : _ref$headers,
-    handleError = _ref.handleError,
-    infoLevel = _ref.infoLevel;
+    handleError = _ref.handleError;
   return new Promise(function (resolve, reject) {
     var params = {
       method: method,
@@ -30,11 +28,7 @@ var requestApi = function requestApi(_ref) {
       if (res.result === 100 || res.success) {
         resolve(res);
       } else {
-        if (infoLevel === "warning") {
-          message.warn(res.message);
-        } else {
-          handleError && handleError(res.message);
-        }
+        handleError && handleError(res.message);
         reject(res);
       }
     }).catch(function (e) {

package/dist/esm/servers/JST/index.d.ts

@@ -1,3 +1,2 @@
-export * from "./logisticsData";
-export * from "./warehouseData";
-export * from "./orderDetailWrap";
+export * from './logisticsData';
+export * from './warehouseData';

package/dist/esm/servers/JST/index.js

@@ -1,3 +1,2 @@
 export * from "./logisticsData";
-export * from "./warehouseData";
-export * from "./orderDetailWrap";
+export * from "./warehouseData";

package/dist/esm/utils/jstOrderBackFormValues.js

@@ -306,11 +306,7 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
 
 // TODO: 确定合并单，例如: WDT根据订单号请求返回的srcTid会有多个订单号组合在一起的数据 排除其他的，返回当前订单号
 export var filterJstOrders = function filterJstOrders(detail, order_no) {
-  var currentTrades = ((detail === null || detail === void 0 ? void 0 : detail.orderList) || []).map(function (item) {
-    return _objectSpread(_objectSpread({}, item), {}, {
-      oId: String(item.oId)
-    });
-  });
+  var currentTrades = (detail === null || detail === void 0 ? void 0 : detail.orderList) || [];
   // .filter(
   //   (item: Record<string, any>) => item?.dealCode === order_no
   // );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2df2af4a37692a99ec89a3463f05e87d10e0f632",
+  "gitHead": "00e06f420455b7ea2eedc3ad876607f925af101d",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }

package/dist/esm/servers/JST/orderDetailWrap.d.ts

@@ -1 +0,0 @@
-export declare const jstOrderDetailWrap: (soId: string) => Promise<any>;

package/dist/esm/servers/JST/orderDetailWrap.js

@@ -1,54 +0,0 @@
-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); }
-import request from "../../request";
-var jstOrderDetail = function jstOrderDetail(data) {
-  return request({
-    url: "/qy/gdfw/order/jstOrderDetail",
-    method: "post",
-    data: data,
-    infoLevel: "warning"
-  });
-};
-
-// jst订单详情
-var jstOrderOutList = function jstOrderOutList(data) {
-  return request({
-    url: "/qy/gdfw/jst/erp/orderOut/list",
-    method: "post",
-    data: data,
-    infoLevel: "warning"
-  });
-};
-
-//将订单接口数据转成出库单数据结构
-function jstOrderDetailDataToOrderOutData(res) {
-  return _objectSpread(_objectSpread({}, res), {}, {
-    data: res.data.orders.map(function (order) {
-      return _objectSpread(_objectSpread({}, order), {}, {
-        orderType: order.erpOrderType
-      });
-    })
-  });
-}
-export var jstOrderDetailWrap = function jstOrderDetailWrap(soId) {
-  return jstOrderDetail({
-    soId: soId
-  }).then(function (res) {
-    var _res$data, _res$data$orders;
-    if (!(res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data$orders = _res$data.orders) !== null && _res$data$orders !== void 0 && _res$data$orders.length)) {
-      return jstOrderOutList({
-        soId: soId
-      });
-    }
-    return jstOrderDetailDataToOrderOutData(res);
-  }).catch(function (e) {
-    // console.log('***** in e', e);
-    return jstOrderOutList({
-      soId: soId
-    });
-  });
-};

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 [];
-};