@kmkf-fe-packages/basic-components 0.6.3-alpha.39 → 0.6.3-alpha.44

package/README.md

@@ -19,4 +19,4 @@ yarn start
 - config 公共方法
 - assets 静态资源
 
-#### 1
+#### 111

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

@@ -7,8 +7,8 @@ interface LogisticsInterceptionValueType {
     interceptDetail: string;
     interceptReceiverName: string;
     interceptReceiverMobile: string;
-    interceptStatus: string | number;
-    interceptOther: string;
+    interceptLogisticsStatus: string | number;
+    interceptLogisticsStatusOther: string;
 }
 interface LogisticsInterceptionProps {
     value: Partial<LogisticsInterceptionValueType>;
@@ -17,7 +17,6 @@ interface LogisticsInterceptionProps {
     required: boolean;
     disabled: boolean;
     isEditing: boolean;
-    logisticsInterceptHandleStatus: string;
     onChange: (value: Partial<LogisticsInterceptionValueType>) => void;
 }
 declare const LogisticsInterception: (props: Partial<LogisticsInterceptionProps>) => React.JSX.Element;

package/dist/config/utils.d.ts

@@ -1,3 +1,2 @@
-export declare const toTree: (list: any[] | undefined, parId: number) => any[];
 export declare const keepDecimals: (value: string) => string;
 export declare function dataURLtoFile(dataurl: string, filename: string): File;

package/dist/index.esm.js

@@ -2,6 +2,7 @@ import React, { useRef, useState, useEffect, useMemo, forwardRef, useImperativeH
 import { Cascader, DatePicker, Input, InputNumber, Select, Upload, Image, message, Radio, Space, Spin, Checkbox, Row, Col, Slider, Rate, Form, Tabs, Modal, Button, ConfigProvider, Pagination, Popover } from 'antd';
 import { EyeOutlined, DeleteOutlined } from '@ant-design/icons';
 import request, { extend } from 'umi-request';
+import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
 import zhCN from 'antd/lib/locale/zh_CN';
 
 function _iterableToArrayLimit(arr, i) {
@@ -854,37 +855,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, ''); //验证第一个字符是数字
@@ -1362,18 +1332,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 = extend({});
-
+var address = AddressData.getInstance();
 var Province = function Province(props) {
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -1382,35 +1341,11 @@ var Province = function Province(props) {
   var isFirst = 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();
         }
@@ -1713,6 +1648,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 = 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);
 
@@ -3119,8 +3066,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     _props$disabled = props.disabled,
     disabled = _props$disabled === void 0 ? false : _props$disabled,
     _props$isEditing = props.isEditing,
-    isEditing = _props$isEditing === void 0 ? false : _props$isEditing,
-    logisticsInterceptHandleStatus = props.logisticsInterceptHandleStatus;
+    isEditing = _props$isEditing === void 0 ? false : _props$isEditing;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     initCompany = _useState2[0],
@@ -3140,7 +3086,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
   var firstIn = useRef(true);
   useEffect(function () {
     //存入第一次的物流地址，防止非对接物流切换成对接物流后无法编辑
-    if (firstIn.current && (value === null || value === void 0 ? void 0 : value.interceptCompany)) {
+    if (firstIn.current && JSON.stringify(value) !== '{}') {
       setInitCompany(value === null || value === void 0 ? void 0 : value.interceptCompany);
       firstIn.current = false;
     }
@@ -3154,7 +3100,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       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]);
   //拦截类型切换 需要清空新派送地
@@ -3183,18 +3129,8 @@ 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 canEdit = useMemo(function () {
     var company = expressInterceptData.find(function (item) {
       return item.value === initCompany;
     });
@@ -3207,7 +3143,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         return item.value === val;
       });
       var returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
-        return item === null || item === void 0 ? void 0 : item.isDefault;
+        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,
@@ -3216,8 +3153,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         interceptDetail: undefined,
         interceptReceiverName: undefined,
         interceptReceiverMobile: undefined,
-        interceptStatus: undefined,
-        interceptOther: undefined
+        interceptLogisticsStatus: undefined,
+        interceptLogisticsStatusOther: undefined
       });
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
@@ -3227,7 +3164,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'logistics'
   }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, {
-    disabled: disabled || canEditCompany,
+    disabled: disabled || canEdit,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
       width: '150px'
@@ -3242,7 +3179,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), /*#__PURE__*/React.createElement(Input, {
-    disabled: disabled || canEditCompany,
+    disabled: disabled || canEdit,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptCode');
@@ -3253,7 +3190,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'interceptType'
   }, /*#__PURE__*/React.createElement(Select, {
-    disabled: disabled || !canEdit,
+    disabled: disabled || canEdit,
     style: {
       width: '200px'
     },
@@ -3278,31 +3215,31 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return changeHandle(val, 'interceptAddress');
     },
     options: [],
-    disabled: disabled || !canEdit
+    disabled: disabled || canEdit
   }), /*#__PURE__*/React.createElement(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.createElement("br", null), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Input, {
     value: value === null || value === void 0 ? void 0 : value.interceptReceiverName,
-    disabled: disabled || !canEdit,
+    disabled: disabled || canEdit,
     placeholder: "\u6536\u4EF6\u4EBA\u59D3\u540D",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptReceiverName');
     }
   }), /*#__PURE__*/React.createElement(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.createElement(Item, {
-    label: '拦截状态',
-    key: 'interceptStatus'
+    label: '物流状态',
+    key: 'interceptLogisticsStatus'
   }, /*#__PURE__*/React.createElement(Select, {
     disabled: disabled || isInterface,
     style: {
@@ -3310,22 +3247,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.createElement(Input, {
+  }), (value === null || value === void 0 ? void 0 : value.interceptLogisticsStatus) === 'OTHER' && /*#__PURE__*/React.createElement(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');
     }
   })));
 };

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 }; }
@@ -864,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, ''); //验证第一个字符是数字
@@ -1372,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),
@@ -1392,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();
         }
@@ -1723,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);
 
@@ -3129,8 +3076,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     _props$disabled = props.disabled,
     disabled = _props$disabled === void 0 ? false : _props$disabled,
     _props$isEditing = props.isEditing,
-    isEditing = _props$isEditing === void 0 ? false : _props$isEditing,
-    logisticsInterceptHandleStatus = props.logisticsInterceptHandleStatus;
+    isEditing = _props$isEditing === void 0 ? false : _props$isEditing;
   var _useState = React.useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     initCompany = _useState2[0],
@@ -3150,7 +3096,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
   var firstIn = React.useRef(true);
   React.useEffect(function () {
     //存入第一次的物流地址，防止非对接物流切换成对接物流后无法编辑
-    if (firstIn.current && (value === null || value === void 0 ? void 0 : value.interceptCompany)) {
+    if (firstIn.current && JSON.stringify(value) !== '{}') {
       setInitCompany(value === null || value === void 0 ? void 0 : value.interceptCompany);
       firstIn.current = false;
     }
@@ -3164,7 +3110,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       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]);
   //拦截类型切换 需要清空新派送地
@@ -3193,18 +3139,8 @@ 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 canEdit = React.useMemo(function () {
     var company = expressInterceptData.find(function (item) {
       return item.value === initCompany;
     });
@@ -3217,7 +3153,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         return item.value === val;
       });
       var returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
-        return item === null || item === void 0 ? void 0 : item.isDefault;
+        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,
@@ -3226,8 +3163,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         interceptDetail: undefined,
         interceptReceiverName: undefined,
         interceptReceiverMobile: undefined,
-        interceptStatus: undefined,
-        interceptOther: undefined
+        interceptLogisticsStatus: undefined,
+        interceptLogisticsStatusOther: undefined
       });
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
@@ -3237,7 +3174,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 || canEditCompany,
+    disabled: disabled || canEdit,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
       width: '150px'
@@ -3252,7 +3189,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    disabled: disabled || canEditCompany,
+    disabled: disabled || canEdit,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptCode');
@@ -3263,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'
     },
@@ -3288,31 +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,
+    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: {
@@ -3320,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, {
+  }), (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');
     }
   })));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.6.3-alpha.39",
+  "version": "0.6.3-alpha.44",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -19,6 +19,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
+    "@kmkf-fe-packages/kmkf-utils": "^0.6.3-alpha.44",
     "umi-request": "^1.4.0"
   },
   "devDependencies": {
@@ -41,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "11e3dc7ff8cb374b91d27d81bccaaf27d168adc4"
+  "gitHead": "cbdb203dd7951559af410da4c7a1d2339bd45878"
 }