@kmkf-fe-packages/basic-components 0.6.3-alpha.22 → 0.6.3-alpha.27

package/dist/index.esm.js

@@ -3121,28 +3121,29 @@ var LogisticsInterception = function LogisticsInterception(props) {
     _props$isEditing = props.isEditing,
     isEditing = _props$isEditing === void 0 ? false : _props$isEditing,
     logisticsInterceptHandleStatus = props.logisticsInterceptHandleStatus;
-  var _useState = useState([]),
+  var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
-    typeOptions = _useState2[0],
-    setTypeOptions = _useState2[1];
+    initCompany = _useState2[0],
+    setInitCompany = _useState2[1];
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
-    statusOptions = _useState4[0],
-    setStatusOptions = _useState4[1];
-  var _useState5 = useState(false),
+    typeOptions = _useState4[0],
+    setTypeOptions = _useState4[1];
+  var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    isInterface = _useState6[0],
-    setIsInterface = _useState6[1];
-  var canEdit = useMemo(function () {
-    // 已对接公司如果拦截状态为【拦截中】，可以修改物流拦截组件信息，否则该组件不能修改；
-    // 非对接公司可以修改组件
-    // 修改后把工单信息重新提交给快递公司，清空拦截状态的值
-    if (!isInterface) return true;
-    //已对接公司在拦截中可以修改
-    var INTERCEPTING = logisticsInterceptHandleStatus === 'INTERCEPTING';
-    return isEditing ? INTERCEPTING : true;
-  }, [value === null || value === void 0 ? void 0 : value.interceptCompany, statusOptions, isInterface, isEditing]);
+    statusOptions = _useState6[0],
+    setStatusOptions = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    isInterface = _useState8[0],
+    setIsInterface = _useState8[1];
+  var firstIn = useRef(true);
   useEffect(function () {
+    //存入第一次的物流地址，防止非对接物流切换成对接物流后无法编辑
+    if (firstIn.current && (value === null || value === void 0 ? void 0 : value.interceptCompany)) {
+      setInitCompany(value === null || value === void 0 ? void 0 : value.interceptCompany);
+      firstIn.current = false;
+    }
     if (!(value === null || value === void 0 ? void 0 : value.interceptCompany)) {
       setTypeOptions([]);
       setStatusOptions([]);
@@ -3156,6 +3157,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     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) {
@@ -3181,6 +3183,23 @@ 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 canEdit = useMemo(function () {
+    // 已对接公司如果拦截状态为【拦截中】，可以修改物流拦截组件信息，否则该组件不能修改；
+    // 非对接公司可以修改组件
+    // 修改后把工单信息重新提交给快递公司，清空拦截状态的值
+    if (!isInterface) return true;
+    //已对接公司在拦截中可以修改
+    var INTERCEPTING = !logisticsInterceptHandleStatus || logisticsInterceptHandleStatus === 'INTERCEPTING';
+    return isEditing ? INTERCEPTING : true;
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany, statusOptions, isInterface, isEditing]);
+  //判断是否能修改物流信息
+  var canEditCompany = useMemo(function () {
+    var company = expressInterceptData.find(function (item) {
+      return item.value === initCompany;
+    });
+    return isEditing && !!(company === null || company === void 0 ? void 0 : company.isInterface);
+  }, [isEditing, initCompany]);
   var changeHandle = function changeHandle(val, type) {
     var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val));
     if (type === 'interceptCompany') {
@@ -3188,12 +3207,11 @@ var LogisticsInterception = function LogisticsInterception(props) {
         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;
+        return item === null || item === void 0 ? void 0 : item.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,
         interceptAddress: [],
         interceptDetail: undefined,
         interceptReceiverName: undefined,
@@ -3209,7 +3227,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'logistics'
   }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, {
-    disabled: disabled || !canEdit,
+    disabled: disabled || canEditCompany,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
       width: '200px'
@@ -3224,7 +3242,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), /*#__PURE__*/React.createElement(Input, {
-    disabled: disabled || !canEdit,
+    disabled: disabled || canEditCompany,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptCode');

package/dist/index.js

@@ -3131,28 +3131,29 @@ var LogisticsInterception = function LogisticsInterception(props) {
     _props$isEditing = props.isEditing,
     isEditing = _props$isEditing === void 0 ? false : _props$isEditing,
     logisticsInterceptHandleStatus = props.logisticsInterceptHandleStatus;
-  var _useState = React.useState([]),
+  var _useState = React.useState(''),
     _useState2 = _slicedToArray(_useState, 2),
-    typeOptions = _useState2[0],
-    setTypeOptions = _useState2[1];
+    initCompany = _useState2[0],
+    setInitCompany = _useState2[1];
   var _useState3 = React.useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
-    statusOptions = _useState4[0],
-    setStatusOptions = _useState4[1];
-  var _useState5 = React.useState(false),
+    typeOptions = _useState4[0],
+    setTypeOptions = _useState4[1];
+  var _useState5 = React.useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    isInterface = _useState6[0],
-    setIsInterface = _useState6[1];
-  var canEdit = React.useMemo(function () {
-    // 已对接公司如果拦截状态为【拦截中】，可以修改物流拦截组件信息，否则该组件不能修改；
-    // 非对接公司可以修改组件
-    // 修改后把工单信息重新提交给快递公司，清空拦截状态的值
-    if (!isInterface) return true;
-    //已对接公司在拦截中可以修改
-    var INTERCEPTING = logisticsInterceptHandleStatus === 'INTERCEPTING';
-    return isEditing ? INTERCEPTING : true;
-  }, [value === null || value === void 0 ? void 0 : value.interceptCompany, statusOptions, isInterface, isEditing]);
+    statusOptions = _useState6[0],
+    setStatusOptions = _useState6[1];
+  var _useState7 = React.useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    isInterface = _useState8[0],
+    setIsInterface = _useState8[1];
+  var firstIn = React.useRef(true);
   React.useEffect(function () {
+    //存入第一次的物流地址，防止非对接物流切换成对接物流后无法编辑
+    if (firstIn.current && (value === null || value === void 0 ? void 0 : value.interceptCompany)) {
+      setInitCompany(value === null || value === void 0 ? void 0 : value.interceptCompany);
+      firstIn.current = false;
+    }
     if (!(value === null || value === void 0 ? void 0 : value.interceptCompany)) {
       setTypeOptions([]);
       setStatusOptions([]);
@@ -3166,6 +3167,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     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) {
@@ -3191,6 +3193,23 @@ 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 canEdit = React.useMemo(function () {
+    // 已对接公司如果拦截状态为【拦截中】，可以修改物流拦截组件信息，否则该组件不能修改；
+    // 非对接公司可以修改组件
+    // 修改后把工单信息重新提交给快递公司，清空拦截状态的值
+    if (!isInterface) return true;
+    //已对接公司在拦截中可以修改
+    var INTERCEPTING = !logisticsInterceptHandleStatus || logisticsInterceptHandleStatus === 'INTERCEPTING';
+    return isEditing ? INTERCEPTING : true;
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany, statusOptions, isInterface, isEditing]);
+  //判断是否能修改物流信息
+  var canEditCompany = React.useMemo(function () {
+    var company = expressInterceptData.find(function (item) {
+      return item.value === initCompany;
+    });
+    return isEditing && !!(company === null || company === void 0 ? void 0 : company.isInterface);
+  }, [isEditing, initCompany]);
   var changeHandle = function changeHandle(val, type) {
     var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val));
     if (type === 'interceptCompany') {
@@ -3198,12 +3217,11 @@ var LogisticsInterception = function LogisticsInterception(props) {
         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;
+        return item === null || item === void 0 ? void 0 : item.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,
         interceptAddress: [],
         interceptDetail: undefined,
         interceptReceiverName: undefined,
@@ -3219,7 +3237,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'logistics'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-    disabled: disabled || !canEdit,
+    disabled: disabled || canEditCompany,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
       width: '200px'
@@ -3234,7 +3252,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    disabled: disabled || !canEdit,
+    disabled: disabled || canEditCompany,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptCode');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.6.3-alpha.22",
+  "version": "0.6.3-alpha.27",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "57ad72d0ca4d08a63632f70692eee04fdaa0a946"
+  "gitHead": "6568517bf5c889bc02b548d5cf4a0c03dea307ae"
 }