@kmkf-fe-packages/basic-components 2.2.39-beta.0 → 2.2.39-beta.3

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.
Files changed (3) hide show
  1. package/dist/index.esm.js +73 -43
  2. package/dist/index.js +73 -43
  3. package/package.json +3 -3
package/dist/index.esm.js CHANGED
@@ -22398,11 +22398,38 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
22398
22398
  var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
22399
22399
  onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
22400
22400
  };
22401
- var rowSelection = {
22401
+ var rowSelection = _objectSpread2({
22402
22402
  selectedRowKeys: selectedRowKeys,
22403
22403
  fixed: true,
22404
22404
  onChange: handleChangeSelectedKeys
22405
- };
22405
+ }, type === 'JST_REISSUE_GOODS' ? {
22406
+ getCheckboxProps: function getCheckboxProps(record) {
22407
+ var allSelectedGoodsSukIdList = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
22408
+ return selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.includes(item === null || item === void 0 ? void 0 : item[uniqueKey]);
22409
+ }).map(function (item) {
22410
+ return item === null || item === void 0 ? void 0 : item.skuId;
22411
+ });
22412
+ var isDisabled = allSelectedGoodsSukIdList.includes(record === null || record === void 0 ? void 0 : record.skuId) && !selectedRowKeys.includes(record === null || record === void 0 ? void 0 : record[uniqueKey]);
22413
+ return {
22414
+ disabled: isDisabled
22415
+ };
22416
+ },
22417
+ renderCell: function renderCell(_, record, __, originNode) {
22418
+ var allSelectedGoodsSukIdList = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
22419
+ return selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.includes(item === null || item === void 0 ? void 0 : item[uniqueKey]);
22420
+ }).map(function (item) {
22421
+ return item === null || item === void 0 ? void 0 : item.skuId;
22422
+ });
22423
+ var isDisabled = allSelectedGoodsSukIdList.includes(record === null || record === void 0 ? void 0 : record.skuId) && !selectedRowKeys.includes(record === null || record === void 0 ? void 0 : record[uniqueKey]);
22424
+ if (isDisabled) {
22425
+ return /*#__PURE__*/React.createElement(Tooltip, {
22426
+ title: "\u5DF2\u6DFB\u52A0\u5728\u7EC4\u4EF6\u4E2D\uFF0C\u76F8\u540C\u5546\u54C1\u4E0D\u80FD\u91CD\u590D\u9009\u62E9"
22427
+ }, originNode);
22428
+ } else {
22429
+ return originNode;
22430
+ }
22431
+ }
22432
+ } : {});
22406
22433
  var buttonTextMapping = {
22407
22434
  SKX_GOODS: '选择发货单商品',
22408
22435
  SKX_RETURN_GOODS: '选择退货单商品'
@@ -26246,8 +26273,10 @@ var typeMap$2 = {
26246
26273
  goodDetailsKey: 'items',
26247
26274
  mergeIdenticalGoods: jstMergeIdenticalGoods,
26248
26275
  uniqueKey: 'uuid',
26249
- isShowSelectTradeGoods: true
26276
+ isShowSelectTradeGoods: true,
26277
+ isSelectTradeGoodsMerge: true //为true时，选择订单商品时，合并相同商品
26250
26278
  },
26279
+
26251
26280
  JST_RETURN_GOODS: {
26252
26281
  compType: '退货',
26253
26282
  key: 'jstReturnGoods',
@@ -26305,7 +26334,7 @@ var typeMap$2 = {
26305
26334
  }
26306
26335
  };
26307
26336
  var PublicReissue = function PublicReissue(props) {
26308
- var _typeMap$type34, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _value$typeMap$type$s8, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _value$typeMap$type$s9, _typeMap$type51, _typeMap$type52, _typeMap$type53, _typeMap$type54;
26337
+ var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$type53, _typeMap$type54, _typeMap$type55, _typeMap$type56;
26309
26338
  var value = props.value,
26310
26339
  onChange = props.onChange,
26311
26340
  _props$reasonList = props.reasonList,
@@ -26422,7 +26451,7 @@ var PublicReissue = function PublicReissue(props) {
26422
26451
  }))));
26423
26452
  };
26424
26453
  var getGoodDetails = function getGoodDetails(_ref4) {
26425
- var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22;
26454
+ var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22, _typeMap$type23, _typeMap$type24;
26426
26455
  var mode = _ref4.mode,
26427
26456
  sysOrderNo = _ref4.sysOrderNo,
26428
26457
  _ref4$isAllOrders = _ref4.isAllOrders,
@@ -26450,7 +26479,8 @@ var PublicReissue = function PublicReissue(props) {
26450
26479
  var _order$typeMap$type$g;
26451
26480
  return order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length;
26452
26481
  });
26453
- var goodDetails = hasGoodDetails ? !isAllOrders && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle(orders, orderRest)) : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.updateGoodsHandle(orders, orderRest) : [];
26482
+ console.log(type, orders, (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle(orders, orderRest));
26483
+ var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.updateGoodsHandle(orders, orderRest)) : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.updateGoodsHandle(orders, orderRest) : [];
26454
26484
  var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
26455
26485
  var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
26456
26486
  return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
@@ -26458,30 +26488,30 @@ var PublicReissue = function PublicReissue(props) {
26458
26488
  return list;
26459
26489
  };
26460
26490
  var changeGoodHandle = function changeGoodHandle(val) {
26461
- var _typeMap$type23;
26491
+ var _typeMap$type25;
26462
26492
  var newValue = _objectSpread2({}, value);
26463
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)] = val || [];
26493
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)] = val || [];
26464
26494
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
26465
26495
  };
26466
26496
  var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
26467
- var _typeMap$type24, _typeMap$type25, _value$typeMap$type$t2, _typeMap$type30, _value$typeMap$type$t3, _typeMap$type32;
26497
+ var _typeMap$type26, _typeMap$type27, _value$typeMap$type$t2, _typeMap$type32, _value$typeMap$type$t3, _typeMap$type34;
26468
26498
  var newValue = _objectSpread2({}, value);
26469
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo)] = val;
26470
- if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderBillType) {
26471
- var _value$typeMap$type$s7, _typeMap$type26, _typeMap$type28, _typeMap$type29;
26472
- var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
26499
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo)] = val;
26500
+ if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderBillType) {
26501
+ var _value$typeMap$type$s7, _typeMap$type28, _typeMap$type30, _typeMap$type31;
26502
+ var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
26473
26503
  var targetOrder = val && orders.find(function (oItem) {
26474
- var _typeMap$type27;
26475
- return oItem[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.oIdKey] === val;
26504
+ var _typeMap$type29;
26505
+ return oItem[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.oIdKey] === val;
26476
26506
  });
26477
- newValue[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.orderTypeKey];
26507
+ newValue[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.orderTypeKey];
26478
26508
  }
26479
- if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
26480
- var _typeMap$type31;
26481
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)] = [];
26482
- } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
26509
+ if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
26483
26510
  var _typeMap$type33;
26484
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)] = getGoodDetails({
26511
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)] = [];
26512
+ } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
26513
+ var _typeMap$type35;
26514
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key)] = getGoodDetails({
26485
26515
  mode: isStrict,
26486
26516
  sysOrderNo: val
26487
26517
  });
@@ -26489,27 +26519,27 @@ var PublicReissue = function PublicReissue(props) {
26489
26519
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue, 'systemOrder');
26490
26520
  };
26491
26521
  //显示选择商品按钮
26492
- var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.systemOrderNo]);
26522
+ var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.systemOrderNo]);
26493
26523
  var selectedGoodsChange = useCallback(function (skuList) {
26494
- var _typeMap$type35, _typeMap$type36, _typeMap$type37, _uniqBy, _typeMap$type38;
26524
+ var _typeMap$type37, _typeMap$type38, _typeMap$type39, _uniqBy, _typeMap$type40;
26495
26525
  var newValue = _objectSpread2({}, value);
26496
26526
  // 原订单商品
26497
26527
  var originTradeGoodList = getGoodDetails({
26498
26528
  mode: isStrict,
26499
- isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.isShowSelectTradeGoods
26529
+ isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.isShowSelectTradeGoods
26500
26530
  }) || [];
26501
26531
  // 当前选中的所有商品【包含了原订单+商品库】
26502
- var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.key)]) || [];
26503
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
26504
- var _typeMap$type39;
26505
- return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.uniqueKey) || 'uuid']);
26532
+ var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)]) || [];
26533
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
26534
+ var _typeMap$type41;
26535
+ return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.uniqueKey) || 'uuid']);
26506
26536
  });
26507
26537
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
26508
- }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.key)], isStrict]);
26538
+ }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.key)], isStrict]);
26509
26539
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
26510
26540
  gutter: 8,
26511
26541
  wrap: true,
26512
- id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.key) || "".concat(Date.now())
26542
+ id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.key) || "".concat(Date.now())
26513
26543
  }, /*#__PURE__*/React.createElement(Col, {
26514
26544
  className: "gutter-row",
26515
26545
  xs: {
@@ -26525,12 +26555,12 @@ var PublicReissue = function PublicReissue(props) {
26525
26555
  },
26526
26556
  disabled: disabled,
26527
26557
  allowClear: false,
26528
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.systemOrderNo)],
26558
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrderNo)],
26529
26559
  onChange: function onChange(val) {
26530
26560
  return changeSystemOrderHandle(val);
26531
26561
  },
26532
- placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.compType) || '', "\u7CFB\u7EDF\u5355")
26533
- }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
26562
+ placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.compType) || '', "\u7CFB\u7EDF\u5355")
26563
+ }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
26534
26564
  return /*#__PURE__*/React.createElement(Select.Option, {
26535
26565
  key: item[typeMap$2[type].oIdKey],
26536
26566
  value: item[typeMap$2[type].oIdKey],
@@ -26552,11 +26582,11 @@ var PublicReissue = function PublicReissue(props) {
26552
26582
  disabled: isSettingConfig ? !isSettingConfig : disabled,
26553
26583
  allowClear: false,
26554
26584
  options: reasonList,
26555
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.typeName)],
26585
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.typeName)],
26556
26586
  onChange: function onChange(val) {
26557
26587
  return changeTypeHandle(val);
26558
26588
  }
26559
- })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React.createElement(Col, {
26589
+ })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React.createElement(Col, {
26560
26590
  className: "gutter-row",
26561
26591
  xs: {
26562
26592
  span: 11
@@ -26565,7 +26595,7 @@ var PublicReissue = function PublicReissue(props) {
26565
26595
  span: 6
26566
26596
  }
26567
26597
  }, /*#__PURE__*/React.createElement(Input, {
26568
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.systemOrderBillType)],
26598
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.systemOrderBillType)],
26569
26599
  disabled: disabled,
26570
26600
  readOnly: true
26571
26601
  }))), /*#__PURE__*/React.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
@@ -26576,25 +26606,25 @@ var PublicReissue = function PublicReissue(props) {
26576
26606
  canUpdateNumber: showChangeBtn,
26577
26607
  hasSelectedSystemOrder: showChangeBtn,
26578
26608
  // showChangeBtn={showChangeBtn || typeMap?.[type]?.isShowSelectTradeGoods}
26579
- alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.alwaysShowChooseErpGoodsBtn,
26609
+ alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.alwaysShowChooseErpGoodsBtn,
26580
26610
  // showErpGoodsBtn={typeMap?.[type]?.showErpGoodsBtn}
26581
26611
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
26582
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.key)],
26612
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.key)],
26583
26613
  onChange: function onChange(val) {
26584
26614
  return changeGoodHandle(val);
26585
26615
  },
26586
26616
  onModeChange: handleModeChange,
26587
26617
  showModeBtn: false,
26588
26618
  isStrict: isStrict,
26589
- isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.isShowSelectTradeGoods,
26590
- systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
26591
- selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.systemOrderNo)]] : [],
26619
+ isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.isShowSelectTradeGoods,
26620
+ systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
26621
+ selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.systemOrderNo)]] : [],
26592
26622
  tradeGoods: {
26593
26623
  originDataSource: getGoodDetails({
26594
26624
  mode: isStrict,
26595
- isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.isShowSelectTradeGoods
26625
+ isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.isShowSelectTradeGoods
26596
26626
  }),
26597
- uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.uniqueKey) || 'uuid',
26627
+ uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.uniqueKey) || 'uuid',
26598
26628
  selectedGoodsChange: selectedGoodsChange
26599
26629
  }
26600
26630
  })));
package/dist/index.js CHANGED
@@ -22413,11 +22413,38 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
22413
22413
  var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
22414
22414
  onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
22415
22415
  };
22416
- var rowSelection = {
22416
+ var rowSelection = _objectSpread2({
22417
22417
  selectedRowKeys: selectedRowKeys,
22418
22418
  fixed: true,
22419
22419
  onChange: handleChangeSelectedKeys
22420
- };
22420
+ }, type === 'JST_REISSUE_GOODS' ? {
22421
+ getCheckboxProps: function getCheckboxProps(record) {
22422
+ var allSelectedGoodsSukIdList = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
22423
+ return selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.includes(item === null || item === void 0 ? void 0 : item[uniqueKey]);
22424
+ }).map(function (item) {
22425
+ return item === null || item === void 0 ? void 0 : item.skuId;
22426
+ });
22427
+ var isDisabled = allSelectedGoodsSukIdList.includes(record === null || record === void 0 ? void 0 : record.skuId) && !selectedRowKeys.includes(record === null || record === void 0 ? void 0 : record[uniqueKey]);
22428
+ return {
22429
+ disabled: isDisabled
22430
+ };
22431
+ },
22432
+ renderCell: function renderCell(_, record, __, originNode) {
22433
+ var allSelectedGoodsSukIdList = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
22434
+ return selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.includes(item === null || item === void 0 ? void 0 : item[uniqueKey]);
22435
+ }).map(function (item) {
22436
+ return item === null || item === void 0 ? void 0 : item.skuId;
22437
+ });
22438
+ var isDisabled = allSelectedGoodsSukIdList.includes(record === null || record === void 0 ? void 0 : record.skuId) && !selectedRowKeys.includes(record === null || record === void 0 ? void 0 : record[uniqueKey]);
22439
+ if (isDisabled) {
22440
+ return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
22441
+ title: "\u5DF2\u6DFB\u52A0\u5728\u7EC4\u4EF6\u4E2D\uFF0C\u76F8\u540C\u5546\u54C1\u4E0D\u80FD\u91CD\u590D\u9009\u62E9"
22442
+ }, originNode);
22443
+ } else {
22444
+ return originNode;
22445
+ }
22446
+ }
22447
+ } : {});
22421
22448
  var buttonTextMapping = {
22422
22449
  SKX_GOODS: '选择发货单商品',
22423
22450
  SKX_RETURN_GOODS: '选择退货单商品'
@@ -26261,8 +26288,10 @@ var typeMap$2 = {
26261
26288
  goodDetailsKey: 'items',
26262
26289
  mergeIdenticalGoods: kmkfUtils.jstMergeIdenticalGoods,
26263
26290
  uniqueKey: 'uuid',
26264
- isShowSelectTradeGoods: true
26291
+ isShowSelectTradeGoods: true,
26292
+ isSelectTradeGoodsMerge: true //为true时，选择订单商品时，合并相同商品
26265
26293
  },
26294
+
26266
26295
  JST_RETURN_GOODS: {
26267
26296
  compType: '退货',
26268
26297
  key: 'jstReturnGoods',
@@ -26320,7 +26349,7 @@ var typeMap$2 = {
26320
26349
  }
26321
26350
  };
26322
26351
  var PublicReissue = function PublicReissue(props) {
26323
- var _typeMap$type34, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _value$typeMap$type$s8, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _value$typeMap$type$s9, _typeMap$type51, _typeMap$type52, _typeMap$type53, _typeMap$type54;
26352
+ var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$type53, _typeMap$type54, _typeMap$type55, _typeMap$type56;
26324
26353
  var value = props.value,
26325
26354
  onChange = props.onChange,
26326
26355
  _props$reasonList = props.reasonList,
@@ -26437,7 +26466,7 @@ var PublicReissue = function PublicReissue(props) {
26437
26466
  }))));
26438
26467
  };
26439
26468
  var getGoodDetails = function getGoodDetails(_ref4) {
26440
- var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22;
26469
+ var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22, _typeMap$type23, _typeMap$type24;
26441
26470
  var mode = _ref4.mode,
26442
26471
  sysOrderNo = _ref4.sysOrderNo,
26443
26472
  _ref4$isAllOrders = _ref4.isAllOrders,
@@ -26465,7 +26494,8 @@ var PublicReissue = function PublicReissue(props) {
26465
26494
  var _order$typeMap$type$g;
26466
26495
  return order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length;
26467
26496
  });
26468
- var goodDetails = hasGoodDetails ? !isAllOrders && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle(orders, orderRest)) : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.updateGoodsHandle(orders, orderRest) : [];
26497
+ console.log(type, orders, (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle(orders, orderRest));
26498
+ var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.updateGoodsHandle(orders, orderRest)) : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.updateGoodsHandle(orders, orderRest) : [];
26469
26499
  var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
26470
26500
  var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
26471
26501
  return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
@@ -26473,30 +26503,30 @@ var PublicReissue = function PublicReissue(props) {
26473
26503
  return list;
26474
26504
  };
26475
26505
  var changeGoodHandle = function changeGoodHandle(val) {
26476
- var _typeMap$type23;
26506
+ var _typeMap$type25;
26477
26507
  var newValue = _objectSpread2({}, value);
26478
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)] = val || [];
26508
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)] = val || [];
26479
26509
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
26480
26510
  };
26481
26511
  var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
26482
- var _typeMap$type24, _typeMap$type25, _value$typeMap$type$t2, _typeMap$type30, _value$typeMap$type$t3, _typeMap$type32;
26512
+ var _typeMap$type26, _typeMap$type27, _value$typeMap$type$t2, _typeMap$type32, _value$typeMap$type$t3, _typeMap$type34;
26483
26513
  var newValue = _objectSpread2({}, value);
26484
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo)] = val;
26485
- if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderBillType) {
26486
- var _value$typeMap$type$s7, _typeMap$type26, _typeMap$type28, _typeMap$type29;
26487
- var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
26514
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo)] = val;
26515
+ if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderBillType) {
26516
+ var _value$typeMap$type$s7, _typeMap$type28, _typeMap$type30, _typeMap$type31;
26517
+ var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
26488
26518
  var targetOrder = val && orders.find(function (oItem) {
26489
- var _typeMap$type27;
26490
- return oItem[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.oIdKey] === val;
26519
+ var _typeMap$type29;
26520
+ return oItem[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.oIdKey] === val;
26491
26521
  });
26492
- newValue[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.orderTypeKey];
26522
+ newValue[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.orderTypeKey];
26493
26523
  }
26494
- if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
26495
- var _typeMap$type31;
26496
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)] = [];
26497
- } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
26524
+ if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
26498
26525
  var _typeMap$type33;
26499
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)] = getGoodDetails({
26526
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)] = [];
26527
+ } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
26528
+ var _typeMap$type35;
26529
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key)] = getGoodDetails({
26500
26530
  mode: isStrict,
26501
26531
  sysOrderNo: val
26502
26532
  });
@@ -26504,27 +26534,27 @@ var PublicReissue = function PublicReissue(props) {
26504
26534
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue, 'systemOrder');
26505
26535
  };
26506
26536
  //显示选择商品按钮
26507
- var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.systemOrderNo]);
26537
+ var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.systemOrderNo]);
26508
26538
  var selectedGoodsChange = React.useCallback(function (skuList) {
26509
- var _typeMap$type35, _typeMap$type36, _typeMap$type37, _uniqBy, _typeMap$type38;
26539
+ var _typeMap$type37, _typeMap$type38, _typeMap$type39, _uniqBy, _typeMap$type40;
26510
26540
  var newValue = _objectSpread2({}, value);
26511
26541
  // 原订单商品
26512
26542
  var originTradeGoodList = getGoodDetails({
26513
26543
  mode: isStrict,
26514
- isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.isShowSelectTradeGoods
26544
+ isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.isShowSelectTradeGoods
26515
26545
  }) || [];
26516
26546
  // 当前选中的所有商品【包含了原订单+商品库】
26517
- var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.key)]) || [];
26518
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
26519
- var _typeMap$type39;
26520
- return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.uniqueKey) || 'uuid']);
26547
+ var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)]) || [];
26548
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
26549
+ var _typeMap$type41;
26550
+ return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.uniqueKey) || 'uuid']);
26521
26551
  });
26522
26552
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
26523
- }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.key)], isStrict]);
26553
+ }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.key)], isStrict]);
26524
26554
  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
26525
26555
  gutter: 8,
26526
26556
  wrap: true,
26527
- id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.key) || "".concat(Date.now())
26557
+ id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.key) || "".concat(Date.now())
26528
26558
  }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
26529
26559
  className: "gutter-row",
26530
26560
  xs: {
@@ -26540,12 +26570,12 @@ var PublicReissue = function PublicReissue(props) {
26540
26570
  },
26541
26571
  disabled: disabled,
26542
26572
  allowClear: false,
26543
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.systemOrderNo)],
26573
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrderNo)],
26544
26574
  onChange: function onChange(val) {
26545
26575
  return changeSystemOrderHandle(val);
26546
26576
  },
26547
- placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.compType) || '', "\u7CFB\u7EDF\u5355")
26548
- }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
26577
+ placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.compType) || '', "\u7CFB\u7EDF\u5355")
26578
+ }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
26549
26579
  return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
26550
26580
  key: item[typeMap$2[type].oIdKey],
26551
26581
  value: item[typeMap$2[type].oIdKey],
@@ -26567,11 +26597,11 @@ var PublicReissue = function PublicReissue(props) {
26567
26597
  disabled: isSettingConfig ? !isSettingConfig : disabled,
26568
26598
  allowClear: false,
26569
26599
  options: reasonList,
26570
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.typeName)],
26600
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.typeName)],
26571
26601
  onChange: function onChange(val) {
26572
26602
  return changeTypeHandle(val);
26573
26603
  }
26574
- })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
26604
+ })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
26575
26605
  className: "gutter-row",
26576
26606
  xs: {
26577
26607
  span: 11
@@ -26580,7 +26610,7 @@ var PublicReissue = function PublicReissue(props) {
26580
26610
  span: 6
26581
26611
  }
26582
26612
  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
26583
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.systemOrderBillType)],
26613
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.systemOrderBillType)],
26584
26614
  disabled: disabled,
26585
26615
  readOnly: true
26586
26616
  }))), /*#__PURE__*/React__default['default'].createElement(GoodItem$1, _objectSpread2(_objectSpread2({
@@ -26591,25 +26621,25 @@ var PublicReissue = function PublicReissue(props) {
26591
26621
  canUpdateNumber: showChangeBtn,
26592
26622
  hasSelectedSystemOrder: showChangeBtn,
26593
26623
  // showChangeBtn={showChangeBtn || typeMap?.[type]?.isShowSelectTradeGoods}
26594
- alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.alwaysShowChooseErpGoodsBtn,
26624
+ alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.alwaysShowChooseErpGoodsBtn,
26595
26625
  // showErpGoodsBtn={typeMap?.[type]?.showErpGoodsBtn}
26596
26626
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
26597
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.key)],
26627
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.key)],
26598
26628
  onChange: function onChange(val) {
26599
26629
  return changeGoodHandle(val);
26600
26630
  },
26601
26631
  onModeChange: handleModeChange,
26602
26632
  showModeBtn: false,
26603
26633
  isStrict: isStrict,
26604
- isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.isShowSelectTradeGoods,
26605
- systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
26606
- selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.systemOrderNo)]] : [],
26634
+ isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.isShowSelectTradeGoods,
26635
+ systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
26636
+ selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.systemOrderNo)]] : [],
26607
26637
  tradeGoods: {
26608
26638
  originDataSource: getGoodDetails({
26609
26639
  mode: isStrict,
26610
- isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.isShowSelectTradeGoods
26640
+ isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.isShowSelectTradeGoods
26611
26641
  }),
26612
- uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.uniqueKey) || 'uuid',
26642
+ uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.uniqueKey) || 'uuid',
26613
26643
  selectedGoodsChange: selectedGoodsChange
26614
26644
  }
26615
26645
  })));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "2.2.39-beta.0",
3
+ "version": "2.2.39-beta.3",
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": "2.2.39-beta.0",
23
+ "@kmkf-fe-packages/kmkf-utils": "2.2.39-beta.3",
24
24
  "ahooks": "^3.7.4",
25
25
  "ali-react-table": "2.6.1",
26
26
  "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
66
66
  "publishConfig": {
67
67
  "access": "public"
68
68
  },
69
- "gitHead": "9017c5c2ff27a176e9ff269593336782f990383b"
69
+ "gitHead": "cbac7a423266d326572ff12c5b49a5dc915e552a"
70
70
  }