@kmkf-fe-packages/basic-components 0.6.3-alpha.4 → 0.6.3-alpha.45

package/dist/index.js

@@ -6,6 +6,7 @@ var React = require('react');
 var antd = require('antd');
 var icons = require('@ant-design/icons');
 var request = require('umi-request');
+var kmkfUtils = require('@kmkf-fe-packages/kmkf-utils');
 var zhCN = require('antd/lib/locale/zh_CN');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -508,6 +509,7 @@ var ApaasDate = function ApaasDate(props) {
 
 var _excluded$1 = ["isNumber", "replaceWarn"];
 function ApaasInput(props) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   var isNumber = props.isNumber,
     replaceWarn = props.replaceWarn,
     other = _objectWithoutProperties(props, _excluded$1);
@@ -520,6 +522,7 @@ function ApaasInputNumber(props) {
 
 var _excluded$2 = ["options", "basicMultSelect"];
 function ApaasSelect(props) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   var _props$options = props.options,
     options = _props$options === void 0 ? [] : _props$options,
     basicMultSelect = props.basicMultSelect,
@@ -589,8 +592,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 +607,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 +665,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;
@@ -862,37 +865,6 @@ function ApaasRadio(props) {
   }))));
 }
 
-/*
- * @Author: wangzhenggui jianjia.wzg@raycloud.com
- * @Date: 2022-09-20 14:29:14
- * @LastEditors: litian
- * @LastEditTime: 2022-09-27 13:49:32
- * @FilePath: /raycloud-apaas-fe-setup/packages/apaas-react-basics-widgets/src/config/utils.ts
- * @Description:
- *
- * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
- */
-//组装地址
-var toTree = function toTree() {
-  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var parId = arguments.length > 1 ? arguments[1] : undefined;
-  var len = list === null || list === void 0 ? void 0 : list.length;
-  function loop(parId) {
-    var res = [];
-    for (var i = 0; i < len; i++) {
-      var item = list[i];
-      if (item.parentId === Number(parId)) {
-        item.children = loop(item.id);
-        res.push(_objectSpread2(_objectSpread2({}, item), {}, {
-          label: item.name,
-          value: item.id
-        }));
-      }
-    }
-    return res;
-  }
-  return loop(parId);
-};
 var keepDecimals = function keepDecimals(value) {
   value = value.replace(/[^\d.]/g, ''); //清除"数字"和"."以外的字符
   value = value.replace(/^\./g, ''); //验证第一个字符是数字
@@ -921,32 +893,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 +941,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 +982,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 +997,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 +1014,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 +1024,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 +1170,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 +1181,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;
@@ -1371,18 +1342,7 @@ function ApaasRate(props) {
   }));
 }
 
-/*
- * @Author: wangzhenggui jianjia.wzg@raycloud.com
- * @Date: 2022-09-13 11:06:09
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-11-04 15:55:10
- * @FilePath: /raycloud-apaas-fe-setup/packages/apaas-react-basics-widgets/src/common/request.ts
- * @Description:
- *
- * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
- */
-var extendRequest = request.extend({});
-
+var address = kmkfUtils.AddressData.getInstance();
 var Province = function Province(props) {
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -1391,35 +1351,11 @@ var Province = function Province(props) {
   var isFirst = React.useRef(false);
   var initPageSource = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var apaasAddress, apaasSaveTime, isExpire, _yield$request, list, arr;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            apaasAddress = window.localStorage.getItem('apaasAddress');
-            apaasSaveTime = window.localStorage.getItem('apaasSaveTime'); //判断是否过期 缓存7天
-            isExpire = apaasSaveTime ? Number(apaasSaveTime) + 7 * 3600 * 24 * 1000 < new Date().getTime() : true;
-            if (!(apaasAddress && !isExpire)) {
-              _context.next = 6;
-              break;
-            }
-            setOptions(JSON.parse(apaasAddress));
-            return _context.abrupt("return");
-          case 6:
-            _context.next = 8;
-            return extendRequest('/qy/gdfw/template/queryAreas', {
-              method: 'get',
-              params: {
-                apiName: 'queryAreas'
-              }
-            });
-          case 8:
-            _yield$request = _context.sent;
-            list = _yield$request.data;
-            arr = toTree(list, 0);
-            setOptions(arr[0].children);
-            window.localStorage.setItem('apaasAddress', JSON.stringify(arr[0].children));
-            window.localStorage.setItem('apaasSaveTime', new Date().getTime().toString());
-          case 14:
+            setOptions(address.addressOptions || []);
+          case 1:
           case "end":
             return _context.stop();
         }
@@ -1517,15 +1453,11 @@ var ShopNameSelect = function ShopNameSelect(props) {
     disabled = props.disabled,
     style = props.style;
   var _useState = React.useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    options = _useState2[0],
-    setOptions = _useState2[1];
+    _useState2 = _slicedToArray(_useState, 1),
+    options = _useState2[0];
   var handleChange = function handleChange(value) {
     onChange === null || onChange === void 0 ? void 0 : onChange(value);
   };
-  React.useEffect(function () {
-    // initDataSource();
-  }, []);
   return /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     defaultValue: value,
     disabled: disabled,
@@ -1550,7 +1482,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 +1632,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",
@@ -1727,6 +1658,18 @@ var AliPay = function AliPay(props) {
   })));
 };
 
+/*
+ * @Author: wangzhenggui jianjia.wzg@raycloud.com
+ * @Date: 2022-09-13 11:06:09
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-11-04 15:55:10
+ * @FilePath: /raycloud-apaas-fe-setup/packages/apaas-react-basics-widgets/src/common/request.ts
+ * @Description:
+ *
+ * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
+ */
+var extendRequest = request.extend({});
+
 var css_248z$4 = ".goodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.goodsBox .goodBox-Img {\n  width: 80px;\n  margin: 0 10px 10px 0;\n}\n.goodsBox .right-context {\n  font-size: 12px;\n}\n.goodsBox .right-context .ant-input {\n  font-size: 12px;\n  width: 80px;\n  height: 20px;\n  padding-left: 5px;\n  padding-right: 5px;\n}\n.goodsBox .right-context .ant-input.id-textarea {\n  width: 80px;\n  resize: none;\n  height: 45px;\n}\n.goodsBox.goodsBox-item-horizontal--box {\n  flex-direction: row;\n  width: auto;\n}\n.goods-imgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border-radius: 4px;\n  border: 1px solid #f2f3f5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n  background-color: #f2f3f5;\n}\n.goods-imgBox .add-btn {\n  color: #86909c;\n}\n.goods-imgBox .text {\n  color: #86909c;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4e5969;\n}\n.searchBox {\n  display: flex;\n  justify-content: space-between;\n  flex-wrap: wrap;\n  margin-bottom: 10px;\n}\n.searchBox .search {\n  width: 150px;\n  margin-left: 6px;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodsMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 400px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodsMain .goodItem {\n  width: 142px;\n  height: 184px;\n  padding: 7px;\n  margin: 0 16px 16px 0;\n  border-radius: 4px;\n  background: #ffffff;\n  box-sizing: border-box;\n  /* 主题色/常规 */\n  border: 1px solid #c9cdd4;\n}\n.goodsMain .goodItem .goodImg {\n  width: 128px;\n  height: 128px;\n  border-radius: 4px;\n  overflow: hidden;\n}\n.goodsMain .goodItem .goodImg img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goodsMain .goodItem .goodText {\n  text-align: center;\n  font-size: 12px;\n  color: #4e5969;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodsMain .goodItem .goodPrice {\n  text-align: center;\n  font-size: 14px;\n  color: #1d2129;\n}\n.goodsMain .goodItem.active {\n  border: 1px solid #1b5bf3;\n}\n@media screen and (max-width: 500px) {\n  .goodsMain {\n    display: grid;\n    grid-template-columns: repeat(3, 1fr);\n    grid-gap: 8px;\n    height: 300px;\n  }\n  .goodsMain .goodItem {\n    height: 126px;\n    width: 83px;\n    padding: 4px;\n    margin: 0;\n    border-radius: 4px;\n    background: #FFFFFF;\n    box-sizing: border-box;\n    border: 1px solid rgba(0, 0, 0, 0.15);\n  }\n  .goodsMain .goodItem .goodImg {\n    width: 98%;\n    height: 77px;\n  }\n  .goodsMain .goodItem .goodText {\n    overflow: hidden;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n  }\n  .goodsMain .goodItem.active {\n    border: 1px solid #3089dc;\n  }\n  .searchBox {\n    display: flex;\n    flex-wrap: wrap;\n    justify-content: initial;\n  }\n  .searchBox .classify {\n    width: 120px;\n  }\n  .goodModal .ant-modal-body {\n    padding: 8px;\n  }\n}\n.goods-uploaded-count {\n  color: #ff3638;\n}\n.footer {\n  display: flex;\n  justify-content: flex-end;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n.right-context .info-row {\n  width: 80px;\n  display: flex;\n  align-items: center;\n  padding: 0px 8px;\n  border-radius: 2px;\n  cursor: pointer;\n  background: #f2f3f5;\n  margin-bottom: 4px;\n}\n.right-context .info-row > div {\n  text-overflow: ellipsis;\n  display: -webkit-box;\n  -webkit-box-orient: vertical;\n  -webkit-line-clamp: 2;\n  overflow: hidden;\n  word-break: break-all;\n}\n.sphPagination {\n  display: flex;\n  align-items: center;\n}\n.sphPagination .shpBtn {\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  padding: 0 8px;\n  height: 32px;\n  border: 1px solid #d9d9d9;\n  border-radius: 2px;\n  cursor: pointer;\n  margin: 0 8px;\n}\n.sphPagination .shpBtn.unCursor {\n  color: #eee;\n  cursor: not-allowed;\n}\n";
 styleInject(css_248z$4);
 
@@ -2242,8 +2185,7 @@ var Sku = /*#__PURE__*/React.forwardRef(function (props, ref) {
   React.useImperativeHandle(ref, function () {
     return {
       open: function open(_ref) {
-        var shopId = _ref.shopId,
-          numIids = _ref.numIids,
+        var numIids = _ref.numIids,
           options = _ref.options;
         setVisible(true);
         setSku('');
@@ -2383,19 +2325,14 @@ var Goods = function Goods(props) {
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var _useState3 = React.useState(''),
+  var _useState3 = React.useState(0),
     _useState4 = _slicedToArray(_useState3, 2),
-    editState = _useState4[0],
-    setEditState = _useState4[1];
-  var _useState5 = React.useState(0),
-    _useState6 = _slicedToArray(_useState5, 2),
-    uploadImageCount = _useState6[0],
-    setUploadImageCount = _useState6[1];
+    uploadImageCount = _useState4[0],
+    setUploadImageCount = _useState4[1];
   var skuRef = React.useRef();
-  var _useState7 = React.useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    editVisible = _useState8[0],
-    setEditVisible = _useState8[1];
+  var _useState5 = React.useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    setEditVisible = _useState6[1];
   // onChange事件会修改imgList里的字段，所以保存初始化的imglist值
   if (!imgListConstant.length) {
     imgListConstant = JSON.parse(JSON.stringify(imgList));
@@ -2801,7 +2738,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 +2759,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,6 +3068,8 @@ 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,
@@ -3138,41 +3077,61 @@ var LogisticsInterception = function LogisticsInterception(props) {
     disabled = _props$disabled === void 0 ? false : _props$disabled,
     _props$isEditing = props.isEditing,
     isEditing = _props$isEditing === void 0 ? false : _props$isEditing;
-  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 = 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]);
+    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 && JSON.stringify(value) !== '{}') {
+      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([]);
       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) || []);
+    setStatusOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.logisticsStatusList) || []);
     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;
@@ -3180,18 +3139,32 @@ 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 () {
+    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') {
+      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$config2;
+        return item === null || item === void 0 ? void 0 : (_item$config2 = item.config) === null || _item$config2 === void 0 ? void 0 : _item$config2.isDefault;
+      });
       newValue = _objectSpread2(_objectSpread2({}, value), {}, {
         interceptCompany: val,
-        interceptType: 'RETURN',
+        interceptType: returnValue === null || returnValue === void 0 ? void 0 : returnValue.value,
         interceptAddress: [],
-        interceptDetail: '',
-        interceptReceiverName: '',
-        interceptReceiverMobile: '',
-        interceptStatus: '',
-        interceptOther: ''
+        interceptDetail: undefined,
+        interceptReceiverName: undefined,
+        interceptReceiverMobile: undefined,
+        interceptLogisticsStatus: undefined,
+        interceptLogisticsStatusOther: undefined
       });
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
@@ -3201,10 +3174,10 @@ 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 || canEdit,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
-      width: '200px'
+      width: '150px'
     },
     onChange: function onChange(val) {
       return changeHandle(val, 'interceptCompany');
@@ -3216,7 +3189,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    disabled: disabled || !canEdit,
+    disabled: disabled || canEdit,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptCode');
@@ -3227,7 +3200,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'interceptType'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-    disabled: disabled || !canEdit,
+    disabled: disabled || canEdit,
     style: {
       width: '200px'
     },
@@ -3252,34 +3225,31 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return changeHandle(val, 'interceptAddress');
     },
     options: [],
-    disabled: disabled || !canEdit
+    disabled: disabled || canEdit
   }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     value: value === null || value === void 0 ? void 0 : value.interceptDetail,
-    disabled: disabled || !canEdit,
+    disabled: disabled || canEdit,
     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 || !canEdit,
-    style: {
-      width: '200px'
-    },
+    disabled: disabled || canEdit,
     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 || !canEdit,
+    disabled: disabled || canEdit,
     placeholder: "\u6536\u4EF6\u4EBA\u7535\u8BDD",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptReceiverMobile');
     }
   }))), /*#__PURE__*/React__default['default'].createElement(Item, {
-    label: '拦截状态',
-    key: 'interceptStatus'
+    label: '物流状态',
+    key: 'interceptLogisticsStatus'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     disabled: disabled || isInterface,
     style: {
@@ -3287,22 +3257,22 @@ var LogisticsInterception = function LogisticsInterception(props) {
     },
     options: statusOptions,
     onChange: function onChange(val) {
-      return changeHandle(val, 'interceptStatus');
+      return changeHandle(val, 'interceptLogisticsStatus');
     },
-    value: value === null || value === void 0 ? void 0 : value.interceptStatus,
-    placeholder: "\u62E6\u622A\u72B6\u6001",
+    value: value === null || value === void 0 ? void 0 : value.interceptLogisticsStatus,
+    placeholder: "\u7269\u6D41\u72B6\u6001",
     showSearch: true,
     filterOption: function filterOption(input, option) {
       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,
+  }), (value === null || value === void 0 ? void 0 : value.interceptLogisticsStatus) === 'OTHER' && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    disabled: disabled || !canEdit,
     style: {
       width: '200px'
     },
     placeholder: "\u5176\u4ED6",
     onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'interceptOther');
+      return changeHandle(e.target.value, 'interceptLogisticsStatusOther');
     }
   })));
 };
@@ -3562,9 +3532,8 @@ var GoodsModal$1 = function GoodsModal(props) {
       tab: '已选择',
       key: 'all'
     }]),
-    _useState18 = _slicedToArray(_useState17, 2),
-    tabs = _useState18[0],
-    setTabs = _useState18[1];
+    _useState18 = _slicedToArray(_useState17, 1),
+    tabs = _useState18[0];
   var _useState19 = React.useState([{
       name: '上架时间',
       value: 'list_time'