@kmkf-fe-packages/basic-components 0.7.1-alpha.1 → 0.7.1

package/dist/index.esm.js

@@ -2,7 +2,7 @@ import React, { useRef, useState, useEffect, useMemo, forwardRef, useImperativeH
 import { Cascader, DatePicker, Input, InputNumber, Select, Upload, Image, message, Radio, Space, Spin, Checkbox, Row, Col, Slider, Rate, Form, Tabs, Modal, Button, ConfigProvider, Pagination, Popover } from 'antd';
 import { EyeOutlined, DeleteOutlined } from '@ant-design/icons';
 import request, { extend } from 'umi-request';
-import { AddressData, request as request$1, LogisticsAddressData } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
 import zhCN from 'antd/lib/locale/zh_CN';
 
 function _iterableToArrayLimit(arr, i) {
@@ -3055,27 +3055,43 @@ var Payment = function Payment(props) {
 var TextArea$1 = Input.TextArea;
 var ParseLogistics = function ParseLogistics(props) {
   var onChange = props.onChange;
-  var _useState = useState(""),
+  var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
-  var handleIdentify = function handleIdentify() {
-    if (!value) {
-      return;
-    }
-    request$1({
-      url: "/qy/logistics/addressAnalysis",
-      method: "post",
-      data: {
-        fullAddress: value
-      }
-    }).then(function (res) {
-      var data = res.data;
-      onChange === null || onChange === void 0 ? void 0 : onChange(data);
-    }).catch(function (e) {
-      console.log(e);
-    });
-  };
+  var handleIdentify = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _yield$request, data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (value) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return");
+          case 2:
+            _context.next = 4;
+            return extendRequest('/qy/logistics/addressAnalysis', {
+              method: 'post',
+              data: {
+                fullAddress: value
+              }
+            });
+          case 4:
+            _yield$request = _context.sent;
+            data = _yield$request.data;
+            onChange === null || onChange === void 0 ? void 0 : onChange(data);
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleIdentify() {
+      return _ref.apply(this, arguments);
+    };
+  }();
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TextArea$1, {
     placeholder: "\u590D\u5236\u7269\u6D41\u4FE1\u606F\uFF0C\u70B9\u51FB\u667A\u80FD\u8BC6\u522B",
     rows: 3,
@@ -3090,67 +3106,12 @@ var ParseLogistics = function ParseLogistics(props) {
   }, "\u667A\u80FD\u8BC6\u522B"), /*#__PURE__*/React.createElement(Button, {
     size: "small",
     onClick: function onClick() {
-      return setValue("");
+      return setValue('');
     }
   }, "\u6E05\u7A7A")));
 };
 
-var IdentifyAddress = function IdentifyAddress(props) {
-  var value = props.value,
-    onChange = props.onChange,
-    _props$disabled = props.disabled,
-    disabled = _props$disabled === void 0 ? false : _props$disabled;
-  var changeHandle = function changeHandle(val, type) {
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val)));
-  };
-  var handleParseLogistics = function handleParseLogistics(val) {
-    var params = {
-      detail: val === null || val === void 0 ? void 0 : val.addressDetail,
-      receiverName: val === null || val === void 0 ? void 0 : val.name,
-      receiverMobile: val === null || val === void 0 ? void 0 : val.phone,
-      address: []
-    };
-    if (val === null || val === void 0 ? void 0 : val.province) {
-      params.address = [AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.province), AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.city), AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.district)];
-    }
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, params));
-  };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && /*#__PURE__*/React.createElement(ParseLogistics, {
-    onChange: handleParseLogistics
-  }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Province, {
-    value: value.address,
-    onChange: function onChange(val) {
-      return changeHandle(val, 'address');
-    },
-    options: [],
-    disabled: disabled
-  }), /*#__PURE__*/React.createElement(Input, {
-    value: value.detail,
-    disabled: disabled,
-    placeholder: "\u8BE6\u7EC6\u5730\u5740",
-    onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'detail');
-    }
-  })), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Input, {
-    value: value.receiverName,
-    disabled: disabled,
-    placeholder: "\u6536\u4EF6\u4EBA\u59D3\u540D",
-    onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'receiverName');
-    }
-  }), /*#__PURE__*/React.createElement(Input, {
-    value: value.receiverMobile,
-    disabled: disabled,
-    placeholder: "\u6536\u4EF6\u4EBA\u7535\u8BDD",
-    onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'receiverMobile');
-    }
-  })));
-};
-
 var Item = Form.Item;
-var LogisticsAddress = LogisticsAddressData.getInstance();
-var address$1 = AddressData.getInstance();
 var LogisticsInterception = function LogisticsInterception(props) {
   var _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
@@ -3183,6 +3144,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     setIsInterface = _useState8[1];
   var firstIn = useRef(true);
   useEffect(function () {
+    AddressData.getInstance();
     //存入第一次的物流地址，防止非对接物流切换成对接物流后无法编辑
     if (firstIn.current && JSON.stringify(value) !== '{}') {
       setInitCompany(value === null || value === void 0 ? void 0 : value.interceptCompany);
@@ -3238,19 +3200,12 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return item.value === (value === null || value === void 0 ? void 0 : value.interceptType);
     })) === null || _find === void 0 ? void 0 : (_find$config = _find.config) === null || _find$config === void 0 ? void 0 : _find$config.showAddress;
   }, [value === null || value === void 0 ? void 0 : value.interceptType, typeOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
-  //是否回退新地址
-  var showReturnAddress = useMemo(function () {
-    var _find2, _find2$config;
-    return (_find2 = (typeOptions || []).find(function (item) {
-      return item.value === (value === null || value === void 0 ? void 0 : value.interceptType);
-    })) === null || _find2 === void 0 ? void 0 : (_find2$config = _find2.config) === null || _find2$config === void 0 ? void 0 : _find2$config.showAddressSelect;
-  }, [value === null || value === void 0 ? void 0 : value.interceptType, typeOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
   //是否展示发件人手机号
   var showSenderMobile = useMemo(function () {
-    var _find3, _find3$config;
-    return (_find3 = (typeOptions || []).find(function (item) {
+    var _find2, _find2$config;
+    return (_find2 = (typeOptions || []).find(function (item) {
       return item.value === (value === null || value === void 0 ? void 0 : value.interceptType);
-    })) === null || _find3 === void 0 ? void 0 : (_find3$config = _find3.config) === null || _find3$config === void 0 ? void 0 : _find3$config.showSenderMobile;
+    })) === null || _find2 === void 0 ? void 0 : (_find2$config = _find2.config) === null || _find2$config === void 0 ? void 0 : _find2$config.showSenderMobile;
   }, [value === null || value === void 0 ? void 0 : value.interceptType, typeOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
   //判断是否能修改物流信息
   var isEdit = useMemo(function () {
@@ -3259,39 +3214,19 @@ var LogisticsInterception = function LogisticsInterception(props) {
     });
     return isEditing && !!(company === null || company === void 0 ? void 0 : company.isInterface);
   }, [isEditing, initCompany]);
-  //退回地址列表
-  var logisticsAddressOptions = useMemo(function () {
-    return ((LogisticsAddress === null || LogisticsAddress === void 0 ? void 0 : LogisticsAddress.getAddressData()) || []).filter(function (item) {
-      return item.cpCode === (value === null || value === void 0 ? void 0 : value.interceptCompany);
-    });
-  }, [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({
-      cpCode: (value === null || value === void 0 ? void 0 : value.interceptCompany) || '',
-      province: value === null || value === void 0 ? void 0 : (_value$interceptAddre = value.interceptAddress) === null || _value$interceptAddre === void 0 ? void 0 : _value$interceptAddre[0],
-      city: value === null || value === void 0 ? void 0 : (_value$interceptAddre2 = value.interceptAddress) === null || _value$interceptAddre2 === void 0 ? void 0 : _value$interceptAddre2[1],
-      district: value === null || value === void 0 ? void 0 : (_value$interceptAddre3 = value.interceptAddress) === null || _value$interceptAddre3 === void 0 ? void 0 : _value$interceptAddre3[2],
-      detail: (value === null || value === void 0 ? void 0 : value.interceptDetail) || '',
-      userName: (value === null || value === void 0 ? void 0 : value.interceptReceiverName) || '',
-      mobile: (value === null || value === void 0 ? void 0 : value.interceptReceiverMobile) || ''
-    });
-    return uk;
-  }, [value === null || value === void 0 ? void 0 : value.interceptCompany, value === null || value === void 0 ? void 0 : value.interceptAddress]);
-  //选择回调
   var changeHandle = function changeHandle(val, type) {
     var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val));
     if (type === 'interceptCompany') {
       var interceptCompany = expressInterceptData.find(function (item) {
         return item.value === val;
       });
-      var _returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
+      var returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
         var _item$config3;
         return item === null || item === void 0 ? void 0 : (_item$config3 = item.config) === null || _item$config3 === void 0 ? void 0 : _item$config3.isDefault;
       });
       newValue = _objectSpread2(_objectSpread2({}, value), {}, {
         interceptCompany: val,
-        interceptType: _returnValue === null || _returnValue === void 0 ? void 0 : _returnValue.value,
+        interceptType: returnValue === null || returnValue === void 0 ? void 0 : returnValue.value,
         interceptSenderMobile: undefined,
         interceptAddress: [],
         interceptDetail: undefined,
@@ -3303,29 +3238,16 @@ var LogisticsInterception = function LogisticsInterception(props) {
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
-  //智能识别回调
-  var changeIdentify = function changeIdentify(val) {
-    //智能识别返填
-    var parseValue = _objectSpread2(_objectSpread2({}, value), {}, {
-      interceptAddress: (val === null || val === void 0 ? void 0 : val.address) || [],
-      interceptDetail: (val === null || val === void 0 ? void 0 : val.detail) || '',
-      interceptReceiverName: (val === null || val === void 0 ? void 0 : val.receiverName) || '',
-      interceptReceiverMobile: (val === null || val === void 0 ? void 0 : val.receiverMobile) || ''
+  var handleParseLogistics = function handleParseLogistics(val) {
+    var params = _objectSpread2(_objectSpread2({}, value), {}, {
+      interceptDetail: val === null || val === void 0 ? void 0 : val.addressDetail,
+      interceptReceiverName: val === null || val === void 0 ? void 0 : val.name,
+      interceptReceiverMobile: val === null || val === void 0 ? void 0 : val.phone
     });
-    onChange === null || onChange === void 0 ? void 0 : onChange(parseValue);
-  };
-  //选择退回地址
-  var changeReturnAddress = function changeReturnAddress(uk) {
-    var item = LogisticsAddress.getItemByUk(uk);
-    console.log(item);
-    if (item) {
-      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-        interceptAddress: [item === null || item === void 0 ? void 0 : item.province, item === null || item === void 0 ? void 0 : item.city, item === null || item === void 0 ? void 0 : item.district],
-        interceptDetail: item === null || item === void 0 ? void 0 : item.detail,
-        interceptReceiverName: item === null || item === void 0 ? void 0 : item.userName,
-        interceptReceiverMobile: item === null || item === void 0 ? void 0 : item.mobile
-      }));
+    if (val === null || val === void 0 ? void 0 : val.province) {
+      params.interceptAddress = [AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.province), AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.city), AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.district)];
     }
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, params));
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Item, {
     label: '物流信息',
@@ -3385,35 +3307,41 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return changeHandle(e.target.value, 'interceptSenderMobile');
     }
   })), /*#__PURE__*/React.createElement(Item, {
-    label: '退回地址',
-    required: true,
-    key: 'returnAddress',
-    hidden: !showReturnAddress
-  }, /*#__PURE__*/React.createElement(Select, {
-    disabled: disabled || isEdit,
-    value: returnValue,
-    onChange: changeReturnAddress,
-    placeholder: "\u8BF7\u9009\u62E9\u9000\u56DE\u5730\u5740"
-  }, logisticsAddressOptions.map(function (item) {
-    return /*#__PURE__*/React.createElement(Select.Option, {
-      key: item.uk,
-      value: item.uk
-    }, "".concat(address$1.getNameByCode(item === null || item === void 0 ? void 0 : item.province) || '').concat(address$1.getNameByCode(item === null || item === void 0 ? void 0 : item.city) || '').concat(address$1.getNameByCode(item === null || item === void 0 ? void 0 : item.district) || '').concat(item.detail, " ").concat(item === null || item === void 0 ? void 0 : item.userName, ":").concat(item === null || item === void 0 ? void 0 : item.mobile));
-  }))), /*#__PURE__*/React.createElement(Item, {
     label: '派送地址',
     required: true,
     key: 'newAddress',
     hidden: !showNewAddress
-  }, /*#__PURE__*/React.createElement(IdentifyAddress, {
-    disabled: disabled || isEdit,
-    value: {
-      address: (value === null || value === void 0 ? void 0 : value.interceptAddress) || [],
-      detail: (value === null || value === void 0 ? void 0 : value.interceptDetail) || '',
-      receiverName: (value === null || value === void 0 ? void 0 : value.interceptReceiverName) || '',
-      receiverMobile: (value === null || value === void 0 ? void 0 : value.interceptReceiverMobile) || ''
+  }, !(disabled || isEdit) && /*#__PURE__*/React.createElement(ParseLogistics, {
+    onChange: handleParseLogistics
+  }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Province, {
+    value: value === null || value === void 0 ? void 0 : value.interceptAddress,
+    onChange: function onChange(val) {
+      return changeHandle(val, 'interceptAddress');
     },
-    onChange: changeIdentify
-  })), /*#__PURE__*/React.createElement(Item, {
+    options: [],
+    disabled: disabled || isEdit
+  }), /*#__PURE__*/React.createElement(Input, {
+    value: value === null || value === void 0 ? void 0 : value.interceptDetail,
+    disabled: disabled || isEdit,
+    placeholder: "\u8BE6\u7EC6\u5730\u5740",
+    onChange: function onChange(e) {
+      return changeHandle(e.target.value, 'interceptDetail');
+    }
+  })), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Input, {
+    value: value === null || value === void 0 ? void 0 : value.interceptReceiverName,
+    disabled: disabled || isEdit,
+    placeholder: "\u6536\u4EF6\u4EBA\u59D3\u540D",
+    onChange: function onChange(e) {
+      return changeHandle(e.target.value, 'interceptReceiverName');
+    }
+  }), /*#__PURE__*/React.createElement(Input, {
+    value: value === null || value === void 0 ? void 0 : value.interceptReceiverMobile,
+    disabled: disabled || isEdit,
+    placeholder: "\u6536\u4EF6\u4EBA\u7535\u8BDD",
+    onChange: function onChange(e) {
+      return changeHandle(e.target.value, 'interceptReceiverMobile');
+    }
+  }))), /*#__PURE__*/React.createElement(Item, {
     label: '物流状态',
     key: 'interceptLogisticsStatus'
   }, /*#__PURE__*/React.createElement(Select, {
@@ -4107,4 +4035,4 @@ var Goods$1 = function Goods(props, ref) {
 };
 var index = /*#__PURE__*/forwardRef(Goods$1);
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasMultipleSelect, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync, BuyerNick, ChooseBaby, ExpressLogistics, Goods, index as GoodsTable, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, ParseLogistics, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId };
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasMultipleSelect, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync, BuyerNick, ChooseBaby, ExpressLogistics, Goods, index as GoodsTable, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId };

package/dist/index.js

@@ -3065,27 +3065,43 @@ var Payment = function Payment(props) {
 var TextArea$1 = antd.Input.TextArea;
 var ParseLogistics = function ParseLogistics(props) {
   var onChange = props.onChange;
-  var _useState = React.useState(""),
+  var _useState = React.useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
-  var handleIdentify = function handleIdentify() {
-    if (!value) {
-      return;
-    }
-    kmkfUtils.request({
-      url: "/qy/logistics/addressAnalysis",
-      method: "post",
-      data: {
-        fullAddress: value
-      }
-    }).then(function (res) {
-      var data = res.data;
-      onChange === null || onChange === void 0 ? void 0 : onChange(data);
-    }).catch(function (e) {
-      console.log(e);
-    });
-  };
+  var handleIdentify = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _yield$request, data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (value) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return");
+          case 2:
+            _context.next = 4;
+            return extendRequest('/qy/logistics/addressAnalysis', {
+              method: 'post',
+              data: {
+                fullAddress: value
+              }
+            });
+          case 4:
+            _yield$request = _context.sent;
+            data = _yield$request.data;
+            onChange === null || onChange === void 0 ? void 0 : onChange(data);
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleIdentify() {
+      return _ref.apply(this, arguments);
+    };
+  }();
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(TextArea$1, {
     placeholder: "\u590D\u5236\u7269\u6D41\u4FE1\u606F\uFF0C\u70B9\u51FB\u667A\u80FD\u8BC6\u522B",
     rows: 3,
@@ -3100,67 +3116,12 @@ var ParseLogistics = function ParseLogistics(props) {
   }, "\u667A\u80FD\u8BC6\u522B"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     size: "small",
     onClick: function onClick() {
-      return setValue("");
+      return setValue('');
     }
   }, "\u6E05\u7A7A")));
 };
 
-var IdentifyAddress = function IdentifyAddress(props) {
-  var value = props.value,
-    onChange = props.onChange,
-    _props$disabled = props.disabled,
-    disabled = _props$disabled === void 0 ? false : _props$disabled;
-  var changeHandle = function changeHandle(val, type) {
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val)));
-  };
-  var handleParseLogistics = function handleParseLogistics(val) {
-    var params = {
-      detail: val === null || val === void 0 ? void 0 : val.addressDetail,
-      receiverName: val === null || val === void 0 ? void 0 : val.name,
-      receiverMobile: val === null || val === void 0 ? void 0 : val.phone,
-      address: []
-    };
-    if (val === null || val === void 0 ? void 0 : val.province) {
-      params.address = [kmkfUtils.AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.province), kmkfUtils.AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.city), kmkfUtils.AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.district)];
-    }
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, params));
-  };
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !disabled && /*#__PURE__*/React__default['default'].createElement(ParseLogistics, {
-    onChange: handleParseLogistics
-  }), /*#__PURE__*/React__default['default'].createElement("br", null), /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(Province, {
-    value: value.address,
-    onChange: function onChange(val) {
-      return changeHandle(val, 'address');
-    },
-    options: [],
-    disabled: disabled
-  }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    value: value.detail,
-    disabled: disabled,
-    placeholder: "\u8BE6\u7EC6\u5730\u5740",
-    onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'detail');
-    }
-  })), /*#__PURE__*/React__default['default'].createElement("br", null), /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    value: value.receiverName,
-    disabled: disabled,
-    placeholder: "\u6536\u4EF6\u4EBA\u59D3\u540D",
-    onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'receiverName');
-    }
-  }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    value: value.receiverMobile,
-    disabled: disabled,
-    placeholder: "\u6536\u4EF6\u4EBA\u7535\u8BDD",
-    onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'receiverMobile');
-    }
-  })));
-};
-
 var Item = antd.Form.Item;
-var LogisticsAddress = kmkfUtils.LogisticsAddressData.getInstance();
-var address$1 = kmkfUtils.AddressData.getInstance();
 var LogisticsInterception = function LogisticsInterception(props) {
   var _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
@@ -3193,6 +3154,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     setIsInterface = _useState8[1];
   var firstIn = React.useRef(true);
   React.useEffect(function () {
+    kmkfUtils.AddressData.getInstance();
     //存入第一次的物流地址，防止非对接物流切换成对接物流后无法编辑
     if (firstIn.current && JSON.stringify(value) !== '{}') {
       setInitCompany(value === null || value === void 0 ? void 0 : value.interceptCompany);
@@ -3248,19 +3210,12 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return item.value === (value === null || value === void 0 ? void 0 : value.interceptType);
     })) === null || _find === void 0 ? void 0 : (_find$config = _find.config) === null || _find$config === void 0 ? void 0 : _find$config.showAddress;
   }, [value === null || value === void 0 ? void 0 : value.interceptType, typeOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
-  //是否回退新地址
-  var showReturnAddress = React.useMemo(function () {
-    var _find2, _find2$config;
-    return (_find2 = (typeOptions || []).find(function (item) {
-      return item.value === (value === null || value === void 0 ? void 0 : value.interceptType);
-    })) === null || _find2 === void 0 ? void 0 : (_find2$config = _find2.config) === null || _find2$config === void 0 ? void 0 : _find2$config.showAddressSelect;
-  }, [value === null || value === void 0 ? void 0 : value.interceptType, typeOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
   //是否展示发件人手机号
   var showSenderMobile = React.useMemo(function () {
-    var _find3, _find3$config;
-    return (_find3 = (typeOptions || []).find(function (item) {
+    var _find2, _find2$config;
+    return (_find2 = (typeOptions || []).find(function (item) {
       return item.value === (value === null || value === void 0 ? void 0 : value.interceptType);
-    })) === null || _find3 === void 0 ? void 0 : (_find3$config = _find3.config) === null || _find3$config === void 0 ? void 0 : _find3$config.showSenderMobile;
+    })) === null || _find2 === void 0 ? void 0 : (_find2$config = _find2.config) === null || _find2$config === void 0 ? void 0 : _find2$config.showSenderMobile;
   }, [value === null || value === void 0 ? void 0 : value.interceptType, typeOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
   //判断是否能修改物流信息
   var isEdit = React.useMemo(function () {
@@ -3269,39 +3224,19 @@ var LogisticsInterception = function LogisticsInterception(props) {
     });
     return isEditing && !!(company === null || company === void 0 ? void 0 : company.isInterface);
   }, [isEditing, initCompany]);
-  //退回地址列表
-  var logisticsAddressOptions = React.useMemo(function () {
-    return ((LogisticsAddress === null || LogisticsAddress === void 0 ? void 0 : LogisticsAddress.getAddressData()) || []).filter(function (item) {
-      return item.cpCode === (value === null || value === void 0 ? void 0 : value.interceptCompany);
-    });
-  }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
-  var returnValue = React.useMemo(function () {
-    var _value$interceptAddre, _value$interceptAddre2, _value$interceptAddre3;
-    var uk = LogisticsAddress === null || LogisticsAddress === void 0 ? void 0 : LogisticsAddress.getUkByInfo({
-      cpCode: (value === null || value === void 0 ? void 0 : value.interceptCompany) || '',
-      province: value === null || value === void 0 ? void 0 : (_value$interceptAddre = value.interceptAddress) === null || _value$interceptAddre === void 0 ? void 0 : _value$interceptAddre[0],
-      city: value === null || value === void 0 ? void 0 : (_value$interceptAddre2 = value.interceptAddress) === null || _value$interceptAddre2 === void 0 ? void 0 : _value$interceptAddre2[1],
-      district: value === null || value === void 0 ? void 0 : (_value$interceptAddre3 = value.interceptAddress) === null || _value$interceptAddre3 === void 0 ? void 0 : _value$interceptAddre3[2],
-      detail: (value === null || value === void 0 ? void 0 : value.interceptDetail) || '',
-      userName: (value === null || value === void 0 ? void 0 : value.interceptReceiverName) || '',
-      mobile: (value === null || value === void 0 ? void 0 : value.interceptReceiverMobile) || ''
-    });
-    return uk;
-  }, [value === null || value === void 0 ? void 0 : value.interceptCompany, value === null || value === void 0 ? void 0 : value.interceptAddress]);
-  //选择回调
   var changeHandle = function changeHandle(val, type) {
     var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val));
     if (type === 'interceptCompany') {
       var interceptCompany = expressInterceptData.find(function (item) {
         return item.value === val;
       });
-      var _returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
+      var returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
         var _item$config3;
         return item === null || item === void 0 ? void 0 : (_item$config3 = item.config) === null || _item$config3 === void 0 ? void 0 : _item$config3.isDefault;
       });
       newValue = _objectSpread2(_objectSpread2({}, value), {}, {
         interceptCompany: val,
-        interceptType: _returnValue === null || _returnValue === void 0 ? void 0 : _returnValue.value,
+        interceptType: returnValue === null || returnValue === void 0 ? void 0 : returnValue.value,
         interceptSenderMobile: undefined,
         interceptAddress: [],
         interceptDetail: undefined,
@@ -3313,29 +3248,16 @@ var LogisticsInterception = function LogisticsInterception(props) {
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
-  //智能识别回调
-  var changeIdentify = function changeIdentify(val) {
-    //智能识别返填
-    var parseValue = _objectSpread2(_objectSpread2({}, value), {}, {
-      interceptAddress: (val === null || val === void 0 ? void 0 : val.address) || [],
-      interceptDetail: (val === null || val === void 0 ? void 0 : val.detail) || '',
-      interceptReceiverName: (val === null || val === void 0 ? void 0 : val.receiverName) || '',
-      interceptReceiverMobile: (val === null || val === void 0 ? void 0 : val.receiverMobile) || ''
+  var handleParseLogistics = function handleParseLogistics(val) {
+    var params = _objectSpread2(_objectSpread2({}, value), {}, {
+      interceptDetail: val === null || val === void 0 ? void 0 : val.addressDetail,
+      interceptReceiverName: val === null || val === void 0 ? void 0 : val.name,
+      interceptReceiverMobile: val === null || val === void 0 ? void 0 : val.phone
     });
-    onChange === null || onChange === void 0 ? void 0 : onChange(parseValue);
-  };
-  //选择退回地址
-  var changeReturnAddress = function changeReturnAddress(uk) {
-    var item = LogisticsAddress.getItemByUk(uk);
-    console.log(item);
-    if (item) {
-      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-        interceptAddress: [item === null || item === void 0 ? void 0 : item.province, item === null || item === void 0 ? void 0 : item.city, item === null || item === void 0 ? void 0 : item.district],
-        interceptDetail: item === null || item === void 0 ? void 0 : item.detail,
-        interceptReceiverName: item === null || item === void 0 ? void 0 : item.userName,
-        interceptReceiverMobile: item === null || item === void 0 ? void 0 : item.mobile
-      }));
+    if (val === null || val === void 0 ? void 0 : val.province) {
+      params.interceptAddress = [kmkfUtils.AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.province), kmkfUtils.AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.city), kmkfUtils.AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.district)];
     }
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, params));
   };
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(Item, {
     label: '物流信息',
@@ -3395,35 +3317,41 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return changeHandle(e.target.value, 'interceptSenderMobile');
     }
   })), /*#__PURE__*/React__default['default'].createElement(Item, {
-    label: '退回地址',
-    required: true,
-    key: 'returnAddress',
-    hidden: !showReturnAddress
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-    disabled: disabled || isEdit,
-    value: returnValue,
-    onChange: changeReturnAddress,
-    placeholder: "\u8BF7\u9009\u62E9\u9000\u56DE\u5730\u5740"
-  }, logisticsAddressOptions.map(function (item) {
-    return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
-      key: item.uk,
-      value: item.uk
-    }, "".concat(address$1.getNameByCode(item === null || item === void 0 ? void 0 : item.province) || '').concat(address$1.getNameByCode(item === null || item === void 0 ? void 0 : item.city) || '').concat(address$1.getNameByCode(item === null || item === void 0 ? void 0 : item.district) || '').concat(item.detail, " ").concat(item === null || item === void 0 ? void 0 : item.userName, ":").concat(item === null || item === void 0 ? void 0 : item.mobile));
-  }))), /*#__PURE__*/React__default['default'].createElement(Item, {
     label: '派送地址',
     required: true,
     key: 'newAddress',
     hidden: !showNewAddress
-  }, /*#__PURE__*/React__default['default'].createElement(IdentifyAddress, {
-    disabled: disabled || isEdit,
-    value: {
-      address: (value === null || value === void 0 ? void 0 : value.interceptAddress) || [],
-      detail: (value === null || value === void 0 ? void 0 : value.interceptDetail) || '',
-      receiverName: (value === null || value === void 0 ? void 0 : value.interceptReceiverName) || '',
-      receiverMobile: (value === null || value === void 0 ? void 0 : value.interceptReceiverMobile) || ''
+  }, !(disabled || isEdit) && /*#__PURE__*/React__default['default'].createElement(ParseLogistics, {
+    onChange: handleParseLogistics
+  }), /*#__PURE__*/React__default['default'].createElement("br", null), /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(Province, {
+    value: value === null || value === void 0 ? void 0 : value.interceptAddress,
+    onChange: function onChange(val) {
+      return changeHandle(val, 'interceptAddress');
     },
-    onChange: changeIdentify
-  })), /*#__PURE__*/React__default['default'].createElement(Item, {
+    options: [],
+    disabled: disabled || isEdit
+  }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    value: value === null || value === void 0 ? void 0 : value.interceptDetail,
+    disabled: disabled || isEdit,
+    placeholder: "\u8BE6\u7EC6\u5730\u5740",
+    onChange: function onChange(e) {
+      return changeHandle(e.target.value, 'interceptDetail');
+    }
+  })), /*#__PURE__*/React__default['default'].createElement("br", null), /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    value: value === null || value === void 0 ? void 0 : value.interceptReceiverName,
+    disabled: disabled || isEdit,
+    placeholder: "\u6536\u4EF6\u4EBA\u59D3\u540D",
+    onChange: function onChange(e) {
+      return changeHandle(e.target.value, 'interceptReceiverName');
+    }
+  }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    value: value === null || value === void 0 ? void 0 : value.interceptReceiverMobile,
+    disabled: disabled || isEdit,
+    placeholder: "\u6536\u4EF6\u4EBA\u7535\u8BDD",
+    onChange: function onChange(e) {
+      return changeHandle(e.target.value, 'interceptReceiverMobile');
+    }
+  }))), /*#__PURE__*/React__default['default'].createElement(Item, {
     label: '物流状态',
     key: 'interceptLogisticsStatus'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
@@ -4139,12 +4067,10 @@ exports.ChooseBaby = ChooseBaby;
 exports.ExpressLogistics = ExpressLogistics;
 exports.Goods = Goods;
 exports.GoodsTable = index;
-exports.IdentifyAddress = IdentifyAddress;
 exports.Invoice = Invoice;
 exports.JstGoods = jstGoods;
 exports.JstItemList = ItemList;
 exports.LogisticsInterception = LogisticsInterception;
-exports.ParseLogistics = ParseLogistics;
 exports.Payment = Payment;
 exports.Remark = RemarkInput;
 exports.ReturnLogistics = ExpressLogistics;

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

@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 interface ParseLogisticsProps {
     onChange: (value: any) => void;
 }

package/dist/src/index.d.ts

@@ -33,5 +33,3 @@ export { default as Goods } from './common/Goods';
 export { default as JstGoods } from './jst/Goods';
 export { default as JstItemList } from './jst/ItemList';
 export { default as GoodsTable } from './common/GoodsTable';
-export { default as ParseLogistics } from './common/ParseLogistics';
-export { default as IdentifyAddress } from './common/IdentifyAddress';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.7.1-alpha.1",
+  "version": "0.7.1",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -16,11 +16,11 @@
     "lint": "eslint '**/*.{ts,tsx}'",
     "lint:fix": "eslint --fix '**/*.{ts,tsx}'",
     "start": "dumi dev",
-    "test": "jest",
-    "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
+    "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'",
+    "test": "jest"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "^0.7.1-alpha.1",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.1",
     "umi-request": "^1.4.0"
   },
   "devDependencies": {
@@ -54,5 +54,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "aa47b4aa4ce5e954a1312a4f0091daeb88b38336"
+  "gitHead": "45b9ed0a862e698d4e244071b87ad8109a2d26c7"
 }

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

@@ -1,13 +0,0 @@
-import React from 'react';
-interface IdentifyAddressProps {
-    value: {
-        address: any[];
-        detail: string;
-        receiverName: string;
-        receiverMobile: string;
-    };
-    onChange: (value: any) => void;
-    disabled?: boolean;
-}
-declare const IdentifyAddress: (props: IdentifyAddressProps) => React.JSX.Element;
-export default IdentifyAddress;