@kmkf-fe-packages/basic-components 1.22.1-beta.0 → 1.22.1

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterKmOrders, KM_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, updateWdtGoodsHandle, updateBsE3GoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, BS_E3_ORDER_STATUS_MAP, updateWdtGoodsHandle, updateBsE3GoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -10956,7 +10956,6 @@ var jstGoods = function jstGoods(props) {
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
-  var isSelectName = ['wdt', 'bsE3', 'km'].includes(platformType);
   useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -10987,7 +10986,7 @@ var jstGoods = function jstGoods(props) {
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
     changeOrderInfo[type] = val;
     changeOrderInfo['sendId'] = option.value;
-    if (isSelectName && type === 'sendName') {
+    if ((platformType === 'wdt' || platformType === 'bsE3') && type === 'sendName') {
       changeOrderInfo['sendSnapshotName'] = option.label;
     }
     var newList = _toConsumableArray(value);
@@ -11070,7 +11069,7 @@ var jstGoods = function jstGoods(props) {
       return changeInputHandle(e.target.value, 'sendId');
     },
     value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.sendId
-  }), ['sendName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React.createElement(Select, {
+  }), ['sendName', 'all'].includes(showField) && (platformType === 'wdt' || platformType === 'bsE3' ? /*#__PURE__*/React.createElement(Select, {
     style: {
       minWidth: '100px',
       maxWidth: '180px'
@@ -14210,53 +14209,6 @@ var bsE3Utils = {
   getBsE3OrderListSingleton: getBsE3OrderListSingleton
 };
 
-var singletonMap$2 = new Map();
-var getOrderListSingleton = function getOrderListSingleton(orderNo) {
-  if (!singletonMap$2.has(orderNo)) {
-    var p = new Promise(function (resolve, reject) {
-      var doReject = function doReject(err) {
-        // 清空掉错误的请求记录
-        singletonMap$2.delete(orderNo);
-        reject(err);
-      };
-      extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
-        method: 'post',
-        data: {
-          tid: orderNo
-        }
-      }).then(function (data) {
-        if (data === null || data === void 0 ? void 0 : data.success) {
-          var _data$data, _data$data$orderDetai;
-          if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$orderDetai = _data$data.orderDetailDtoList) === null || _data$data$orderDetai === void 0 ? void 0 : _data$data$orderDetai.length) {
-            var list = filterKmOrders(data === null || data === void 0 ? void 0 : data.data, orderNo).map(function (item) {
-              return _objectSpread2(_objectSpread2({}, item), {}, {
-                billNo: item.sid,
-                sysStatus: item.sysStatus,
-                billType: item.type,
-                billTag: item.tags
-              });
-            });
-            resolve(list);
-          } else {
-            resolve([]);
-          }
-          // 延迟10秒清除,保证订单的时效性
-          setTimeout(function () {
-            singletonMap$2.delete(orderNo);
-          }, 1000 * 10);
-        } else {
-          doReject(data);
-        }
-      }).catch(doReject);
-    });
-    singletonMap$2.set(orderNo, p);
-  }
-  return singletonMap$2.get(orderNo);
-};
-var kmUtils = {
-  getOrderListSingleton: getOrderListSingleton
-};
-
 var columnsMap = {
   BS_SYSTEM_ORDER: [{
     title: '单据类型',
@@ -14286,7 +14238,6 @@ var columnsMap = {
   // },
   ],
 
-  KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
   WLN_SYSTEM_ORDER: [{
     title: '订单类型',
     dataIndex: 'billType',
@@ -14383,7 +14334,6 @@ var columnsMap = {
 };
 var rowKeyMap = {
   BS_SYSTEM_ORDER: 'billNo',
-  KM_SYSTEM_ORDER: 'billNo',
   WLN_SYSTEM_ORDER: 'billNo',
   WDT_SYSTEM_ORDER: 'billNo',
   BS_E3_SYSTEM_ORDER: 'orderSn'
@@ -14400,8 +14350,6 @@ var index$1 = (function (props) {
       onceRef.current = true;
       if (type === 'BS_SYSTEM_ORDER') {
         getOrderList(value.orderNo);
-      } else if (type === 'KM_SYSTEM_ORDER') {
-        getKmOrderList(value.orderNo);
       } else if (type === 'WLN_SYSTEM_ORDER') {
         getWlnOrderList(value.orderNo);
       } else if (type === 'WDT_SYSTEM_ORDER') {
@@ -14563,37 +14511,6 @@ var index$1 = (function (props) {
       return _ref5.apply(this, arguments);
     };
   }();
-  var getKmOrderList = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(orderNo) {
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            kmUtils.getOrderListSingleton(orderNo).then(function (trades) {
-              _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-                orders: trades,
-                showOrderInfo: trades.map(function (_ref7) {
-                  var billNo = _ref7.billNo,
-                    billType = _ref7.billType,
-                    billTag = _ref7.billTag;
-                  return {
-                    billNo: billNo,
-                    billType: billType,
-                    billTag: billTag
-                  };
-                })
-              }));
-            });
-            onceRef.current = false;
-          case 2:
-          case "end":
-            return _context5.stop();
-        }
-      }, _callee5);
-    }));
-    return function getKmOrderList(_x5) {
-      return _ref6.apply(this, arguments);
-    };
-  }();
   var rowSelection = {
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
     fixed: true,
@@ -16078,7 +15995,6 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
 
 var _excluded$j = ["value", "onChange", "disabled", "failValue", "type"];
 var msgTypeCh = {
-  pdd: '拼多多',
   ding: '钉钉',
   wechat: '微信',
   qq: 'QQ',
@@ -16127,7 +16043,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, msgTypeCh[key] || key, item.ruleName);
+    }, msgTypeCh[key], item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,

package/dist/index.js

@@ -10968,7 +10968,6 @@ var jstGoods = function jstGoods(props) {
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = kmkfUtils.SendDataCenter.getInstance(platformType).getSendData();
-  var isSelectName = ['wdt', 'bsE3', 'km'].includes(platformType);
   React.useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -10999,7 +10998,7 @@ var jstGoods = function jstGoods(props) {
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
     changeOrderInfo[type] = val;
     changeOrderInfo['sendId'] = option.value;
-    if (isSelectName && type === 'sendName') {
+    if ((platformType === 'wdt' || platformType === 'bsE3') && type === 'sendName') {
       changeOrderInfo['sendSnapshotName'] = option.label;
     }
     var newList = _toConsumableArray(value);
@@ -11082,7 +11081,7 @@ var jstGoods = function jstGoods(props) {
       return changeInputHandle(e.target.value, 'sendId');
     },
     value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.sendId
-  }), ['sendName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+  }), ['sendName', 'all'].includes(showField) && (platformType === 'wdt' || platformType === 'bsE3' ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     style: {
       minWidth: '100px',
       maxWidth: '180px'
@@ -14222,53 +14221,6 @@ var bsE3Utils = {
   getBsE3OrderListSingleton: getBsE3OrderListSingleton
 };
 
-var singletonMap$2 = new Map();
-var getOrderListSingleton = function getOrderListSingleton(orderNo) {
-  if (!singletonMap$2.has(orderNo)) {
-    var p = new Promise(function (resolve, reject) {
-      var doReject = function doReject(err) {
-        // 清空掉错误的请求记录
-        singletonMap$2.delete(orderNo);
-        reject(err);
-      };
-      extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
-        method: 'post',
-        data: {
-          tid: orderNo
-        }
-      }).then(function (data) {
-        if (data === null || data === void 0 ? void 0 : data.success) {
-          var _data$data, _data$data$orderDetai;
-          if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$orderDetai = _data$data.orderDetailDtoList) === null || _data$data$orderDetai === void 0 ? void 0 : _data$data$orderDetai.length) {
-            var list = kmkfUtils.filterKmOrders(data === null || data === void 0 ? void 0 : data.data, orderNo).map(function (item) {
-              return _objectSpread2(_objectSpread2({}, item), {}, {
-                billNo: item.sid,
-                sysStatus: item.sysStatus,
-                billType: item.type,
-                billTag: item.tags
-              });
-            });
-            resolve(list);
-          } else {
-            resolve([]);
-          }
-          // 延迟10秒清除,保证订单的时效性
-          setTimeout(function () {
-            singletonMap$2.delete(orderNo);
-          }, 1000 * 10);
-        } else {
-          doReject(data);
-        }
-      }).catch(doReject);
-    });
-    singletonMap$2.set(orderNo, p);
-  }
-  return singletonMap$2.get(orderNo);
-};
-var kmUtils = {
-  getOrderListSingleton: getOrderListSingleton
-};
-
 var columnsMap = {
   BS_SYSTEM_ORDER: [{
     title: '单据类型',
@@ -14298,7 +14250,6 @@ var columnsMap = {
   // },
   ],
 
-  KM_SYSTEM_ORDER: kmkfUtils.KM_SYSTEM_ORDER_CONFIG.columns,
   WLN_SYSTEM_ORDER: [{
     title: '订单类型',
     dataIndex: 'billType',
@@ -14395,7 +14346,6 @@ var columnsMap = {
 };
 var rowKeyMap = {
   BS_SYSTEM_ORDER: 'billNo',
-  KM_SYSTEM_ORDER: 'billNo',
   WLN_SYSTEM_ORDER: 'billNo',
   WDT_SYSTEM_ORDER: 'billNo',
   BS_E3_SYSTEM_ORDER: 'orderSn'
@@ -14412,8 +14362,6 @@ var index$1 = (function (props) {
       onceRef.current = true;
       if (type === 'BS_SYSTEM_ORDER') {
         getOrderList(value.orderNo);
-      } else if (type === 'KM_SYSTEM_ORDER') {
-        getKmOrderList(value.orderNo);
       } else if (type === 'WLN_SYSTEM_ORDER') {
         getWlnOrderList(value.orderNo);
       } else if (type === 'WDT_SYSTEM_ORDER') {
@@ -14575,37 +14523,6 @@ var index$1 = (function (props) {
       return _ref5.apply(this, arguments);
     };
   }();
-  var getKmOrderList = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(orderNo) {
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            kmUtils.getOrderListSingleton(orderNo).then(function (trades) {
-              _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-                orders: trades,
-                showOrderInfo: trades.map(function (_ref7) {
-                  var billNo = _ref7.billNo,
-                    billType = _ref7.billType,
-                    billTag = _ref7.billTag;
-                  return {
-                    billNo: billNo,
-                    billType: billType,
-                    billTag: billTag
-                  };
-                })
-              }));
-            });
-            onceRef.current = false;
-          case 2:
-          case "end":
-            return _context5.stop();
-        }
-      }, _callee5);
-    }));
-    return function getKmOrderList(_x5) {
-      return _ref6.apply(this, arguments);
-    };
-  }();
   var rowSelection = {
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
     fixed: true,
@@ -16090,7 +16007,6 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
 
 var _excluded$j = ["value", "onChange", "disabled", "failValue", "type"];
 var msgTypeCh = {
-  pdd: '拼多多',
   ding: '钉钉',
   wechat: '微信',
   qq: 'QQ',
@@ -16139,7 +16055,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, msgTypeCh[key] || key, item.ruleName);
+    }, msgTypeCh[key], item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "1.22.1-beta.0",
+  "version": "1.22.1",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.0",
+    "@kmkf-fe-packages/kmkf-utils": "1.22.1",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0fe6eb2f00f1a864386cb87e5a1494cb6564fcae"
+  "gitHead": "35cd2d70edf1827fbaf6cce07539166e92b58dc1"
 }

package/dist/src/km/common/index.d.ts

@@ -1,4 +0,0 @@
-declare const _default: {
-    getOrderListSingleton: (orderNo: string) => Promise<any>;
-};
-export default _default;