@kmkf-fe-packages/basic-components 2.10.9-beta.12 → 2.10.9-beta.14

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, DxdSuppliersData, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, isJdLogisticsCompany, getJdCustomerCodeOptions, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, DxdSuppliersData, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import every from 'lodash/every';
 import maxBy from 'lodash/maxBy';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
@@ -736,6 +736,12 @@ var ApaasUpload = function ApaasUpload(_ref) {
     resetProps = _objectWithoutProperties(_ref, _excluded$4);
   var inputRef = useRef(null);
   var valueRef = useRef(value);
+  // 当前批次的文件选择序号，用于按选择顺序展示上传结果
+  var batchSeqRef = useRef(0);
+  // 当前批次的上传结果，按序号存储，最后统一排序合并
+  var batchResultsRef = useRef(new Map());
+  // 当前批次正在处理的文件数，用于判断批次何时结束
+  var pendingCountRef = useRef(0);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
@@ -751,6 +757,32 @@ var ApaasUpload = function ApaasUpload(_ref) {
   useEffect(function () {
     valueRef.current = value;
   }, [value]);
+  // 获取当前批次的文件选择序号；没有正在处理的文件时视为新一批，重置批次状态
+  var acquireBatchSeq = function acquireBatchSeq() {
+    if (pendingCountRef.current === 0) {
+      batchSeqRef.current = 0;
+      batchResultsRef.current.clear();
+    }
+    return batchSeqRef.current++;
+  };
+  // 将单个文件结果存入当前批次，本批次全部完成时按选择顺序合并到 value
+  var appendResult = function appendResult(batchSeq, result) {
+    if (valueRef.current.length + batchResultsRef.current.size < maxCount) {
+      batchResultsRef.current.set(batchSeq, result);
+    }
+    pendingCountRef.current = Math.max(0, pendingCountRef.current - 1);
+    if (pendingCountRef.current === 0 && batchResultsRef.current.size > 0) {
+      var sorted = _toConsumableArray(batchResultsRef.current.entries()).sort(function (a, b) {
+        return a[0] - b[0];
+      }).map(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+          v = _ref3[1];
+        return v;
+      });
+      handleChange([].concat(_toConsumableArray(valueRef.current), _toConsumableArray(sorted)));
+      batchResultsRef.current.clear();
+    }
+  };
   var imgReader = function imgReader(item) {
     var blob = item.getAsFile(),
       reader = new FileReader();
@@ -758,14 +790,16 @@ var ApaasUpload = function ApaasUpload(_ref) {
       message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return;
     }
-    if (valueRef.current.length >= maxCount) {
+    if (valueRef.current.length + pendingCountRef.current >= maxCount) {
       message.error("\u53EA\u80FD\u4E0A\u4F20".concat(maxCount, "\u5F20\u56FE\u7247"));
       return;
     }
+    var batchSeq = acquireBatchSeq();
+    pendingCountRef.current += 1;
     reader.onload = function (e) {
       var _e$target;
       var result = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
-      handleChange([].concat(_toConsumableArray(valueRef.current), [result]));
+      appendResult(batchSeq, result);
     };
     reader.readAsDataURL(blob);
   };
@@ -798,7 +832,8 @@ var ApaasUpload = function ApaasUpload(_ref) {
   // 手动上传模式, 一直返回false
   var beforeUpload = function beforeUpload(file) {
     var size = file.size / 1024 / 1024 < maxSize;
-    if (value.length > maxCount) {
+    // 并发上传时用「已上传 + 待上传」一起判断，避免一次选多张时超出 maxCount
+    if (valueRef.current.length + pendingCountRef.current >= maxCount) {
       message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u5F20\u56FE\u7247\uFF01"));
       return Upload.LIST_IGNORE;
     }
@@ -806,8 +841,10 @@ var ApaasUpload = function ApaasUpload(_ref) {
       message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return Upload.LIST_IGNORE;
     }
+    var batchSeq = acquireBatchSeq();
+    pendingCountRef.current += 1;
     getBase64(file).then(function (res) {
-      return handleChange([].concat(_toConsumableArray(valueRef.current), [res]));
+      appendResult(batchSeq, res);
     });
     return Upload.LIST_IGNORE;
   };
@@ -909,6 +946,7 @@ var ApaasUpload = function ApaasUpload(_ref) {
     name: "file",
     listType: "picture-card",
     maxCount: maxCount,
+    multiple: true,
     className: styles.upload,
     beforeUpload: beforeUpload
   }, resetProps), value.length >= maxCount ? null : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
@@ -1049,6 +1087,16 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
     resetProps = _objectWithoutProperties(_ref, _excluded$6);
   var inputRef = useRef(null);
   var valueRef = useRef(value);
+  // 并发上传时用于正确控制 loading 状态（多个文件同时上传）
+  var uploadingCountRef = useRef(0);
+  // 已选中待上传的文件数，用于数量预占，避免并发上传超过 maxCount
+  var pendingCountRef = useRef(0);
+  // 文件序号，保证并发上传时文件名唯一
+  var seqRef = useRef(0);
+  // 当前批次的文件选择序号，用于按选择顺序展示上传结果
+  var batchSeqRef = useRef(0);
+  // 当前批次的上传结果，按序号存储，最后统一排序合并
+  var batchResultsRef = useRef(new Map());
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     uploading = _useState2[0],
@@ -1063,48 +1111,80 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
   useEffect(function () {
     valueRef.current = value;
   }, [value]);
+  var genFileName = function genFileName() {
+    seqRef.current += 1;
+    return "".concat(uniqueKey, "_").concat(seqRef.current, "_").concat(new Date().getTime(), ".jpg");
+  };
+  // 获取当前批次的文件选择序号；没有正在上传的文件时视为新一批，重置批次状态
+  var acquireBatchSeq = function acquireBatchSeq() {
+    if (pendingCountRef.current === 0) {
+      batchSeqRef.current = 0;
+      batchResultsRef.current.clear();
+    }
+    return batchSeqRef.current++;
+  };
   var asyncUpload = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
-      var _valueRef$current;
-      var formData, fileName, _yield$request, success, data;
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file, batchSeq) {
+      var formData, fileName, _yield$request, success, data, sorted;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            pendingCountRef.current += 1;
+            uploadingCountRef.current += 1;
             setUploading(true);
             formData = new FormData();
             formData.append('file', file);
-            fileName = "".concat(uniqueKey, "_").concat(((_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : _valueRef$current.length) + 1, "_").concat(new Date().getTime(), ".jpg");
+            fileName = genFileName();
             formData.append('fileName', fileName);
-            _context.prev = 5;
-            _context.next = 8;
+            _context.prev = 7;
+            _context.next = 10;
             return request(actionUrl, {
               method: 'post',
               body: formData
             });
-          case 8:
+          case 10:
             _yield$request = _context.sent;
             success = _yield$request.success;
             data = _yield$request.data;
             if (success) {
-              handleChange([].concat(_toConsumableArray(valueRef.current), [data]));
+              if (valueRef.current.length + batchResultsRef.current.size < maxCount) {
+                // 先暂存到当前批次，等本批次全部完成后再按选择顺序合并
+                batchResultsRef.current.set(batchSeq, data);
+              }
             }
-            _context.next = 17;
+            _context.next = 19;
             break;
-          case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](5);
+          case 16:
+            _context.prev = 16;
+            _context.t0 = _context["catch"](7);
             message.error('图片上传失败');
-          case 17:
-            _context.prev = 17;
-            setUploading(false);
-            return _context.finish(17);
-          case 20:
+          case 19:
+            _context.prev = 19;
+            pendingCountRef.current = Math.max(0, pendingCountRef.current - 1);
+            uploadingCountRef.current = Math.max(0, uploadingCountRef.current - 1);
+            // 本批次全部上传完成，按选择序号排序后一次性合并到 value
+            if (pendingCountRef.current === 0 && batchResultsRef.current.size > 0) {
+              sorted = _toConsumableArray(batchResultsRef.current.entries()).sort(function (a, b) {
+                return a[0] - b[0];
+              }).map(function (_ref3) {
+                var _ref4 = _slicedToArray(_ref3, 2),
+                  v = _ref4[1];
+                return v;
+              });
+              handleChange([].concat(_toConsumableArray(valueRef.current), _toConsumableArray(sorted)));
+              batchResultsRef.current.clear();
+            }
+            if (uploadingCountRef.current === 0) {
+              setUploading(false);
+            }
+            return _context.finish(19);
+          case 25:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5, 14, 17, 20]]);
+      }, _callee, null, [[7, 16, 19, 25]]);
     }));
-    return function asyncUpload(_x) {
+    return function asyncUpload(_x, _x2) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -1120,24 +1200,24 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
       return;
     }
     reader.onload = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
-        var _e$target, _valueRef$current2;
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+        var _e$target;
         var result, fileName, file;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               result = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
-              fileName = "".concat(uniqueKey, "_").concat(((_valueRef$current2 = valueRef.current) === null || _valueRef$current2 === void 0 ? void 0 : _valueRef$current2.length) + 1, "_").concat(new Date().getTime(), ".jpg");
+              fileName = genFileName();
               file = dataURLtoFile(result, fileName);
-              asyncUpload(file);
+              asyncUpload(file, acquireBatchSeq());
             case 4:
             case "end":
               return _context2.stop();
           }
         }, _callee2);
       }));
-      return function (_x2) {
-        return _ref3.apply(this, arguments);
+      return function (_x3) {
+        return _ref5.apply(this, arguments);
       };
     }();
     reader.readAsDataURL(blob);
@@ -1171,7 +1251,8 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
   // 手动上传模式, 一直返回false
   var beforeUpload = function beforeUpload(file) {
     var size = file.size / 1024 / 1024 < maxSize;
-    if (value.length > maxCount) {
+    // 并发上传时用「已上传 + 待上传」一起判断，避免一次选多张时超出 maxCount
+    if (valueRef.current.length + pendingCountRef.current >= maxCount) {
       message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u5F20\u56FE\u7247\uFF01"));
       return Upload.LIST_IGNORE;
     }
@@ -1179,7 +1260,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
       message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return Upload.LIST_IGNORE;
     }
-    asyncUpload(file);
+    asyncUpload(file, acquireBatchSeq());
     return Upload.LIST_IGNORE;
   };
   var handleDelete = function handleDelete(key) {
@@ -1276,6 +1357,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
     name: "file",
     listType: "picture-card",
     maxCount: maxCount,
+    multiple: true,
     className: styles$1.upload,
     beforeUpload: beforeUpload
   }, resetProps), value.length >= maxCount ? null : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
@@ -1319,6 +1401,16 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
     resetProps = _objectWithoutProperties(_ref, _excluded$7);
   var inputRef = useRef(null);
   var valueRef = useRef(value);
+  // 并发上传时用于正确控制 loading 状态（多个文件同时上传）
+  var uploadingCountRef = useRef(0);
+  // 已选中待上传的文件数，用于数量预占，避免并发上传超过 maxCount
+  var pendingCountRef = useRef(0);
+  // 文件序号，保证并发上传时文件名唯一
+  var seqRef = useRef(0);
+  // 当前批次的文件选择序号，用于按选择顺序展示上传结果
+  var batchSeqRef = useRef(0);
+  // 当前批次的上传结果，按序号存储，最后统一排序合并
+  var batchResultsRef = useRef(new Map());
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     uploading = _useState2[0],
@@ -1333,61 +1425,84 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
   useEffect(function () {
     valueRef.current = value;
   }, [value]);
+  var genFileName = function genFileName() {
+    seqRef.current += 1;
+    return "".concat(uniqueKey, "_").concat(seqRef.current, "_").concat(new Date().getTime(), ".jpg");
+  };
+  // 获取当前批次的文件选择序号；没有正在上传的文件时视为新一批，重置批次状态
+  var acquireBatchSeq = function acquireBatchSeq() {
+    if (pendingCountRef.current === 0) {
+      batchSeqRef.current = 0;
+      batchResultsRef.current.clear();
+    }
+    return batchSeqRef.current++;
+  };
   var asyncUpload = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
-      var _valueRef$current;
-      var formData, fileName, showName, _yield$request, success, data;
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file, batchSeq) {
+      var formData, fileName, showName, _yield$request, success, data, sorted;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            pendingCountRef.current += 1;
+            uploadingCountRef.current += 1;
             setUploading(true);
             formData = new FormData();
             formData.append('file', file);
-            fileName = "".concat(uniqueKey, "_").concat(((_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : _valueRef$current.length) + 1, "_").concat(new Date().getTime(), ".jpg");
+            fileName = genFileName();
             formData.append('fileName', fileName);
             showName = file.name.substring(0, file.name.lastIndexOf('.'));
-            _context.prev = 6;
-            _context.next = 9;
+            _context.prev = 8;
+            _context.next = 11;
             return request(actionUrl, {
               method: 'post',
               body: formData
             });
-          case 9:
+          case 11:
             _yield$request = _context.sent;
             success = _yield$request.success;
             data = _yield$request.data;
-            if (!success) {
-              _context.next = 16;
-              break;
-            }
-            if (!(valueRef.current.length >= maxCount)) {
-              _context.next = 15;
-              break;
+            if (success) {
+              if (valueRef.current.length + batchResultsRef.current.size < maxCount) {
+                // 先暂存到当前批次，等本批次全部完成后再按选择顺序合并
+                batchResultsRef.current.set(batchSeq, {
+                  url: data,
+                  name: showName
+                });
+              }
             }
-            return _context.abrupt("return");
-          case 15:
-            handleChange([].concat(_toConsumableArray(valueRef.current), [{
-              url: data,
-              name: showName
-            }]));
-          case 16:
-            _context.next = 21;
+            _context.next = 20;
             break;
-          case 18:
-            _context.prev = 18;
-            _context.t0 = _context["catch"](6);
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](8);
             message.error('图片上传失败');
-          case 21:
-            _context.prev = 21;
-            setUploading(false);
-            return _context.finish(21);
-          case 24:
+          case 20:
+            _context.prev = 20;
+            pendingCountRef.current = Math.max(0, pendingCountRef.current - 1);
+            uploadingCountRef.current = Math.max(0, uploadingCountRef.current - 1);
+            // 本批次全部上传完成，按选择序号排序后一次性合并到 value
+            if (pendingCountRef.current === 0 && batchResultsRef.current.size > 0) {
+              sorted = _toConsumableArray(batchResultsRef.current.entries()).sort(function (a, b) {
+                return a[0] - b[0];
+              }).map(function (_ref3) {
+                var _ref4 = _slicedToArray(_ref3, 2),
+                  v = _ref4[1];
+                return v;
+              });
+              handleChange([].concat(_toConsumableArray(valueRef.current), _toConsumableArray(sorted)));
+              batchResultsRef.current.clear();
+            }
+            if (uploadingCountRef.current === 0) {
+              setUploading(false);
+            }
+            return _context.finish(20);
+          case 26:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 18, 21, 24]]);
+      }, _callee, null, [[8, 17, 20, 26]]);
     }));
-    return function asyncUpload(_x) {
+    return function asyncUpload(_x, _x2) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -1403,24 +1518,24 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
       return;
     }
     reader.onload = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
-        var _e$target, _valueRef$current2;
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+        var _e$target;
         var result, fileName, file;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               result = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
-              fileName = "".concat(uniqueKey, "_").concat(((_valueRef$current2 = valueRef.current) === null || _valueRef$current2 === void 0 ? void 0 : _valueRef$current2.length) + 1, "_").concat(new Date().getTime(), ".jpg");
+              fileName = genFileName();
               file = dataURLtoFile(result, fileName);
-              asyncUpload(file);
+              asyncUpload(file, acquireBatchSeq());
             case 4:
             case "end":
               return _context2.stop();
           }
         }, _callee2);
       }));
-      return function (_x2) {
-        return _ref3.apply(this, arguments);
+      return function (_x3) {
+        return _ref5.apply(this, arguments);
       };
     }();
     reader.readAsDataURL(blob);
@@ -1454,7 +1569,8 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
   // 手动上传模式, 一直返回false
   var beforeUpload = function beforeUpload(file) {
     var size = file.size / 1024 / 1024 < maxSize;
-    if (value.length > maxCount) {
+    // 并发上传时用「已上传 + 待上传」一起判断，避免一次选多张时超出 maxCount
+    if (valueRef.current.length + pendingCountRef.current >= maxCount) {
       message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u5F20\u56FE\u7247\uFF01"));
       return Upload.LIST_IGNORE;
     }
@@ -1462,7 +1578,7 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
       message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return Upload.LIST_IGNORE;
     }
-    asyncUpload(file);
+    asyncUpload(file, acquireBatchSeq());
     return Upload.LIST_IGNORE;
   };
   var handleDelete = function handleDelete(key) {
@@ -1596,6 +1712,7 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
     name: "file",
     listType: "picture-card",
     maxCount: maxCount,
+    multiple: true,
     className: styles$2.uploadPro,
     beforeUpload: beforeUpload
   }, resetProps), value.length >= maxCount ? null : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
@@ -8515,7 +8632,7 @@ var processLogisticsInterception = function processLogisticsInterception(getValu
     address = every(address, function (item) {
       return !item;
     }) ? [] : address;
-    var subFields = ['interceptCompany', 'interceptCode', 'interceptType', 'interceptSenderMobile', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus', 'interceptLogisticsUserKCode', 'interceptLogisticsUserSecretKey'];
+    var subFields = ['interceptCompany', 'interceptCode', 'interceptType', 'interceptSenderMobile', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus', 'interceptLogisticsUserKCode', 'interceptLogisticsUserSecretKey', 'interceptLogisticsCustomerCode'];
     var map = subFields.reduce(function (cur, nxt) {
       return _objectSpread2(_objectSpread2({}, cur), {}, _defineProperty({}, nxt, getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
     }, {});
@@ -13354,6 +13471,13 @@ var LogisticsInterception = function LogisticsInterception(props) {
     setStatusOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.logisticsStatusList) || []);
     setIsInterface(interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.isInterface);
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  useEffect(function () {
+    if (!isJdLogisticsCompany(value === null || value === void 0 ? void 0 : value.interceptCompany) && (value === null || value === void 0 ? void 0 : value.interceptLogisticsCustomerCode) !== undefined) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        interceptLogisticsCustomerCode: undefined
+      }));
+    }
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany, value === null || value === void 0 ? void 0 : value.interceptLogisticsCustomerCode]);
   //拦截类型切换 需要清空派送地址
   useEffect(function () {
     if (!(value === null || value === void 0 ? void 0 : value.interceptCompany)) return;
@@ -13416,6 +13540,9 @@ var LogisticsInterception = function LogisticsInterception(props) {
     }
     return isShow;
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  var showCustomerCode = useMemo(function () {
+    return isJdLogisticsCompany(value === null || value === void 0 ? void 0 : value.interceptCompany);
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
   //判断是否能修改物流信息
   var isEdit = useMemo(function () {
     var company = expressInterceptData.find(function (item) {
@@ -13442,6 +13569,9 @@ var LogisticsInterception = function LogisticsInterception(props) {
       });
     });
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  var customerCodeOptions = useMemo(function () {
+    return getJdCustomerCodeOptions(LogisticsAddressOptions, value === null || value === void 0 ? void 0 : value.interceptCompany);
+  }, [LogisticsAddressOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
   var returnValue = useMemo(function () {
     var _value$interceptAddre, _value$interceptAddre2, _value$interceptAddre3;
     var uk = LogisticsAddress === null || LogisticsAddress === void 0 ? void 0 : LogisticsAddress.getUkByInfo({
@@ -13497,9 +13627,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
       //     userSecretKey: '12345678',
       //   },
       // ];
-      var matchKCodeList = LogisticsAddressOptions === null || LogisticsAddressOptions === void 0 ? void 0 : LogisticsAddressOptions.filter(function (item) {
-        return item.cpCode === val && item.userKCode;
-      });
       newValue = _objectSpread2(_objectSpread2({}, newValue), {}, {
         interceptCompany: val,
         interceptType: (_defaultInterceptType = defaultInterceptType) === null || _defaultInterceptType === void 0 ? void 0 : _defaultInterceptType.value,
@@ -13518,7 +13645,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         },
         interceptLogisticsApiStatusReason: undefined,
         interceptLogisticsUserKCode: undefined,
-        interceptLogisticsUserSecretKey: undefined
+        interceptLogisticsUserSecretKey: undefined,
+        interceptLogisticsCustomerCode: undefined
       });
     }
     if (type === 'interceptLogisticsApiStatus') {
@@ -13599,7 +13727,37 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'interceptCode');
     },
     value: value === null || value === void 0 ? void 0 : value.interceptCode
-  }))), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Item, {
+  }))), /*#__PURE__*/React.createElement(Item, {
+    label: /*#__PURE__*/React.createElement("span", null, "\u5BA2\u6237\u7F16\u7801", platform === 'pc' ? /*#__PURE__*/React.createElement(React.Fragment, null, "\uFF1A", /*#__PURE__*/React.createElement(Typography.Link, {
+      style: {
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        return onJumpPage && (onJumpPage === null || onJumpPage === void 0 ? void 0 : onJumpPage({
+          type: 'interceptConfig'
+        }));
+      }
+    }, 'K码/EBU码配置>>')) : null),
+    required: showCustomerCode,
+    key: 'interceptLogisticsCustomerCode',
+    hidden: !showCustomerCode
+  }, /*#__PURE__*/React.createElement(Select, {
+    disabled: disabled,
+    placeholder: "\u9009\u62E9\u5BA2\u6237\u7F16\u7801",
+    notFoundContent: "\u6682\u65E0\u5BA2\u6237\u7F16\u7801\u914D\u7F6E\uFF0C\u8BF7\u5148\u524D\u5F80K\u7801/EBU\u7801\u914D\u7F6E>>",
+    showSearch: true,
+    style: {
+      width: '200px'
+    },
+    onChange: function onChange(val) {
+      return changeHandle(val, 'interceptLogisticsCustomerCode');
+    },
+    options: customerCodeOptions,
+    value: value === null || value === void 0 ? void 0 : value.interceptLogisticsCustomerCode,
+    filterOption: function filterOption(input, option) {
+      return option.label.includes(input);
+    }
+  })), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Item, {
     label: /*#__PURE__*/React.createElement("span", null, "\u5BA2\u6237\u7F16\u7801\uFF08K\u7801\uFF09\uFF1A", platform === 'pc' ? /*#__PURE__*/React.createElement(Typography.Link, {
       style: {
         cursor: 'pointer'
@@ -13644,7 +13802,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     value: value === null || value === void 0 ? void 0 : value.interceptLogisticsUserSecretKey
   }))), /*#__PURE__*/React.createElement(Item, {
     label: '拦截类型',
-    required: required,
+    required: required && !showCustomerCode,
     key: 'interceptType'
   }, /*#__PURE__*/React.createElement(Select, {
     disabled: baseFieldDisabled,
@@ -21136,17 +21294,18 @@ var getColumns$2 = function getColumns(_ref) {
 };
 
 var getYesOrNo$4 = function getYesOrNo(val) {
+  var content = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['是', '否'];
   switch (val) {
     case true:
     case '1':
     case 1:
-      return '是';
+      return content[0];
     case false:
     case '0':
     case 0:
       return '否';
     default:
-      return null;
+      return content[1];
   }
 };
 
@@ -21345,7 +21504,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '非赠品',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, isNull(val) ? null : val ? '赠品' : '非赠品');
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val, ['赠品', '非赠品']));
       }
     }, {
       dataIndex: 'isPackage',
@@ -21577,7 +21736,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '非赠品',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, isNull(val) ? null : val ? '赠品' : '非赠品');
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val, ['赠品', '非赠品']));
       }
     }, {
       dataIndex: 'isPackage',

package/dist/src/business/LogisticsInterception/index.d.ts

@@ -19,6 +19,7 @@ interface LogisticsInterceptionValueType {
     interceptLogisticsApiStatusReason: string;
     interceptLogisticsUserKCode: string;
     interceptLogisticsUserSecretKey: string;
+    interceptLogisticsCustomerCode: string;
 }
 interface LogisticsInterceptionProps {
     value: Partial<LogisticsInterceptionValueType>;

package/dist/src/constants/constants.d.ts

@@ -1 +1 @@
-export declare const getYesOrNo: (val: boolean | string | number) => "是" | "否" | null;
+export declare const getYesOrNo: (val: boolean | string | number, content?: string[]) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.10.9-beta.12",
+  "version": "2.10.9-beta.14",
   "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": "2.10.9-beta.12",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.14",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5a0d12c8caf0912d82e12ed94e64afd3ff746c65"
+  "gitHead": "5d3cdbfbc69828ca860a175154f18f17c1165cf1"
 }