@kmkf-fe-packages/basic-components 2.0.54-beta.94 → 2.0.54-beta.98

package/dist/index.esm.js

@@ -7746,11 +7746,20 @@ var ParseLogistics = function ParseLogistics(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     isCopy = _useState4[0],
     setIsCopy = _useState4[1];
+  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;
     // const needCalibration = selfCalibration && !/1\d{10}/.test(fullAddress);
     setIsCopy(false);
@@ -7774,6 +7783,8 @@ var ParseLogistics = function ParseLogistics(props) {
     }).catch(function (e) {
       handleAIIdentify(fullAddress);
       console.log(e);
+    }).finally(function () {
+      setLoading(false);
     });
   };
   var handleAIIdentify = function handleAIIdentify() {
@@ -7781,6 +7792,7 @@ var ParseLogistics = function ParseLogistics(props) {
     if (!value && !val) {
       return;
     }
+    setAiLoading(true);
     var fullAddress = value || val;
     setIsCopy(false);
     request$1({
@@ -7795,6 +7807,9 @@ var ParseLogistics = function ParseLogistics(props) {
       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) {
@@ -7821,12 +7836,14 @@ 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 handleAIIdentify();
     }
@@ -18078,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);
         }
@@ -18156,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);
         }
@@ -18199,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: {
@@ -18222,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"];
@@ -18290,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) {
@@ -18319,10 +18401,10 @@ var index$3 = (function (props) {
                   };
                 })
               }));
-            }
+            });
 
             onceRef.current = false;
-          case 7:
+          case 2:
           case "end":
             return _context.stop();
         }
@@ -18334,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), {}, {
@@ -18366,9 +18437,9 @@ var index$3 = (function (props) {
                   };
                 })
               }));
-            }
+            });
             onceRef.current = false;
-          case 7:
+          case 2:
           case "end":
             return _context2.stop();
         }

package/dist/index.js

@@ -7758,11 +7758,20 @@ var ParseLogistics = function ParseLogistics(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     isCopy = _useState4[0],
     setIsCopy = _useState4[1];
+  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;
     // const needCalibration = selfCalibration && !/1\d{10}/.test(fullAddress);
     setIsCopy(false);
@@ -7786,6 +7795,8 @@ var ParseLogistics = function ParseLogistics(props) {
     }).catch(function (e) {
       handleAIIdentify(fullAddress);
       console.log(e);
+    }).finally(function () {
+      setLoading(false);
     });
   };
   var handleAIIdentify = function handleAIIdentify() {
@@ -7793,6 +7804,7 @@ var ParseLogistics = function ParseLogistics(props) {
     if (!value && !val) {
       return;
     }
+    setAiLoading(true);
     var fullAddress = value || val;
     setIsCopy(false);
     kmkfUtils.request({
@@ -7807,6 +7819,9 @@ var ParseLogistics = function ParseLogistics(props) {
       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) {
@@ -7833,12 +7848,14 @@ 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 handleAIIdentify();
     }
@@ -18090,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);
         }
@@ -18168,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);
         }
@@ -18211,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: {
@@ -18234,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"];
@@ -18302,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) {
@@ -18331,10 +18413,10 @@ var index$3 = (function (props) {
                   };
                 })
               }));
-            }
+            });
 
             onceRef.current = false;
-          case 7:
+          case 2:
           case "end":
             return _context.stop();
         }
@@ -18346,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), {}, {
@@ -18378,9 +18449,9 @@ var index$3 = (function (props) {
                   };
                 })
               }));
-            }
+            });
             onceRef.current = false;
-          case 7:
+          case 2:
           case "end":
             return _context2.stop();
         }

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

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

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.54-beta.94",
+  "version": "2.0.54-beta.98",
   "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.54-beta.94",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.54-beta.98",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8546c4bf3d92e31e62d5495c3665123a9066d16f"
+  "gitHead": "4eff3b229555e22e47fc541cab484a91f7d482da"
 }