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

package/README.md

@@ -19,4 +19,4 @@ yarn start
 - config 公共方法
 - assets 静态资源
 
-111111
+1111111

package/dist/index.esm.js

@@ -7737,8 +7737,7 @@ var Province = function Province(props) {
 var TextArea$1 = Input.TextArea;
 var ParseLogistics = function ParseLogistics(props) {
   var onChange = props.onChange,
-    _props$selfCalibratio = props.selfCalibration,
-    selfCalibration = _props$selfCalibratio === void 0 ? false : _props$selfCalibratio;
+    _props$selfCalibratio = props.selfCalibration;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
@@ -7747,29 +7746,70 @@ var ParseLogistics = function ParseLogistics(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     isCopy = _useState4[0],
     setIsCopy = _useState4[1];
-  var handleIdentify = function handleIdentify(val) {
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    aiLoading = _useState8[0],
+    setAiLoading = _useState8[1];
+  var handleIdentify = function handleIdentify() {
+    var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     if (!value && !val) {
       return;
     }
+    setLoading(true);
     var fullAddress = value || val;
-    var needCalibration = selfCalibration && !/1\d{10}/.test(fullAddress);
+    // const needCalibration = selfCalibration && !/1\d{10}/.test(fullAddress);
     setIsCopy(false);
     request$1({
       url: '/qy/logistics/addressAnalysis',
       method: 'post',
       data: {
-        fullAddress: needCalibration ? "".concat(fullAddress, " \u5F20\u4E09 18888888888") : fullAddress
+        fullAddress: fullAddress
+        // fullAddress: needCalibration
+        //   ? `${fullAddress} 张三 18888888888`
+        //   : fullAddress,
       }
     }).then(function (res) {
       var data = res.data;
       // 如果是通过内部校准添加的姓名和手机号，则去除
-      if (needCalibration) {
-        data.name = '';
-        data.phone = '';
+      // if (needCalibration) {
+      //   data.name = '';
+      //   data.phone = '';
+      // }
+      onChange === null || onChange === void 0 ? void 0 : onChange(data);
+    }).catch(function (e) {
+      handleAIIdentify(fullAddress);
+      console.log(e);
+    }).finally(function () {
+      setLoading(false);
+    });
+  };
+  var handleAIIdentify = function handleAIIdentify() {
+    var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    if (!value && !val) {
+      return;
+    }
+    setAiLoading(true);
+    var fullAddress = value || val;
+    setIsCopy(false);
+    request$1({
+      url: '/qy/logistics/addressAnalysis',
+      method: 'post',
+      data: {
+        fullAddress: fullAddress,
+        isAiParse: true
       }
+    }).then(function (res) {
+      var data = res.data;
       onChange === null || onChange === void 0 ? void 0 : onChange(data);
     }).catch(function (e) {
       console.log(e);
+      message.error('识别失败，请输入正确的信息');
+    }).finally(function () {
+      setAiLoading(false);
     });
   };
   var _onKeyDown = function onKeyDown(e) {
@@ -7796,10 +7836,18 @@ var ParseLogistics = function ParseLogistics(props) {
   }), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
     size: "small",
     type: "primary",
+    loading: loading,
+    onClick: function onClick() {
+      return handleIdentify();
+    }
+  }, "\u4E00\u952E\u8BC6\u522B"), /*#__PURE__*/React.createElement(Button, {
+    size: "small",
+    type: "primary",
+    loading: aiLoading,
     onClick: function onClick() {
-      return handleIdentify('');
+      return handleAIIdentify();
     }
-  }, "\u667A\u80FD\u8BC6\u522B"), /*#__PURE__*/React.createElement(Button, {
+  }, "AI\u8BC6\u522B"), /*#__PURE__*/React.createElement(Button, {
     size: "small",
     onClick: function onClick() {
       return setValue('');
@@ -13559,6 +13607,7 @@ var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
   var data = {
+    goodShortName: formData.goodShortName || null,
     goodNo: formData.goodNo || null,
     goodName: formData.goodName || null,
     skuCode: formData.skuCode || null,
@@ -15760,7 +15809,7 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(val, record, index) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -16036,7 +16085,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -16145,7 +16194,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'isGift',
@@ -18046,6 +18095,10 @@ var getBsE3OrderListSingleton = function getBsE3OrderListSingleton(orderNo) {
             data.data.orderList = filterBsE3Orders(data === null || data === void 0 ? void 0 : data.data, orderNo);
           }
           resolve(data.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$1.delete(orderNo);
+          }, 1000 * 10);
         } else {
           doReject(data);
         }
@@ -18124,6 +18177,10 @@ var getJstOrderListSingleton = function getJstOrderListSingleton(orderNo) {
             orderList: (data === null || data === void 0 ? void 0 : data.data) || []
           }, orderNo);
           resolve(data.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$3.delete(orderNo);
+          }, 1000 * 10);
         } else {
           doReject(data);
         }
@@ -18167,6 +18224,74 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
         singletonMap$4.delete(orderNo);
         reject(err);
       };
+      extendRequest('/qy/gdfw/order/wlnOrderList', {
+        method: 'post',
+        data: {
+          billNo: orderNo
+        }
+      }).then(function (data) {
+        if (data === null || data === void 0 ? void 0 : data.success) {
+          resolve(data.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$4.delete(orderNo);
+          }, 1000 * 10);
+        } else {
+          doReject(data);
+        }
+      }).catch(doReject);
+    });
+    singletonMap$4.set(orderNo, p);
+  }
+  return singletonMap$4.get(orderNo);
+};
+var wlnUtils = {
+  getOrderListSingleton: getOrderListSingleton
+};
+
+var singletonMap$5 = new Map();
+var getOrderListSingleton$1 = function getOrderListSingleton(orderNo) {
+  if (!singletonMap$5.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap$5.delete(orderNo);
+        reject(err);
+      };
+      extendRequest('/qy/gdfw/order/bsOrderDetail', {
+        method: 'post',
+        data: {
+          billNo: orderNo
+        }
+      }).then(function (data) {
+        if (data === null || data === void 0 ? void 0 : data.success) {
+          resolve(data.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$5.delete(orderNo);
+          }, 1000 * 10);
+        } else {
+          doReject(data);
+        }
+      }).catch(doReject);
+    });
+    singletonMap$5.set(orderNo, p);
+  }
+  return singletonMap$5.get(orderNo);
+};
+var bsUtils = {
+  getOrderListSingleton: getOrderListSingleton$1
+};
+
+var singletonMap$6 = new Map();
+var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
+  if (!singletonMap$6.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap$6.delete(orderNo);
+        reject(err);
+      };
       extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
         method: 'post',
         data: {
@@ -18190,19 +18315,19 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
           }
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$4.delete(orderNo);
+            singletonMap$6.delete(orderNo);
           }, 1000 * 10);
         } else {
           doReject(data);
         }
       }).catch(doReject);
     });
-    singletonMap$4.set(orderNo, p);
+    singletonMap$6.set(orderNo, p);
   }
-  return singletonMap$4.get(orderNo);
+  return singletonMap$6.get(orderNo);
 };
 var kmUtils = {
-  getOrderListSingleton: getOrderListSingleton
+  getOrderListSingleton: getOrderListSingleton$2
 };
 
 var _excluded$h = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"];
@@ -18258,22 +18383,11 @@ var index$3 = (function (props) {
   }, [type]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
-      var _yield$request, success, data, _valueRef$current;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
-            return extendRequest('/qy/gdfw/order/bsOrderDetail', {
-              method: 'post',
-              data: {
-                billNo: orderNo
-              }
-            });
-          case 2:
-            _yield$request = _context.sent;
-            success = _yield$request.success;
-            data = _yield$request.data;
-            if (success) {
+            bsUtils.getOrderListSingleton(orderNo).then(function (data) {
+              var _valueRef$current;
               _onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current = valueRef.current) !== null && _valueRef$current !== void 0 ? _valueRef$current : {}), {}, {
                 orders: (data === null || data === void 0 ? void 0 : data.orders) || [],
                 showOrderInfo: data === null || data === void 0 ? void 0 : data.orders.map(function (item) {
@@ -18287,10 +18401,10 @@ var index$3 = (function (props) {
                   };
                 })
               }));
-            }
+            });
 
             onceRef.current = false;
-          case 7:
+          case 2:
           case "end":
             return _context.stop();
         }
@@ -18302,22 +18416,11 @@ var index$3 = (function (props) {
   }();
   var getWlnOrderList = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(orderNo) {
-      var _yield$request2, success, data, _valueRef$current2;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
-            return extendRequest('/qy/gdfw/order/wlnOrderList', {
-              method: 'post',
-              data: {
-                billCode: orderNo
-              }
-            });
-          case 2:
-            _yield$request2 = _context2.sent;
-            success = _yield$request2.success;
-            data = _yield$request2.data;
-            if (success) {
+            wlnUtils.getOrderListSingleton(orderNo).then(function (data) {
+              var _valueRef$current2;
               _onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current2 = valueRef.current) !== null && _valueRef$current2 !== void 0 ? _valueRef$current2 : {}), {}, {
                 orders: data === null || data === void 0 ? void 0 : data.orders.map(function (item) {
                   return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -18334,9 +18437,9 @@ var index$3 = (function (props) {
                   };
                 })
               }));
-            }
+            });
             onceRef.current = false;
-          case 7:
+          case 2:
           case "end":
             return _context2.stop();
         }
@@ -20562,7 +20665,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, msgTypeCh[key], item.ruleName);
+    }, msgTypeCh[key] || 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,
@@ -20582,11 +20685,14 @@ var MsgStatus = function MsgStatus(props) {
   }, "\u5931\u8D25\u539F\u56E0\uFF1A", (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.reason) : null) : null);
 };
 
-var _excluded$n = ["showOnly", "getOptionsAsync"];
+var _excluded$n = ["mode", "maxSelectCount", "showOnly", "getOptionsAsync", "onChange"];
 var AsyncSelect = function AsyncSelect(props) {
-  var _props$showOnly = props.showOnly,
+  var mode = props.mode,
+    maxSelectCount = props.maxSelectCount,
+    _props$showOnly = props.showOnly,
     showOnly = _props$showOnly === void 0 ? false : _props$showOnly,
     getOptionsAsync = props.getOptionsAsync,
+    _onChange = props.onChange,
     otherProps = _objectWithoutProperties(props, _excluded$n);
   var _React$useState = React.useState([]),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -20598,20 +20704,42 @@ var AsyncSelect = function AsyncSelect(props) {
     });
   }, []);
   var options = [].concat(_toConsumableArray(props.options || []), _toConsumableArray(data || []));
+  var getValueString = function getValueString(value) {
+    var list = options;
+    if (mode === 'multiple' && Array.isArray(value)) {
+      var _list$filter$map$join;
+      return (_list$filter$map$join = list.filter(function (item) {
+        return value.includes(item.value);
+      }).map(function (item) {
+        return item.label;
+      }).join('，')) !== null && _list$filter$map$join !== void 0 ? _list$filter$map$join : '--';
+    } else {
+      var selectedItem = list.find(function (item) {
+        return item.value === value;
+      });
+      return selectedItem ? selectedItem.label : value !== null && value !== void 0 ? value : '--';
+    }
+  };
   if (showOnly) {
-    var selectedItem = options.find(function (option) {
-      return option.value === props.value;
-    });
-    return selectedItem ? selectedItem.label : props.value;
+    return getValueString(props.value);
   }
   return /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
+    showArrow: true,
     showSearch: true,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
     },
     notFoundContent: null
   }, otherProps), {}, {
-    options: options
+    options: options,
+    mode: mode,
+    onChange: function onChange(value, option) {
+      if (mode === 'multiple' && maxSelectCount && maxSelectCount < value.length) {
+        _onChange === null || _onChange === void 0 ? void 0 : _onChange(value.slice(-maxSelectCount), option);
+      } else {
+        _onChange === null || _onChange === void 0 ? void 0 : _onChange(value, option);
+      }
+    }
   }));
 };
 
@@ -21143,7 +21271,7 @@ var GyReissue = function GyReissue(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React.createElement(Cascader, {
     style: {
@@ -21438,7 +21566,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React.createElement(Cascader, {
     style: {

package/dist/index.js

@@ -7749,8 +7749,7 @@ var Province = function Province(props) {
 var TextArea$1 = antd.Input.TextArea;
 var ParseLogistics = function ParseLogistics(props) {
   var onChange = props.onChange,
-    _props$selfCalibratio = props.selfCalibration,
-    selfCalibration = _props$selfCalibratio === void 0 ? false : _props$selfCalibratio;
+    _props$selfCalibratio = props.selfCalibration;
   var _useState = React.useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
@@ -7759,29 +7758,70 @@ var ParseLogistics = function ParseLogistics(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     isCopy = _useState4[0],
     setIsCopy = _useState4[1];
-  var handleIdentify = function handleIdentify(val) {
+  var _useState5 = React.useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var _useState7 = React.useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    aiLoading = _useState8[0],
+    setAiLoading = _useState8[1];
+  var handleIdentify = function handleIdentify() {
+    var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     if (!value && !val) {
       return;
     }
+    setLoading(true);
     var fullAddress = value || val;
-    var needCalibration = selfCalibration && !/1\d{10}/.test(fullAddress);
+    // const needCalibration = selfCalibration && !/1\d{10}/.test(fullAddress);
     setIsCopy(false);
     kmkfUtils.request({
       url: '/qy/logistics/addressAnalysis',
       method: 'post',
       data: {
-        fullAddress: needCalibration ? "".concat(fullAddress, " \u5F20\u4E09 18888888888") : fullAddress
+        fullAddress: fullAddress
+        // fullAddress: needCalibration
+        //   ? `${fullAddress} 张三 18888888888`
+        //   : fullAddress,
       }
     }).then(function (res) {
       var data = res.data;
       // 如果是通过内部校准添加的姓名和手机号，则去除
-      if (needCalibration) {
-        data.name = '';
-        data.phone = '';
+      // if (needCalibration) {
+      //   data.name = '';
+      //   data.phone = '';
+      // }
+      onChange === null || onChange === void 0 ? void 0 : onChange(data);
+    }).catch(function (e) {
+      handleAIIdentify(fullAddress);
+      console.log(e);
+    }).finally(function () {
+      setLoading(false);
+    });
+  };
+  var handleAIIdentify = function handleAIIdentify() {
+    var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    if (!value && !val) {
+      return;
+    }
+    setAiLoading(true);
+    var fullAddress = value || val;
+    setIsCopy(false);
+    kmkfUtils.request({
+      url: '/qy/logistics/addressAnalysis',
+      method: 'post',
+      data: {
+        fullAddress: fullAddress,
+        isAiParse: true
       }
+    }).then(function (res) {
+      var data = res.data;
       onChange === null || onChange === void 0 ? void 0 : onChange(data);
     }).catch(function (e) {
       console.log(e);
+      antd.message.error('识别失败，请输入正确的信息');
+    }).finally(function () {
+      setAiLoading(false);
     });
   };
   var _onKeyDown = function onKeyDown(e) {
@@ -7808,10 +7848,18 @@ var ParseLogistics = function ParseLogistics(props) {
   }), /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     size: "small",
     type: "primary",
+    loading: loading,
+    onClick: function onClick() {
+      return handleIdentify();
+    }
+  }, "\u4E00\u952E\u8BC6\u522B"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    size: "small",
+    type: "primary",
+    loading: aiLoading,
     onClick: function onClick() {
-      return handleIdentify('');
+      return handleAIIdentify();
     }
-  }, "\u667A\u80FD\u8BC6\u522B"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+  }, "AI\u8BC6\u522B"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     size: "small",
     onClick: function onClick() {
       return setValue('');
@@ -13571,6 +13619,7 @@ var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
   var data = {
+    goodShortName: formData.goodShortName || null,
     goodNo: formData.goodNo || null,
     goodName: formData.goodName || null,
     skuCode: formData.skuCode || null,
@@ -15772,7 +15821,7 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(val, record, index) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -16048,7 +16097,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -16157,7 +16206,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'isGift',
@@ -18058,6 +18107,10 @@ var getBsE3OrderListSingleton = function getBsE3OrderListSingleton(orderNo) {
             data.data.orderList = kmkfUtils.filterBsE3Orders(data === null || data === void 0 ? void 0 : data.data, orderNo);
           }
           resolve(data.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$1.delete(orderNo);
+          }, 1000 * 10);
         } else {
           doReject(data);
         }
@@ -18136,6 +18189,10 @@ var getJstOrderListSingleton = function getJstOrderListSingleton(orderNo) {
             orderList: (data === null || data === void 0 ? void 0 : data.data) || []
           }, orderNo);
           resolve(data.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$3.delete(orderNo);
+          }, 1000 * 10);
         } else {
           doReject(data);
         }
@@ -18179,6 +18236,74 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
         singletonMap$4.delete(orderNo);
         reject(err);
       };
+      extendRequest('/qy/gdfw/order/wlnOrderList', {
+        method: 'post',
+        data: {
+          billNo: orderNo
+        }
+      }).then(function (data) {
+        if (data === null || data === void 0 ? void 0 : data.success) {
+          resolve(data.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$4.delete(orderNo);
+          }, 1000 * 10);
+        } else {
+          doReject(data);
+        }
+      }).catch(doReject);
+    });
+    singletonMap$4.set(orderNo, p);
+  }
+  return singletonMap$4.get(orderNo);
+};
+var wlnUtils = {
+  getOrderListSingleton: getOrderListSingleton
+};
+
+var singletonMap$5 = new Map();
+var getOrderListSingleton$1 = function getOrderListSingleton(orderNo) {
+  if (!singletonMap$5.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap$5.delete(orderNo);
+        reject(err);
+      };
+      extendRequest('/qy/gdfw/order/bsOrderDetail', {
+        method: 'post',
+        data: {
+          billNo: orderNo
+        }
+      }).then(function (data) {
+        if (data === null || data === void 0 ? void 0 : data.success) {
+          resolve(data.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$5.delete(orderNo);
+          }, 1000 * 10);
+        } else {
+          doReject(data);
+        }
+      }).catch(doReject);
+    });
+    singletonMap$5.set(orderNo, p);
+  }
+  return singletonMap$5.get(orderNo);
+};
+var bsUtils = {
+  getOrderListSingleton: getOrderListSingleton$1
+};
+
+var singletonMap$6 = new Map();
+var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
+  if (!singletonMap$6.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap$6.delete(orderNo);
+        reject(err);
+      };
       extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
         method: 'post',
         data: {
@@ -18202,19 +18327,19 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
           }
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$4.delete(orderNo);
+            singletonMap$6.delete(orderNo);
           }, 1000 * 10);
         } else {
           doReject(data);
         }
       }).catch(doReject);
     });
-    singletonMap$4.set(orderNo, p);
+    singletonMap$6.set(orderNo, p);
   }
-  return singletonMap$4.get(orderNo);
+  return singletonMap$6.get(orderNo);
 };
 var kmUtils = {
-  getOrderListSingleton: getOrderListSingleton
+  getOrderListSingleton: getOrderListSingleton$2
 };
 
 var _excluded$h = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"];
@@ -18270,22 +18395,11 @@ var index$3 = (function (props) {
   }, [type]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
-      var _yield$request, success, data, _valueRef$current;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
-            return extendRequest('/qy/gdfw/order/bsOrderDetail', {
-              method: 'post',
-              data: {
-                billNo: orderNo
-              }
-            });
-          case 2:
-            _yield$request = _context.sent;
-            success = _yield$request.success;
-            data = _yield$request.data;
-            if (success) {
+            bsUtils.getOrderListSingleton(orderNo).then(function (data) {
+              var _valueRef$current;
               _onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current = valueRef.current) !== null && _valueRef$current !== void 0 ? _valueRef$current : {}), {}, {
                 orders: (data === null || data === void 0 ? void 0 : data.orders) || [],
                 showOrderInfo: data === null || data === void 0 ? void 0 : data.orders.map(function (item) {
@@ -18299,10 +18413,10 @@ var index$3 = (function (props) {
                   };
                 })
               }));
-            }
+            });
 
             onceRef.current = false;
-          case 7:
+          case 2:
           case "end":
             return _context.stop();
         }
@@ -18314,22 +18428,11 @@ var index$3 = (function (props) {
   }();
   var getWlnOrderList = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(orderNo) {
-      var _yield$request2, success, data, _valueRef$current2;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
-            return extendRequest('/qy/gdfw/order/wlnOrderList', {
-              method: 'post',
-              data: {
-                billCode: orderNo
-              }
-            });
-          case 2:
-            _yield$request2 = _context2.sent;
-            success = _yield$request2.success;
-            data = _yield$request2.data;
-            if (success) {
+            wlnUtils.getOrderListSingleton(orderNo).then(function (data) {
+              var _valueRef$current2;
               _onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current2 = valueRef.current) !== null && _valueRef$current2 !== void 0 ? _valueRef$current2 : {}), {}, {
                 orders: data === null || data === void 0 ? void 0 : data.orders.map(function (item) {
                   return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -18346,9 +18449,9 @@ var index$3 = (function (props) {
                   };
                 })
               }));
-            }
+            });
             onceRef.current = false;
-          case 7:
+          case 2:
           case "end":
             return _context2.stop();
         }
@@ -20574,7 +20677,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, kmkfUtils.msgTypeCh[key], item.ruleName);
+    }, kmkfUtils.msgTypeCh[key] || 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,
@@ -20594,11 +20697,14 @@ var MsgStatus = function MsgStatus(props) {
   }, "\u5931\u8D25\u539F\u56E0\uFF1A", (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.reason) : null) : null);
 };
 
-var _excluded$n = ["showOnly", "getOptionsAsync"];
+var _excluded$n = ["mode", "maxSelectCount", "showOnly", "getOptionsAsync", "onChange"];
 var AsyncSelect = function AsyncSelect(props) {
-  var _props$showOnly = props.showOnly,
+  var mode = props.mode,
+    maxSelectCount = props.maxSelectCount,
+    _props$showOnly = props.showOnly,
     showOnly = _props$showOnly === void 0 ? false : _props$showOnly,
     getOptionsAsync = props.getOptionsAsync,
+    _onChange = props.onChange,
     otherProps = _objectWithoutProperties(props, _excluded$n);
   var _React$useState = React__default['default'].useState([]),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -20610,20 +20716,42 @@ var AsyncSelect = function AsyncSelect(props) {
     });
   }, []);
   var options = [].concat(_toConsumableArray(props.options || []), _toConsumableArray(data || []));
+  var getValueString = function getValueString(value) {
+    var list = options;
+    if (mode === 'multiple' && Array.isArray(value)) {
+      var _list$filter$map$join;
+      return (_list$filter$map$join = list.filter(function (item) {
+        return value.includes(item.value);
+      }).map(function (item) {
+        return item.label;
+      }).join('，')) !== null && _list$filter$map$join !== void 0 ? _list$filter$map$join : '--';
+    } else {
+      var selectedItem = list.find(function (item) {
+        return item.value === value;
+      });
+      return selectedItem ? selectedItem.label : value !== null && value !== void 0 ? value : '--';
+    }
+  };
   if (showOnly) {
-    var selectedItem = options.find(function (option) {
-      return option.value === props.value;
-    });
-    return selectedItem ? selectedItem.label : props.value;
+    return getValueString(props.value);
   }
   return /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({
+    showArrow: true,
     showSearch: true,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
     },
     notFoundContent: null
   }, otherProps), {}, {
-    options: options
+    options: options,
+    mode: mode,
+    onChange: function onChange(value, option) {
+      if (mode === 'multiple' && maxSelectCount && maxSelectCount < value.length) {
+        _onChange === null || _onChange === void 0 ? void 0 : _onChange(value.slice(-maxSelectCount), option);
+      } else {
+        _onChange === null || _onChange === void 0 ? void 0 : _onChange(value, option);
+      }
+    }
   }));
 };
 
@@ -21155,7 +21283,7 @@ var GyReissue = function GyReissue(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {
@@ -21450,7 +21578,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {

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

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

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

@@ -1,6 +1,9 @@
 import { SelectProps } from 'antd';
-declare const AsyncSelect: (props: SelectProps & {
-    showOnly?: boolean;
-    getOptionsAsync?: () => Promise<Required<SelectProps>['options']>;
+declare const AsyncSelect: (props: SelectProps<any, import("rc-select/lib/Select").DefaultOptionType> & {
+    mode: string;
+    maxSelectCount?: number | undefined;
+    showOnly?: boolean | undefined;
+    onChange: (value: string | string[], data: any) => void;
+    getOptionsAsync?: (() => Promise<Required<SelectProps>['options']>) | undefined;
 }) => any;
 export default AsyncSelect;

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.77",
+  "version": "2.0.79-beta.0",
   "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.0.77",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.79-beta.0",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c99b48b7dfbcfd3d5a4dffb31df0e5b0050e9281"
+  "gitHead": "2d6e46a13fb42f6e686d1453c0dc1dce33a8e8fc"
 }