@kmkf-fe-packages/basic-components 0.24.1-alpha.6 → 0.24.1-alpha.8

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,
@@ -10606,7 +10616,6 @@ var columns = [{
   dataIndex: 'code',
   title: '商品编码',
   with: 200,
-  // ellipsis: true,
   render: function render(val) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
@@ -10617,8 +10626,6 @@ var columns = [{
 }, {
   dataIndex: 'marketPrice',
   title: '市场价',
-  // with: 200,
-  // ellipsis: true,
   render: function render(val) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
@@ -10753,9 +10760,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) {
@@ -10843,6 +10883,86 @@ 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(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: '确认',
@@ -10924,10 +11044,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".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,
@@ -10617,7 +10627,6 @@ var columns = [{
   dataIndex: 'code',
   title: '商品编码',
   with: 200,
-  // ellipsis: true,
   render: function render(val) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
@@ -10628,8 +10637,6 @@ var columns = [{
 }, {
   dataIndex: 'marketPrice',
   title: '市场价',
-  // with: 200,
-  // ellipsis: true,
   render: function render(val) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
@@ -10764,9 +10771,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) {
@@ -10854,6 +10894,86 @@ 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(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: '确认',
@@ -10935,10 +11055,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".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.6",
+  "version": "0.24.1-alpha.8",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "705084b024bbf29506d25c40c6c259244b22602a"
+  "gitHead": "c95816485d356e428467a0a0b5b1402171662270"
 }