@kmkf-fe-packages/basic-components 2.2.38-rc.1 → 2.2.39-beta.0

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/README.md CHANGED
@@ -19,4 +19,4 @@ yarn start
19
19
  - config 公共方法
20
20
  - assets 静态资源
21
21
 
22
- 111111
22
+ 1111111
package/dist/index.esm.js CHANGED
@@ -10007,8 +10007,8 @@ var SubForm = function SubForm(props) {
10007
10007
  tableHeader = props.tableHeader,
10008
10008
  disabled = props.disabled,
10009
10009
  platform = props.platform,
10010
- manual = props.manual,
10011
- maxCount = props.maxCount;
10010
+ maxCount = props.maxCount,
10011
+ manual = props.manual;
10012
10012
  var ref = useRef(null);
10013
10013
  var isRequest = useRef(false);
10014
10014
  var _useState = useState(false),
@@ -13451,7 +13451,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
13451
13451
  if (disabled) {
13452
13452
  return;
13453
13453
  }
13454
- if (['SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
13454
+ if (['KYE', 'SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
13455
13455
  return;
13456
13456
  } else if (!(newCompany && trajectoryCode)) {
13457
13457
  return;
@@ -13587,7 +13587,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
13587
13587
  value: value === null || value === void 0 ? void 0 : value.trajectorySnapshot
13588
13588
  });
13589
13589
  };
13590
- 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);
13590
+ 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);
13591
13591
  };
13592
13592
 
13593
13593
  var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
@@ -14815,6 +14815,16 @@ var wdtColumns = [{
14815
14815
  render: function render(price) {
14816
14816
  return price || price === 0 ? Number(price).toFixed(2) : '';
14817
14817
  }
14818
+ }, {
14819
+ dataIndex: 'unitName',
14820
+ title: '基本单位',
14821
+ width: 150,
14822
+ render: renderTextEllipsis
14823
+ }, {
14824
+ dataIndex: 'auxUnitName',
14825
+ title: '辅助单位',
14826
+ width: 150,
14827
+ render: renderTextEllipsis
14818
14828
  }];
14819
14829
 
14820
14830
  var bse3Columns = [{
@@ -15959,6 +15969,7 @@ var getTableData$2 = function getTableData(_ref, formData) {
15959
15969
  var current = _ref.current,
15960
15970
  pageSize = _ref.pageSize;
15961
15971
  var data = {
15972
+ goodShortName: formData.goodShortName || null,
15962
15973
  goodNo: formData.goodNo || null,
15963
15974
  goodName: formData.goodName || null,
15964
15975
  skuCode: formData.skuCode || null,
@@ -18936,7 +18947,8 @@ var getColumns$2 = function getColumns(_ref) {
18936
18947
  title: "\u5E73\u53F0\u89C4\u683CID",
18937
18948
  width: 180,
18938
18949
  align: 'center',
18939
- ellipsis: true
18950
+ ellipsis: true,
18951
+ render: renderTextEllipsis
18940
18952
  }, {
18941
18953
  dataIndex: 'brandName',
18942
18954
  title: "\u54C1\u724C\u540D\u79F0",
@@ -18980,6 +18992,20 @@ var getColumns$2 = function getColumns(_ref) {
18980
18992
  title: "\u8D60\u54C1\u65B9\u5F0F",
18981
18993
  width: 100,
18982
18994
  render: renderGiftType
18995
+ }, {
18996
+ dataIndex: 'unitName',
18997
+ title: "\u57FA\u672C\u5355\u4F4D",
18998
+ ellipsis: true,
18999
+ width: 150,
19000
+ align: 'center',
19001
+ render: renderTextEllipsis
19002
+ }, {
19003
+ dataIndex: 'auxUnitName',
19004
+ title: "\u8F85\u52A9\u5355\u4F4D",
19005
+ ellipsis: true,
19006
+ width: 150,
19007
+ align: 'center',
19008
+ render: renderTextEllipsis
18983
19009
  }],
18984
19010
  //旺店通商品信息
18985
19011
  WDT_GOODS: [{
@@ -19056,7 +19082,8 @@ var getColumns$2 = function getColumns(_ref) {
19056
19082
  title: "\u5E73\u53F0\u89C4\u683CID",
19057
19083
  width: 180,
19058
19084
  align: 'center',
19059
- ellipsis: true
19085
+ ellipsis: true,
19086
+ render: renderTextEllipsis
19060
19087
  }, {
19061
19088
  dataIndex: 'brandName',
19062
19089
  title: "\u54C1\u724C\u540D\u79F0",
@@ -19104,6 +19131,20 @@ var getColumns$2 = function getColumns(_ref) {
19104
19131
  align: 'center',
19105
19132
  ellipsis: true,
19106
19133
  width: 100
19134
+ }, {
19135
+ dataIndex: 'unitName',
19136
+ title: "\u57FA\u672C\u5355\u4F4D",
19137
+ ellipsis: true,
19138
+ width: 150,
19139
+ align: 'center',
19140
+ render: renderTextEllipsis
19141
+ }, {
19142
+ dataIndex: 'auxUnitName',
19143
+ title: "\u8F85\u52A9\u5355\u4F4D",
19144
+ ellipsis: true,
19145
+ width: 150,
19146
+ align: 'center',
19147
+ render: renderTextEllipsis
19107
19148
  }],
19108
19149
  //旺店通退货商品信息
19109
19150
  WDT_RETURN_GOODS: [{
@@ -19180,7 +19221,8 @@ var getColumns$2 = function getColumns(_ref) {
19180
19221
  title: "\u5E73\u53F0\u89C4\u683CID",
19181
19222
  width: 180,
19182
19223
  align: 'center',
19183
- ellipsis: true
19224
+ ellipsis: true,
19225
+ render: renderTextEllipsis
19184
19226
  }, {
19185
19227
  dataIndex: 'brandName',
19186
19228
  title: "\u54C1\u724C\u540D\u79F0",
@@ -19267,6 +19309,20 @@ var getColumns$2 = function getColumns(_ref) {
19267
19309
  }
19268
19310
  }) : /*#__PURE__*/React.createElement("span", null, typeMap[val]);
19269
19311
  }
19312
+ }, {
19313
+ dataIndex: 'unitName',
19314
+ title: "\u57FA\u672C\u5355\u4F4D",
19315
+ ellipsis: true,
19316
+ width: 150,
19317
+ align: 'center',
19318
+ render: renderTextEllipsis
19319
+ }, {
19320
+ dataIndex: 'auxUnitName',
19321
+ title: "\u8F85\u52A9\u5355\u4F4D",
19322
+ ellipsis: true,
19323
+ width: 150,
19324
+ align: 'center',
19325
+ render: renderTextEllipsis
19270
19326
  }],
19271
19327
  //旺店通换出商品信息
19272
19328
  WDT_EXCHANGE_GOODS: [{
@@ -19343,7 +19399,8 @@ var getColumns$2 = function getColumns(_ref) {
19343
19399
  title: "\u5E73\u53F0\u89C4\u683CID",
19344
19400
  width: 180,
19345
19401
  align: 'center',
19346
- ellipsis: true
19402
+ ellipsis: true,
19403
+ render: renderTextEllipsis
19347
19404
  }, {
19348
19405
  dataIndex: 'brandName',
19349
19406
  title: "\u54C1\u724C\u540D\u79F0",
@@ -19430,6 +19487,20 @@ var getColumns$2 = function getColumns(_ref) {
19430
19487
  }
19431
19488
  }) : /*#__PURE__*/React.createElement("span", null, typeMap[val]);
19432
19489
  }
19490
+ }, {
19491
+ dataIndex: 'unitName',
19492
+ title: "\u57FA\u672C\u5355\u4F4D",
19493
+ ellipsis: true,
19494
+ width: 150,
19495
+ align: 'center',
19496
+ render: renderTextEllipsis
19497
+ }, {
19498
+ dataIndex: 'auxUnitName',
19499
+ title: "\u8F85\u52A9\u5355\u4F4D",
19500
+ ellipsis: true,
19501
+ width: 150,
19502
+ align: 'center',
19503
+ render: renderTextEllipsis
19433
19504
  }],
19434
19505
  // 旺店通售后商品信息
19435
19506
  WDT_AFTERSALE_GOODS: [{
@@ -19585,6 +19656,20 @@ var getColumns$2 = function getColumns(_ref) {
19585
19656
  align: 'center',
19586
19657
  ellipsis: true,
19587
19658
  render: renderTextEllipsis
19659
+ }, {
19660
+ dataIndex: 'unitName',
19661
+ title: "\u57FA\u672C\u5355\u4F4D",
19662
+ ellipsis: true,
19663
+ width: 150,
19664
+ align: 'center',
19665
+ render: renderTextEllipsis
19666
+ }, {
19667
+ dataIndex: 'auxUnitName',
19668
+ title: "\u8F85\u52A9\u5355\u4F4D",
19669
+ ellipsis: true,
19670
+ width: 150,
19671
+ align: 'center',
19672
+ render: renderTextEllipsis
19588
19673
  }]
19589
19674
  };
19590
19675
  };
@@ -20267,7 +20352,7 @@ var getColumns$5 = function getColumns() {
20267
20352
  ellipsis: true,
20268
20353
  align: 'center',
20269
20354
  render: function render(val, record, index) {
20270
- return (record.qty || 0) * (+record.salePrice || 0);
20355
+ return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
20271
20356
  }
20272
20357
  }, {
20273
20358
  dataIndex: 'batchId',
@@ -20555,7 +20640,7 @@ var getColumns$5 = function getColumns() {
20555
20640
  dataIndex: 'saleAmount',
20556
20641
  title: '总金额',
20557
20642
  render: function render(val, record) {
20558
- return (record.qty || 0) * (+record.salePrice || 0);
20643
+ return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
20559
20644
  }
20560
20645
  }, {
20561
20646
  dataIndex: 'batchId',
@@ -20670,7 +20755,7 @@ var getColumns$5 = function getColumns() {
20670
20755
  dataIndex: 'saleAmount',
20671
20756
  title: '总金额',
20672
20757
  render: function render(val, record) {
20673
- return (record.qty || 0) * (+record.salePrice || 0);
20758
+ return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
20674
20759
  }
20675
20760
  }, {
20676
20761
  dataIndex: 'isGift',
@@ -21538,6 +21623,12 @@ var getColumns$7 = function getColumns(_ref) {
21538
21623
  width: 150,
21539
21624
  render: function render(val, record, index) {
21540
21625
  return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
21626
+ dropdownStyle: {
21627
+ zIndex: 2000
21628
+ },
21629
+ getPopupContainer: function getPopupContainer() {
21630
+ return document.body;
21631
+ },
21541
21632
  value: val,
21542
21633
  onChange: function onChange(value) {
21543
21634
  updateHandle(value, index, 'bfit');
@@ -21567,6 +21658,12 @@ var getColumns$7 = function getColumns(_ref) {
21567
21658
  width: 150,
21568
21659
  render: function render(val, record, index) {
21569
21660
  return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
21661
+ dropdownStyle: {
21662
+ zIndex: 2000
21663
+ },
21664
+ getPopupContainer: function getPopupContainer() {
21665
+ return document.body;
21666
+ },
21570
21667
  value: val,
21571
21668
  onChange: function onChange(value) {
21572
21669
  updateHandle(value, index, 'gift');
@@ -22325,7 +22422,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
22325
22422
  }
22326
22423
  }, isShowSelect && /*#__PURE__*/React.createElement(Row, {
22327
22424
  style: {
22328
- marginBottom: '20px'
22425
+ marginBottom: '12px'
22329
22426
  }
22330
22427
  }, /*#__PURE__*/React.createElement(Col, {
22331
22428
  span: 12
@@ -27240,7 +27337,7 @@ var MsgStatus = function MsgStatus(props) {
27240
27337
  onClick: function onClick() {
27241
27338
  return setChangeIndex(index);
27242
27339
  }
27243
- }, msgTypeCh[key], item.ruleName);
27340
+ }, msgTypeCh[key] || key, item.ruleName);
27244
27341
  }))) : null, type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
27245
27342
  showSearch: true,
27246
27343
  value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -27818,7 +27915,7 @@ var GyReissue = function GyReissue(props) {
27818
27915
  span: 12
27819
27916
  },
27820
27917
  sm: {
27821
- span: 6
27918
+ span: 4
27822
27919
  }
27823
27920
  }, /*#__PURE__*/React.createElement(Cascader, {
27824
27921
  style: {
@@ -28121,7 +28218,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
28121
28218
  span: 12
28122
28219
  },
28123
28220
  sm: {
28124
- span: 6
28221
+ span: 4
28125
28222
  }
28126
28223
  }, /*#__PURE__*/React.createElement(Cascader, {
28127
28224
  style: {
package/dist/index.js CHANGED
@@ -10022,8 +10022,8 @@ var SubForm = function SubForm(props) {
10022
10022
  tableHeader = props.tableHeader,
10023
10023
  disabled = props.disabled,
10024
10024
  platform = props.platform,
10025
- manual = props.manual,
10026
- maxCount = props.maxCount;
10025
+ maxCount = props.maxCount,
10026
+ manual = props.manual;
10027
10027
  var ref = React.useRef(null);
10028
10028
  var isRequest = React.useRef(false);
10029
10029
  var _useState = React.useState(false),
@@ -13466,7 +13466,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
13466
13466
  if (disabled) {
13467
13467
  return;
13468
13468
  }
13469
- if (['SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
13469
+ if (['KYE', 'SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
13470
13470
  return;
13471
13471
  } else if (!(newCompany && trajectoryCode)) {
13472
13472
  return;
@@ -13602,7 +13602,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
13602
13602
  value: value === null || value === void 0 ? void 0 : value.trajectorySnapshot
13603
13603
  });
13604
13604
  };
13605
- 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);
13605
+ 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);
13606
13606
  };
13607
13607
 
13608
13608
  var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
@@ -14830,6 +14830,16 @@ var wdtColumns = [{
14830
14830
  render: function render(price) {
14831
14831
  return price || price === 0 ? Number(price).toFixed(2) : '';
14832
14832
  }
14833
+ }, {
14834
+ dataIndex: 'unitName',
14835
+ title: '基本单位',
14836
+ width: 150,
14837
+ render: renderTextEllipsis
14838
+ }, {
14839
+ dataIndex: 'auxUnitName',
14840
+ title: '辅助单位',
14841
+ width: 150,
14842
+ render: renderTextEllipsis
14833
14843
  }];
14834
14844
 
14835
14845
  var bse3Columns = [{
@@ -15974,6 +15984,7 @@ var getTableData$2 = function getTableData(_ref, formData) {
15974
15984
  var current = _ref.current,
15975
15985
  pageSize = _ref.pageSize;
15976
15986
  var data = {
15987
+ goodShortName: formData.goodShortName || null,
15977
15988
  goodNo: formData.goodNo || null,
15978
15989
  goodName: formData.goodName || null,
15979
15990
  skuCode: formData.skuCode || null,
@@ -18951,7 +18962,8 @@ var getColumns$2 = function getColumns(_ref) {
18951
18962
  title: "\u5E73\u53F0\u89C4\u683CID",
18952
18963
  width: 180,
18953
18964
  align: 'center',
18954
- ellipsis: true
18965
+ ellipsis: true,
18966
+ render: renderTextEllipsis
18955
18967
  }, {
18956
18968
  dataIndex: 'brandName',
18957
18969
  title: "\u54C1\u724C\u540D\u79F0",
@@ -18995,6 +19007,20 @@ var getColumns$2 = function getColumns(_ref) {
18995
19007
  title: "\u8D60\u54C1\u65B9\u5F0F",
18996
19008
  width: 100,
18997
19009
  render: renderGiftType
19010
+ }, {
19011
+ dataIndex: 'unitName',
19012
+ title: "\u57FA\u672C\u5355\u4F4D",
19013
+ ellipsis: true,
19014
+ width: 150,
19015
+ align: 'center',
19016
+ render: renderTextEllipsis
19017
+ }, {
19018
+ dataIndex: 'auxUnitName',
19019
+ title: "\u8F85\u52A9\u5355\u4F4D",
19020
+ ellipsis: true,
19021
+ width: 150,
19022
+ align: 'center',
19023
+ render: renderTextEllipsis
18998
19024
  }],
18999
19025
  //旺店通商品信息
19000
19026
  WDT_GOODS: [{
@@ -19071,7 +19097,8 @@ var getColumns$2 = function getColumns(_ref) {
19071
19097
  title: "\u5E73\u53F0\u89C4\u683CID",
19072
19098
  width: 180,
19073
19099
  align: 'center',
19074
- ellipsis: true
19100
+ ellipsis: true,
19101
+ render: renderTextEllipsis
19075
19102
  }, {
19076
19103
  dataIndex: 'brandName',
19077
19104
  title: "\u54C1\u724C\u540D\u79F0",
@@ -19119,6 +19146,20 @@ var getColumns$2 = function getColumns(_ref) {
19119
19146
  align: 'center',
19120
19147
  ellipsis: true,
19121
19148
  width: 100
19149
+ }, {
19150
+ dataIndex: 'unitName',
19151
+ title: "\u57FA\u672C\u5355\u4F4D",
19152
+ ellipsis: true,
19153
+ width: 150,
19154
+ align: 'center',
19155
+ render: renderTextEllipsis
19156
+ }, {
19157
+ dataIndex: 'auxUnitName',
19158
+ title: "\u8F85\u52A9\u5355\u4F4D",
19159
+ ellipsis: true,
19160
+ width: 150,
19161
+ align: 'center',
19162
+ render: renderTextEllipsis
19122
19163
  }],
19123
19164
  //旺店通退货商品信息
19124
19165
  WDT_RETURN_GOODS: [{
@@ -19195,7 +19236,8 @@ var getColumns$2 = function getColumns(_ref) {
19195
19236
  title: "\u5E73\u53F0\u89C4\u683CID",
19196
19237
  width: 180,
19197
19238
  align: 'center',
19198
- ellipsis: true
19239
+ ellipsis: true,
19240
+ render: renderTextEllipsis
19199
19241
  }, {
19200
19242
  dataIndex: 'brandName',
19201
19243
  title: "\u54C1\u724C\u540D\u79F0",
@@ -19282,6 +19324,20 @@ var getColumns$2 = function getColumns(_ref) {
19282
19324
  }
19283
19325
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeMap[val]);
19284
19326
  }
19327
+ }, {
19328
+ dataIndex: 'unitName',
19329
+ title: "\u57FA\u672C\u5355\u4F4D",
19330
+ ellipsis: true,
19331
+ width: 150,
19332
+ align: 'center',
19333
+ render: renderTextEllipsis
19334
+ }, {
19335
+ dataIndex: 'auxUnitName',
19336
+ title: "\u8F85\u52A9\u5355\u4F4D",
19337
+ ellipsis: true,
19338
+ width: 150,
19339
+ align: 'center',
19340
+ render: renderTextEllipsis
19285
19341
  }],
19286
19342
  //旺店通换出商品信息
19287
19343
  WDT_EXCHANGE_GOODS: [{
@@ -19358,7 +19414,8 @@ var getColumns$2 = function getColumns(_ref) {
19358
19414
  title: "\u5E73\u53F0\u89C4\u683CID",
19359
19415
  width: 180,
19360
19416
  align: 'center',
19361
- ellipsis: true
19417
+ ellipsis: true,
19418
+ render: renderTextEllipsis
19362
19419
  }, {
19363
19420
  dataIndex: 'brandName',
19364
19421
  title: "\u54C1\u724C\u540D\u79F0",
@@ -19445,6 +19502,20 @@ var getColumns$2 = function getColumns(_ref) {
19445
19502
  }
19446
19503
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeMap[val]);
19447
19504
  }
19505
+ }, {
19506
+ dataIndex: 'unitName',
19507
+ title: "\u57FA\u672C\u5355\u4F4D",
19508
+ ellipsis: true,
19509
+ width: 150,
19510
+ align: 'center',
19511
+ render: renderTextEllipsis
19512
+ }, {
19513
+ dataIndex: 'auxUnitName',
19514
+ title: "\u8F85\u52A9\u5355\u4F4D",
19515
+ ellipsis: true,
19516
+ width: 150,
19517
+ align: 'center',
19518
+ render: renderTextEllipsis
19448
19519
  }],
19449
19520
  // 旺店通售后商品信息
19450
19521
  WDT_AFTERSALE_GOODS: [{
@@ -19600,6 +19671,20 @@ var getColumns$2 = function getColumns(_ref) {
19600
19671
  align: 'center',
19601
19672
  ellipsis: true,
19602
19673
  render: renderTextEllipsis
19674
+ }, {
19675
+ dataIndex: 'unitName',
19676
+ title: "\u57FA\u672C\u5355\u4F4D",
19677
+ ellipsis: true,
19678
+ width: 150,
19679
+ align: 'center',
19680
+ render: renderTextEllipsis
19681
+ }, {
19682
+ dataIndex: 'auxUnitName',
19683
+ title: "\u8F85\u52A9\u5355\u4F4D",
19684
+ ellipsis: true,
19685
+ width: 150,
19686
+ align: 'center',
19687
+ render: renderTextEllipsis
19603
19688
  }]
19604
19689
  };
19605
19690
  };
@@ -20282,7 +20367,7 @@ var getColumns$5 = function getColumns() {
20282
20367
  ellipsis: true,
20283
20368
  align: 'center',
20284
20369
  render: function render(val, record, index) {
20285
- return (record.qty || 0) * (+record.salePrice || 0);
20370
+ return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
20286
20371
  }
20287
20372
  }, {
20288
20373
  dataIndex: 'batchId',
@@ -20570,7 +20655,7 @@ var getColumns$5 = function getColumns() {
20570
20655
  dataIndex: 'saleAmount',
20571
20656
  title: '总金额',
20572
20657
  render: function render(val, record) {
20573
- return (record.qty || 0) * (+record.salePrice || 0);
20658
+ return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
20574
20659
  }
20575
20660
  }, {
20576
20661
  dataIndex: 'batchId',
@@ -20685,7 +20770,7 @@ var getColumns$5 = function getColumns() {
20685
20770
  dataIndex: 'saleAmount',
20686
20771
  title: '总金额',
20687
20772
  render: function render(val, record) {
20688
- return (record.qty || 0) * (+record.salePrice || 0);
20773
+ return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
20689
20774
  }
20690
20775
  }, {
20691
20776
  dataIndex: 'isGift',
@@ -21553,6 +21638,12 @@ var getColumns$7 = function getColumns(_ref) {
21553
21638
  width: 150,
21554
21639
  render: function render(val, record, index) {
21555
21640
  return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
21641
+ dropdownStyle: {
21642
+ zIndex: 2000
21643
+ },
21644
+ getPopupContainer: function getPopupContainer() {
21645
+ return document.body;
21646
+ },
21556
21647
  value: val,
21557
21648
  onChange: function onChange(value) {
21558
21649
  updateHandle(value, index, 'bfit');
@@ -21582,6 +21673,12 @@ var getColumns$7 = function getColumns(_ref) {
21582
21673
  width: 150,
21583
21674
  render: function render(val, record, index) {
21584
21675
  return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
21676
+ dropdownStyle: {
21677
+ zIndex: 2000
21678
+ },
21679
+ getPopupContainer: function getPopupContainer() {
21680
+ return document.body;
21681
+ },
21585
21682
  value: val,
21586
21683
  onChange: function onChange(value) {
21587
21684
  updateHandle(value, index, 'gift');
@@ -22340,7 +22437,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
22340
22437
  }
22341
22438
  }, isShowSelect && /*#__PURE__*/React__default['default'].createElement(antd.Row, {
22342
22439
  style: {
22343
- marginBottom: '20px'
22440
+ marginBottom: '12px'
22344
22441
  }
22345
22442
  }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
22346
22443
  span: 12
@@ -27255,7 +27352,7 @@ var MsgStatus = function MsgStatus(props) {
27255
27352
  onClick: function onClick() {
27256
27353
  return setChangeIndex(index);
27257
27354
  }
27258
- }, kmkfUtils.msgTypeCh[key], item.ruleName);
27355
+ }, kmkfUtils.msgTypeCh[key] || key, item.ruleName);
27259
27356
  }))) : 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), {}, {
27260
27357
  showSearch: true,
27261
27358
  value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -27833,7 +27930,7 @@ var GyReissue = function GyReissue(props) {
27833
27930
  span: 12
27834
27931
  },
27835
27932
  sm: {
27836
- span: 6
27933
+ span: 4
27837
27934
  }
27838
27935
  }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
27839
27936
  style: {
@@ -28136,7 +28233,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
28136
28233
  span: 12
28137
28234
  },
28138
28235
  sm: {
28139
- span: 6
28236
+ span: 4
28140
28237
  }
28141
28238
  }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
28142
28239
  style: {
@@ -26,8 +26,8 @@ type SubFormProps = {
26
26
  tableHeader: subConfigType[];
27
27
  disabled: boolean;
28
28
  platform: string;
29
- manual?: boolean;
30
29
  maxCount?: number;
30
+ manual?: boolean;
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.38-rc.1",
3
+ "version": "2.2.39-beta.0",
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.38-rc.1",
23
+ "@kmkf-fe-packages/kmkf-utils": "2.2.39-beta.0",
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": "115ad7ec702d00f362b955b958149326213a769f"
69
+ "gitHead": "9017c5c2ff27a176e9ff269593336782f990383b"
70
70
  }