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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.esm.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import React, { useRef, useState, useEffect, forwardRef, useImperativeHandle, useMemo } from 'react';
2
2
  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';
3
- import { EyeOutlined, DeleteOutlined, CaretUpOutlined } from '@ant-design/icons';
3
+ import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } from '@ant-design/icons';
4
4
  import request, { extend as extend$1 } from 'umi-request';
5
5
  import { CopyToClipboard } from 'react-copy-to-clipboard';
6
6
  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) {
516
516
  var isNumber = props.isNumber,
517
517
  replaceWarn = props.replaceWarn,
518
518
  other = _objectWithoutProperties(props, _excluded$1);
519
+ var handleBlur = function handleBlur(e) {
520
+ // 去除头尾空格
521
+ e.target.value = e.target.value.trim();
522
+ var onChange = props.onChange,
523
+ onBlur = props.onBlur;
524
+ typeof onChange === 'function' && onChange(e);
525
+ typeof onBlur === 'function' && onBlur(e);
526
+ };
519
527
  // @ts-ignore
520
- return isNumber ? /*#__PURE__*/React.createElement(InputNumber, _objectSpread2({}, other)) : /*#__PURE__*/React.createElement(Input, _objectSpread2({}, other));
528
+ return isNumber ? /*#__PURE__*/React.createElement(InputNumber, _objectSpread2({}, other)) : /*#__PURE__*/React.createElement(Input, _objectSpread2(_objectSpread2({}, other), {}, {
529
+ onBlur: handleBlur
530
+ }));
521
531
  }
522
532
 
523
533
  function ApaasInputNumber(props) {
@@ -7394,11 +7404,14 @@ var Province = function Province(props) {
7394
7404
  workOrder: addressData
7395
7405
  }[type] || addressData).addressOptions || [];
7396
7406
  if (!(options === null || options === void 0 ? void 0 : options.length) && num < 6) {
7407
+ getBsAddress();
7397
7408
  time.current = setTimeout(function () {
7398
7409
  initPageSource();
7399
7410
  }, 1000);
7400
7411
  }
7401
- setOptions(options);
7412
+ if (options.length) {
7413
+ setOptions(options);
7414
+ }
7402
7415
  case 4:
7403
7416
  case "end":
7404
7417
  return _context.stop();
@@ -9734,7 +9747,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
9734
9747
  var address = AddressData.getInstance();
9735
9748
  var _props$value = props.value,
9736
9749
  value = _props$value === void 0 ? {} : _props$value,
9737
- _props$logisticsOptio = props.logisticsOptions,
9738
9750
  _props$expressInterce = props.expressInterceptData,
9739
9751
  expressInterceptData = _props$expressInterce === void 0 ? [] : _props$expressInterce,
9740
9752
  _props$required = props.required,
@@ -10026,6 +10038,64 @@ var LogisticsInterception = function LogisticsInterception(props) {
10026
10038
  })));
10027
10039
  };
10028
10040
 
10041
+ var LogisticsMoreInterception = function LogisticsMoreInterception(props) {
10042
+ var required = props.required,
10043
+ expressInterceptData = props.expressInterceptData,
10044
+ _props$value = props.value,
10045
+ value = _props$value === void 0 ? [] : _props$value,
10046
+ disabled = props.disabled,
10047
+ onChange = props.onChange,
10048
+ isEditing = props.isEditing;
10049
+ var _useState = useState(0),
10050
+ _useState2 = _slicedToArray(_useState, 2),
10051
+ changeIndex = _useState2[0],
10052
+ setChangeIndex = _useState2[1];
10053
+ var handleChange = function handleChange(val, index) {
10054
+ var newValue = cloneDeep(value);
10055
+ newValue.splice(index, 1, val);
10056
+ onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
10057
+ };
10058
+ var handleDelete = function handleDelete(e, index) {
10059
+ e.stopPropagation();
10060
+ var newValue = cloneDeep(value);
10061
+ newValue.splice(index, 1);
10062
+ onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
10063
+ setChangeIndex(0);
10064
+ };
10065
+ return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, {
10066
+ wrap: true
10067
+ }, value.length > 1 ? (value || []).map(function (item, index) {
10068
+ return /*#__PURE__*/React.createElement("span", {
10069
+ style: {
10070
+ position: 'relative',
10071
+ color: changeIndex === index ? '#4569d4' : 'black',
10072
+ cursor: 'pointer'
10073
+ },
10074
+ onClick: function onClick() {
10075
+ return setChangeIndex(index);
10076
+ }
10077
+ }, "\u5305\u88F9".concat(index + 1), !disabled ? /*#__PURE__*/React.createElement(CloseCircleOutlined, {
10078
+ style: {
10079
+ position: 'absolute',
10080
+ right: '-7px',
10081
+ top: '-10px'
10082
+ },
10083
+ onClick: function onClick(e) {
10084
+ return handleDelete(e, index);
10085
+ }
10086
+ }) : null);
10087
+ }) : null), /*#__PURE__*/React.createElement(LogisticsInterception, {
10088
+ required: required,
10089
+ expressInterceptData: expressInterceptData,
10090
+ value: value[changeIndex],
10091
+ disabled: disabled,
10092
+ isEditing: false,
10093
+ onChange: function onChange(val) {
10094
+ return handleChange(val, changeIndex);
10095
+ }
10096
+ }));
10097
+ };
10098
+
10029
10099
  var LogisticsTrajectory = function LogisticsTrajectory(props) {
10030
10100
  var showField = props.showField,
10031
10101
  _props$value = props.value,
@@ -11094,11 +11164,11 @@ var columns$1 = [{
11094
11164
  }, {
11095
11165
  dataIndex: 'goodName',
11096
11166
  title: '商品名称',
11097
- width: 200,
11167
+ width: 250,
11098
11168
  ellipsis: true
11099
11169
  }, {
11100
11170
  dataIndex: 'goodNo',
11101
- title: '商品spu编码',
11171
+ title: '商品SPU编码',
11102
11172
  width: 200,
11103
11173
  ellipsis: true
11104
11174
  }, {
@@ -11109,17 +11179,17 @@ var columns$1 = [{
11109
11179
  }, {
11110
11180
  dataIndex: 'specCount',
11111
11181
  title: '规格数',
11112
- width: 160,
11182
+ width: 100,
11113
11183
  ellipsis: true
11114
11184
  }];
11115
11185
  var expandedColumns = [{
11116
11186
  dataIndex: 'specName',
11117
- title: '商品sku名称',
11187
+ title: '商品SKU名称',
11118
11188
  width: 200,
11119
11189
  ellipsis: true
11120
11190
  }, {
11121
11191
  dataIndex: 'specNo',
11122
- title: '商品sku编码',
11192
+ title: '商品SKU编码',
11123
11193
  width: 200,
11124
11194
  ellipsis: true
11125
11195
  }, {
@@ -11371,6 +11441,8 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11371
11441
  var displaySelectedColumns = [{
11372
11442
  dataIndex: 'operation',
11373
11443
  title: '',
11444
+ ellipsis: true,
11445
+ width: 50,
11374
11446
  render: function render(_, record, index) {
11375
11447
  return /*#__PURE__*/React.createElement(DeleteOutlined, {
11376
11448
  onClick: function onClick() {
@@ -11381,6 +11453,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11381
11453
  }, {
11382
11454
  dataIndex: 'index',
11383
11455
  title: 'NO',
11456
+ width: 100,
11384
11457
  render: function render(val, record, index) {
11385
11458
  return /*#__PURE__*/React.createElement("div", {
11386
11459
  style: {
@@ -11388,6 +11461,16 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11388
11461
  }
11389
11462
  }, index + 1);
11390
11463
  }
11464
+ }, {
11465
+ dataIndex: 'goodName',
11466
+ title: '商品名称',
11467
+ width: 250,
11468
+ ellipsis: true
11469
+ }, {
11470
+ dataIndex: 'goodNo',
11471
+ title: "\u5546\u54C1SPU\u7F16\u7801",
11472
+ ellipsis: true,
11473
+ width: 200
11391
11474
  }];
11392
11475
  var expandedRowSelection = {
11393
11476
  fixed: true,
@@ -11464,14 +11547,17 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11464
11547
  })), /*#__PURE__*/React.createElement(Form.Item, {
11465
11548
  name: "code"
11466
11549
  }, /*#__PURE__*/React.createElement(Input, {
11467
- placeholder: "\u5546\u54C1\u7F16\u7801",
11550
+ placeholder: "\u5546\u54C1SPU\u7F16\u7801",
11468
11551
  allowClear: true,
11469
11552
  style: {
11470
11553
  width: 150
11471
11554
  }
11472
11555
  })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
11473
11556
  type: "primary",
11474
- htmlType: "submit"
11557
+ htmlType: "submit",
11558
+ style: {
11559
+ marginRight: '8px'
11560
+ }
11475
11561
  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
11476
11562
  onClick: onReset
11477
11563
  }, "\u91CD\u7F6E"))), /*#__PURE__*/React.createElement("div", {
@@ -11484,7 +11570,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11484
11570
  dataSource: goodList,
11485
11571
  loading: loading,
11486
11572
  scroll: {
11487
- x: true,
11573
+ x: '100%',
11488
11574
  y: 250
11489
11575
  },
11490
11576
  expandable: {
@@ -11498,13 +11584,17 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11498
11584
  pageSizeOptions: [],
11499
11585
  onChange: pageChange
11500
11586
  }
11501
- })), !!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, {
11587
+ })), !!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", {
11588
+ style: {
11589
+ marginTop: '16px'
11590
+ }
11591
+ }, /*#__PURE__*/React.createElement(Table, {
11502
11592
  rowKey: 'specId',
11503
11593
  columns: [].concat(displaySelectedColumns, expandedColumns),
11504
11594
  dataSource: displaySelectList,
11505
11595
  pagination: false,
11506
11596
  scroll: {
11507
- x: true,
11597
+ x: '100%',
11508
11598
  y: 250
11509
11599
  },
11510
11600
  style: {
@@ -11587,10 +11677,10 @@ var GoodItem$1 = function GoodItem(props) {
11587
11677
  width: 70
11588
11678
  }, {
11589
11679
  dataIndex: 'goodNo',
11590
- title: "SPU\u5546\u54C1\u7F16\u7801",
11680
+ title: "\u5546\u54C1SPU\u7F16\u7801",
11591
11681
  align: 'center',
11592
11682
  ellipsis: true,
11593
- width: 100
11683
+ width: 180
11594
11684
  }, {
11595
11685
  dataIndex: 'goodName',
11596
11686
  title: "".concat(text, "\u5546\u54C1\u540D\u79F0"),
@@ -11605,13 +11695,13 @@ var GoodItem$1 = function GoodItem(props) {
11605
11695
  width: 100
11606
11696
  }, {
11607
11697
  dataIndex: 'specNo',
11608
- title: "".concat(text, "sku\u7F16\u7801"),
11698
+ title: "".concat(text, "\u5546\u54C1SKU\u7F16\u7801"),
11609
11699
  align: 'center',
11610
11700
  ellipsis: true,
11611
- width: 100
11701
+ width: 180
11612
11702
  }, {
11613
11703
  dataIndex: 'specName',
11614
- title: "".concat(text, "sku\u540D\u79F0"),
11704
+ title: "".concat(text, "\u5546\u54C1SKU\u540D\u79F0"),
11615
11705
  align: 'center',
11616
11706
  ellipsis: true,
11617
11707
  width: 250
@@ -12250,7 +12340,7 @@ var BsExchange = function BsExchange(props) {
12250
12340
  key: 'bsReturnGoods'
12251
12341
  }, other), {}, {
12252
12342
  disabled: disabled,
12253
- showChangeBtn: showChangeBtn,
12343
+ showChangeBtn: false,
12254
12344
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
12255
12345
  value: item === null || item === void 0 ? void 0 : item.bsExchangeReturnGoods,
12256
12346
  onChange: function onChange(val) {
@@ -12525,7 +12615,7 @@ var BsReturnGoods = function BsReturnGoods(props) {
12525
12615
  }, other), {}, {
12526
12616
  disabled: disabled,
12527
12617
  canUpdateNumber: showChangeBtn,
12528
- showChangeBtn: showChangeBtn,
12618
+ showChangeBtn: false,
12529
12619
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
12530
12620
  value: value === null || value === void 0 ? void 0 : value.bsReturnGoods,
12531
12621
  onChange: function onChange(val) {
@@ -13675,4 +13765,4 @@ var CalculationInput = function CalculationInput(props) {
13675
13765
  }, config === null || config === void 0 ? void 0 : config.unit));
13676
13766
  };
13677
13767
 
13678
- 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 };
13768
+ 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 CHANGED
@@ -527,8 +527,18 @@ function ApaasInput(props) {
527
527
  var isNumber = props.isNumber,
528
528
  replaceWarn = props.replaceWarn,
529
529
  other = _objectWithoutProperties(props, _excluded$1);
530
+ var handleBlur = function handleBlur(e) {
531
+ // 去除头尾空格
532
+ e.target.value = e.target.value.trim();
533
+ var onChange = props.onChange,
534
+ onBlur = props.onBlur;
535
+ typeof onChange === 'function' && onChange(e);
536
+ typeof onBlur === 'function' && onBlur(e);
537
+ };
530
538
  // @ts-ignore
531
- return isNumber ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2({}, other)) : /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2({}, other));
539
+ return isNumber ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2({}, other)) : /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2(_objectSpread2({}, other), {}, {
540
+ onBlur: handleBlur
541
+ }));
532
542
  }
533
543
 
534
544
  function ApaasInputNumber(props) {
@@ -7405,11 +7415,14 @@ var Province = function Province(props) {
7405
7415
  workOrder: addressData
7406
7416
  }[type] || addressData).addressOptions || [];
7407
7417
  if (!(options === null || options === void 0 ? void 0 : options.length) && num < 6) {
7418
+ getBsAddress();
7408
7419
  time.current = setTimeout(function () {
7409
7420
  initPageSource();
7410
7421
  }, 1000);
7411
7422
  }
7412
- setOptions(options);
7423
+ if (options.length) {
7424
+ setOptions(options);
7425
+ }
7413
7426
  case 4:
7414
7427
  case "end":
7415
7428
  return _context.stop();
@@ -9745,7 +9758,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
9745
9758
  var address = kmkfUtils.AddressData.getInstance();
9746
9759
  var _props$value = props.value,
9747
9760
  value = _props$value === void 0 ? {} : _props$value,
9748
- _props$logisticsOptio = props.logisticsOptions,
9749
9761
  _props$expressInterce = props.expressInterceptData,
9750
9762
  expressInterceptData = _props$expressInterce === void 0 ? [] : _props$expressInterce,
9751
9763
  _props$required = props.required,
@@ -10037,6 +10049,64 @@ var LogisticsInterception = function LogisticsInterception(props) {
10037
10049
  })));
10038
10050
  };
10039
10051
 
10052
+ var LogisticsMoreInterception = function LogisticsMoreInterception(props) {
10053
+ var required = props.required,
10054
+ expressInterceptData = props.expressInterceptData,
10055
+ _props$value = props.value,
10056
+ value = _props$value === void 0 ? [] : _props$value,
10057
+ disabled = props.disabled,
10058
+ onChange = props.onChange,
10059
+ isEditing = props.isEditing;
10060
+ var _useState = React.useState(0),
10061
+ _useState2 = _slicedToArray(_useState, 2),
10062
+ changeIndex = _useState2[0],
10063
+ setChangeIndex = _useState2[1];
10064
+ var handleChange = function handleChange(val, index) {
10065
+ var newValue = lodash.cloneDeep(value);
10066
+ newValue.splice(index, 1, val);
10067
+ onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
10068
+ };
10069
+ var handleDelete = function handleDelete(e, index) {
10070
+ e.stopPropagation();
10071
+ var newValue = lodash.cloneDeep(value);
10072
+ newValue.splice(index, 1);
10073
+ onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
10074
+ setChangeIndex(0);
10075
+ };
10076
+ return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, {
10077
+ wrap: true
10078
+ }, value.length > 1 ? (value || []).map(function (item, index) {
10079
+ return /*#__PURE__*/React__default['default'].createElement("span", {
10080
+ style: {
10081
+ position: 'relative',
10082
+ color: changeIndex === index ? '#4569d4' : 'black',
10083
+ cursor: 'pointer'
10084
+ },
10085
+ onClick: function onClick() {
10086
+ return setChangeIndex(index);
10087
+ }
10088
+ }, "\u5305\u88F9".concat(index + 1), !disabled ? /*#__PURE__*/React__default['default'].createElement(icons.CloseCircleOutlined, {
10089
+ style: {
10090
+ position: 'absolute',
10091
+ right: '-7px',
10092
+ top: '-10px'
10093
+ },
10094
+ onClick: function onClick(e) {
10095
+ return handleDelete(e, index);
10096
+ }
10097
+ }) : null);
10098
+ }) : null), /*#__PURE__*/React__default['default'].createElement(LogisticsInterception, {
10099
+ required: required,
10100
+ expressInterceptData: expressInterceptData,
10101
+ value: value[changeIndex],
10102
+ disabled: disabled,
10103
+ isEditing: false,
10104
+ onChange: function onChange(val) {
10105
+ return handleChange(val, changeIndex);
10106
+ }
10107
+ }));
10108
+ };
10109
+
10040
10110
  var LogisticsTrajectory = function LogisticsTrajectory(props) {
10041
10111
  var showField = props.showField,
10042
10112
  _props$value = props.value,
@@ -11105,11 +11175,11 @@ var columns$1 = [{
11105
11175
  }, {
11106
11176
  dataIndex: 'goodName',
11107
11177
  title: '商品名称',
11108
- width: 200,
11178
+ width: 250,
11109
11179
  ellipsis: true
11110
11180
  }, {
11111
11181
  dataIndex: 'goodNo',
11112
- title: '商品spu编码',
11182
+ title: '商品SPU编码',
11113
11183
  width: 200,
11114
11184
  ellipsis: true
11115
11185
  }, {
@@ -11120,17 +11190,17 @@ var columns$1 = [{
11120
11190
  }, {
11121
11191
  dataIndex: 'specCount',
11122
11192
  title: '规格数',
11123
- width: 160,
11193
+ width: 100,
11124
11194
  ellipsis: true
11125
11195
  }];
11126
11196
  var expandedColumns = [{
11127
11197
  dataIndex: 'specName',
11128
- title: '商品sku名称',
11198
+ title: '商品SKU名称',
11129
11199
  width: 200,
11130
11200
  ellipsis: true
11131
11201
  }, {
11132
11202
  dataIndex: 'specNo',
11133
- title: '商品sku编码',
11203
+ title: '商品SKU编码',
11134
11204
  width: 200,
11135
11205
  ellipsis: true
11136
11206
  }, {
@@ -11382,6 +11452,8 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11382
11452
  var displaySelectedColumns = [{
11383
11453
  dataIndex: 'operation',
11384
11454
  title: '',
11455
+ ellipsis: true,
11456
+ width: 50,
11385
11457
  render: function render(_, record, index) {
11386
11458
  return /*#__PURE__*/React__default['default'].createElement(icons.DeleteOutlined, {
11387
11459
  onClick: function onClick() {
@@ -11392,6 +11464,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11392
11464
  }, {
11393
11465
  dataIndex: 'index',
11394
11466
  title: 'NO',
11467
+ width: 100,
11395
11468
  render: function render(val, record, index) {
11396
11469
  return /*#__PURE__*/React__default['default'].createElement("div", {
11397
11470
  style: {
@@ -11399,6 +11472,16 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11399
11472
  }
11400
11473
  }, index + 1);
11401
11474
  }
11475
+ }, {
11476
+ dataIndex: 'goodName',
11477
+ title: '商品名称',
11478
+ width: 250,
11479
+ ellipsis: true
11480
+ }, {
11481
+ dataIndex: 'goodNo',
11482
+ title: "\u5546\u54C1SPU\u7F16\u7801",
11483
+ ellipsis: true,
11484
+ width: 200
11402
11485
  }];
11403
11486
  var expandedRowSelection = {
11404
11487
  fixed: true,
@@ -11475,14 +11558,17 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11475
11558
  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
11476
11559
  name: "code"
11477
11560
  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
11478
- placeholder: "\u5546\u54C1\u7F16\u7801",
11561
+ placeholder: "\u5546\u54C1SPU\u7F16\u7801",
11479
11562
  allowClear: true,
11480
11563
  style: {
11481
11564
  width: 150
11482
11565
  }
11483
11566
  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
11484
11567
  type: "primary",
11485
- htmlType: "submit"
11568
+ htmlType: "submit",
11569
+ style: {
11570
+ marginRight: '8px'
11571
+ }
11486
11572
  }, "\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
11487
11573
  onClick: onReset
11488
11574
  }, "\u91CD\u7F6E"))), /*#__PURE__*/React__default['default'].createElement("div", {
@@ -11495,7 +11581,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11495
11581
  dataSource: goodList,
11496
11582
  loading: loading,
11497
11583
  scroll: {
11498
- x: true,
11584
+ x: '100%',
11499
11585
  y: 250
11500
11586
  },
11501
11587
  expandable: {
@@ -11509,13 +11595,17 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11509
11595
  pageSizeOptions: [],
11510
11596
  onChange: pageChange
11511
11597
  }
11512
- })), !!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, {
11598
+ })), !!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", {
11599
+ style: {
11600
+ marginTop: '16px'
11601
+ }
11602
+ }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
11513
11603
  rowKey: 'specId',
11514
11604
  columns: [].concat(displaySelectedColumns, expandedColumns),
11515
11605
  dataSource: displaySelectList,
11516
11606
  pagination: false,
11517
11607
  scroll: {
11518
- x: true,
11608
+ x: '100%',
11519
11609
  y: 250
11520
11610
  },
11521
11611
  style: {
@@ -11598,10 +11688,10 @@ var GoodItem$1 = function GoodItem(props) {
11598
11688
  width: 70
11599
11689
  }, {
11600
11690
  dataIndex: 'goodNo',
11601
- title: "SPU\u5546\u54C1\u7F16\u7801",
11691
+ title: "\u5546\u54C1SPU\u7F16\u7801",
11602
11692
  align: 'center',
11603
11693
  ellipsis: true,
11604
- width: 100
11694
+ width: 180
11605
11695
  }, {
11606
11696
  dataIndex: 'goodName',
11607
11697
  title: "".concat(text, "\u5546\u54C1\u540D\u79F0"),
@@ -11616,13 +11706,13 @@ var GoodItem$1 = function GoodItem(props) {
11616
11706
  width: 100
11617
11707
  }, {
11618
11708
  dataIndex: 'specNo',
11619
- title: "".concat(text, "sku\u7F16\u7801"),
11709
+ title: "".concat(text, "\u5546\u54C1SKU\u7F16\u7801"),
11620
11710
  align: 'center',
11621
11711
  ellipsis: true,
11622
- width: 100
11712
+ width: 180
11623
11713
  }, {
11624
11714
  dataIndex: 'specName',
11625
- title: "".concat(text, "sku\u540D\u79F0"),
11715
+ title: "".concat(text, "\u5546\u54C1SKU\u540D\u79F0"),
11626
11716
  align: 'center',
11627
11717
  ellipsis: true,
11628
11718
  width: 250
@@ -12261,7 +12351,7 @@ var BsExchange = function BsExchange(props) {
12261
12351
  key: 'bsReturnGoods'
12262
12352
  }, other), {}, {
12263
12353
  disabled: disabled,
12264
- showChangeBtn: showChangeBtn,
12354
+ showChangeBtn: false,
12265
12355
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
12266
12356
  value: item === null || item === void 0 ? void 0 : item.bsExchangeReturnGoods,
12267
12357
  onChange: function onChange(val) {
@@ -12536,7 +12626,7 @@ var BsReturnGoods = function BsReturnGoods(props) {
12536
12626
  }, other), {}, {
12537
12627
  disabled: disabled,
12538
12628
  canUpdateNumber: showChangeBtn,
12539
- showChangeBtn: showChangeBtn,
12629
+ showChangeBtn: false,
12540
12630
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
12541
12631
  value: value === null || value === void 0 ? void 0 : value.bsReturnGoods,
12542
12632
  onChange: function onChange(val) {
@@ -13726,6 +13816,7 @@ exports.Invoice = Invoice;
13726
13816
  exports.JstGoods = jstGoods;
13727
13817
  exports.JstItemList = ItemList;
13728
13818
  exports.LogisticsInterception = LogisticsInterception;
13819
+ exports.LogisticsMoreInterception = LogisticsMoreInterception;
13729
13820
  exports.LogisticsMoreTrajectory = LogisticsMoreTrajectory;
13730
13821
  exports.LogisticsTrajectory = LogisticsTrajectory;
13731
13822
  exports.MsgStatus = MsgStatus;
@@ -14,7 +14,6 @@ interface LogisticsInterceptionValueType {
14
14
  }
15
15
  interface LogisticsInterceptionProps {
16
16
  value: Partial<LogisticsInterceptionValueType>;
17
- logisticsOptions: any[];
18
17
  expressInterceptData: any[];
19
18
  required: boolean;
20
19
  disabled: boolean;
@@ -0,0 +1,3 @@
1
+ import React from 'react';
2
+ declare const LogisticsMoreInterception: (props: any) => React.JSX.Element;
3
+ export default LogisticsMoreInterception;
@@ -32,6 +32,7 @@ export { default as Invoice } from './business/Invoice';
32
32
  export { default as Status } from './business/Status';
33
33
  export { default as Payment } from './business/Payment';
34
34
  export { default as LogisticsInterception } from './business/LogisticsInterception';
35
+ export { default as LogisticsMoreInterception } from './business/LogisticsMoreInterception';
35
36
  export { default as LogisticsTrajectory } from './business/LogisticsTrajectory';
36
37
  export { default as LogisticsMoreTrajectory } from './business/LogisticsMoreTrajectory';
37
38
  export { default as Goods } from './common/Goods';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "0.24.2-beta.1",
3
+ "version": "0.24.2-beta.10",
4
4
  "description": "> TODO: description",
5
5
  "homepage": "",
6
6
  "license": "ISC",
@@ -20,7 +20,7 @@
20
20
  "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
21
21
  },
22
22
  "dependencies": {
23
- "@kmkf-fe-packages/kmkf-utils": "^0.24.2-beta.0",
23
+ "@kmkf-fe-packages/kmkf-utils": "^0.24.2-beta.10",
24
24
  "ahooks": "^3.7.4",
25
25
  "kmkf-monitor": "^0.8.8",
26
26
  "lodash": "^4.17.21",
@@ -64,5 +64,5 @@
64
64
  "publishConfig": {
65
65
  "access": "public"
66
66
  },
67
- "gitHead": "6814711ba1b3f235edaeb64b899e3fcd23def8f8"
67
+ "gitHead": "8b0fc652b4d41aa56964a39fc7d274457a4af996"
68
68
  }