@kmkf-fe-packages/basic-components 0.24.1-alpha.1 → 0.24.1-alpha.13

package/dist/index.esm.js

@@ -1,11 +1,11 @@
 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 } from '@ant-design/icons';
+import { EyeOutlined, DeleteOutlined, CaretUpOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { AddressData, BsAddressData, toTree, request as request$1, ExpressData, uuid, LogisticsAddressData } from '@kmkf-fe-packages/kmkf-utils';
 import zhCN from 'antd/lib/locale/zh_CN';
-import { cloneDeep } from 'lodash';
+import { cloneDeep, difference, differenceWith } from 'lodash';
 import { useDebounceEffect } from 'ahooks';
 import pubsub from 'pubsub-js';
 
@@ -7437,7 +7437,9 @@ var Province = function Province(props) {
 
 var TextArea = Input.TextArea;
 var ParseLogistics = function ParseLogistics(props) {
-  var onChange = props.onChange;
+  var onChange = props.onChange,
+    _props$selfCalibratio = props.selfCalibration,
+    selfCalibration = _props$selfCalibratio === void 0 ? false : _props$selfCalibratio;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
@@ -7450,15 +7452,22 @@ var ParseLogistics = function ParseLogistics(props) {
     if (!value && !val) {
       return;
     }
+    var fullAddress = value || val;
+    var needCalibration = selfCalibration && !/1\d{10}/.test(fullAddress);
     setIsCopy(false);
     request$1({
       url: '/qy/logistics/addressAnalysis',
       method: 'post',
       data: {
-        fullAddress: value || val
+        fullAddress: needCalibration ? "".concat(fullAddress, " \u5F20\u4E09 18888888888") : fullAddress
       }
     }).then(function (res) {
       var data = res.data;
+      // 如果是通过内部校准添加的姓名和手机号，则去除
+      if (needCalibration) {
+        data.name = '';
+        data.phone = '';
+      }
       onChange === null || onChange === void 0 ? void 0 : onChange(data);
     }).catch(function (e) {
       console.log(e);
@@ -7765,6 +7774,7 @@ function ApaasAddress(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(params);
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && showIdentify && /*#__PURE__*/React.createElement(ParseLogistics, {
+    selfCalibration: true,
     onChange: handleParseLogistics
   }), /*#__PURE__*/React.createElement(Province, {
     value: value === null || value === void 0 ? void 0 : value.address,
@@ -8941,7 +8951,7 @@ var ChooseBaby = function ChooseBaby(props) {
   }));
 };
 
-var css_248z$6 = ".goodsBox.single-row {\n  max-height: 800px;\n  overflow-y: auto;\n  padding-top: 4px;\n  flex-basis: 100%;\n}\n.goodsBox.single-row .goodBox-Img.rich-item.with-pic,\n.goodsBox.single-row .goodBox-Img.rich-item.with-attr,\n.goodsBox.single-row .goodBox-Img.rich-item.with-attr.with-pic {\n  flex-basis: 100%;\n}\n.goodsBox.single-row .goodBox-Img.rich-item .right-context {\n  flex-grow: 1;\n  flex-shrink: 1;\n}\n.goodsBox.single-row .goodBox-Img.rich-item .right-context .good-item-attr {\n  flex-grow: 1;\n  flex-shrink: 1;\n  max-width: 80px;\n  width: 20px;\n  flex-basis: 20px;\n}\n.goodsBox.single-row .goodBox-Img.rich-item .right-context .ant-input {\n  flex-shrink: 1;\n  flex-grow: 1;\n  width: 20px;\n  flex-basis: 40px;\n}\n.goodBox-Img.rich-item {\n  position: relative;\n  border: 1px solid #ccc;\n  display: flex;\n  flex-basis: 80px;\n  flex-wrap: wrap;\n  margin: 0 10px 10px 0;\n  padding: 4px;\n}\n.goodBox-Img.rich-item.with-pic {\n  flex-basis: 90px;\n}\n.goodBox-Img.rich-item.with-attr {\n  flex-basis: 150px;\n}\n.goodBox-Img.rich-item.with-attr.with-pic {\n  flex-basis: 238px;\n}\n.goodBox-Img.rich-item.with-attr.with-pic .goods-imgBox {\n  margin-right: 8px;\n}\n.goodBox-Img.rich-item .good-item-attr {\n  margin-right: 6px;\n  width: 52px;\n  flex-basis: 52px;\n}\n.goodBox-Img.rich-item .goods-imgBox {\n  margin-bottom: 0;\n}\n.goodBox-Img.rich-item .right-context div {\n  display: flex;\n}\n.goodBox-Img.rich-item .right-context div:not(:first-child) {\n  margin-top: 4px;\n}\n";
+var css_248z$6 = "#goods-wrap.goodsBox.single-row {\n  max-height: 800px;\n  overflow-y: auto;\n  padding-top: 4px;\n  flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-pic,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr.with-pic {\n  flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs {\n  flex-grow: 1;\n  flex-shrink: 1;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .good-item-attr {\n  flex-grow: 1;\n  flex-shrink: 1;\n  max-width: 80px;\n  width: 20px;\n  flex-basis: 20px;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .ant-input {\n  flex-shrink: 1;\n  flex-grow: 1;\n  width: 20px;\n  flex-basis: 40px;\n}\n#goods-wrap .good-item.rich-item {\n  position: relative;\n  border: 1px solid #ccc;\n  display: flex;\n  flex-basis: 80px;\n  flex-wrap: nowrap;\n  margin: 0 10px 10px 0;\n  padding: 4px;\n}\n#goods-wrap .good-item.rich-item.with-pic {\n  flex-basis: 90px;\n}\n#goods-wrap .good-item.rich-item.with-attr {\n  flex-basis: 150px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic {\n  flex-basis: 238px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic .goods-imgBox {\n  margin-right: 8px;\n}\n#goods-wrap .good-item.rich-item .good-item-attr {\n  margin-right: 6px;\n  width: 52px;\n  flex-basis: 52px;\n}\n#goods-wrap .good-item.rich-item .good-img {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border-radius: 4px;\n  border: 1px solid #f2f3f5;\n  margin: 0 10px 0 0;\n  text-align: center;\n  background-color: #f2f3f5;\n}\n#goods-wrap .good-item.rich-item .good-attrs {\n  display: flex;\n  flex-direction: column;\n  font-size: 12px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input {\n  font-size: 12px;\n  width: 80px;\n  height: 20px;\n  padding-left: 5px;\n  padding-right: 5px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input.id-textarea {\n  width: 80px;\n  resize: none;\n  height: 45px;\n}\n#goods-wrap .good-item.rich-item .good-attrs div {\n  display: flex;\n}\n#goods-wrap .good-item.rich-item .good-attrs div:not(:first-child) {\n  margin-top: 4px;\n}\n";
 styleInject(css_248z$6);
 
 var GoodItem = function GoodItem(props) {
@@ -8953,7 +8963,7 @@ var GoodItem = function GoodItem(props) {
       imgList: []
     } : _props$value,
     _props$maxLength = props.maxLength,
-    maxLength = _props$maxLength === void 0 ? 999999999 : _props$maxLength,
+    maxLength = _props$maxLength === void 0 ? 20 : _props$maxLength,
     onChange = props.onChange,
     _props$type = props.type,
     type = _props$type === void 0 ? 2 : _props$type,
@@ -9176,13 +9186,20 @@ var GoodItem = function GoodItem(props) {
   }];
   var hasPic = headerList.includes('picUrl');
   var hasAttr = hasPic ? headerList.length > 1 : headerList.length > 0;
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", null, imgList.length === 0 ? /*#__PURE__*/React.createElement("p", {
+    className: "goods-title"
+  }, "\u6700\u591A\u6DFB\u52A0", maxLength, "\u4E2A\u5B9D\u8D1D") : /*#__PURE__*/React.createElement("p", {
+    className: "goods-uploaded-state"
+  }, "\u5DF2\u6DFB\u52A0", /*#__PURE__*/React.createElement("span", {
+    className: "goods-uploaded-count"
+  }, imgList.length), "/", maxLength, "\u4E2A\u5B9D\u8D1D"), /*#__PURE__*/React.createElement("div", {
     ref: boxRef,
+    id: "goods-wrap",
     className: "goodsBox goodsBox-item-horizontal--box".concat(isSingleRow ? ' single-row' : '')
   }, imgList === null || imgList === void 0 ? void 0 : imgList.map(function (img, index) {
     return /*#__PURE__*/React.createElement("div", {
       key: index,
-      className: "goodBox-Img rich-item".concat(hasPic ? ' with-pic' : '').concat(hasAttr ? ' with-attr' : '')
+      className: "good-item rich-item".concat(hasPic ? ' with-pic' : '').concat(hasAttr ? ' with-attr' : '')
     }, !disabled && /*#__PURE__*/React.createElement("img", {
       src: iconDelete,
       alt: "",
@@ -9191,7 +9208,7 @@ var GoodItem = function GoodItem(props) {
         handleDelete(index);
       }
     }), hasPic && /*#__PURE__*/React.createElement("div", {
-      className: "goods-imgBox",
+      className: "good-img",
       key: "".concat(img.picUrl, "-").concat(index, "-goods")
     }, img.platform !== 'taobao' ? /*#__PURE__*/React.createElement("img", {
       src: img.picUrl || defaultImg,
@@ -9205,7 +9222,7 @@ var GoodItem = function GoodItem(props) {
       className: "img",
       alt: ""
     }))), /*#__PURE__*/React.createElement("div", {
-      className: "right-context",
+      className: "good-attrs",
       key: "".concat(img.picUrl, "-").concat(index, "-context")
     }, goodItemAttrs.map(function (item) {
       return item.isShow && /*#__PURE__*/React.createElement("div", {
@@ -9254,7 +9271,7 @@ var GoodItem = function GoodItem(props) {
     ref: skuRef,
     userNick: userNick,
     type: type
-  }));
+  })));
 };
 
 var TBGoodSerial = function TBGoodSerial(props) {
@@ -10600,7 +10617,6 @@ var columns = [{
   dataIndex: 'code',
   title: '商品编码',
   with: 200,
-  // ellipsis: true,
   render: function render(val) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
@@ -10611,8 +10627,6 @@ var columns = [{
 }, {
   dataIndex: 'marketPrice',
   title: '市场价',
-  // with: 200,
-  // ellipsis: true,
   render: function render(val) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
@@ -10747,9 +10761,42 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
-    onChange: function onChange(selectedRowKeys, selectedRows, info) {
-      setSelectIds(selectedRowKeys);
-      setSelect(_toConsumableArray(selectedRows));
+    // onChange: (
+    //   selectedRowKeys: React.SetStateAction<string[]>,
+    //   selectedRows: any[],
+    //   info: any,
+    // ) => {
+    //   setSelectIds(selectedRowKeys);
+    //   setSelect([...selectedRows]);
+    // },
+    onSelect: function onSelect(record, selected) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.skuCode]));
+        setSelect([].concat(_toConsumableArray(selectList), [record]));
+      } else {
+        setSelectIds(selectIds.filter(function (t) {
+          return t !== record.skuCode;
+        }));
+        setSelect(selectList.filter(function (t) {
+          return t.skuCode !== record.skuCode;
+        }));
+      }
+    },
+    onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.skuCode;
+        }))));
+        setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
+      } else {
+        setSelectIds(difference(selectIds, changeRows.map(function (t) {
+          return t.skuCode;
+        })));
+        var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
+          return arrVal.skuCode !== othVal.skuCode;
+        });
+        setSelect(list);
+      }
     }
   };
   var initData = function initData(list) {
@@ -10837,6 +10884,91 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       });
     }
   };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record) {
+      setSelectIds(selectIds.filter(function (t) {
+        return t !== record.skuCode;
+      }));
+      setSelect(selectList.filter(function (t) {
+        return t.skuCode !== record.skuCode;
+      }));
+    };
+    var showColumns = [{
+      dataIndex: '',
+      title: "\u64CD\u4F5C",
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record) {
+        return /*#__PURE__*/React.createElement(Button, {
+          type: "link",
+          onClick: function onClick() {
+            return handleDelete(record);
+          }
+        }, "\u5220\u9664");
+      }
+    }, {
+      dataIndex: 'skuName',
+      title: '商品sku名称',
+      with: 200,
+      ellipsis: true
+    }, {
+      dataIndex: 'skuCode',
+      title: '商品sku编码',
+      with: 200,
+      ellipsis: true
+    }, {
+      dataIndex: 'name',
+      title: '商品名称',
+      with: 200,
+      ellipsis: true
+    }, {
+      dataIndex: 'goodsId',
+      title: '商品id',
+      with: 200,
+      ellipsis: true
+    }, {
+      dataIndex: 'code',
+      title: '商品编码',
+      with: 200,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement("div", {
+          style: {
+            width: '100px'
+          }
+        }, val);
+      }
+    }, {
+      dataIndex: 'marketPrice',
+      title: '市场价',
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement("div", {
+          style: {
+            width: '70px'
+          }
+        }, val);
+      }
+    }];
+    return selectList.length ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: '100%',
+        maxWidth: '850px'
+      }
+    }, /*#__PURE__*/React.createElement(Table, {
+      columns: showColumns,
+      rowKey: 'skuCode',
+      dataSource: selectList,
+      scroll: {
+        x: true,
+        y: 250
+      },
+      pagination: {
+        size: 'small',
+        total: selectIds.length,
+        pageSize: pageSize,
+        showSizeChanger: false
+      }
+    })) : null;
+  };
   return /*#__PURE__*/React.createElement(Modal, {
     title: '选择商品',
     okText: '确认',
@@ -10847,7 +10979,10 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       _onCancel();
     },
     onOk: onOk,
-    wrapClassName: "goodModal"
+    wrapClassName: "goodModal",
+    style: {
+      top: 20
+    }
   }, /*#__PURE__*/React.createElement(Form, {
     layout: "inline",
     form: form,
@@ -10918,10 +11053,20 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       total: total,
       current: pageNo,
       pageSize: pageSize,
-      pageSizeOptions: [],
+      showSizeChanger: false,
+      showQuickJumper: true,
       onChange: pageChange
     }
-  })));
+  }), /*#__PURE__*/React.createElement(Popover, {
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement;
+    },
+    content: showTable(),
+    title: "\u5DF2\u9009\u62E9".concat(selectIds.length, "\u4E2A\u5546\u54C1")
+  }, /*#__PURE__*/React.createElement(Button, {
+    danger: true,
+    type: "text"
+  }, "\u5DF2\u9009".concat(selectIds.length > 99 ? '99+' : selectIds.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null)))));
 };
 var GoodsModal$2 = /*#__PURE__*/forwardRef(GoodsModal$1);
 

package/dist/index.js

@@ -7448,7 +7448,9 @@ var Province = function Province(props) {
 
 var TextArea = antd.Input.TextArea;
 var ParseLogistics = function ParseLogistics(props) {
-  var onChange = props.onChange;
+  var onChange = props.onChange,
+    _props$selfCalibratio = props.selfCalibration,
+    selfCalibration = _props$selfCalibratio === void 0 ? false : _props$selfCalibratio;
   var _useState = React.useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
@@ -7461,15 +7463,22 @@ var ParseLogistics = function ParseLogistics(props) {
     if (!value && !val) {
       return;
     }
+    var fullAddress = value || val;
+    var needCalibration = selfCalibration && !/1\d{10}/.test(fullAddress);
     setIsCopy(false);
     kmkfUtils.request({
       url: '/qy/logistics/addressAnalysis',
       method: 'post',
       data: {
-        fullAddress: value || val
+        fullAddress: needCalibration ? "".concat(fullAddress, " \u5F20\u4E09 18888888888") : fullAddress
       }
     }).then(function (res) {
       var data = res.data;
+      // 如果是通过内部校准添加的姓名和手机号，则去除
+      if (needCalibration) {
+        data.name = '';
+        data.phone = '';
+      }
       onChange === null || onChange === void 0 ? void 0 : onChange(data);
     }).catch(function (e) {
       console.log(e);
@@ -7776,6 +7785,7 @@ function ApaasAddress(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(params);
   };
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !disabled && showIdentify && /*#__PURE__*/React__default['default'].createElement(ParseLogistics, {
+    selfCalibration: true,
     onChange: handleParseLogistics
   }), /*#__PURE__*/React__default['default'].createElement(Province, {
     value: value === null || value === void 0 ? void 0 : value.address,
@@ -8952,7 +8962,7 @@ var ChooseBaby = function ChooseBaby(props) {
   }));
 };
 
-var css_248z$6 = ".goodsBox.single-row {\n  max-height: 800px;\n  overflow-y: auto;\n  padding-top: 4px;\n  flex-basis: 100%;\n}\n.goodsBox.single-row .goodBox-Img.rich-item.with-pic,\n.goodsBox.single-row .goodBox-Img.rich-item.with-attr,\n.goodsBox.single-row .goodBox-Img.rich-item.with-attr.with-pic {\n  flex-basis: 100%;\n}\n.goodsBox.single-row .goodBox-Img.rich-item .right-context {\n  flex-grow: 1;\n  flex-shrink: 1;\n}\n.goodsBox.single-row .goodBox-Img.rich-item .right-context .good-item-attr {\n  flex-grow: 1;\n  flex-shrink: 1;\n  max-width: 80px;\n  width: 20px;\n  flex-basis: 20px;\n}\n.goodsBox.single-row .goodBox-Img.rich-item .right-context .ant-input {\n  flex-shrink: 1;\n  flex-grow: 1;\n  width: 20px;\n  flex-basis: 40px;\n}\n.goodBox-Img.rich-item {\n  position: relative;\n  border: 1px solid #ccc;\n  display: flex;\n  flex-basis: 80px;\n  flex-wrap: wrap;\n  margin: 0 10px 10px 0;\n  padding: 4px;\n}\n.goodBox-Img.rich-item.with-pic {\n  flex-basis: 90px;\n}\n.goodBox-Img.rich-item.with-attr {\n  flex-basis: 150px;\n}\n.goodBox-Img.rich-item.with-attr.with-pic {\n  flex-basis: 238px;\n}\n.goodBox-Img.rich-item.with-attr.with-pic .goods-imgBox {\n  margin-right: 8px;\n}\n.goodBox-Img.rich-item .good-item-attr {\n  margin-right: 6px;\n  width: 52px;\n  flex-basis: 52px;\n}\n.goodBox-Img.rich-item .goods-imgBox {\n  margin-bottom: 0;\n}\n.goodBox-Img.rich-item .right-context div {\n  display: flex;\n}\n.goodBox-Img.rich-item .right-context div:not(:first-child) {\n  margin-top: 4px;\n}\n";
+var css_248z$6 = "#goods-wrap.goodsBox.single-row {\n  max-height: 800px;\n  overflow-y: auto;\n  padding-top: 4px;\n  flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-pic,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr.with-pic {\n  flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs {\n  flex-grow: 1;\n  flex-shrink: 1;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .good-item-attr {\n  flex-grow: 1;\n  flex-shrink: 1;\n  max-width: 80px;\n  width: 20px;\n  flex-basis: 20px;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .ant-input {\n  flex-shrink: 1;\n  flex-grow: 1;\n  width: 20px;\n  flex-basis: 40px;\n}\n#goods-wrap .good-item.rich-item {\n  position: relative;\n  border: 1px solid #ccc;\n  display: flex;\n  flex-basis: 80px;\n  flex-wrap: nowrap;\n  margin: 0 10px 10px 0;\n  padding: 4px;\n}\n#goods-wrap .good-item.rich-item.with-pic {\n  flex-basis: 90px;\n}\n#goods-wrap .good-item.rich-item.with-attr {\n  flex-basis: 150px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic {\n  flex-basis: 238px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic .goods-imgBox {\n  margin-right: 8px;\n}\n#goods-wrap .good-item.rich-item .good-item-attr {\n  margin-right: 6px;\n  width: 52px;\n  flex-basis: 52px;\n}\n#goods-wrap .good-item.rich-item .good-img {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border-radius: 4px;\n  border: 1px solid #f2f3f5;\n  margin: 0 10px 0 0;\n  text-align: center;\n  background-color: #f2f3f5;\n}\n#goods-wrap .good-item.rich-item .good-attrs {\n  display: flex;\n  flex-direction: column;\n  font-size: 12px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input {\n  font-size: 12px;\n  width: 80px;\n  height: 20px;\n  padding-left: 5px;\n  padding-right: 5px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input.id-textarea {\n  width: 80px;\n  resize: none;\n  height: 45px;\n}\n#goods-wrap .good-item.rich-item .good-attrs div {\n  display: flex;\n}\n#goods-wrap .good-item.rich-item .good-attrs div:not(:first-child) {\n  margin-top: 4px;\n}\n";
 styleInject(css_248z$6);
 
 var GoodItem = function GoodItem(props) {
@@ -8964,7 +8974,7 @@ var GoodItem = function GoodItem(props) {
       imgList: []
     } : _props$value,
     _props$maxLength = props.maxLength,
-    maxLength = _props$maxLength === void 0 ? 999999999 : _props$maxLength,
+    maxLength = _props$maxLength === void 0 ? 20 : _props$maxLength,
     onChange = props.onChange,
     _props$type = props.type,
     type = _props$type === void 0 ? 2 : _props$type,
@@ -9187,13 +9197,20 @@ var GoodItem = function GoodItem(props) {
   }];
   var hasPic = headerList.includes('picUrl');
   var hasAttr = hasPic ? headerList.length > 1 : headerList.length > 0;
-  return /*#__PURE__*/React__default['default'].createElement("div", {
+  return /*#__PURE__*/React__default['default'].createElement("div", null, imgList.length === 0 ? /*#__PURE__*/React__default['default'].createElement("p", {
+    className: "goods-title"
+  }, "\u6700\u591A\u6DFB\u52A0", maxLength, "\u4E2A\u5B9D\u8D1D") : /*#__PURE__*/React__default['default'].createElement("p", {
+    className: "goods-uploaded-state"
+  }, "\u5DF2\u6DFB\u52A0", /*#__PURE__*/React__default['default'].createElement("span", {
+    className: "goods-uploaded-count"
+  }, imgList.length), "/", maxLength, "\u4E2A\u5B9D\u8D1D"), /*#__PURE__*/React__default['default'].createElement("div", {
     ref: boxRef,
+    id: "goods-wrap",
     className: "goodsBox goodsBox-item-horizontal--box".concat(isSingleRow ? ' single-row' : '')
   }, imgList === null || imgList === void 0 ? void 0 : imgList.map(function (img, index) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       key: index,
-      className: "goodBox-Img rich-item".concat(hasPic ? ' with-pic' : '').concat(hasAttr ? ' with-attr' : '')
+      className: "good-item rich-item".concat(hasPic ? ' with-pic' : '').concat(hasAttr ? ' with-attr' : '')
     }, !disabled && /*#__PURE__*/React__default['default'].createElement("img", {
       src: iconDelete,
       alt: "",
@@ -9202,7 +9219,7 @@ var GoodItem = function GoodItem(props) {
         handleDelete(index);
       }
     }), hasPic && /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "goods-imgBox",
+      className: "good-img",
       key: "".concat(img.picUrl, "-").concat(index, "-goods")
     }, img.platform !== 'taobao' ? /*#__PURE__*/React__default['default'].createElement("img", {
       src: img.picUrl || defaultImg,
@@ -9216,7 +9233,7 @@ var GoodItem = function GoodItem(props) {
       className: "img",
       alt: ""
     }))), /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "right-context",
+      className: "good-attrs",
       key: "".concat(img.picUrl, "-").concat(index, "-context")
     }, goodItemAttrs.map(function (item) {
       return item.isShow && /*#__PURE__*/React__default['default'].createElement("div", {
@@ -9265,7 +9282,7 @@ var GoodItem = function GoodItem(props) {
     ref: skuRef,
     userNick: userNick,
     type: type
-  }));
+  })));
 };
 
 var TBGoodSerial = function TBGoodSerial(props) {
@@ -10611,7 +10628,6 @@ var columns = [{
   dataIndex: 'code',
   title: '商品编码',
   with: 200,
-  // ellipsis: true,
   render: function render(val) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
@@ -10622,8 +10638,6 @@ var columns = [{
 }, {
   dataIndex: 'marketPrice',
   title: '市场价',
-  // with: 200,
-  // ellipsis: true,
   render: function render(val) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
@@ -10758,9 +10772,42 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
-    onChange: function onChange(selectedRowKeys, selectedRows, info) {
-      setSelectIds(selectedRowKeys);
-      setSelect(_toConsumableArray(selectedRows));
+    // onChange: (
+    //   selectedRowKeys: React.SetStateAction<string[]>,
+    //   selectedRows: any[],
+    //   info: any,
+    // ) => {
+    //   setSelectIds(selectedRowKeys);
+    //   setSelect([...selectedRows]);
+    // },
+    onSelect: function onSelect(record, selected) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.skuCode]));
+        setSelect([].concat(_toConsumableArray(selectList), [record]));
+      } else {
+        setSelectIds(selectIds.filter(function (t) {
+          return t !== record.skuCode;
+        }));
+        setSelect(selectList.filter(function (t) {
+          return t.skuCode !== record.skuCode;
+        }));
+      }
+    },
+    onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.skuCode;
+        }))));
+        setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
+      } else {
+        setSelectIds(lodash.difference(selectIds, changeRows.map(function (t) {
+          return t.skuCode;
+        })));
+        var list = lodash.differenceWith(selectList, changeRows, function (arrVal, othVal) {
+          return arrVal.skuCode !== othVal.skuCode;
+        });
+        setSelect(list);
+      }
     }
   };
   var initData = function initData(list) {
@@ -10848,6 +10895,91 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       });
     }
   };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record) {
+      setSelectIds(selectIds.filter(function (t) {
+        return t !== record.skuCode;
+      }));
+      setSelect(selectList.filter(function (t) {
+        return t.skuCode !== record.skuCode;
+      }));
+    };
+    var showColumns = [{
+      dataIndex: '',
+      title: "\u64CD\u4F5C",
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+          type: "link",
+          onClick: function onClick() {
+            return handleDelete(record);
+          }
+        }, "\u5220\u9664");
+      }
+    }, {
+      dataIndex: 'skuName',
+      title: '商品sku名称',
+      with: 200,
+      ellipsis: true
+    }, {
+      dataIndex: 'skuCode',
+      title: '商品sku编码',
+      with: 200,
+      ellipsis: true
+    }, {
+      dataIndex: 'name',
+      title: '商品名称',
+      with: 200,
+      ellipsis: true
+    }, {
+      dataIndex: 'goodsId',
+      title: '商品id',
+      with: 200,
+      ellipsis: true
+    }, {
+      dataIndex: 'code',
+      title: '商品编码',
+      with: 200,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement("div", {
+          style: {
+            width: '100px'
+          }
+        }, val);
+      }
+    }, {
+      dataIndex: 'marketPrice',
+      title: '市场价',
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement("div", {
+          style: {
+            width: '70px'
+          }
+        }, val);
+      }
+    }];
+    return selectList.length ? /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        width: '100%',
+        maxWidth: '850px'
+      }
+    }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
+      columns: showColumns,
+      rowKey: 'skuCode',
+      dataSource: selectList,
+      scroll: {
+        x: true,
+        y: 250
+      },
+      pagination: {
+        size: 'small',
+        total: selectIds.length,
+        pageSize: pageSize,
+        showSizeChanger: false
+      }
+    })) : null;
+  };
   return /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
     title: '选择商品',
     okText: '确认',
@@ -10858,7 +10990,10 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       _onCancel();
     },
     onOk: onOk,
-    wrapClassName: "goodModal"
+    wrapClassName: "goodModal",
+    style: {
+      top: 20
+    }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form, {
     layout: "inline",
     form: form,
@@ -10929,10 +11064,20 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       total: total,
       current: pageNo,
       pageSize: pageSize,
-      pageSizeOptions: [],
+      showSizeChanger: false,
+      showQuickJumper: true,
       onChange: pageChange
     }
-  })));
+  }), /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement;
+    },
+    content: showTable(),
+    title: "\u5DF2\u9009\u62E9".concat(selectIds.length, "\u4E2A\u5546\u54C1")
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    danger: true,
+    type: "text"
+  }, "\u5DF2\u9009".concat(selectIds.length > 99 ? '99+' : selectIds.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(icons.CaretUpOutlined, null)))));
 };
 var GoodsModal$2 = /*#__PURE__*/React.forwardRef(GoodsModal$1);
 

package/dist/src/common/ParseLogistics/index.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 interface ParseLogisticsProps {
+    selfCalibration?: boolean;
     onChange: (value: any) => void;
 }
 declare const ParseLogistics: (props: ParseLogisticsProps) => React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.24.1-alpha.1",
+  "version": "0.24.1-alpha.13",
   "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.1-alpha.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.24.1-alpha.4",
     "ahooks": "^3.7.4",
     "kmkf-monitor": "^0.8.8",
     "lodash": "^4.17.21",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f2f307188e76984908f2f53a1a218d8be57794b5"
+  "gitHead": "1ec9ec0c8db18680426bb57e8ef75e392a6a9bd4"
 }