@kmkf-fe-packages/basic-components 2.2.31-beta.25 → 2.2.32

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 (5) hide show
  1. package/README.md +1 -1
  2. package/dist/index.esm.js +16 -42
  3. package/dist/index.js +16 -42
  4. package/dist/src/apaas/SubForm/index.d.ts +1 -1
  5. package/package.json +3 -3
package/README.md CHANGED
@@ -19,4 +19,4 @@ yarn start
19
19
  - config 公共方法
20
20
  - assets 静态资源
21
21
 
22
- 1111111
22
+ 111111
package/dist/index.esm.js CHANGED
@@ -8099,8 +8099,6 @@ var updateWorkTypeKeys = {
8099
8099
  BS_DEPOSIT: 'bsDeposit',
8100
8100
  NEW_PAYMENT_STATUS: 'newPaymentStatus',
8101
8101
  BUSINESS_ORDER_NO: 'businessOrderNo',
8102
- REPAIR_ORDER_SN: 'repairOrderSn',
8103
- REPAIR_ORDER_ID: 'repairOrderId',
8104
8102
  PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
8105
8103
  ACTUAL_RECEIPT_PAYMENT: 'actualReceiptPayment',
8106
8104
  WDT_SHOP: 'shopCode'
@@ -8580,10 +8578,6 @@ var processCallBackStatus = function processCallBackStatus(getValue) {
8580
8578
  RETURN_EXCHANGE_GOODS_REVIEW_STATUS: {
8581
8579
  status: 'returnExchangeGoodsReviewStatusValue',
8582
8580
  reason: 'returnExchangeGoodsReviewStatusReason'
8583
- },
8584
- REPAIR_ORDER_STATUS: {
8585
- status: 'repairOrderStatusValue',
8586
- reason: 'repairOrderStatusReason'
8587
8581
  }
8588
8582
  };
8589
8583
  return _defineProperty({}, nex.uniqueKey, {
@@ -9348,7 +9342,6 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9348
9342
  AGREE_RETURN_GOODS_STATUS: processCallBackStatus,
9349
9343
  REJECT_RETURN_GOODS_STATUS: processCallBackStatus,
9350
9344
  RETURN_EXCHANGE_GOODS_REVIEW_STATUS: processCallBackStatus,
9351
- REPAIR_ORDER_STATUS: processCallBackStatus,
9352
9345
  RETURN_GOODS_STATUS: processSceneStatus,
9353
9346
  EXCHANGE_STATUS: processSceneStatus,
9354
9347
  WAREHOUSING_STATUS: processSceneStatus,
@@ -9428,8 +9421,6 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9428
9421
  BS_DEPOSIT: processSingleField,
9429
9422
  NEW_PAYMENT_STATUS: processSingleField,
9430
9423
  BUSINESS_ORDER_NO: processSingleField,
9431
- REPAIR_ORDER_SN: processSingleField,
9432
- REPAIR_ORDER_ID: processSingleField,
9433
9424
  PAYMENT_VOUCHER_CODE: processSingleField,
9434
9425
  BS_E3_REISSUE_GOODS: processBsE3ReissueGoods(templateColumns),
9435
9426
  ACTUAL_RECEIPT_PAYMENT: processSingleField,
@@ -10005,8 +9996,8 @@ var SubForm = function SubForm(props) {
10005
9996
  tableHeader = props.tableHeader,
10006
9997
  disabled = props.disabled,
10007
9998
  platform = props.platform,
10008
- maxCount = props.maxCount,
10009
- manual = props.manual;
9999
+ manual = props.manual,
10000
+ maxCount = props.maxCount;
10010
10001
  var ref = useRef(null);
10011
10002
  var isRequest = useRef(false);
10012
10003
  var _useState = useState(false),
@@ -13448,7 +13439,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
13448
13439
  if (disabled) {
13449
13440
  return;
13450
13441
  }
13451
- if (['KYE', 'SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
13442
+ if (['SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
13452
13443
  return;
13453
13444
  } else if (!(newCompany && trajectoryCode)) {
13454
13445
  return;
@@ -13584,7 +13575,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
13584
13575
  value: value === null || value === void 0 ? void 0 : value.trajectorySnapshot
13585
13576
  });
13586
13577
  };
13587
- return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), ['SF', 'ZTO', 'KYE'].includes(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? LogisticsPhone(value === null || value === void 0 ? void 0 : value.trajectoryCompany) : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
13578
+ return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), ['SF', 'ZTO'].includes(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? LogisticsPhone(value === null || value === void 0 ? void 0 : value.trajectoryCompany) : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
13588
13579
  };
13589
13580
 
13590
13581
  var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
@@ -15956,7 +15947,6 @@ var getTableData$2 = function getTableData(_ref, formData) {
15956
15947
  var current = _ref.current,
15957
15948
  pageSize = _ref.pageSize;
15958
15949
  var data = {
15959
- goodShortName: formData.goodShortName || null,
15960
15950
  goodNo: formData.goodNo || null,
15961
15951
  goodName: formData.goodName || null,
15962
15952
  skuCode: formData.skuCode || null,
@@ -18934,8 +18924,7 @@ var getColumns$2 = function getColumns(_ref) {
18934
18924
  title: "\u5E73\u53F0\u89C4\u683CID",
18935
18925
  width: 180,
18936
18926
  align: 'center',
18937
- ellipsis: true,
18938
- render: renderTextEllipsis
18927
+ ellipsis: true
18939
18928
  }, {
18940
18929
  dataIndex: 'brandName',
18941
18930
  title: "\u54C1\u724C\u540D\u79F0",
@@ -19055,8 +19044,7 @@ var getColumns$2 = function getColumns(_ref) {
19055
19044
  title: "\u5E73\u53F0\u89C4\u683CID",
19056
19045
  width: 180,
19057
19046
  align: 'center',
19058
- ellipsis: true,
19059
- render: renderTextEllipsis
19047
+ ellipsis: true
19060
19048
  }, {
19061
19049
  dataIndex: 'brandName',
19062
19050
  title: "\u54C1\u724C\u540D\u79F0",
@@ -19180,8 +19168,7 @@ var getColumns$2 = function getColumns(_ref) {
19180
19168
  title: "\u5E73\u53F0\u89C4\u683CID",
19181
19169
  width: 180,
19182
19170
  align: 'center',
19183
- ellipsis: true,
19184
- render: renderTextEllipsis
19171
+ ellipsis: true
19185
19172
  }, {
19186
19173
  dataIndex: 'brandName',
19187
19174
  title: "\u54C1\u724C\u540D\u79F0",
@@ -19344,8 +19331,7 @@ var getColumns$2 = function getColumns(_ref) {
19344
19331
  title: "\u5E73\u53F0\u89C4\u683CID",
19345
19332
  width: 180,
19346
19333
  align: 'center',
19347
- ellipsis: true,
19348
- render: renderTextEllipsis
19334
+ ellipsis: true
19349
19335
  }, {
19350
19336
  dataIndex: 'brandName',
19351
19337
  title: "\u54C1\u724C\u540D\u79F0",
@@ -20249,7 +20235,7 @@ var getColumns$5 = function getColumns() {
20249
20235
  ellipsis: true,
20250
20236
  align: 'center',
20251
20237
  render: function render(val, record, index) {
20252
- return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
20238
+ return (record.qty || 0) * (+record.salePrice || 0);
20253
20239
  }
20254
20240
  }, {
20255
20241
  dataIndex: 'batchId',
@@ -20537,7 +20523,7 @@ var getColumns$5 = function getColumns() {
20537
20523
  dataIndex: 'saleAmount',
20538
20524
  title: '总金额',
20539
20525
  render: function render(val, record) {
20540
- return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
20526
+ return (record.qty || 0) * (+record.salePrice || 0);
20541
20527
  }
20542
20528
  }, {
20543
20529
  dataIndex: 'batchId',
@@ -20652,7 +20638,7 @@ var getColumns$5 = function getColumns() {
20652
20638
  dataIndex: 'saleAmount',
20653
20639
  title: '总金额',
20654
20640
  render: function render(val, record) {
20655
- return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
20641
+ return (record.qty || 0) * (+record.salePrice || 0);
20656
20642
  }
20657
20643
  }, {
20658
20644
  dataIndex: 'isGift',
@@ -21520,12 +21506,6 @@ var getColumns$7 = function getColumns(_ref) {
21520
21506
  width: 150,
21521
21507
  render: function render(val, record, index) {
21522
21508
  return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
21523
- dropdownStyle: {
21524
- zIndex: 2000
21525
- },
21526
- getPopupContainer: function getPopupContainer() {
21527
- return document.body;
21528
- },
21529
21509
  value: val,
21530
21510
  onChange: function onChange(value) {
21531
21511
  updateHandle(value, index, 'bfit');
@@ -21555,12 +21535,6 @@ var getColumns$7 = function getColumns(_ref) {
21555
21535
  width: 150,
21556
21536
  render: function render(val, record, index) {
21557
21537
  return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
21558
- dropdownStyle: {
21559
- zIndex: 2000
21560
- },
21561
- getPopupContainer: function getPopupContainer() {
21562
- return document.body;
21563
- },
21564
21538
  value: val,
21565
21539
  onChange: function onChange(value) {
21566
21540
  updateHandle(value, index, 'gift');
@@ -22319,7 +22293,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
22319
22293
  }
22320
22294
  }, isShowSelect && /*#__PURE__*/React.createElement(Row, {
22321
22295
  style: {
22322
- marginBottom: '12px'
22296
+ marginBottom: '20px'
22323
22297
  }
22324
22298
  }, /*#__PURE__*/React.createElement(Col, {
22325
22299
  span: 12
@@ -26347,7 +26321,7 @@ var PublicReissue = function PublicReissue(props) {
26347
26321
  var _order$typeMap$type$g;
26348
26322
  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;
26349
26323
  });
26350
- var goodDetails = hasGoodDetails ? 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) : [];
26324
+ 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) : [];
26351
26325
  var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
26352
26326
  var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
26353
26327
  return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
@@ -27234,7 +27208,7 @@ var MsgStatus = function MsgStatus(props) {
27234
27208
  onClick: function onClick() {
27235
27209
  return setChangeIndex(index);
27236
27210
  }
27237
- }, msgTypeCh[key] || key, item.ruleName);
27211
+ }, msgTypeCh[key], item.ruleName);
27238
27212
  }))) : null, type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
27239
27213
  showSearch: true,
27240
27214
  value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -27812,7 +27786,7 @@ var GyReissue = function GyReissue(props) {
27812
27786
  span: 12
27813
27787
  },
27814
27788
  sm: {
27815
- span: 4
27789
+ span: 6
27816
27790
  }
27817
27791
  }, /*#__PURE__*/React.createElement(Cascader, {
27818
27792
  style: {
@@ -28115,7 +28089,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
28115
28089
  span: 12
28116
28090
  },
28117
28091
  sm: {
28118
- span: 4
28092
+ span: 6
28119
28093
  }
28120
28094
  }, /*#__PURE__*/React.createElement(Cascader, {
28121
28095
  style: {
package/dist/index.js CHANGED
@@ -8114,8 +8114,6 @@ var updateWorkTypeKeys = {
8114
8114
  BS_DEPOSIT: 'bsDeposit',
8115
8115
  NEW_PAYMENT_STATUS: 'newPaymentStatus',
8116
8116
  BUSINESS_ORDER_NO: 'businessOrderNo',
8117
- REPAIR_ORDER_SN: 'repairOrderSn',
8118
- REPAIR_ORDER_ID: 'repairOrderId',
8119
8117
  PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
8120
8118
  ACTUAL_RECEIPT_PAYMENT: 'actualReceiptPayment',
8121
8119
  WDT_SHOP: 'shopCode'
@@ -8595,10 +8593,6 @@ var processCallBackStatus = function processCallBackStatus(getValue) {
8595
8593
  RETURN_EXCHANGE_GOODS_REVIEW_STATUS: {
8596
8594
  status: 'returnExchangeGoodsReviewStatusValue',
8597
8595
  reason: 'returnExchangeGoodsReviewStatusReason'
8598
- },
8599
- REPAIR_ORDER_STATUS: {
8600
- status: 'repairOrderStatusValue',
8601
- reason: 'repairOrderStatusReason'
8602
8596
  }
8603
8597
  };
8604
8598
  return _defineProperty({}, nex.uniqueKey, {
@@ -9363,7 +9357,6 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9363
9357
  AGREE_RETURN_GOODS_STATUS: processCallBackStatus,
9364
9358
  REJECT_RETURN_GOODS_STATUS: processCallBackStatus,
9365
9359
  RETURN_EXCHANGE_GOODS_REVIEW_STATUS: processCallBackStatus,
9366
- REPAIR_ORDER_STATUS: processCallBackStatus,
9367
9360
  RETURN_GOODS_STATUS: processSceneStatus,
9368
9361
  EXCHANGE_STATUS: processSceneStatus,
9369
9362
  WAREHOUSING_STATUS: processSceneStatus,
@@ -9443,8 +9436,6 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9443
9436
  BS_DEPOSIT: processSingleField,
9444
9437
  NEW_PAYMENT_STATUS: processSingleField,
9445
9438
  BUSINESS_ORDER_NO: processSingleField,
9446
- REPAIR_ORDER_SN: processSingleField,
9447
- REPAIR_ORDER_ID: processSingleField,
9448
9439
  PAYMENT_VOUCHER_CODE: processSingleField,
9449
9440
  BS_E3_REISSUE_GOODS: processBsE3ReissueGoods(templateColumns),
9450
9441
  ACTUAL_RECEIPT_PAYMENT: processSingleField,
@@ -10020,8 +10011,8 @@ var SubForm = function SubForm(props) {
10020
10011
  tableHeader = props.tableHeader,
10021
10012
  disabled = props.disabled,
10022
10013
  platform = props.platform,
10023
- maxCount = props.maxCount,
10024
- manual = props.manual;
10014
+ manual = props.manual,
10015
+ maxCount = props.maxCount;
10025
10016
  var ref = React.useRef(null);
10026
10017
  var isRequest = React.useRef(false);
10027
10018
  var _useState = React.useState(false),
@@ -13463,7 +13454,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
13463
13454
  if (disabled) {
13464
13455
  return;
13465
13456
  }
13466
- if (['KYE', 'SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
13457
+ if (['SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
13467
13458
  return;
13468
13459
  } else if (!(newCompany && trajectoryCode)) {
13469
13460
  return;
@@ -13599,7 +13590,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
13599
13590
  value: value === null || value === void 0 ? void 0 : value.trajectorySnapshot
13600
13591
  });
13601
13592
  };
13602
- return /*#__PURE__*/React__default['default'].createElement("div", null, LogisticsCompany(), LogisticsCode(), ['SF', 'ZTO', 'KYE'].includes(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? LogisticsPhone(value === null || value === void 0 ? void 0 : value.trajectoryCompany) : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React__default['default'].createElement(LogisticsSnapshot, null) : null);
13593
+ return /*#__PURE__*/React__default['default'].createElement("div", null, LogisticsCompany(), LogisticsCode(), ['SF', 'ZTO'].includes(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? LogisticsPhone(value === null || value === void 0 ? void 0 : value.trajectoryCompany) : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React__default['default'].createElement(LogisticsSnapshot, null) : null);
13603
13594
  };
13604
13595
 
13605
13596
  var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
@@ -15971,7 +15962,6 @@ var getTableData$2 = function getTableData(_ref, formData) {
15971
15962
  var current = _ref.current,
15972
15963
  pageSize = _ref.pageSize;
15973
15964
  var data = {
15974
- goodShortName: formData.goodShortName || null,
15975
15965
  goodNo: formData.goodNo || null,
15976
15966
  goodName: formData.goodName || null,
15977
15967
  skuCode: formData.skuCode || null,
@@ -18949,8 +18939,7 @@ var getColumns$2 = function getColumns(_ref) {
18949
18939
  title: "\u5E73\u53F0\u89C4\u683CID",
18950
18940
  width: 180,
18951
18941
  align: 'center',
18952
- ellipsis: true,
18953
- render: renderTextEllipsis
18942
+ ellipsis: true
18954
18943
  }, {
18955
18944
  dataIndex: 'brandName',
18956
18945
  title: "\u54C1\u724C\u540D\u79F0",
@@ -19070,8 +19059,7 @@ var getColumns$2 = function getColumns(_ref) {
19070
19059
  title: "\u5E73\u53F0\u89C4\u683CID",
19071
19060
  width: 180,
19072
19061
  align: 'center',
19073
- ellipsis: true,
19074
- render: renderTextEllipsis
19062
+ ellipsis: true
19075
19063
  }, {
19076
19064
  dataIndex: 'brandName',
19077
19065
  title: "\u54C1\u724C\u540D\u79F0",
@@ -19195,8 +19183,7 @@ var getColumns$2 = function getColumns(_ref) {
19195
19183
  title: "\u5E73\u53F0\u89C4\u683CID",
19196
19184
  width: 180,
19197
19185
  align: 'center',
19198
- ellipsis: true,
19199
- render: renderTextEllipsis
19186
+ ellipsis: true
19200
19187
  }, {
19201
19188
  dataIndex: 'brandName',
19202
19189
  title: "\u54C1\u724C\u540D\u79F0",
@@ -19359,8 +19346,7 @@ var getColumns$2 = function getColumns(_ref) {
19359
19346
  title: "\u5E73\u53F0\u89C4\u683CID",
19360
19347
  width: 180,
19361
19348
  align: 'center',
19362
- ellipsis: true,
19363
- render: renderTextEllipsis
19349
+ ellipsis: true
19364
19350
  }, {
19365
19351
  dataIndex: 'brandName',
19366
19352
  title: "\u54C1\u724C\u540D\u79F0",
@@ -20264,7 +20250,7 @@ var getColumns$5 = function getColumns() {
20264
20250
  ellipsis: true,
20265
20251
  align: 'center',
20266
20252
  render: function render(val, record, index) {
20267
- return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
20253
+ return (record.qty || 0) * (+record.salePrice || 0);
20268
20254
  }
20269
20255
  }, {
20270
20256
  dataIndex: 'batchId',
@@ -20552,7 +20538,7 @@ var getColumns$5 = function getColumns() {
20552
20538
  dataIndex: 'saleAmount',
20553
20539
  title: '总金额',
20554
20540
  render: function render(val, record) {
20555
- return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
20541
+ return (record.qty || 0) * (+record.salePrice || 0);
20556
20542
  }
20557
20543
  }, {
20558
20544
  dataIndex: 'batchId',
@@ -20667,7 +20653,7 @@ var getColumns$5 = function getColumns() {
20667
20653
  dataIndex: 'saleAmount',
20668
20654
  title: '总金额',
20669
20655
  render: function render(val, record) {
20670
- return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
20656
+ return (record.qty || 0) * (+record.salePrice || 0);
20671
20657
  }
20672
20658
  }, {
20673
20659
  dataIndex: 'isGift',
@@ -21535,12 +21521,6 @@ var getColumns$7 = function getColumns(_ref) {
21535
21521
  width: 150,
21536
21522
  render: function render(val, record, index) {
21537
21523
  return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
21538
- dropdownStyle: {
21539
- zIndex: 2000
21540
- },
21541
- getPopupContainer: function getPopupContainer() {
21542
- return document.body;
21543
- },
21544
21524
  value: val,
21545
21525
  onChange: function onChange(value) {
21546
21526
  updateHandle(value, index, 'bfit');
@@ -21570,12 +21550,6 @@ var getColumns$7 = function getColumns(_ref) {
21570
21550
  width: 150,
21571
21551
  render: function render(val, record, index) {
21572
21552
  return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
21573
- dropdownStyle: {
21574
- zIndex: 2000
21575
- },
21576
- getPopupContainer: function getPopupContainer() {
21577
- return document.body;
21578
- },
21579
21553
  value: val,
21580
21554
  onChange: function onChange(value) {
21581
21555
  updateHandle(value, index, 'gift');
@@ -22334,7 +22308,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
22334
22308
  }
22335
22309
  }, isShowSelect && /*#__PURE__*/React__default['default'].createElement(antd.Row, {
22336
22310
  style: {
22337
- marginBottom: '12px'
22311
+ marginBottom: '20px'
22338
22312
  }
22339
22313
  }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
22340
22314
  span: 12
@@ -26362,7 +26336,7 @@ var PublicReissue = function PublicReissue(props) {
26362
26336
  var _order$typeMap$type$g;
26363
26337
  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;
26364
26338
  });
26365
- var goodDetails = hasGoodDetails ? 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) : [];
26339
+ 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) : [];
26366
26340
  var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
26367
26341
  var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
26368
26342
  return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
@@ -27249,7 +27223,7 @@ var MsgStatus = function MsgStatus(props) {
27249
27223
  onClick: function onClick() {
27250
27224
  return setChangeIndex(index);
27251
27225
  }
27252
- }, kmkfUtils.msgTypeCh[key] || key, item.ruleName);
27226
+ }, kmkfUtils.msgTypeCh[key], item.ruleName);
27253
27227
  }))) : null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
27254
27228
  showSearch: true,
27255
27229
  value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -27827,7 +27801,7 @@ var GyReissue = function GyReissue(props) {
27827
27801
  span: 12
27828
27802
  },
27829
27803
  sm: {
27830
- span: 4
27804
+ span: 6
27831
27805
  }
27832
27806
  }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
27833
27807
  style: {
@@ -28130,7 +28104,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
28130
28104
  span: 12
28131
28105
  },
28132
28106
  sm: {
28133
- span: 4
28107
+ span: 6
28134
28108
  }
28135
28109
  }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
28136
28110
  style: {
package/dist/src/apaas/SubForm/index.d.ts CHANGED
@@ -26,8 +26,8 @@ type SubFormProps = {
26
26
  tableHeader: subConfigType[];
27
27
  disabled: boolean;
28
28
  platform: string;
29
- maxCount?: number;
30
29
  manual?: boolean;
30
+ maxCount?: number;
31
31
  };
32
32
  declare const SubForm: (props: SubFormProps) => React.JSX.Element;
33
33
  export default SubForm;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "2.2.31-beta.25",
3
+ "version": "2.2.32",
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.31-beta.25",
23
+ "@kmkf-fe-packages/kmkf-utils": "2.2.32",
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": "9e1f85be0a458da3acd6075c5667834019006fe5"
69
+ "gitHead": "7f51024d94cfdccb5e1d8fe2b1e6fb02c8ad9a00"
70
70
  }