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

package/dist/index.esm.js

@@ -3101,7 +3101,7 @@ var IdentifyAddress = function IdentifyAddress(props) {
     _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(val, type);
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val)));
   };
   var handleParseLogistics = function handleParseLogistics(val) {
     var params = {
@@ -3150,6 +3150,7 @@ var IdentifyAddress = function IdentifyAddress(props) {
 
 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,
@@ -3157,8 +3158,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
     logisticsOptions = _props$logisticsOptio === void 0 ? [] : _props$logisticsOptio,
     _props$expressInterce = props.expressInterceptData,
     expressInterceptData = _props$expressInterce === void 0 ? [] : _props$expressInterce,
-    _props$logisticsAddre = props.logisticsAddressData,
-    logisticsAddressData = _props$logisticsAddre === void 0 ? [] : _props$logisticsAddre,
     _props$required = props.required,
     required = _props$required === void 0 ? false : _props$required,
     onChange = props.onChange,
@@ -3184,7 +3183,6 @@ 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);
@@ -3261,11 +3259,25 @@ var LogisticsInterception = function LogisticsInterception(props) {
     });
     return isEditing && !!(company === null || company === void 0 ? void 0 : company.isInterface);
   }, [isEditing, initCompany]);
+  //退回地址列表
   var logisticsAddressOptions = useMemo(function () {
-    return logisticsAddressData.filter(function (item) {
+    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));
@@ -3273,13 +3285,13 @@ var LogisticsInterception = function LogisticsInterception(props) {
       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,
@@ -3292,31 +3304,20 @@ var LogisticsInterception = function LogisticsInterception(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   //智能识别回调
-  var changeIdentify = function changeIdentify(val, type) {
-    //输入返填
-    if (type) {
-      var typeMap = {
-        address: 'interceptAddress',
-        detail: 'interceptDetail',
-        receiverName: 'interceptReceiverName',
-        receiverMobile: 'interceptReceiverMobile'
-      };
-      var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, typeMap[type], val));
-      onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-    } else {
-      //智能识别返填
-      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) || ''
-      });
-      onChange === null || onChange === void 0 ? void 0 : onChange(parseValue);
-    }
+  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) || ''
+    });
+    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],
@@ -3389,9 +3390,16 @@ var LogisticsInterception = function LogisticsInterception(props) {
     key: 'returnAddress',
     hidden: !showReturnAddress
   }, /*#__PURE__*/React.createElement(Select, {
-    options: logisticsAddressOptions,
-    onChange: changeReturnAddress
-  })), /*#__PURE__*/React.createElement(Item, {
+    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',

package/dist/index.js

@@ -3111,7 +3111,7 @@ var IdentifyAddress = function IdentifyAddress(props) {
     _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(val, type);
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val)));
   };
   var handleParseLogistics = function handleParseLogistics(val) {
     var params = {
@@ -3160,6 +3160,7 @@ var IdentifyAddress = function IdentifyAddress(props) {
 
 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,
@@ -3167,8 +3168,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
     logisticsOptions = _props$logisticsOptio === void 0 ? [] : _props$logisticsOptio,
     _props$expressInterce = props.expressInterceptData,
     expressInterceptData = _props$expressInterce === void 0 ? [] : _props$expressInterce,
-    _props$logisticsAddre = props.logisticsAddressData,
-    logisticsAddressData = _props$logisticsAddre === void 0 ? [] : _props$logisticsAddre,
     _props$required = props.required,
     required = _props$required === void 0 ? false : _props$required,
     onChange = props.onChange,
@@ -3194,7 +3193,6 @@ 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);
@@ -3271,11 +3269,25 @@ var LogisticsInterception = function LogisticsInterception(props) {
     });
     return isEditing && !!(company === null || company === void 0 ? void 0 : company.isInterface);
   }, [isEditing, initCompany]);
+  //退回地址列表
   var logisticsAddressOptions = React.useMemo(function () {
-    return logisticsAddressData.filter(function (item) {
+    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));
@@ -3283,13 +3295,13 @@ var LogisticsInterception = function LogisticsInterception(props) {
       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,
@@ -3302,31 +3314,20 @@ var LogisticsInterception = function LogisticsInterception(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   //智能识别回调
-  var changeIdentify = function changeIdentify(val, type) {
-    //输入返填
-    if (type) {
-      var typeMap = {
-        address: 'interceptAddress',
-        detail: 'interceptDetail',
-        receiverName: 'interceptReceiverName',
-        receiverMobile: 'interceptReceiverMobile'
-      };
-      var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, typeMap[type], val));
-      onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-    } else {
-      //智能识别返填
-      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) || ''
-      });
-      onChange === null || onChange === void 0 ? void 0 : onChange(parseValue);
-    }
+  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) || ''
+    });
+    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],
@@ -3399,9 +3400,16 @@ var LogisticsInterception = function LogisticsInterception(props) {
     key: 'returnAddress',
     hidden: !showReturnAddress
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-    options: logisticsAddressOptions,
-    onChange: changeReturnAddress
-  })), /*#__PURE__*/React__default['default'].createElement(Item, {
+    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',

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

@@ -15,7 +15,6 @@ interface LogisticsInterceptionProps {
     value: Partial<LogisticsInterceptionValueType>;
     logisticsOptions: any[];
     expressInterceptData: any[];
-    logisticsAddressData: any[];
     required: boolean;
     disabled: boolean;
     isEditing: boolean;

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

@@ -6,7 +6,7 @@ interface IdentifyAddressProps {
         receiverName: string;
         receiverMobile: string;
     };
-    onChange: (value: any, type?: string) => void;
+    onChange: (value: any) => void;
     disabled?: boolean;
 }
 declare const IdentifyAddress: (props: IdentifyAddressProps) => React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.7.1-alpha.0",
+  "version": "0.7.1-alpha.1",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "^0.7.1-alpha.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.1-alpha.1",
     "umi-request": "^1.4.0"
   },
   "devDependencies": {
@@ -54,5 +54,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7ad1a590f1f169f979d75636f52a0456343ceeee"
+  "gitHead": "aa47b4aa4ce5e954a1312a4f0091daeb88b38336"
 }