@kmkf-fe-packages/basic-components 2.2.24 → 2.2.26

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 (4) hide show
  1. package/dist/index.esm.js +94 -40
  2. package/dist/index.js +94 -40
  3. package/dist/src/bs/component/GoodItem/constants/wdtReissueGoodsColumns.d.ts +2 -1
  4. package/package.json +3 -3
package/dist/index.esm.js CHANGED
@@ -18666,10 +18666,15 @@ var renderGiftType = function renderGiftType(val) {
18666
18666
  };
18667
18667
  return renderTextEllipsis(giftTypeMap[val]);
18668
18668
  };
18669
+ var isNumberOrNumberString = function isNumberOrNumberString(value) {
18670
+ if (typeof value === 'number') return true;
18671
+ if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
18672
+ return false;
18673
+ };
18669
18674
  var renderFieldMap = {
18670
18675
  num: function num(_ref) {
18671
18676
  var disabled = _ref.disabled,
18672
- updateHandle = _ref.updateHandle;
18677
+ updateDataHandle = _ref.updateDataHandle;
18673
18678
  return function (val, record, index) {
18674
18679
  return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
18675
18680
  style: {
@@ -18679,19 +18684,40 @@ var renderFieldMap = {
18679
18684
  min: 1,
18680
18685
  precision: 0,
18681
18686
  onChange: function onChange(num) {
18682
- return updateHandle(num, index, 'num');
18687
+ updateDataHandle({
18688
+ num: num,
18689
+ orderPrice: num && isNumberOrNumberString(record.sharePrice) ? num * record.price : null
18690
+ }, index);
18683
18691
  }
18684
18692
  }) : /*#__PURE__*/React.createElement("span", null, val);
18685
18693
  };
18686
18694
  },
18687
18695
  giftType: function giftType() {
18688
18696
  return renderGiftType;
18697
+ },
18698
+ orderPrice: function orderPrice(_ref2) {
18699
+ var disabled = _ref2.disabled,
18700
+ updateHandle = _ref2.updateHandle;
18701
+ return function (val, record, index) {
18702
+ return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
18703
+ style: {
18704
+ width: 70
18705
+ },
18706
+ value: val,
18707
+ min: 1,
18708
+ precision: 2,
18709
+ onChange: function onChange(num) {
18710
+ return updateHandle(num, index, 'orderPrice');
18711
+ }
18712
+ }) : /*#__PURE__*/React.createElement("span", null, (record.num || record.num === 0) && (val || val === 0) ? Number(val * record.num).toFixed(2) : null);
18713
+ };
18689
18714
  }
18690
18715
  };
18691
- var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref2) {
18692
- var disabled = _ref2.disabled,
18693
- updateHandle = _ref2.updateHandle,
18694
- operate = _ref2.operate;
18716
+ var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref3) {
18717
+ var disabled = _ref3.disabled,
18718
+ updateHandle = _ref3.updateHandle,
18719
+ updateDataHandle = _ref3.updateDataHandle,
18720
+ operate = _ref3.operate;
18695
18721
  return getColumnsMap$1()['WDT_REISSUE_GOODS'].map(function (item) {
18696
18722
  var newItem = _objectSpread2({
18697
18723
  align: 'center',
@@ -18701,7 +18727,8 @@ var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref2) {
18701
18727
  return _objectSpread2(_objectSpread2({}, newItem), {}, {
18702
18728
  render: renderFieldMap === null || renderFieldMap === void 0 ? void 0 : renderFieldMap[item.dataIndex]({
18703
18729
  disabled: disabled,
18704
- updateHandle: updateHandle
18730
+ updateHandle: updateHandle,
18731
+ updateDataHandle: updateDataHandle
18705
18732
  })
18706
18733
  });
18707
18734
  }
@@ -18709,11 +18736,21 @@ var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref2) {
18709
18736
  });
18710
18737
  };
18711
18738
 
18739
+ function toNum(value) {
18740
+ if (typeof value === 'string') {
18741
+ return value ? +value : void 0;
18742
+ }
18743
+ if (typeof value === 'number') {
18744
+ return value;
18745
+ }
18746
+ return void 0;
18747
+ }
18712
18748
  var getColumns$2 = function getColumns(_ref) {
18713
18749
  var _ref$text = _ref.text,
18714
18750
  text = _ref$text === void 0 ? '' : _ref$text,
18715
18751
  disabled = _ref.disabled,
18716
- updateHandle = _ref.updateHandle;
18752
+ updateHandle = _ref.updateHandle,
18753
+ updateDataHandle = _ref.updateDataHandle;
18717
18754
  return {
18718
18755
  //旺店通补发商品信息
18719
18756
  WDT_REISSUE_GOODS: [{
@@ -18800,15 +18837,31 @@ var getColumns$2 = function getColumns(_ref) {
18800
18837
  render: renderTextEllipsis
18801
18838
  }, {
18802
18839
  dataIndex: 'orderPrice',
18803
- title: "\u6210\u4EA4\u603B\u91D1\u989D",
18804
- render: function render(val, record) {
18805
- return (record.num || record.num === 0) && (val || val === 0) ? Number(val * record.num).toFixed(2) : null;
18806
- },
18840
+ title: "\u8865\u53D1\u91D1\u989D",
18841
+ align: 'center',
18842
+ // render: (val: number, record: any) => {
18843
+ // return (record.num || record.num === 0) && (val || val === 0)
18844
+ // ? Number(val * record.num).toFixed(2)
18845
+ // : null;
18846
+ // },
18807
18847
  width: 200
18808
18848
  }, {
18809
18849
  dataIndex: 'num',
18810
18850
  title: "\u6570\u91CF",
18811
- width: 100
18851
+ width: 100,
18852
+ validator: function validator(_rule, value) {
18853
+ var goodsName = '';
18854
+ if (((value === null || value === void 0 ? void 0 : value.wdtReissueGoods) || []).some(function (goods) {
18855
+ var num = toNum(goods === null || goods === void 0 ? void 0 : goods.num);
18856
+ var res = typeof num === 'number' ? num < 1 : true;
18857
+ if (res) {
18858
+ goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
18859
+ }
18860
+ return res;
18861
+ })) {
18862
+ return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
18863
+ }
18864
+ }
18812
18865
  }, {
18813
18866
  dataIndex: 'sharePrice',
18814
18867
  title: "\u5206\u644A\u4EF7",
@@ -19430,7 +19483,7 @@ var getColumns$3 = function getColumns(_ref) {
19430
19483
  };
19431
19484
  };
19432
19485
 
19433
- var isNumberOrNumberString = function isNumberOrNumberString(value) {
19486
+ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
19434
19487
  if (typeof value === 'number') return true;
19435
19488
  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
19436
19489
  return false;
@@ -19439,7 +19492,7 @@ var getYesOrNo$3 = function getYesOrNo(val) {
19439
19492
  if (isNull(val)) return null;
19440
19493
  return val ? '是' : '否';
19441
19494
  };
19442
- function toNum(value) {
19495
+ function toNum$1(value) {
19443
19496
  if (typeof value === 'string') {
19444
19497
  return value ? +value : void 0;
19445
19498
  }
@@ -19499,8 +19552,8 @@ var getColumns$4 = function getColumns(_ref) {
19499
19552
  onChange: function onChange(num) {
19500
19553
  updateDataHandle({
19501
19554
  qty: num,
19502
- amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
19503
- originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
19555
+ amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
19556
+ originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
19504
19557
  }, index);
19505
19558
  }
19506
19559
  }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -19520,7 +19573,7 @@ var getColumns$4 = function getColumns(_ref) {
19520
19573
  onChange: function onChange(num) {
19521
19574
  updateDataHandle({
19522
19575
  price: num,
19523
- amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
19576
+ amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
19524
19577
  }, index);
19525
19578
  }
19526
19579
  }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -19619,7 +19672,7 @@ var getColumns$4 = function getColumns(_ref) {
19619
19672
  validator: function validator(_rule, value) {
19620
19673
  var goodsName = '';
19621
19674
  if (((value === null || value === void 0 ? void 0 : value.gyReissueGoods) || []).some(function (goods) {
19622
- var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
19675
+ var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
19623
19676
  var res = typeof qty === 'number' ? qty < 1 : true;
19624
19677
  if (res) {
19625
19678
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -19640,8 +19693,8 @@ var getColumns$4 = function getColumns(_ref) {
19640
19693
  onChange: function onChange(num) {
19641
19694
  updateDataHandle({
19642
19695
  qty: num,
19643
- amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
19644
- originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
19696
+ amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
19697
+ originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
19645
19698
  }, index);
19646
19699
  }
19647
19700
  }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -19661,7 +19714,7 @@ var getColumns$4 = function getColumns(_ref) {
19661
19714
  onChange: function onChange(num) {
19662
19715
  updateDataHandle({
19663
19716
  price: num,
19664
- amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
19717
+ amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
19665
19718
  }, index);
19666
19719
  }
19667
19720
  }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -19740,7 +19793,7 @@ var getColumns$4 = function getColumns(_ref) {
19740
19793
  validator: function validator(_rule, value) {
19741
19794
  var goodsName = '';
19742
19795
  if (((value === null || value === void 0 ? void 0 : value.gyReturnGoods) || []).some(function (goods) {
19743
- var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
19796
+ var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
19744
19797
  var res = typeof qty === 'number' ? qty < 1 : true;
19745
19798
  if (res) {
19746
19799
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -19761,8 +19814,8 @@ var getColumns$4 = function getColumns(_ref) {
19761
19814
  onChange: function onChange(num) {
19762
19815
  updateDataHandle({
19763
19816
  qty: num,
19764
- amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
19765
- originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
19817
+ amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
19818
+ originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
19766
19819
  }, index);
19767
19820
  }
19768
19821
  }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -19782,7 +19835,7 @@ var getColumns$4 = function getColumns(_ref) {
19782
19835
  onChange: function onChange(num) {
19783
19836
  updateDataHandle({
19784
19837
  price: num,
19785
- amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
19838
+ amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
19786
19839
  }, index);
19787
19840
  }
19788
19841
  }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -19841,7 +19894,7 @@ var fillAttrs = function fillAttrs(item) {
19841
19894
  if (!item.align) item.align = 'center';
19842
19895
  return item;
19843
19896
  };
19844
- function toNum$1(value) {
19897
+ function toNum$2(value) {
19845
19898
  if (typeof value === 'string') {
19846
19899
  return value ? +value : void 0;
19847
19900
  }
@@ -20080,7 +20133,7 @@ var getColumns$5 = function getColumns() {
20080
20133
  validator: function validator(_rule, value) {
20081
20134
  var goodsName = '';
20082
20135
  if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
20083
- var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
20136
+ var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
20084
20137
  var res = typeof qty === 'number' ? qty < 1 : true;
20085
20138
  if (res) {
20086
20139
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -20181,7 +20234,7 @@ var getColumns$5 = function getColumns() {
20181
20234
  validator: function validator(_rule, value) {
20182
20235
  var goodsName = '';
20183
20236
  if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
20184
- var v = toNum$1(goods === null || goods === void 0 ? void 0 : goods.salePrice);
20237
+ var v = toNum$2(goods === null || goods === void 0 ? void 0 : goods.salePrice);
20185
20238
  var res = typeof v === 'number' ? v < 0 : true;
20186
20239
  if (res) {
20187
20240
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -20211,7 +20264,7 @@ var getColumns$5 = function getColumns() {
20211
20264
  validator: function validator(_rule, value) {
20212
20265
  var goodsName = '';
20213
20266
  if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
20214
- var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
20267
+ var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
20215
20268
  var res = typeof qty === 'number' ? qty < 1 : true;
20216
20269
  if (res) {
20217
20270
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -20392,7 +20445,7 @@ var getColumns$5 = function getColumns() {
20392
20445
  };
20393
20446
  };
20394
20447
 
20395
- function toNum$2(value) {
20448
+ function toNum$3(value) {
20396
20449
  if (typeof value === 'string') {
20397
20450
  return value ? +value : void 0;
20398
20451
  }
@@ -20555,7 +20608,7 @@ var getColumns$6 = function getColumns(_ref) {
20555
20608
  validator: function validator(_rule, value) {
20556
20609
  var title = '';
20557
20610
  if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
20558
- var realNum = toNum$2(goods === null || goods === void 0 ? void 0 : goods.realNum);
20611
+ var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
20559
20612
  var res = typeof realNum === 'number' ? realNum < 1 : true;
20560
20613
  if (res) {
20561
20614
  title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -20643,12 +20696,12 @@ var getColumns$6 = function getColumns(_ref) {
20643
20696
  };
20644
20697
  };
20645
20698
 
20646
- var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
20699
+ var isNumberOrNumberString$2 = function isNumberOrNumberString(value) {
20647
20700
  if (typeof value === 'number') return true;
20648
20701
  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
20649
20702
  return false;
20650
20703
  };
20651
- function toNum$3(value) {
20704
+ function toNum$4(value) {
20652
20705
  if (typeof value === 'string') {
20653
20706
  return value ? +value : void 0;
20654
20707
  }
@@ -20797,7 +20850,7 @@ var getColumns$7 = function getColumns(_ref) {
20797
20850
  onChange: function onChange(num) {
20798
20851
  updateDataHandle({
20799
20852
  sellCount: num,
20800
- sellTotal: num && isNumberOrNumberString$1(record.sellPrice) ? num * record.sellPrice : null
20853
+ sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
20801
20854
  }, index);
20802
20855
  }
20803
20856
  }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -20817,7 +20870,7 @@ var getColumns$7 = function getColumns(_ref) {
20817
20870
  onChange: function onChange(num) {
20818
20871
  updateDataHandle({
20819
20872
  sellPrice: num,
20820
- sellTotal: num && isNumberOrNumberString$1(record.sellCount) ? num * record.sellCount : null
20873
+ sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
20821
20874
  }, index);
20822
20875
  }
20823
20876
  }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -20999,7 +21052,7 @@ var getColumns$7 = function getColumns(_ref) {
20999
21052
  validator: function validator(_rule, value) {
21000
21053
  var productName = '';
21001
21054
  if (((value === null || value === void 0 ? void 0 : value.jyReissueGoods) || []).some(function (goods) {
21002
- var qty = toNum$3(goods === null || goods === void 0 ? void 0 : goods.sellCount);
21055
+ var qty = toNum$4(goods === null || goods === void 0 ? void 0 : goods.sellCount);
21003
21056
  var res = typeof qty === 'number' ? qty < 1 : true;
21004
21057
  if (res) {
21005
21058
  productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
@@ -21020,7 +21073,7 @@ var getColumns$7 = function getColumns(_ref) {
21020
21073
  onChange: function onChange(num) {
21021
21074
  updateDataHandle({
21022
21075
  sellCount: num,
21023
- sellTotal: num && isNumberOrNumberString$1(record.sellPrice) ? num * record.sellPrice : null
21076
+ sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
21024
21077
  }, index);
21025
21078
  }
21026
21079
  }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -21040,7 +21093,7 @@ var getColumns$7 = function getColumns(_ref) {
21040
21093
  onChange: function onChange(num) {
21041
21094
  updateDataHandle({
21042
21095
  sellPrice: num,
21043
- sellTotal: num && isNumberOrNumberString$1(record.sellCount) ? num * record.sellCount : null
21096
+ sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
21044
21097
  }, index);
21045
21098
  }
21046
21099
  }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -22052,7 +22105,8 @@ var GoodItem$1 = function GoodItem(props) {
22052
22105
  columns = getWdtReissueGoodColumns({
22053
22106
  disabled: disabled || columnsOptions.disabled,
22054
22107
  updateHandle: updateHandle,
22055
- operate: columnsOptions.operate
22108
+ operate: columnsOptions.operate,
22109
+ updateDataHandle: updateDataHandle
22056
22110
  });
22057
22111
  }
22058
22112
  break;
package/dist/index.js CHANGED
@@ -18681,10 +18681,15 @@ var renderGiftType = function renderGiftType(val) {
18681
18681
  };
18682
18682
  return renderTextEllipsis(giftTypeMap[val]);
18683
18683
  };
18684
+ var isNumberOrNumberString = function isNumberOrNumberString(value) {
18685
+ if (typeof value === 'number') return true;
18686
+ if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
18687
+ return false;
18688
+ };
18684
18689
  var renderFieldMap = {
18685
18690
  num: function num(_ref) {
18686
18691
  var disabled = _ref.disabled,
18687
- updateHandle = _ref.updateHandle;
18692
+ updateDataHandle = _ref.updateDataHandle;
18688
18693
  return function (val, record, index) {
18689
18694
  return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
18690
18695
  style: {
@@ -18694,19 +18699,40 @@ var renderFieldMap = {
18694
18699
  min: 1,
18695
18700
  precision: 0,
18696
18701
  onChange: function onChange(num) {
18697
- return updateHandle(num, index, 'num');
18702
+ updateDataHandle({
18703
+ num: num,
18704
+ orderPrice: num && isNumberOrNumberString(record.sharePrice) ? num * record.price : null
18705
+ }, index);
18698
18706
  }
18699
18707
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
18700
18708
  };
18701
18709
  },
18702
18710
  giftType: function giftType() {
18703
18711
  return renderGiftType;
18712
+ },
18713
+ orderPrice: function orderPrice(_ref2) {
18714
+ var disabled = _ref2.disabled,
18715
+ updateHandle = _ref2.updateHandle;
18716
+ return function (val, record, index) {
18717
+ return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
18718
+ style: {
18719
+ width: 70
18720
+ },
18721
+ value: val,
18722
+ min: 1,
18723
+ precision: 2,
18724
+ onChange: function onChange(num) {
18725
+ return updateHandle(num, index, 'orderPrice');
18726
+ }
18727
+ }) : /*#__PURE__*/React__default['default'].createElement("span", null, (record.num || record.num === 0) && (val || val === 0) ? Number(val * record.num).toFixed(2) : null);
18728
+ };
18704
18729
  }
18705
18730
  };
18706
- var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref2) {
18707
- var disabled = _ref2.disabled,
18708
- updateHandle = _ref2.updateHandle,
18709
- operate = _ref2.operate;
18731
+ var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref3) {
18732
+ var disabled = _ref3.disabled,
18733
+ updateHandle = _ref3.updateHandle,
18734
+ updateDataHandle = _ref3.updateDataHandle,
18735
+ operate = _ref3.operate;
18710
18736
  return getColumnsMap$1()['WDT_REISSUE_GOODS'].map(function (item) {
18711
18737
  var newItem = _objectSpread2({
18712
18738
  align: 'center',
@@ -18716,7 +18742,8 @@ var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref2) {
18716
18742
  return _objectSpread2(_objectSpread2({}, newItem), {}, {
18717
18743
  render: renderFieldMap === null || renderFieldMap === void 0 ? void 0 : renderFieldMap[item.dataIndex]({
18718
18744
  disabled: disabled,
18719
- updateHandle: updateHandle
18745
+ updateHandle: updateHandle,
18746
+ updateDataHandle: updateDataHandle
18720
18747
  })
18721
18748
  });
18722
18749
  }
@@ -18724,11 +18751,21 @@ var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref2) {
18724
18751
  });
18725
18752
  };
18726
18753
 
18754
+ function toNum(value) {
18755
+ if (typeof value === 'string') {
18756
+ return value ? +value : void 0;
18757
+ }
18758
+ if (typeof value === 'number') {
18759
+ return value;
18760
+ }
18761
+ return void 0;
18762
+ }
18727
18763
  var getColumns$2 = function getColumns(_ref) {
18728
18764
  var _ref$text = _ref.text,
18729
18765
  text = _ref$text === void 0 ? '' : _ref$text,
18730
18766
  disabled = _ref.disabled,
18731
- updateHandle = _ref.updateHandle;
18767
+ updateHandle = _ref.updateHandle,
18768
+ updateDataHandle = _ref.updateDataHandle;
18732
18769
  return {
18733
18770
  //旺店通补发商品信息
18734
18771
  WDT_REISSUE_GOODS: [{
@@ -18815,15 +18852,31 @@ var getColumns$2 = function getColumns(_ref) {
18815
18852
  render: renderTextEllipsis
18816
18853
  }, {
18817
18854
  dataIndex: 'orderPrice',
18818
- title: "\u6210\u4EA4\u603B\u91D1\u989D",
18819
- render: function render(val, record) {
18820
- return (record.num || record.num === 0) && (val || val === 0) ? Number(val * record.num).toFixed(2) : null;
18821
- },
18855
+ title: "\u8865\u53D1\u91D1\u989D",
18856
+ align: 'center',
18857
+ // render: (val: number, record: any) => {
18858
+ // return (record.num || record.num === 0) && (val || val === 0)
18859
+ // ? Number(val * record.num).toFixed(2)
18860
+ // : null;
18861
+ // },
18822
18862
  width: 200
18823
18863
  }, {
18824
18864
  dataIndex: 'num',
18825
18865
  title: "\u6570\u91CF",
18826
- width: 100
18866
+ width: 100,
18867
+ validator: function validator(_rule, value) {
18868
+ var goodsName = '';
18869
+ if (((value === null || value === void 0 ? void 0 : value.wdtReissueGoods) || []).some(function (goods) {
18870
+ var num = toNum(goods === null || goods === void 0 ? void 0 : goods.num);
18871
+ var res = typeof num === 'number' ? num < 1 : true;
18872
+ if (res) {
18873
+ goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
18874
+ }
18875
+ return res;
18876
+ })) {
18877
+ return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
18878
+ }
18879
+ }
18827
18880
  }, {
18828
18881
  dataIndex: 'sharePrice',
18829
18882
  title: "\u5206\u644A\u4EF7",
@@ -19445,7 +19498,7 @@ var getColumns$3 = function getColumns(_ref) {
19445
19498
  };
19446
19499
  };
19447
19500
 
19448
- var isNumberOrNumberString = function isNumberOrNumberString(value) {
19501
+ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
19449
19502
  if (typeof value === 'number') return true;
19450
19503
  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
19451
19504
  return false;
@@ -19454,7 +19507,7 @@ var getYesOrNo$3 = function getYesOrNo(val) {
19454
19507
  if (kmkfUtils.isNull(val)) return null;
19455
19508
  return val ? '是' : '否';
19456
19509
  };
19457
- function toNum(value) {
19510
+ function toNum$1(value) {
19458
19511
  if (typeof value === 'string') {
19459
19512
  return value ? +value : void 0;
19460
19513
  }
@@ -19514,8 +19567,8 @@ var getColumns$4 = function getColumns(_ref) {
19514
19567
  onChange: function onChange(num) {
19515
19568
  updateDataHandle({
19516
19569
  qty: num,
19517
- amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
19518
- originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
19570
+ amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
19571
+ originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
19519
19572
  }, index);
19520
19573
  }
19521
19574
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -19535,7 +19588,7 @@ var getColumns$4 = function getColumns(_ref) {
19535
19588
  onChange: function onChange(num) {
19536
19589
  updateDataHandle({
19537
19590
  price: num,
19538
- amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
19591
+ amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
19539
19592
  }, index);
19540
19593
  }
19541
19594
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -19634,7 +19687,7 @@ var getColumns$4 = function getColumns(_ref) {
19634
19687
  validator: function validator(_rule, value) {
19635
19688
  var goodsName = '';
19636
19689
  if (((value === null || value === void 0 ? void 0 : value.gyReissueGoods) || []).some(function (goods) {
19637
- var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
19690
+ var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
19638
19691
  var res = typeof qty === 'number' ? qty < 1 : true;
19639
19692
  if (res) {
19640
19693
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -19655,8 +19708,8 @@ var getColumns$4 = function getColumns(_ref) {
19655
19708
  onChange: function onChange(num) {
19656
19709
  updateDataHandle({
19657
19710
  qty: num,
19658
- amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
19659
- originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
19711
+ amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
19712
+ originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
19660
19713
  }, index);
19661
19714
  }
19662
19715
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -19676,7 +19729,7 @@ var getColumns$4 = function getColumns(_ref) {
19676
19729
  onChange: function onChange(num) {
19677
19730
  updateDataHandle({
19678
19731
  price: num,
19679
- amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
19732
+ amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
19680
19733
  }, index);
19681
19734
  }
19682
19735
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -19755,7 +19808,7 @@ var getColumns$4 = function getColumns(_ref) {
19755
19808
  validator: function validator(_rule, value) {
19756
19809
  var goodsName = '';
19757
19810
  if (((value === null || value === void 0 ? void 0 : value.gyReturnGoods) || []).some(function (goods) {
19758
- var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
19811
+ var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
19759
19812
  var res = typeof qty === 'number' ? qty < 1 : true;
19760
19813
  if (res) {
19761
19814
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -19776,8 +19829,8 @@ var getColumns$4 = function getColumns(_ref) {
19776
19829
  onChange: function onChange(num) {
19777
19830
  updateDataHandle({
19778
19831
  qty: num,
19779
- amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
19780
- originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
19832
+ amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
19833
+ originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
19781
19834
  }, index);
19782
19835
  }
19783
19836
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -19797,7 +19850,7 @@ var getColumns$4 = function getColumns(_ref) {
19797
19850
  onChange: function onChange(num) {
19798
19851
  updateDataHandle({
19799
19852
  price: num,
19800
- amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
19853
+ amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
19801
19854
  }, index);
19802
19855
  }
19803
19856
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -19856,7 +19909,7 @@ var fillAttrs = function fillAttrs(item) {
19856
19909
  if (!item.align) item.align = 'center';
19857
19910
  return item;
19858
19911
  };
19859
- function toNum$1(value) {
19912
+ function toNum$2(value) {
19860
19913
  if (typeof value === 'string') {
19861
19914
  return value ? +value : void 0;
19862
19915
  }
@@ -20095,7 +20148,7 @@ var getColumns$5 = function getColumns() {
20095
20148
  validator: function validator(_rule, value) {
20096
20149
  var goodsName = '';
20097
20150
  if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
20098
- var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
20151
+ var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
20099
20152
  var res = typeof qty === 'number' ? qty < 1 : true;
20100
20153
  if (res) {
20101
20154
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -20196,7 +20249,7 @@ var getColumns$5 = function getColumns() {
20196
20249
  validator: function validator(_rule, value) {
20197
20250
  var goodsName = '';
20198
20251
  if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
20199
- var v = toNum$1(goods === null || goods === void 0 ? void 0 : goods.salePrice);
20252
+ var v = toNum$2(goods === null || goods === void 0 ? void 0 : goods.salePrice);
20200
20253
  var res = typeof v === 'number' ? v < 0 : true;
20201
20254
  if (res) {
20202
20255
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -20226,7 +20279,7 @@ var getColumns$5 = function getColumns() {
20226
20279
  validator: function validator(_rule, value) {
20227
20280
  var goodsName = '';
20228
20281
  if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
20229
- var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
20282
+ var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
20230
20283
  var res = typeof qty === 'number' ? qty < 1 : true;
20231
20284
  if (res) {
20232
20285
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -20407,7 +20460,7 @@ var getColumns$5 = function getColumns() {
20407
20460
  };
20408
20461
  };
20409
20462
 
20410
- function toNum$2(value) {
20463
+ function toNum$3(value) {
20411
20464
  if (typeof value === 'string') {
20412
20465
  return value ? +value : void 0;
20413
20466
  }
@@ -20570,7 +20623,7 @@ var getColumns$6 = function getColumns(_ref) {
20570
20623
  validator: function validator(_rule, value) {
20571
20624
  var title = '';
20572
20625
  if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
20573
- var realNum = toNum$2(goods === null || goods === void 0 ? void 0 : goods.realNum);
20626
+ var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
20574
20627
  var res = typeof realNum === 'number' ? realNum < 1 : true;
20575
20628
  if (res) {
20576
20629
  title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -20658,12 +20711,12 @@ var getColumns$6 = function getColumns(_ref) {
20658
20711
  };
20659
20712
  };
20660
20713
 
20661
- var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
20714
+ var isNumberOrNumberString$2 = function isNumberOrNumberString(value) {
20662
20715
  if (typeof value === 'number') return true;
20663
20716
  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
20664
20717
  return false;
20665
20718
  };
20666
- function toNum$3(value) {
20719
+ function toNum$4(value) {
20667
20720
  if (typeof value === 'string') {
20668
20721
  return value ? +value : void 0;
20669
20722
  }
@@ -20812,7 +20865,7 @@ var getColumns$7 = function getColumns(_ref) {
20812
20865
  onChange: function onChange(num) {
20813
20866
  updateDataHandle({
20814
20867
  sellCount: num,
20815
- sellTotal: num && isNumberOrNumberString$1(record.sellPrice) ? num * record.sellPrice : null
20868
+ sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
20816
20869
  }, index);
20817
20870
  }
20818
20871
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -20832,7 +20885,7 @@ var getColumns$7 = function getColumns(_ref) {
20832
20885
  onChange: function onChange(num) {
20833
20886
  updateDataHandle({
20834
20887
  sellPrice: num,
20835
- sellTotal: num && isNumberOrNumberString$1(record.sellCount) ? num * record.sellCount : null
20888
+ sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
20836
20889
  }, index);
20837
20890
  }
20838
20891
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -21014,7 +21067,7 @@ var getColumns$7 = function getColumns(_ref) {
21014
21067
  validator: function validator(_rule, value) {
21015
21068
  var productName = '';
21016
21069
  if (((value === null || value === void 0 ? void 0 : value.jyReissueGoods) || []).some(function (goods) {
21017
- var qty = toNum$3(goods === null || goods === void 0 ? void 0 : goods.sellCount);
21070
+ var qty = toNum$4(goods === null || goods === void 0 ? void 0 : goods.sellCount);
21018
21071
  var res = typeof qty === 'number' ? qty < 1 : true;
21019
21072
  if (res) {
21020
21073
  productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
@@ -21035,7 +21088,7 @@ var getColumns$7 = function getColumns(_ref) {
21035
21088
  onChange: function onChange(num) {
21036
21089
  updateDataHandle({
21037
21090
  sellCount: num,
21038
- sellTotal: num && isNumberOrNumberString$1(record.sellPrice) ? num * record.sellPrice : null
21091
+ sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
21039
21092
  }, index);
21040
21093
  }
21041
21094
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -21055,7 +21108,7 @@ var getColumns$7 = function getColumns(_ref) {
21055
21108
  onChange: function onChange(num) {
21056
21109
  updateDataHandle({
21057
21110
  sellPrice: num,
21058
- sellTotal: num && isNumberOrNumberString$1(record.sellCount) ? num * record.sellCount : null
21111
+ sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
21059
21112
  }, index);
21060
21113
  }
21061
21114
  }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -22067,7 +22120,8 @@ var GoodItem$1 = function GoodItem(props) {
22067
22120
  columns = getWdtReissueGoodColumns({
22068
22121
  disabled: disabled || columnsOptions.disabled,
22069
22122
  updateHandle: updateHandle,
22070
- operate: columnsOptions.operate
22123
+ operate: columnsOptions.operate,
22124
+ updateDataHandle: updateDataHandle
22071
22125
  });
22072
22126
  }
22073
22127
  break;
package/dist/src/bs/component/GoodItem/constants/wdtReissueGoodsColumns.d.ts CHANGED
@@ -4,8 +4,9 @@ type P = {
4
4
  disabled: boolean | undefined;
5
5
  updateHandle: (v: any, index: number, key: string) => void;
6
6
  operate?: boolean;
7
+ updateDataHandle: (v: any, index: number) => void;
7
8
  };
8
- export declare const getWdtReissueGoodColumns: ({ disabled, updateHandle, operate, }: P) => ({
9
+ export declare const getWdtReissueGoodColumns: ({ disabled, updateHandle, updateDataHandle, operate, }: P) => ({
9
10
  dataIndex: string;
10
11
  title: string;
11
12
  width?: number | undefined;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "2.2.24",
3
+ "version": "2.2.26",
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.24",
23
+ "@kmkf-fe-packages/kmkf-utils": "2.2.26",
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": "35bc1e4833e1bcb1255c9c43cb3c807d2544e88c"
69
+ "gitHead": "786169beb384512f2dd49ceb5ecee234058f4434"
70
70
  }