@kmkf-fe-packages/basic-components 0.24.2-beta.0 → 0.24.2-beta.10

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 import React, { useRef, useState, useEffect, forwardRef, useImperativeHandle, useMemo } from 'react';
 import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, message, Radio, Space, Spin, Modal, Button, Checkbox, Row, Col, Slider, Rate, Form, Tabs, ConfigProvider, Pagination, Popover, Table } from 'antd';
-import { EyeOutlined, DeleteOutlined, CaretUpOutlined } from '@ant-design/icons';
+import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { AddressData, BsAddressData, WdtAddressData, toTree, request as request$1, ExpressData, uuid, LogisticsAddressData, WDT_ORDER_TYPE_MAP } from '@kmkf-fe-packages/kmkf-utils';
@@ -516,8 +516,18 @@ function ApaasInput(props) {
   var isNumber = props.isNumber,
     replaceWarn = props.replaceWarn,
     other = _objectWithoutProperties(props, _excluded$1);
+  var handleBlur = function handleBlur(e) {
+    // 去除头尾空格
+    e.target.value = e.target.value.trim();
+    var onChange = props.onChange,
+      onBlur = props.onBlur;
+    typeof onChange === 'function' && onChange(e);
+    typeof onBlur === 'function' && onBlur(e);
+  };
   // @ts-ignore
-  return isNumber ? /*#__PURE__*/React.createElement(InputNumber, _objectSpread2({}, other)) : /*#__PURE__*/React.createElement(Input, _objectSpread2({}, other));
+  return isNumber ? /*#__PURE__*/React.createElement(InputNumber, _objectSpread2({}, other)) : /*#__PURE__*/React.createElement(Input, _objectSpread2(_objectSpread2({}, other), {}, {
+    onBlur: handleBlur
+  }));
 }
 
 function ApaasInputNumber(props) {
@@ -7394,11 +7404,14 @@ var Province = function Province(props) {
               workOrder: addressData
             }[type] || addressData).addressOptions || [];
             if (!(options === null || options === void 0 ? void 0 : options.length) && num < 6) {
+              getBsAddress();
               time.current = setTimeout(function () {
                 initPageSource();
               }, 1000);
             }
-            setOptions(options);
+            if (options.length) {
+              setOptions(options);
+            }
           case 4:
           case "end":
             return _context.stop();
@@ -9734,7 +9747,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
   var address = AddressData.getInstance();
   var _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
-    _props$logisticsOptio = props.logisticsOptions,
     _props$expressInterce = props.expressInterceptData,
     expressInterceptData = _props$expressInterce === void 0 ? [] : _props$expressInterce,
     _props$required = props.required,
@@ -10026,6 +10038,64 @@ var LogisticsInterception = function LogisticsInterception(props) {
   })));
 };
 
+var LogisticsMoreInterception = function LogisticsMoreInterception(props) {
+  var required = props.required,
+    expressInterceptData = props.expressInterceptData,
+    _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
+    disabled = props.disabled,
+    onChange = props.onChange,
+    isEditing = props.isEditing;
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    changeIndex = _useState2[0],
+    setChangeIndex = _useState2[1];
+  var handleChange = function handleChange(val, index) {
+    var newValue = cloneDeep(value);
+    newValue.splice(index, 1, val);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  };
+  var handleDelete = function handleDelete(e, index) {
+    e.stopPropagation();
+    var newValue = cloneDeep(value);
+    newValue.splice(index, 1);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    setChangeIndex(0);
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, {
+    wrap: true
+  }, value.length > 1 ? (value || []).map(function (item, index) {
+    return /*#__PURE__*/React.createElement("span", {
+      style: {
+        position: 'relative',
+        color: changeIndex === index ? '#4569d4' : 'black',
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        return setChangeIndex(index);
+      }
+    }, "\u5305\u88F9".concat(index + 1), !disabled ? /*#__PURE__*/React.createElement(CloseCircleOutlined, {
+      style: {
+        position: 'absolute',
+        right: '-7px',
+        top: '-10px'
+      },
+      onClick: function onClick(e) {
+        return handleDelete(e, index);
+      }
+    }) : null);
+  }) : null), /*#__PURE__*/React.createElement(LogisticsInterception, {
+    required: required,
+    expressInterceptData: expressInterceptData,
+    value: value[changeIndex],
+    disabled: disabled,
+    isEditing: false,
+    onChange: function onChange(val) {
+      return handleChange(val, changeIndex);
+    }
+  }));
+};
+
 var LogisticsTrajectory = function LogisticsTrajectory(props) {
   var showField = props.showField,
     _props$value = props.value,
@@ -11089,15 +11159,16 @@ var columns$1 = [{
         width: 25
       }
     }, index + 1);
-  }
+  },
+  width: 100
 }, {
   dataIndex: 'goodName',
   title: '商品名称',
-  width: 200,
+  width: 250,
   ellipsis: true
 }, {
   dataIndex: 'goodNo',
-  title: '商品spu编码',
+  title: '商品SPU编码',
   width: 200,
   ellipsis: true
 }, {
@@ -11108,17 +11179,17 @@ var columns$1 = [{
 }, {
   dataIndex: 'specCount',
   title: '规格数',
-  width: 160,
+  width: 100,
   ellipsis: true
 }];
 var expandedColumns = [{
   dataIndex: 'specName',
-  title: '商品sku名称',
+  title: '商品SKU名称',
   width: 200,
   ellipsis: true
 }, {
   dataIndex: 'specNo',
-  title: '商品sku编码',
+  title: '商品SKU编码',
   width: 200,
   ellipsis: true
 }, {
@@ -11155,7 +11226,7 @@ var expandedColumns = [{
 }];
 var dateFormat = 'YYYY-MM-DD HH:mm:ss';
 var GoodsModal$3 = function GoodsModal(props, ref) {
-  var initStartTime = hooks().subtract(1, 'M');
+  var initStartTime = hooks().subtract(30, 'd');
   var initEndTime = hooks();
   useImperativeHandle(ref, function () {
     return {
@@ -11259,7 +11330,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
             _context.prev = 1;
             setLoading(true);
             formData = form.getFieldsValue();
-            startTime = ((_formData$dateTimePic = formData.dateTimePicker) === null || _formData$dateTimePic === void 0 ? void 0 : (_formData$dateTimePic2 = _formData$dateTimePic[0]) === null || _formData$dateTimePic2 === void 0 ? void 0 : (_formData$dateTimePic3 = _formData$dateTimePic2.format) === null || _formData$dateTimePic3 === void 0 ? void 0 : _formData$dateTimePic3.call(_formData$dateTimePic2, dateFormat)) || hooks().subtract(1, 'M').format(dateFormat);
+            startTime = ((_formData$dateTimePic = formData.dateTimePicker) === null || _formData$dateTimePic === void 0 ? void 0 : (_formData$dateTimePic2 = _formData$dateTimePic[0]) === null || _formData$dateTimePic2 === void 0 ? void 0 : (_formData$dateTimePic3 = _formData$dateTimePic2.format) === null || _formData$dateTimePic3 === void 0 ? void 0 : _formData$dateTimePic3.call(_formData$dateTimePic2, dateFormat)) || hooks().subtract(30, 'd').format(dateFormat);
             endTime = ((_formData$dateTimePic4 = formData.dateTimePicker) === null || _formData$dateTimePic4 === void 0 ? void 0 : (_formData$dateTimePic5 = _formData$dateTimePic4[1]) === null || _formData$dateTimePic5 === void 0 ? void 0 : (_formData$dateTimePic6 = _formData$dateTimePic5.format) === null || _formData$dateTimePic6 === void 0 ? void 0 : _formData$dateTimePic6.call(_formData$dateTimePic5, dateFormat)) || hooks().format(dateFormat);
             params = {
               // shopCode: shopCode,
@@ -11322,7 +11393,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   var onReset = function onReset() {
     form.resetFields();
     form.setFieldsValue({
-      dateTimePicker: [hooks().subtract(1, 'M'), hooks()],
+      dateTimePicker: [hooks().subtract(30, 'd'), hooks()],
       code: ''
     });
     setPageNo(function (prev) {
@@ -11370,6 +11441,8 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   var displaySelectedColumns = [{
     dataIndex: 'operation',
     title: '',
+    ellipsis: true,
+    width: 50,
     render: function render(_, record, index) {
       return /*#__PURE__*/React.createElement(DeleteOutlined, {
         onClick: function onClick() {
@@ -11380,6 +11453,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   }, {
     dataIndex: 'index',
     title: 'NO',
+    width: 100,
     render: function render(val, record, index) {
       return /*#__PURE__*/React.createElement("div", {
         style: {
@@ -11387,6 +11461,16 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
         }
       }, index + 1);
     }
+  }, {
+    dataIndex: 'goodName',
+    title: '商品名称',
+    width: 250,
+    ellipsis: true
+  }, {
+    dataIndex: 'goodNo',
+    title: "\u5546\u54C1SPU\u7F16\u7801",
+    ellipsis: true,
+    width: 200
   }];
   var expandedRowSelection = {
     fixed: true,
@@ -11463,14 +11547,17 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "code"
   }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801",
+    placeholder: "\u5546\u54C1SPU\u7F16\u7801",
     allowClear: true,
     style: {
       width: 150
     }
   })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
-    htmlType: "submit"
+    htmlType: "submit",
+    style: {
+      marginRight: '8px'
+    }
   }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
     onClick: onReset
   }, "\u91CD\u7F6E"))), /*#__PURE__*/React.createElement("div", {
@@ -11483,7 +11570,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     dataSource: goodList,
     loading: loading,
     scroll: {
-      x: true,
+      x: '100%',
       y: 250
     },
     expandable: {
@@ -11497,13 +11584,17 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
       pageSizeOptions: [],
       onChange: pageChange
     }
-  })), !!selectList.length && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, "\u5DF2\u7ECF\u9009\u62E9\u5546\u54C1\uFF08", selectList.length, "\uFF09"), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Table, {
+  })), !!selectList.length && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, "\u5DF2\u7ECF\u9009\u62E9\u5546\u54C1\uFF08", selectList.length, "\uFF09"), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '16px'
+    }
+  }, /*#__PURE__*/React.createElement(Table, {
     rowKey: 'specId',
     columns: [].concat(displaySelectedColumns, expandedColumns),
     dataSource: displaySelectList,
     pagination: false,
     scroll: {
-      x: true,
+      x: '100%',
       y: 250
     },
     style: {
@@ -11586,10 +11677,10 @@ var GoodItem$1 = function GoodItem(props) {
             width: 70
           }, {
             dataIndex: 'goodNo',
-            title: "SPU\u5546\u54C1\u7F16\u7801",
+            title: "\u5546\u54C1SPU\u7F16\u7801",
             align: 'center',
             ellipsis: true,
-            width: 100
+            width: 180
           }, {
             dataIndex: 'goodName',
             title: "".concat(text, "\u5546\u54C1\u540D\u79F0"),
@@ -11604,13 +11695,13 @@ var GoodItem$1 = function GoodItem(props) {
             width: 100
           }, {
             dataIndex: 'specNo',
-            title: "".concat(text, "sku\u7F16\u7801"),
+            title: "".concat(text, "\u5546\u54C1SKU\u7F16\u7801"),
             align: 'center',
             ellipsis: true,
-            width: 100
+            width: 180
           }, {
             dataIndex: 'specName',
-            title: "".concat(text, "sku\u540D\u79F0"),
+            title: "".concat(text, "\u5546\u54C1SKU\u540D\u79F0"),
             align: 'center',
             ellipsis: true,
             width: 250
@@ -12249,7 +12340,7 @@ var BsExchange = function BsExchange(props) {
       key: 'bsReturnGoods'
     }, other), {}, {
       disabled: disabled,
-      showChangeBtn: showChangeBtn,
+      showChangeBtn: false,
       shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
       value: item === null || item === void 0 ? void 0 : item.bsExchangeReturnGoods,
       onChange: function onChange(val) {
@@ -12524,7 +12615,7 @@ var BsReturnGoods = function BsReturnGoods(props) {
   }, other), {}, {
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn,
+    showChangeBtn: false,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value.bsReturnGoods,
     onChange: function onChange(val) {
@@ -13674,4 +13765,4 @@ var CalculationInput = function CalculationInput(props) {
   }, config === null || config === void 0 ? void 0 : config.unit));
 };
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$1 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$2 as GoodsTable, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId, WlnGoods };
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$1 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$2 as GoodsTable, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId, WlnGoods };

package/dist/index.js

@@ -527,8 +527,18 @@ function ApaasInput(props) {
   var isNumber = props.isNumber,
     replaceWarn = props.replaceWarn,
     other = _objectWithoutProperties(props, _excluded$1);
+  var handleBlur = function handleBlur(e) {
+    // 去除头尾空格
+    e.target.value = e.target.value.trim();
+    var onChange = props.onChange,
+      onBlur = props.onBlur;
+    typeof onChange === 'function' && onChange(e);
+    typeof onBlur === 'function' && onBlur(e);
+  };
   // @ts-ignore
-  return isNumber ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2({}, other)) : /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2({}, other));
+  return isNumber ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2({}, other)) : /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2(_objectSpread2({}, other), {}, {
+    onBlur: handleBlur
+  }));
 }
 
 function ApaasInputNumber(props) {
@@ -7405,11 +7415,14 @@ var Province = function Province(props) {
               workOrder: addressData
             }[type] || addressData).addressOptions || [];
             if (!(options === null || options === void 0 ? void 0 : options.length) && num < 6) {
+              getBsAddress();
               time.current = setTimeout(function () {
                 initPageSource();
               }, 1000);
             }
-            setOptions(options);
+            if (options.length) {
+              setOptions(options);
+            }
           case 4:
           case "end":
             return _context.stop();
@@ -9745,7 +9758,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
   var address = kmkfUtils.AddressData.getInstance();
   var _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
-    _props$logisticsOptio = props.logisticsOptions,
     _props$expressInterce = props.expressInterceptData,
     expressInterceptData = _props$expressInterce === void 0 ? [] : _props$expressInterce,
     _props$required = props.required,
@@ -10037,6 +10049,64 @@ var LogisticsInterception = function LogisticsInterception(props) {
   })));
 };
 
+var LogisticsMoreInterception = function LogisticsMoreInterception(props) {
+  var required = props.required,
+    expressInterceptData = props.expressInterceptData,
+    _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
+    disabled = props.disabled,
+    onChange = props.onChange,
+    isEditing = props.isEditing;
+  var _useState = React.useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    changeIndex = _useState2[0],
+    setChangeIndex = _useState2[1];
+  var handleChange = function handleChange(val, index) {
+    var newValue = lodash.cloneDeep(value);
+    newValue.splice(index, 1, val);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  };
+  var handleDelete = function handleDelete(e, index) {
+    e.stopPropagation();
+    var newValue = lodash.cloneDeep(value);
+    newValue.splice(index, 1);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    setChangeIndex(0);
+  };
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, {
+    wrap: true
+  }, value.length > 1 ? (value || []).map(function (item, index) {
+    return /*#__PURE__*/React__default['default'].createElement("span", {
+      style: {
+        position: 'relative',
+        color: changeIndex === index ? '#4569d4' : 'black',
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        return setChangeIndex(index);
+      }
+    }, "\u5305\u88F9".concat(index + 1), !disabled ? /*#__PURE__*/React__default['default'].createElement(icons.CloseCircleOutlined, {
+      style: {
+        position: 'absolute',
+        right: '-7px',
+        top: '-10px'
+      },
+      onClick: function onClick(e) {
+        return handleDelete(e, index);
+      }
+    }) : null);
+  }) : null), /*#__PURE__*/React__default['default'].createElement(LogisticsInterception, {
+    required: required,
+    expressInterceptData: expressInterceptData,
+    value: value[changeIndex],
+    disabled: disabled,
+    isEditing: false,
+    onChange: function onChange(val) {
+      return handleChange(val, changeIndex);
+    }
+  }));
+};
+
 var LogisticsTrajectory = function LogisticsTrajectory(props) {
   var showField = props.showField,
     _props$value = props.value,
@@ -11100,15 +11170,16 @@ var columns$1 = [{
         width: 25
       }
     }, index + 1);
-  }
+  },
+  width: 100
 }, {
   dataIndex: 'goodName',
   title: '商品名称',
-  width: 200,
+  width: 250,
   ellipsis: true
 }, {
   dataIndex: 'goodNo',
-  title: '商品spu编码',
+  title: '商品SPU编码',
   width: 200,
   ellipsis: true
 }, {
@@ -11119,17 +11190,17 @@ var columns$1 = [{
 }, {
   dataIndex: 'specCount',
   title: '规格数',
-  width: 160,
+  width: 100,
   ellipsis: true
 }];
 var expandedColumns = [{
   dataIndex: 'specName',
-  title: '商品sku名称',
+  title: '商品SKU名称',
   width: 200,
   ellipsis: true
 }, {
   dataIndex: 'specNo',
-  title: '商品sku编码',
+  title: '商品SKU编码',
   width: 200,
   ellipsis: true
 }, {
@@ -11166,7 +11237,7 @@ var expandedColumns = [{
 }];
 var dateFormat = 'YYYY-MM-DD HH:mm:ss';
 var GoodsModal$3 = function GoodsModal(props, ref) {
-  var initStartTime = hooks().subtract(1, 'M');
+  var initStartTime = hooks().subtract(30, 'd');
   var initEndTime = hooks();
   React.useImperativeHandle(ref, function () {
     return {
@@ -11270,7 +11341,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
             _context.prev = 1;
             setLoading(true);
             formData = form.getFieldsValue();
-            startTime = ((_formData$dateTimePic = formData.dateTimePicker) === null || _formData$dateTimePic === void 0 ? void 0 : (_formData$dateTimePic2 = _formData$dateTimePic[0]) === null || _formData$dateTimePic2 === void 0 ? void 0 : (_formData$dateTimePic3 = _formData$dateTimePic2.format) === null || _formData$dateTimePic3 === void 0 ? void 0 : _formData$dateTimePic3.call(_formData$dateTimePic2, dateFormat)) || hooks().subtract(1, 'M').format(dateFormat);
+            startTime = ((_formData$dateTimePic = formData.dateTimePicker) === null || _formData$dateTimePic === void 0 ? void 0 : (_formData$dateTimePic2 = _formData$dateTimePic[0]) === null || _formData$dateTimePic2 === void 0 ? void 0 : (_formData$dateTimePic3 = _formData$dateTimePic2.format) === null || _formData$dateTimePic3 === void 0 ? void 0 : _formData$dateTimePic3.call(_formData$dateTimePic2, dateFormat)) || hooks().subtract(30, 'd').format(dateFormat);
             endTime = ((_formData$dateTimePic4 = formData.dateTimePicker) === null || _formData$dateTimePic4 === void 0 ? void 0 : (_formData$dateTimePic5 = _formData$dateTimePic4[1]) === null || _formData$dateTimePic5 === void 0 ? void 0 : (_formData$dateTimePic6 = _formData$dateTimePic5.format) === null || _formData$dateTimePic6 === void 0 ? void 0 : _formData$dateTimePic6.call(_formData$dateTimePic5, dateFormat)) || hooks().format(dateFormat);
             params = {
               // shopCode: shopCode,
@@ -11333,7 +11404,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   var onReset = function onReset() {
     form.resetFields();
     form.setFieldsValue({
-      dateTimePicker: [hooks().subtract(1, 'M'), hooks()],
+      dateTimePicker: [hooks().subtract(30, 'd'), hooks()],
       code: ''
     });
     setPageNo(function (prev) {
@@ -11381,6 +11452,8 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   var displaySelectedColumns = [{
     dataIndex: 'operation',
     title: '',
+    ellipsis: true,
+    width: 50,
     render: function render(_, record, index) {
       return /*#__PURE__*/React__default['default'].createElement(icons.DeleteOutlined, {
         onClick: function onClick() {
@@ -11391,6 +11464,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   }, {
     dataIndex: 'index',
     title: 'NO',
+    width: 100,
     render: function render(val, record, index) {
       return /*#__PURE__*/React__default['default'].createElement("div", {
         style: {
@@ -11398,6 +11472,16 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
         }
       }, index + 1);
     }
+  }, {
+    dataIndex: 'goodName',
+    title: '商品名称',
+    width: 250,
+    ellipsis: true
+  }, {
+    dataIndex: 'goodNo',
+    title: "\u5546\u54C1SPU\u7F16\u7801",
+    ellipsis: true,
+    width: 200
   }];
   var expandedRowSelection = {
     fixed: true,
@@ -11474,14 +11558,17 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
     name: "code"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801",
+    placeholder: "\u5546\u54C1SPU\u7F16\u7801",
     allowClear: true,
     style: {
       width: 150
     }
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "primary",
-    htmlType: "submit"
+    htmlType: "submit",
+    style: {
+      marginRight: '8px'
+    }
   }, "\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     onClick: onReset
   }, "\u91CD\u7F6E"))), /*#__PURE__*/React__default['default'].createElement("div", {
@@ -11494,7 +11581,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     dataSource: goodList,
     loading: loading,
     scroll: {
-      x: true,
+      x: '100%',
       y: 250
     },
     expandable: {
@@ -11508,13 +11595,17 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
       pageSizeOptions: [],
       onChange: pageChange
     }
-  })), !!selectList.length && /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, "\u5DF2\u7ECF\u9009\u62E9\u5546\u54C1\uFF08", selectList.length, "\uFF09"), /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
+  })), !!selectList.length && /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, "\u5DF2\u7ECF\u9009\u62E9\u5546\u54C1\uFF08", selectList.length, "\uFF09"), /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      marginTop: '16px'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
     rowKey: 'specId',
     columns: [].concat(displaySelectedColumns, expandedColumns),
     dataSource: displaySelectList,
     pagination: false,
     scroll: {
-      x: true,
+      x: '100%',
       y: 250
     },
     style: {
@@ -11597,10 +11688,10 @@ var GoodItem$1 = function GoodItem(props) {
             width: 70
           }, {
             dataIndex: 'goodNo',
-            title: "SPU\u5546\u54C1\u7F16\u7801",
+            title: "\u5546\u54C1SPU\u7F16\u7801",
             align: 'center',
             ellipsis: true,
-            width: 100
+            width: 180
           }, {
             dataIndex: 'goodName',
             title: "".concat(text, "\u5546\u54C1\u540D\u79F0"),
@@ -11615,13 +11706,13 @@ var GoodItem$1 = function GoodItem(props) {
             width: 100
           }, {
             dataIndex: 'specNo',
-            title: "".concat(text, "sku\u7F16\u7801"),
+            title: "".concat(text, "\u5546\u54C1SKU\u7F16\u7801"),
             align: 'center',
             ellipsis: true,
-            width: 100
+            width: 180
           }, {
             dataIndex: 'specName',
-            title: "".concat(text, "sku\u540D\u79F0"),
+            title: "".concat(text, "\u5546\u54C1SKU\u540D\u79F0"),
             align: 'center',
             ellipsis: true,
             width: 250
@@ -12260,7 +12351,7 @@ var BsExchange = function BsExchange(props) {
       key: 'bsReturnGoods'
     }, other), {}, {
       disabled: disabled,
-      showChangeBtn: showChangeBtn,
+      showChangeBtn: false,
       shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
       value: item === null || item === void 0 ? void 0 : item.bsExchangeReturnGoods,
       onChange: function onChange(val) {
@@ -12535,7 +12626,7 @@ var BsReturnGoods = function BsReturnGoods(props) {
   }, other), {}, {
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn,
+    showChangeBtn: false,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value.bsReturnGoods,
     onChange: function onChange(val) {
@@ -13725,6 +13816,7 @@ exports.Invoice = Invoice;
 exports.JstGoods = jstGoods;
 exports.JstItemList = ItemList;
 exports.LogisticsInterception = LogisticsInterception;
+exports.LogisticsMoreInterception = LogisticsMoreInterception;
 exports.LogisticsMoreTrajectory = LogisticsMoreTrajectory;
 exports.LogisticsTrajectory = LogisticsTrajectory;
 exports.MsgStatus = MsgStatus;

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

@@ -14,7 +14,6 @@ interface LogisticsInterceptionValueType {
 }
 interface LogisticsInterceptionProps {
     value: Partial<LogisticsInterceptionValueType>;
-    logisticsOptions: any[];
     expressInterceptData: any[];
     required: boolean;
     disabled: boolean;

package/dist/src/business/LogisticsMoreInterception/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const LogisticsMoreInterception: (props: any) => React.JSX.Element;
+export default LogisticsMoreInterception;

package/dist/src/index.d.ts

@@ -32,6 +32,7 @@ export { default as Invoice } from './business/Invoice';
 export { default as Status } from './business/Status';
 export { default as Payment } from './business/Payment';
 export { default as LogisticsInterception } from './business/LogisticsInterception';
+export { default as LogisticsMoreInterception } from './business/LogisticsMoreInterception';
 export { default as LogisticsTrajectory } from './business/LogisticsTrajectory';
 export { default as LogisticsMoreTrajectory } from './business/LogisticsMoreTrajectory';
 export { default as Goods } from './common/Goods';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.24.2-beta.0",
+  "version": "0.24.2-beta.10",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,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.24.2-beta.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.24.2-beta.10",
     "ahooks": "^3.7.4",
     "kmkf-monitor": "^0.8.8",
     "lodash": "^4.17.21",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "30399e50d7f31f367632061e59ef94ca56deaf2c"
+  "gitHead": "8b0fc652b4d41aa56964a39fc7d274457a4af996"
 }