@kmkf-fe-packages/basic-components 0.23.1-beta.1 → 0.23.1-beta.3

package/dist/index.esm.js

@@ -1,12 +1,13 @@
 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, WdtAddressData, request as request$1, ExpressData, LogisticsAddressData, uuid, WDT_ORDER_TYPE_MAP } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, toTree, request as request$1, ExpressData, LogisticsAddressData, uuid, WDT_ORDER_TYPE_MAP } from '@kmkf-fe-packages/kmkf-utils';
 import zhCN from 'antd/lib/locale/zh_CN';
+import { cloneDeep, difference, differenceWith } from 'lodash';
+import { useDebounceEffect } from 'ahooks';
 import pubsub from 'pubsub-js';
-import { cloneDeep } from 'lodash';
 
 function _iterableToArrayLimit(arr, i) {
   var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"];
@@ -7357,12 +7358,13 @@ function ApaasRate(props) {
   }));
 }
 
-AddressData.getInstance();
-BsAddressData.getInstance();
-WdtAddressData.getInstance();
+var addressData = AddressData.getInstance();
+var bsAddressData = BsAddressData.getInstance();
+var wdtAddressData = WdtAddressData.getInstance();
 var Province = function Province(props) {
   var _props$type = props.type,
-    type = _props$type === void 0 ? 'workOrder' : _props$type;
+    type = _props$type === void 0 ? 'workOrder' : _props$type,
+    value = props.value;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     option = _useState2[0],
@@ -7378,10 +7380,10 @@ var Province = function Province(props) {
           case 0:
             num++;
             options = ({
-              bs: BsAddressData,
-              wdt: WdtAddressData,
-              workOrder: AddressData
-            }[type] || AddressData).getInstance().addressOptions || [];
+              bs: bsAddressData,
+              wdt: wdtAddressData,
+              workOrder: addressData
+            }[type] || addressData).addressOptions || [];
             if (!(options === null || options === void 0 ? void 0 : options.length) && num < 6) {
               time.current = setTimeout(function () {
                 initPageSource();
@@ -7398,6 +7400,19 @@ var Province = function Province(props) {
       return _ref.apply(this, arguments);
     };
   }();
+  var getBsAddress = function getBsAddress() {
+    var data = JSON.parse(localStorage.getItem('bsAddressData') || '[]');
+    if (data.length) {
+      var options = toTree(data, 1);
+      setOptions(options);
+    }
+  };
+  //如果值改变地址不存在则再获取一遍
+  useEffect(function () {
+    if (value && type == 'bs' && !option.length) {
+      getBsAddress();
+    }
+  }, [value, type, option]);
   useEffect(function () {
     if (!isFirst.current) {
       initPageSource();
@@ -9623,8 +9638,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
 };
 
 var LogisticsTrajectory = function LogisticsTrajectory(props) {
-  var options = props.options,
-    showField = props.showField,
+  var showField = props.showField,
     _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
     disabled = props.disabled,
@@ -9755,6 +9769,220 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
   return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === 'SF' ? LogisticsPhone() : null, showField && showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
 };
 
+var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
+  var showField = props.showField,
+    _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
+    disabled = props.disabled,
+    onChange = props.onChange;
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    newValue = _useState2[0],
+    setNewValue = _useState2[1];
+  var _useState3 = useState(0),
+    _useState4 = _slicedToArray(_useState3, 2),
+    changeIndex = _useState4[0],
+    setChangeIndex = _useState4[1];
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    initValue = _useState6[0],
+    setInitValue = _useState6[1];
+  var _useState7 = useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    changeValue = _useState8[0],
+    setChangeValue = _useState8[1];
+  var firstRef = useRef(true);
+  var hasSave = useRef(false);
+  useEffect(function () {
+    if (value.length && firstRef.current) {
+      setInitValue(value);
+      firstRef.current = false;
+    }
+  }, [value]);
+  useDebounceEffect(function () {
+    initHandle({
+      initValue: initValue,
+      value: value
+    });
+  }, [initValue, value], {
+    wait: 500
+  });
+  var initHandle = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+      var initValue, value, hasSnapshot, initList, valueList, changeList, initSnapshotList, valueSnapshotList, hasValue, listValue, requestList, requestValues;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            initValue = _ref.initValue, value = _ref.value;
+            hasSnapshot = showField && showField.includes('snapshot');
+            initList = initValue.map(function (item) {
+              if (item.trajectoryCompany === 'SF') {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode,
+                  trajectoryPhone: item.trajectoryPhone
+                };
+              } else {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode
+                };
+              }
+            });
+            valueList = value.map(function (item) {
+              if (item.trajectoryCompany === 'SF') {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode,
+                  trajectoryPhone: item.trajectoryPhone
+                };
+              } else {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode
+                };
+              }
+            });
+            changeList = changeValue.map(function (item) {
+              if (item.trajectoryCompany === 'SF') {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode,
+                  trajectoryPhone: item.trajectoryPhone
+                };
+              } else {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode
+                };
+              }
+            }); // 1、初始值没有 传入值有请求快照
+            // 2、初始值有 传入值有 其中有不一样的请求快照
+            // 3、初始值有 传入值有 都一样的返回初始值
+            console.log('list', initList, valueList, changeList);
+            // console.log('old', initValue, value, changeValue);
+            // console.log('一样', JSON.stringify(initList) !== JSON.stringify(valueList));
+            // console.log(
+            //   '一样2',
+            //   JSON.stringify(changeList) !== JSON.stringify(valueList),
+            // );
+            if (!(!initList.length && !valueList.length)) {
+              _context.next = 8;
+              break;
+            }
+            return _context.abrupt("return");
+          case 8:
+            if (!(JSON.stringify(initList) === JSON.stringify(valueList))) {
+              _context.next = 14;
+              break;
+            }
+            initSnapshotList = initValue.reduce(function (prv, next) {
+              prv += next.trajectorySnapshot;
+              return prv;
+            }, '');
+            valueSnapshotList = value.reduce(function (prv, next) {
+              prv += next.trajectorySnapshot;
+              return prv;
+            }, '');
+            if (initSnapshotList === valueSnapshotList) {
+              hasSave.current = false;
+              setNewValue(value);
+            } else if (!hasSave.current) {
+              hasSave.current = true;
+              setNewValue(initValue);
+              onChange(initValue);
+            }
+            _context.next = 30;
+            break;
+          case 14:
+            if (!(
+            //开启了物流快照才会获取快照信息
+            hasSnapshot && JSON.stringify(initList) !== JSON.stringify(valueList) && JSON.stringify(changeList) !== JSON.stringify(valueList))) {
+              _context.next = 29;
+              break;
+            }
+            hasSave.current = false;
+            hasValue = valueList.some(function (item) {
+              return item.trajectoryCompany && item.trajectoryCode;
+            });
+            listValue = cloneDeep(value);
+            if (!hasValue) {
+              _context.next = 24;
+              break;
+            }
+            requestList = valueList.map(function (item) {
+              if (item.trajectoryCode && item.trajectoryCompany) {
+                return extendRequest('/qy/logistics/logisticsTraceSearch', {
+                  method: 'post',
+                  data: {
+                    mailNo: item.trajectoryCode,
+                    cpCode: item.trajectoryCompany,
+                    mobile: item.trajectoryPhone
+                  }
+                });
+              } else {
+                return new Promise(function (resolve) {
+                  resolve({});
+                });
+              }
+            });
+            _context.next = 22;
+            return Promise.allSettled(requestList);
+          case 22:
+            requestValues = _context.sent;
+            listValue = cloneDeep(value).map(function (item, index) {
+              var _requestValues$index, _requestValues$index$, _requestValues$index$2;
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                trajectorySnapshot: (_requestValues$index = requestValues[index]) === null || _requestValues$index === void 0 ? void 0 : (_requestValues$index$ = _requestValues$index.value) === null || _requestValues$index$ === void 0 ? void 0 : (_requestValues$index$2 = _requestValues$index$.data) === null || _requestValues$index$2 === void 0 ? void 0 : _requestValues$index$2.logisticsStatusDesc
+              });
+            });
+          case 24:
+            setChangeValue(listValue);
+            setNewValue(listValue);
+            onChange(listValue);
+            _context.next = 30;
+            break;
+          case 29:
+            setNewValue(value);
+          case 30:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function initHandle(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var handleChange = function handleChange(val, index) {
+    var newValue = cloneDeep(value);
+    newValue.splice(index, 1, val);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    setChangeValue(newValue);
+    setNewValue(newValue);
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, {
+    wrap: true
+  }, (newValue || []).map(function (item, index) {
+    return /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: changeIndex === index ? '#4569d4' : 'black',
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        return setChangeIndex(index);
+      }
+    }, "\u5305\u88F9".concat(index + 1));
+  })), /*#__PURE__*/React.createElement(LogisticsTrajectory, {
+    value: newValue[changeIndex],
+    showField: showField,
+    disabled: disabled,
+    onChange: function onChange(val) {
+      return handleChange(val, changeIndex);
+    }
+  }));
+};
+
 //组件类型的默认值
 var typeInitValueMap = {
   1: [{
@@ -10156,9 +10384,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) {
@@ -10246,6 +10507,86 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       });
     }
   };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record, index) {
+      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, index) {
+        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(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: '确认',
@@ -10327,10 +10668,17 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       total: total,
       current: pageNo,
       pageSize: pageSize,
-      pageSizeOptions: [],
+      showSizeChanger: false,
+      showQuickJumper: true,
       onChange: pageChange
     }
-  })));
+  }), /*#__PURE__*/React.createElement(Popover, {
+    content: showTable(),
+    title: "\u5DF2\u9009\u62E9".concat(selectIds.length, "\u4E2A\u5546\u54C1")
+  }, /*#__PURE__*/React.createElement(Button, {
+    danger: true,
+    type: "text"
+  }, "\u5DF2\u9009\u62E9\u5546\u54C1(".concat(selectIds.length > 99 ? '99+' : selectIds.length, ")"), /*#__PURE__*/React.createElement(CaretUpOutlined, null)))));
 };
 var GoodsModal$2 = /*#__PURE__*/forwardRef(GoodsModal$1);
 
@@ -12250,4 +12598,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, CommonSystemOrder$1 as CommonMultiStatus, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$2 as GoodsTable, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, 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, 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 };

package/dist/index.js

@@ -9,8 +9,9 @@ var request = require('umi-request');
 var reactCopyToClipboard = require('react-copy-to-clipboard');
 var kmkfUtils = require('@kmkf-fe-packages/kmkf-utils');
 var zhCN = require('antd/lib/locale/zh_CN');
-var pubsub = require('pubsub-js');
 var lodash = require('lodash');
+var ahooks = require('ahooks');
+var pubsub = require('pubsub-js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -7368,12 +7369,13 @@ function ApaasRate(props) {
   }));
 }
 
-kmkfUtils.AddressData.getInstance();
-kmkfUtils.BsAddressData.getInstance();
-kmkfUtils.WdtAddressData.getInstance();
+var addressData = kmkfUtils.AddressData.getInstance();
+var bsAddressData = kmkfUtils.BsAddressData.getInstance();
+var wdtAddressData = kmkfUtils.WdtAddressData.getInstance();
 var Province = function Province(props) {
   var _props$type = props.type,
-    type = _props$type === void 0 ? 'workOrder' : _props$type;
+    type = _props$type === void 0 ? 'workOrder' : _props$type,
+    value = props.value;
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     option = _useState2[0],
@@ -7389,10 +7391,10 @@ var Province = function Province(props) {
           case 0:
             num++;
             options = ({
-              bs: kmkfUtils.BsAddressData,
-              wdt: kmkfUtils.WdtAddressData,
-              workOrder: kmkfUtils.AddressData
-            }[type] || kmkfUtils.AddressData).getInstance().addressOptions || [];
+              bs: bsAddressData,
+              wdt: wdtAddressData,
+              workOrder: addressData
+            }[type] || addressData).addressOptions || [];
             if (!(options === null || options === void 0 ? void 0 : options.length) && num < 6) {
               time.current = setTimeout(function () {
                 initPageSource();
@@ -7409,6 +7411,19 @@ var Province = function Province(props) {
       return _ref.apply(this, arguments);
     };
   }();
+  var getBsAddress = function getBsAddress() {
+    var data = JSON.parse(localStorage.getItem('bsAddressData') || '[]');
+    if (data.length) {
+      var options = kmkfUtils.toTree(data, 1);
+      setOptions(options);
+    }
+  };
+  //如果值改变地址不存在则再获取一遍
+  React.useEffect(function () {
+    if (value && type == 'bs' && !option.length) {
+      getBsAddress();
+    }
+  }, [value, type, option]);
   React.useEffect(function () {
     if (!isFirst.current) {
       initPageSource();
@@ -9634,8 +9649,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
 };
 
 var LogisticsTrajectory = function LogisticsTrajectory(props) {
-  var options = props.options,
-    showField = props.showField,
+  var showField = props.showField,
     _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
     disabled = props.disabled,
@@ -9766,6 +9780,220 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
   return /*#__PURE__*/React__default['default'].createElement("div", null, LogisticsCompany(), LogisticsCode(), (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === 'SF' ? LogisticsPhone() : null, showField && showField.includes('snapshot') ? /*#__PURE__*/React__default['default'].createElement(LogisticsSnapshot, null) : null);
 };
 
+var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
+  var showField = props.showField,
+    _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
+    disabled = props.disabled,
+    onChange = props.onChange;
+  var _useState = React.useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    newValue = _useState2[0],
+    setNewValue = _useState2[1];
+  var _useState3 = React.useState(0),
+    _useState4 = _slicedToArray(_useState3, 2),
+    changeIndex = _useState4[0],
+    setChangeIndex = _useState4[1];
+  var _useState5 = React.useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    initValue = _useState6[0],
+    setInitValue = _useState6[1];
+  var _useState7 = React.useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    changeValue = _useState8[0],
+    setChangeValue = _useState8[1];
+  var firstRef = React.useRef(true);
+  var hasSave = React.useRef(false);
+  React.useEffect(function () {
+    if (value.length && firstRef.current) {
+      setInitValue(value);
+      firstRef.current = false;
+    }
+  }, [value]);
+  ahooks.useDebounceEffect(function () {
+    initHandle({
+      initValue: initValue,
+      value: value
+    });
+  }, [initValue, value], {
+    wait: 500
+  });
+  var initHandle = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+      var initValue, value, hasSnapshot, initList, valueList, changeList, initSnapshotList, valueSnapshotList, hasValue, listValue, requestList, requestValues;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            initValue = _ref.initValue, value = _ref.value;
+            hasSnapshot = showField && showField.includes('snapshot');
+            initList = initValue.map(function (item) {
+              if (item.trajectoryCompany === 'SF') {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode,
+                  trajectoryPhone: item.trajectoryPhone
+                };
+              } else {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode
+                };
+              }
+            });
+            valueList = value.map(function (item) {
+              if (item.trajectoryCompany === 'SF') {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode,
+                  trajectoryPhone: item.trajectoryPhone
+                };
+              } else {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode
+                };
+              }
+            });
+            changeList = changeValue.map(function (item) {
+              if (item.trajectoryCompany === 'SF') {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode,
+                  trajectoryPhone: item.trajectoryPhone
+                };
+              } else {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode
+                };
+              }
+            }); // 1、初始值没有 传入值有请求快照
+            // 2、初始值有 传入值有 其中有不一样的请求快照
+            // 3、初始值有 传入值有 都一样的返回初始值
+            console.log('list', initList, valueList, changeList);
+            // console.log('old', initValue, value, changeValue);
+            // console.log('一样', JSON.stringify(initList) !== JSON.stringify(valueList));
+            // console.log(
+            //   '一样2',
+            //   JSON.stringify(changeList) !== JSON.stringify(valueList),
+            // );
+            if (!(!initList.length && !valueList.length)) {
+              _context.next = 8;
+              break;
+            }
+            return _context.abrupt("return");
+          case 8:
+            if (!(JSON.stringify(initList) === JSON.stringify(valueList))) {
+              _context.next = 14;
+              break;
+            }
+            initSnapshotList = initValue.reduce(function (prv, next) {
+              prv += next.trajectorySnapshot;
+              return prv;
+            }, '');
+            valueSnapshotList = value.reduce(function (prv, next) {
+              prv += next.trajectorySnapshot;
+              return prv;
+            }, '');
+            if (initSnapshotList === valueSnapshotList) {
+              hasSave.current = false;
+              setNewValue(value);
+            } else if (!hasSave.current) {
+              hasSave.current = true;
+              setNewValue(initValue);
+              onChange(initValue);
+            }
+            _context.next = 30;
+            break;
+          case 14:
+            if (!(
+            //开启了物流快照才会获取快照信息
+            hasSnapshot && JSON.stringify(initList) !== JSON.stringify(valueList) && JSON.stringify(changeList) !== JSON.stringify(valueList))) {
+              _context.next = 29;
+              break;
+            }
+            hasSave.current = false;
+            hasValue = valueList.some(function (item) {
+              return item.trajectoryCompany && item.trajectoryCode;
+            });
+            listValue = lodash.cloneDeep(value);
+            if (!hasValue) {
+              _context.next = 24;
+              break;
+            }
+            requestList = valueList.map(function (item) {
+              if (item.trajectoryCode && item.trajectoryCompany) {
+                return extendRequest('/qy/logistics/logisticsTraceSearch', {
+                  method: 'post',
+                  data: {
+                    mailNo: item.trajectoryCode,
+                    cpCode: item.trajectoryCompany,
+                    mobile: item.trajectoryPhone
+                  }
+                });
+              } else {
+                return new Promise(function (resolve) {
+                  resolve({});
+                });
+              }
+            });
+            _context.next = 22;
+            return Promise.allSettled(requestList);
+          case 22:
+            requestValues = _context.sent;
+            listValue = lodash.cloneDeep(value).map(function (item, index) {
+              var _requestValues$index, _requestValues$index$, _requestValues$index$2;
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                trajectorySnapshot: (_requestValues$index = requestValues[index]) === null || _requestValues$index === void 0 ? void 0 : (_requestValues$index$ = _requestValues$index.value) === null || _requestValues$index$ === void 0 ? void 0 : (_requestValues$index$2 = _requestValues$index$.data) === null || _requestValues$index$2 === void 0 ? void 0 : _requestValues$index$2.logisticsStatusDesc
+              });
+            });
+          case 24:
+            setChangeValue(listValue);
+            setNewValue(listValue);
+            onChange(listValue);
+            _context.next = 30;
+            break;
+          case 29:
+            setNewValue(value);
+          case 30:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function initHandle(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  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);
+    setChangeValue(newValue);
+    setNewValue(newValue);
+  };
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, {
+    wrap: true
+  }, (newValue || []).map(function (item, index) {
+    return /*#__PURE__*/React__default['default'].createElement("span", {
+      style: {
+        color: changeIndex === index ? '#4569d4' : 'black',
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        return setChangeIndex(index);
+      }
+    }, "\u5305\u88F9".concat(index + 1));
+  })), /*#__PURE__*/React__default['default'].createElement(LogisticsTrajectory, {
+    value: newValue[changeIndex],
+    showField: showField,
+    disabled: disabled,
+    onChange: function onChange(val) {
+      return handleChange(val, changeIndex);
+    }
+  }));
+};
+
 //组件类型的默认值
 var typeInitValueMap = {
   1: [{
@@ -10167,9 +10395,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) {
@@ -10257,6 +10518,86 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       });
     }
   };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record, index) {
+      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, index) {
+        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(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: '确认',
@@ -10338,10 +10679,17 @@ 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, {
+    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\u62E9\u5546\u54C1(".concat(selectIds.length > 99 ? '99+' : selectIds.length, ")"), /*#__PURE__*/React__default['default'].createElement(icons.CaretUpOutlined, null)))));
 };
 var GoodsModal$2 = /*#__PURE__*/React.forwardRef(GoodsModal$1);
 
@@ -12300,6 +12648,7 @@ exports.Invoice = Invoice;
 exports.JstGoods = jstGoods;
 exports.JstItemList = ItemList;
 exports.LogisticsInterception = LogisticsInterception;
+exports.LogisticsMoreTrajectory = LogisticsMoreTrajectory;
 exports.LogisticsTrajectory = LogisticsTrajectory;
 exports.MsgStatus = MsgStatus;
 exports.ParseLogistics = ParseLogistics;

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

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

package/dist/src/index.d.ts

@@ -33,6 +33,7 @@ export { default as Status } from './business/Status';
 export { default as Payment } from './business/Payment';
 export { default as LogisticsInterception } from './business/LogisticsInterception';
 export { default as LogisticsTrajectory } from './business/LogisticsTrajectory';
+export { default as LogisticsMoreTrajectory } from './business/LogisticsMoreTrajectory';
 export { default as Goods } from './common/Goods';
 export { default as JstGoods } from './jst/Goods';
 export { default as JstItemList } from './jst/ItemList';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.23.1-beta.1",
+  "version": "0.23.1-beta.3",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,9 @@
     "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.23.1-beta.1",
+    "@kmkf-fe-packages/kmkf-utils": "^0.23.1-beta.3",
+    "ahooks": "3.7.4",
+    "kmkf-monitor": "^0.8.8",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "react-copy-to-clipboard": "^5.1.0",
@@ -45,6 +47,7 @@
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
+    "kmkf-monitor": "^0.8.8",
     "lint-staged": "^10.0.7",
     "lodash": "^4.17.21",
     "prettier": "^2.2.1",
@@ -61,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7767b6fb6b50a7f3db6e12b0d6b5bcf643e5e89e"
+  "gitHead": "0402084934b9b8e089b5d0f6b0679059653bf189"
 }