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

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

@@ -579,8 +579,8 @@ var styles = {"imageBox":"index-module_imageBox__3tOEt","inputImage":"index-modu
 styleInject(css_248z);
 
 var _excluded$4 = ["maxCount", "maxSize", "uploadText", "onChange", "value", "accept", "canPreview", "disabled"];
-var fn = function fn(_ref) {
-  var _ref2 = _slicedToArray(_ref, 0);
+var fn = function fn() {
+  return void 0;
 };
 var getBase64 = function getBase64(file) {
   return new Promise(function (resolve, reject) {
@@ -594,24 +594,24 @@ var getBase64 = function getBase64(file) {
     };
   });
 };
-var ApaasUpload = function ApaasUpload(_ref3) {
-  var _ref3$maxCount = _ref3.maxCount,
-    maxCount = _ref3$maxCount === void 0 ? 10 : _ref3$maxCount,
-    _ref3$maxSize = _ref3.maxSize,
-    maxSize = _ref3$maxSize === void 0 ? 10 : _ref3$maxSize,
-    _ref3$uploadText = _ref3.uploadText,
-    uploadText = _ref3$uploadText === void 0 ? '上传' : _ref3$uploadText,
-    _ref3$onChange = _ref3.onChange,
-    onChange = _ref3$onChange === void 0 ? fn : _ref3$onChange,
-    _ref3$value = _ref3.value,
-    value = _ref3$value === void 0 ? [] : _ref3$value,
-    _ref3$accept = _ref3.accept,
-    accept = _ref3$accept === void 0 ? 'image/gif,image/jpg,image/jpeg,image/png' : _ref3$accept,
-    _ref3$canPreview = _ref3.canPreview,
-    canPreview = _ref3$canPreview === void 0 ? false : _ref3$canPreview,
-    _ref3$disabled = _ref3.disabled,
-    disabled = _ref3$disabled === void 0 ? false : _ref3$disabled,
-    resetProps = _objectWithoutProperties(_ref3, _excluded$4);
+var ApaasUpload = function ApaasUpload(_ref) {
+  var _ref$maxCount = _ref.maxCount,
+    maxCount = _ref$maxCount === void 0 ? 10 : _ref$maxCount,
+    _ref$maxSize = _ref.maxSize,
+    maxSize = _ref$maxSize === void 0 ? 10 : _ref$maxSize,
+    _ref$uploadText = _ref.uploadText,
+    uploadText = _ref$uploadText === void 0 ? '上传' : _ref$uploadText,
+    _ref$onChange = _ref.onChange,
+    onChange = _ref$onChange === void 0 ? fn : _ref$onChange,
+    _ref$value = _ref.value,
+    value = _ref$value === void 0 ? [] : _ref$value,
+    _ref$accept = _ref.accept,
+    accept = _ref$accept === void 0 ? 'image/gif,image/jpg,image/jpeg,image/png' : _ref$accept,
+    _ref$canPreview = _ref.canPreview,
+    canPreview = _ref$canPreview === void 0 ? false : _ref$canPreview,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    resetProps = _objectWithoutProperties(_ref, _excluded$4);
   var inputRef = useRef(null);
   var valueRef = useRef(value);
   var _useState = useState(false),
@@ -652,8 +652,8 @@ var ApaasUpload = function ApaasUpload(_ref3) {
     onChange(list);
   };
   var clipboardDataChange = function clipboardDataChange(e) {
-    var clipboardData = e.clipboardData || window.clipboardData,
-      i = 0,
+    var clipboardData = e.clipboardData || window.clipboardData;
+    var i = 0,
       items,
       item,
       types;
@@ -911,32 +911,32 @@ var styles$1 = {"imageBox":"index-module_imageBox__8zj7A","inputImage":"index-mo
 styleInject(css_248z$1);
 
 var _excluded$6 = ["maxCount", "maxSize", "uploadText", "onChange", "value", "accept", "canPreview", "disabled", "uniqueKey", "hostUrl", "actionUrl"];
-var fn$1 = function fn(_ref) {
-  var _ref2 = _slicedToArray(_ref, 0);
+var fn$1 = function fn() {
+  return void 0;
 };
-var ApaasUploadAsync = function ApaasUploadAsync(_ref3) {
-  var _ref3$maxCount = _ref3.maxCount,
-    maxCount = _ref3$maxCount === void 0 ? 10 : _ref3$maxCount,
-    _ref3$maxSize = _ref3.maxSize,
-    maxSize = _ref3$maxSize === void 0 ? 10 : _ref3$maxSize,
-    _ref3$uploadText = _ref3.uploadText,
-    uploadText = _ref3$uploadText === void 0 ? '上传' : _ref3$uploadText,
-    _ref3$onChange = _ref3.onChange,
-    onChange = _ref3$onChange === void 0 ? fn$1 : _ref3$onChange,
-    _ref3$value = _ref3.value,
-    value = _ref3$value === void 0 ? [] : _ref3$value,
-    _ref3$accept = _ref3.accept,
-    accept = _ref3$accept === void 0 ? 'image/gif,image/jpg,image/jpeg,image/png' : _ref3$accept,
-    _ref3$canPreview = _ref3.canPreview,
-    canPreview = _ref3$canPreview === void 0 ? false : _ref3$canPreview,
-    _ref3$disabled = _ref3.disabled,
-    disabled = _ref3$disabled === void 0 ? false : _ref3$disabled,
-    uniqueKey = _ref3.uniqueKey,
-    _ref3$hostUrl = _ref3.hostUrl,
-    hostUrl = _ref3$hostUrl === void 0 ? '' : _ref3$hostUrl,
-    _ref3$actionUrl = _ref3.actionUrl,
-    actionUrl = _ref3$actionUrl === void 0 ? '/qy/common/uploadWorkOrderImg' : _ref3$actionUrl,
-    resetProps = _objectWithoutProperties(_ref3, _excluded$6);
+var ApaasUploadAsync = function ApaasUploadAsync(_ref) {
+  var _ref$maxCount = _ref.maxCount,
+    maxCount = _ref$maxCount === void 0 ? 10 : _ref$maxCount,
+    _ref$maxSize = _ref.maxSize,
+    maxSize = _ref$maxSize === void 0 ? 10 : _ref$maxSize,
+    _ref$uploadText = _ref.uploadText,
+    uploadText = _ref$uploadText === void 0 ? '上传' : _ref$uploadText,
+    _ref$onChange = _ref.onChange,
+    onChange = _ref$onChange === void 0 ? fn$1 : _ref$onChange,
+    _ref$value = _ref.value,
+    value = _ref$value === void 0 ? [] : _ref$value,
+    _ref$accept = _ref.accept,
+    accept = _ref$accept === void 0 ? 'image/gif,image/jpg,image/jpeg,image/png' : _ref$accept,
+    _ref$canPreview = _ref.canPreview,
+    canPreview = _ref$canPreview === void 0 ? false : _ref$canPreview,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    uniqueKey = _ref.uniqueKey,
+    _ref$hostUrl = _ref.hostUrl,
+    hostUrl = _ref$hostUrl === void 0 ? '' : _ref$hostUrl,
+    _ref$actionUrl = _ref.actionUrl,
+    actionUrl = _ref$actionUrl === void 0 ? '/qy/common/uploadWorkOrderImg' : _ref$actionUrl,
+    resetProps = _objectWithoutProperties(_ref, _excluded$6);
   var inputRef = useRef(null);
   var valueRef = useRef(value);
   var _useState = useState(false),
@@ -959,7 +959,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref3) {
     valueRef.current = value;
   }, [value]);
   var asyncUpload = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
       var _valueRef$current;
       var formData, fileName, _yield$request, success, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -1000,7 +1000,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref3) {
       }, _callee, null, [[5, 14, 17, 20]]);
     }));
     return function asyncUpload(_x) {
-      return _ref4.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var imgReader = function imgReader(item) {
@@ -1015,7 +1015,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref3) {
       return;
     }
     reader.onload = /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
         var _e$target, _valueRef$current2;
         var result, fileName, file;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -1032,7 +1032,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref3) {
         }, _callee2);
       }));
       return function (_x2) {
-        return _ref5.apply(this, arguments);
+        return _ref3.apply(this, arguments);
       };
     }();
     reader.readAsDataURL(blob);
@@ -1042,8 +1042,8 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref3) {
     onChange(list);
   };
   var clipboardDataChange = function clipboardDataChange(e) {
-    var clipboardData = e.clipboardData || window.clipboardData,
-      i = 0,
+    var clipboardData = e.clipboardData || window.clipboardData;
+    var i = 0,
       items,
       item,
       types;
@@ -1188,7 +1188,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref3) {
   })));
 };
 
-var _excluded$7 = ["showOther", "horizontal", "options", "value", "onChange", "disabled", "checkboxOther"];
+var _excluded$7 = ["showOther", "horizontal", "options", "value", "onChange", "disabled"];
 function ApaasCheckbox(props) {
   var showOther = props.showOther,
     _props$horizontal = props.horizontal,
@@ -1199,7 +1199,6 @@ function ApaasCheckbox(props) {
     value = _props$value === void 0 ? {} : _props$value,
     onChange = props.onChange,
     disabled = props.disabled,
-    checkboxOther = props.checkboxOther,
     otherProps = _objectWithoutProperties(props, _excluded$7);
   var checkboxValue = value.value,
     other = value.other;
@@ -1540,7 +1539,7 @@ function ApaasAddress(props) {
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled;
-  var changeCity = function changeCity(city, selectedOptions) {
+  var changeCity = function changeCity(city) {
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
       address: city
     }));
@@ -1690,7 +1689,6 @@ var AliPay = function AliPay(props) {
   var changeValue = function changeValue(e, type) {
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, e.target.value)));
   };
-  useEffect(function () {}, []);
   return /*#__PURE__*/React.createElement("div", null, !isSingle ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u652F\u4ED8\u5B9D\u540D\u79F0",
@@ -2791,7 +2789,7 @@ var Invoice = function Invoice(props) {
    */
   var handleChange = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(ordinaryTaitou) {
-      var data, list, newList, index, element, kpName, idx;
+      var data, _list, newList, index, element, kpName, idx;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -2812,16 +2810,16 @@ var Invoice = function Invoice(props) {
               _context2.next = 16;
               break;
             }
-            list = data.data ? data.data.info || [] : [];
-            if (list.length) {
+            _list = data.data ? data.data.info || [] : [];
+            if (_list.length) {
               _context2.next = 10;
               break;
             }
             return _context2.abrupt("return");
           case 10:
             newList = [];
-            for (index = 0; index < list.length; index++) {
-              element = list[index];
+            for (index = 0; index < _list.length; index++) {
+              element = _list[index];
               kpName = element.kpName;
               idx = kpName.indexOf(ordinaryTaitou);
               element.kpName1 = kpName.substring(0, idx);
@@ -3121,13 +3119,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 +3142,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 +3157,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 +3192,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 +3312,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

@@ -589,8 +589,8 @@ var styles = {"imageBox":"index-module_imageBox__3tOEt","inputImage":"index-modu
 styleInject(css_248z);
 
 var _excluded$4 = ["maxCount", "maxSize", "uploadText", "onChange", "value", "accept", "canPreview", "disabled"];
-var fn = function fn(_ref) {
-  var _ref2 = _slicedToArray(_ref, 0);
+var fn = function fn() {
+  return void 0;
 };
 var getBase64 = function getBase64(file) {
   return new Promise(function (resolve, reject) {
@@ -604,24 +604,24 @@ var getBase64 = function getBase64(file) {
     };
   });
 };
-var ApaasUpload = function ApaasUpload(_ref3) {
-  var _ref3$maxCount = _ref3.maxCount,
-    maxCount = _ref3$maxCount === void 0 ? 10 : _ref3$maxCount,
-    _ref3$maxSize = _ref3.maxSize,
-    maxSize = _ref3$maxSize === void 0 ? 10 : _ref3$maxSize,
-    _ref3$uploadText = _ref3.uploadText,
-    uploadText = _ref3$uploadText === void 0 ? '上传' : _ref3$uploadText,
-    _ref3$onChange = _ref3.onChange,
-    onChange = _ref3$onChange === void 0 ? fn : _ref3$onChange,
-    _ref3$value = _ref3.value,
-    value = _ref3$value === void 0 ? [] : _ref3$value,
-    _ref3$accept = _ref3.accept,
-    accept = _ref3$accept === void 0 ? 'image/gif,image/jpg,image/jpeg,image/png' : _ref3$accept,
-    _ref3$canPreview = _ref3.canPreview,
-    canPreview = _ref3$canPreview === void 0 ? false : _ref3$canPreview,
-    _ref3$disabled = _ref3.disabled,
-    disabled = _ref3$disabled === void 0 ? false : _ref3$disabled,
-    resetProps = _objectWithoutProperties(_ref3, _excluded$4);
+var ApaasUpload = function ApaasUpload(_ref) {
+  var _ref$maxCount = _ref.maxCount,
+    maxCount = _ref$maxCount === void 0 ? 10 : _ref$maxCount,
+    _ref$maxSize = _ref.maxSize,
+    maxSize = _ref$maxSize === void 0 ? 10 : _ref$maxSize,
+    _ref$uploadText = _ref.uploadText,
+    uploadText = _ref$uploadText === void 0 ? '上传' : _ref$uploadText,
+    _ref$onChange = _ref.onChange,
+    onChange = _ref$onChange === void 0 ? fn : _ref$onChange,
+    _ref$value = _ref.value,
+    value = _ref$value === void 0 ? [] : _ref$value,
+    _ref$accept = _ref.accept,
+    accept = _ref$accept === void 0 ? 'image/gif,image/jpg,image/jpeg,image/png' : _ref$accept,
+    _ref$canPreview = _ref.canPreview,
+    canPreview = _ref$canPreview === void 0 ? false : _ref$canPreview,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    resetProps = _objectWithoutProperties(_ref, _excluded$4);
   var inputRef = React.useRef(null);
   var valueRef = React.useRef(value);
   var _useState = React.useState(false),
@@ -662,8 +662,8 @@ var ApaasUpload = function ApaasUpload(_ref3) {
     onChange(list);
   };
   var clipboardDataChange = function clipboardDataChange(e) {
-    var clipboardData = e.clipboardData || window.clipboardData,
-      i = 0,
+    var clipboardData = e.clipboardData || window.clipboardData;
+    var i = 0,
       items,
       item,
       types;
@@ -921,32 +921,32 @@ var styles$1 = {"imageBox":"index-module_imageBox__8zj7A","inputImage":"index-mo
 styleInject(css_248z$1);
 
 var _excluded$6 = ["maxCount", "maxSize", "uploadText", "onChange", "value", "accept", "canPreview", "disabled", "uniqueKey", "hostUrl", "actionUrl"];
-var fn$1 = function fn(_ref) {
-  var _ref2 = _slicedToArray(_ref, 0);
+var fn$1 = function fn() {
+  return void 0;
 };
-var ApaasUploadAsync = function ApaasUploadAsync(_ref3) {
-  var _ref3$maxCount = _ref3.maxCount,
-    maxCount = _ref3$maxCount === void 0 ? 10 : _ref3$maxCount,
-    _ref3$maxSize = _ref3.maxSize,
-    maxSize = _ref3$maxSize === void 0 ? 10 : _ref3$maxSize,
-    _ref3$uploadText = _ref3.uploadText,
-    uploadText = _ref3$uploadText === void 0 ? '上传' : _ref3$uploadText,
-    _ref3$onChange = _ref3.onChange,
-    onChange = _ref3$onChange === void 0 ? fn$1 : _ref3$onChange,
-    _ref3$value = _ref3.value,
-    value = _ref3$value === void 0 ? [] : _ref3$value,
-    _ref3$accept = _ref3.accept,
-    accept = _ref3$accept === void 0 ? 'image/gif,image/jpg,image/jpeg,image/png' : _ref3$accept,
-    _ref3$canPreview = _ref3.canPreview,
-    canPreview = _ref3$canPreview === void 0 ? false : _ref3$canPreview,
-    _ref3$disabled = _ref3.disabled,
-    disabled = _ref3$disabled === void 0 ? false : _ref3$disabled,
-    uniqueKey = _ref3.uniqueKey,
-    _ref3$hostUrl = _ref3.hostUrl,
-    hostUrl = _ref3$hostUrl === void 0 ? '' : _ref3$hostUrl,
-    _ref3$actionUrl = _ref3.actionUrl,
-    actionUrl = _ref3$actionUrl === void 0 ? '/qy/common/uploadWorkOrderImg' : _ref3$actionUrl,
-    resetProps = _objectWithoutProperties(_ref3, _excluded$6);
+var ApaasUploadAsync = function ApaasUploadAsync(_ref) {
+  var _ref$maxCount = _ref.maxCount,
+    maxCount = _ref$maxCount === void 0 ? 10 : _ref$maxCount,
+    _ref$maxSize = _ref.maxSize,
+    maxSize = _ref$maxSize === void 0 ? 10 : _ref$maxSize,
+    _ref$uploadText = _ref.uploadText,
+    uploadText = _ref$uploadText === void 0 ? '上传' : _ref$uploadText,
+    _ref$onChange = _ref.onChange,
+    onChange = _ref$onChange === void 0 ? fn$1 : _ref$onChange,
+    _ref$value = _ref.value,
+    value = _ref$value === void 0 ? [] : _ref$value,
+    _ref$accept = _ref.accept,
+    accept = _ref$accept === void 0 ? 'image/gif,image/jpg,image/jpeg,image/png' : _ref$accept,
+    _ref$canPreview = _ref.canPreview,
+    canPreview = _ref$canPreview === void 0 ? false : _ref$canPreview,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    uniqueKey = _ref.uniqueKey,
+    _ref$hostUrl = _ref.hostUrl,
+    hostUrl = _ref$hostUrl === void 0 ? '' : _ref$hostUrl,
+    _ref$actionUrl = _ref.actionUrl,
+    actionUrl = _ref$actionUrl === void 0 ? '/qy/common/uploadWorkOrderImg' : _ref$actionUrl,
+    resetProps = _objectWithoutProperties(_ref, _excluded$6);
   var inputRef = React.useRef(null);
   var valueRef = React.useRef(value);
   var _useState = React.useState(false),
@@ -969,7 +969,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref3) {
     valueRef.current = value;
   }, [value]);
   var asyncUpload = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
       var _valueRef$current;
       var formData, fileName, _yield$request, success, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -1010,7 +1010,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref3) {
       }, _callee, null, [[5, 14, 17, 20]]);
     }));
     return function asyncUpload(_x) {
-      return _ref4.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var imgReader = function imgReader(item) {
@@ -1025,7 +1025,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref3) {
       return;
     }
     reader.onload = /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
         var _e$target, _valueRef$current2;
         var result, fileName, file;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -1042,7 +1042,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref3) {
         }, _callee2);
       }));
       return function (_x2) {
-        return _ref5.apply(this, arguments);
+        return _ref3.apply(this, arguments);
       };
     }();
     reader.readAsDataURL(blob);
@@ -1052,8 +1052,8 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref3) {
     onChange(list);
   };
   var clipboardDataChange = function clipboardDataChange(e) {
-    var clipboardData = e.clipboardData || window.clipboardData,
-      i = 0,
+    var clipboardData = e.clipboardData || window.clipboardData;
+    var i = 0,
       items,
       item,
       types;
@@ -1198,7 +1198,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref3) {
   })));
 };
 
-var _excluded$7 = ["showOther", "horizontal", "options", "value", "onChange", "disabled", "checkboxOther"];
+var _excluded$7 = ["showOther", "horizontal", "options", "value", "onChange", "disabled"];
 function ApaasCheckbox(props) {
   var showOther = props.showOther,
     _props$horizontal = props.horizontal,
@@ -1209,7 +1209,6 @@ function ApaasCheckbox(props) {
     value = _props$value === void 0 ? {} : _props$value,
     onChange = props.onChange,
     disabled = props.disabled,
-    checkboxOther = props.checkboxOther,
     otherProps = _objectWithoutProperties(props, _excluded$7);
   var checkboxValue = value.value,
     other = value.other;
@@ -1550,7 +1549,7 @@ function ApaasAddress(props) {
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled;
-  var changeCity = function changeCity(city, selectedOptions) {
+  var changeCity = function changeCity(city) {
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
       address: city
     }));
@@ -1700,7 +1699,6 @@ var AliPay = function AliPay(props) {
   var changeValue = function changeValue(e, type) {
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, e.target.value)));
   };
-  React.useEffect(function () {}, []);
   return /*#__PURE__*/React__default['default'].createElement("div", null, !isSingle ? /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u652F\u4ED8\u5B9D\u540D\u79F0",
@@ -2801,7 +2799,7 @@ var Invoice = function Invoice(props) {
    */
   var handleChange = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(ordinaryTaitou) {
-      var data, list, newList, index, element, kpName, idx;
+      var data, _list, newList, index, element, kpName, idx;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -2822,16 +2820,16 @@ var Invoice = function Invoice(props) {
               _context2.next = 16;
               break;
             }
-            list = data.data ? data.data.info || [] : [];
-            if (list.length) {
+            _list = data.data ? data.data.info || [] : [];
+            if (_list.length) {
               _context2.next = 10;
               break;
             }
             return _context2.abrupt("return");
           case 10:
             newList = [];
-            for (index = 0; index < list.length; index++) {
-              element = list[index];
+            for (index = 0; index < _list.length; index++) {
+              element = _list[index];
               kpName = element.kpName;
               idx = kpName.indexOf(ordinaryTaitou);
               element.kpName1 = kpName.substring(0, idx);
@@ -3131,13 +3129,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 +3152,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 +3167,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 +3202,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 +3322,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.16",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -12,7 +12,9 @@
   ],
   "scripts": {
     "async": "yarn build && yalc push",
-    "build": "father-build",
+    "build": "yarn lint && father-build",
+    "lint": "eslint '**/*.{ts,tsx}'",
+    "lint:fix": "eslint --fix '**/*.{ts,tsx}'",
     "start": "dumi dev",
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
@@ -20,9 +22,12 @@
     "umi-request": "^1.4.0"
   },
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.59.2",
+    "@typescript-eslint/parser": "^5.59.2",
     "@umijs/test": "^3.0.5",
     "babel-plugin-import": "^1.13.5",
     "dumi": "^1.0.16",
+    "eslint": "^8.40.0",
     "father-build": "^1.17.2",
     "gh-pages": "^3.0.0",
     "lint-staged": "^10.0.7",
@@ -37,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f2de883a1a57e0ead13d3ee345acaf3dd1b3467d"
+  "gitHead": "b12616df54e56709922c3dc064f381f3032c0b73"
 }