@kmkf-fe-packages/basic-components 0.6.3-alpha.0 → 0.6.3-alpha.15

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

@@ -12,10 +12,11 @@ interface LogisticsInterceptionValueType {
 interface LogisticsInterceptionProps {
     value: Partial<LogisticsInterceptionValueType>;
     logisticsOptions: any[];
+    expressInterceptData: any[];
     required: boolean;
     disabled: boolean;
     isEditing: boolean;
-    id: string;
+    logisticsInterceptHandleStatus: string;
     onChange: (value: Partial<LogisticsInterceptionValueType>) => void;
 }
 declare const LogisticsInterception: (props: Partial<LogisticsInterceptionProps>) => JSX.Element;

package/dist/index.esm.js

@@ -3121,13 +3121,16 @@ var LogisticsInterception = function LogisticsInterception(props) {
     value = _props$value === void 0 ? {} : _props$value,
     _props$logisticsOptio = props.logisticsOptions,
     logisticsOptions = _props$logisticsOptio === void 0 ? [] : _props$logisticsOptio,
+    _props$expressInterce = props.expressInterceptData,
+    expressInterceptData = _props$expressInterce === void 0 ? [] : _props$expressInterce,
     _props$required = props.required,
     required = _props$required === void 0 ? false : _props$required,
     onChange = props.onChange,
     _props$disabled = props.disabled,
     disabled = _props$disabled === void 0 ? false : _props$disabled,
     _props$isEditing = props.isEditing,
-    isEditing = _props$isEditing === void 0 ? false : _props$isEditing;
+    isEditing = _props$isEditing === void 0 ? false : _props$isEditing,
+    logisticsInterceptHandleStatus = props.logisticsInterceptHandleStatus;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     typeOptions = _useState2[0],
@@ -3141,14 +3144,14 @@ var LogisticsInterception = function LogisticsInterception(props) {
     isInterface = _useState6[0],
     setIsInterface = _useState6[1];
   var canEdit = useMemo(function () {
-    //非对接公司可以修改
+    // 已对接公司如果拦截状态为【拦截中】，可以修改物流拦截组件信息，否则该组件不能修改；
+    // 非对接公司可以修改组件
+    // 修改后把工单信息重新提交给快递公司，清空拦截状态的值
     if (!isInterface) return true;
     //已对接公司在拦截中可以修改
-    var INTERCEPTING = statusOptions.some(function (item) {
-      return item.value === (value === null || value === void 0 ? void 0 : value.interceptStatus) && (item === null || item === void 0 ? void 0 : item.showInterceptionBtn);
-    });
-    return isEditing && (value === null || value === void 0 ? void 0 : value.interceptStatus) ? INTERCEPTING && isEditing : true;
-  }, [value, statusOptions, isInterface, isEditing]);
+    var INTERCEPTING = logisticsInterceptHandleStatus === 'INTERCEPTING';
+    return isEditing ? INTERCEPTING : true;
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany, statusOptions, isInterface, isEditing]);
   useEffect(function () {
     if (!(value === null || value === void 0 ? void 0 : value.interceptCompany)) {
       setTypeOptions([]);
@@ -3156,13 +3159,31 @@ var LogisticsInterception = function LogisticsInterception(props) {
       setIsInterface(false);
       return;
     }
-    var interceptCompany = logisticsOptions.find(function (item) {
-      return item.expressCode === (value === null || value === void 0 ? void 0 : value.interceptCompany);
+    var interceptCompany = expressInterceptData.find(function (item) {
+      return item.value === (value === null || value === void 0 ? void 0 : value.interceptCompany);
     });
     setTypeOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []);
     setStatusOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionStatusList) || []);
     setIsInterface(interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.isInterface);
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  useEffect(function () {
+    if (!(value === null || value === void 0 ? void 0 : value.interceptCompany)) return;
+    var interceptCompany = expressInterceptData.find(function (item) {
+      return item.value === (value === null || value === void 0 ? void 0 : value.interceptCompany);
+    });
+    var showAddress = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).some(function (item) {
+      var _item$config;
+      return item.value === (value === null || value === void 0 ? void 0 : value.interceptType) && (item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.showAddress);
+    });
+    if (!showAddress) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        interceptAddress: [],
+        interceptDetail: '',
+        interceptReceiverName: '',
+        interceptReceiverMobile: ''
+      }));
+    }
+  }, [value === null || value === void 0 ? void 0 : value.interceptType]);
   //是否展示新地址
   var showNewAddress = useMemo(function () {
     var _find, _find$config;
@@ -3173,14 +3194,21 @@ var LogisticsInterception = function LogisticsInterception(props) {
   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 _item$label;
+        return (item === null || item === void 0 ? void 0 : item.label) && (item === null || item === void 0 ? void 0 : (_item$label = item.label) === null || _item$label === void 0 ? void 0 : _item$label.indexOf('退回')) > -1;
+      });
       newValue = _objectSpread2(_objectSpread2({}, value), {}, {
         interceptCompany: val,
-        interceptType: 'RETURN',
+        interceptType: (returnValue === null || returnValue === void 0 ? void 0 : returnValue.value) || '',
         interceptAddress: [],
         interceptDetail: '',
         interceptReceiverName: '',
         interceptReceiverMobile: '',
-        interceptStatus: '',
+        interceptStatus: undefined,
         interceptOther: ''
       });
     }
@@ -3286,7 +3314,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), (value === null || value === void 0 ? void 0 : value.interceptStatus) === 'OTHER' && /*#__PURE__*/React.createElement(Input, {
-    disabled: disabled || canEdit,
+    disabled: disabled || !canEdit,
     style: {
       width: '200px'
     },

package/dist/index.js

@@ -3131,13 +3131,16 @@ var LogisticsInterception = function LogisticsInterception(props) {
     value = _props$value === void 0 ? {} : _props$value,
     _props$logisticsOptio = props.logisticsOptions,
     logisticsOptions = _props$logisticsOptio === void 0 ? [] : _props$logisticsOptio,
+    _props$expressInterce = props.expressInterceptData,
+    expressInterceptData = _props$expressInterce === void 0 ? [] : _props$expressInterce,
     _props$required = props.required,
     required = _props$required === void 0 ? false : _props$required,
     onChange = props.onChange,
     _props$disabled = props.disabled,
     disabled = _props$disabled === void 0 ? false : _props$disabled,
     _props$isEditing = props.isEditing,
-    isEditing = _props$isEditing === void 0 ? false : _props$isEditing;
+    isEditing = _props$isEditing === void 0 ? false : _props$isEditing,
+    logisticsInterceptHandleStatus = props.logisticsInterceptHandleStatus;
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     typeOptions = _useState2[0],
@@ -3151,14 +3154,14 @@ var LogisticsInterception = function LogisticsInterception(props) {
     isInterface = _useState6[0],
     setIsInterface = _useState6[1];
   var canEdit = React.useMemo(function () {
-    //非对接公司可以修改
+    // 已对接公司如果拦截状态为【拦截中】，可以修改物流拦截组件信息，否则该组件不能修改；
+    // 非对接公司可以修改组件
+    // 修改后把工单信息重新提交给快递公司，清空拦截状态的值
     if (!isInterface) return true;
     //已对接公司在拦截中可以修改
-    var INTERCEPTING = statusOptions.some(function (item) {
-      return item.value === (value === null || value === void 0 ? void 0 : value.interceptStatus) && (item === null || item === void 0 ? void 0 : item.showInterceptionBtn);
-    });
-    return isEditing && (value === null || value === void 0 ? void 0 : value.interceptStatus) ? INTERCEPTING && isEditing : true;
-  }, [value, statusOptions, isInterface, isEditing]);
+    var INTERCEPTING = logisticsInterceptHandleStatus === 'INTERCEPTING';
+    return isEditing ? INTERCEPTING : true;
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany, statusOptions, isInterface, isEditing]);
   React.useEffect(function () {
     if (!(value === null || value === void 0 ? void 0 : value.interceptCompany)) {
       setTypeOptions([]);
@@ -3166,13 +3169,31 @@ var LogisticsInterception = function LogisticsInterception(props) {
       setIsInterface(false);
       return;
     }
-    var interceptCompany = logisticsOptions.find(function (item) {
-      return item.expressCode === (value === null || value === void 0 ? void 0 : value.interceptCompany);
+    var interceptCompany = expressInterceptData.find(function (item) {
+      return item.value === (value === null || value === void 0 ? void 0 : value.interceptCompany);
     });
     setTypeOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []);
     setStatusOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionStatusList) || []);
     setIsInterface(interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.isInterface);
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  React.useEffect(function () {
+    if (!(value === null || value === void 0 ? void 0 : value.interceptCompany)) return;
+    var interceptCompany = expressInterceptData.find(function (item) {
+      return item.value === (value === null || value === void 0 ? void 0 : value.interceptCompany);
+    });
+    var showAddress = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).some(function (item) {
+      var _item$config;
+      return item.value === (value === null || value === void 0 ? void 0 : value.interceptType) && (item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.showAddress);
+    });
+    if (!showAddress) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        interceptAddress: [],
+        interceptDetail: '',
+        interceptReceiverName: '',
+        interceptReceiverMobile: ''
+      }));
+    }
+  }, [value === null || value === void 0 ? void 0 : value.interceptType]);
   //是否展示新地址
   var showNewAddress = React.useMemo(function () {
     var _find, _find$config;
@@ -3183,14 +3204,21 @@ var LogisticsInterception = function LogisticsInterception(props) {
   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 _item$label;
+        return (item === null || item === void 0 ? void 0 : item.label) && (item === null || item === void 0 ? void 0 : (_item$label = item.label) === null || _item$label === void 0 ? void 0 : _item$label.indexOf('退回')) > -1;
+      });
       newValue = _objectSpread2(_objectSpread2({}, value), {}, {
         interceptCompany: val,
-        interceptType: 'RETURN',
+        interceptType: (returnValue === null || returnValue === void 0 ? void 0 : returnValue.value) || '',
         interceptAddress: [],
         interceptDetail: '',
         interceptReceiverName: '',
         interceptReceiverMobile: '',
-        interceptStatus: '',
+        interceptStatus: undefined,
         interceptOther: ''
       });
     }
@@ -3296,7 +3324,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), (value === null || value === void 0 ? void 0 : value.interceptStatus) === 'OTHER' && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    disabled: disabled || canEdit,
+    disabled: disabled || !canEdit,
     style: {
       width: '200px'
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.6.3-alpha.0",
+  "version": "0.6.3-alpha.15",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f2de883a1a57e0ead13d3ee345acaf3dd1b3467d"
+  "gitHead": "48cd1f4dc355b1b386299c085845494a7068c374"
 }