@kmkf-fe-packages/basic-components 0.23.1-beta.15 → 0.23.1-beta.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.esm.js CHANGED
@@ -10702,43 +10702,44 @@ var columns$1 = [{
10702
10702
  }, {
10703
10703
  dataIndex: 'goodName',
10704
10704
  title: '商品名称',
10705
- with: 200,
10705
+ width: 200,
10706
10706
  ellipsis: true
10707
10707
  }, {
10708
10708
  dataIndex: 'goodNo',
10709
10709
  title: '商品spu编码',
10710
- with: 200,
10711
- ellipsis: true
10710
+ width: 200
10711
+ // ellipsis: true,
10712
10712
  }, {
10713
10713
  dataIndex: 'goodId',
10714
10714
  title: 'SPUID',
10715
- with: 200,
10716
- ellipsis: true
10715
+ width: 200
10716
+ // ellipsis: true,
10717
10717
  }, {
10718
10718
  dataIndex: 'specCount',
10719
10719
  title: '规格数',
10720
- with: 200,
10721
- ellipsis: true
10720
+ width: 160
10721
+ // ellipsis: true,
10722
10722
  }];
10723
+
10723
10724
  var expandedColumns = [{
10724
10725
  dataIndex: 'specName',
10725
10726
  title: '商品sku名称',
10726
- with: 200,
10727
+ width: 200,
10727
10728
  ellipsis: true
10728
10729
  }, {
10729
10730
  dataIndex: 'specNo',
10730
10731
  title: '商品sku编码',
10731
- with: 200,
10732
- ellipsis: true
10732
+ width: 200
10733
+ // ellipsis: true,
10733
10734
  }, {
10734
10735
  dataIndex: 'specId',
10735
10736
  title: 'SKUID',
10736
- with: 200,
10737
- ellipsis: true
10737
+ width: 200
10738
+ // ellipsis: true,
10738
10739
  }, {
10739
10740
  dataIndex: 'imgUrl',
10740
10741
  title: '商品图片',
10741
- with: 200,
10742
+ width: 100,
10742
10743
  render: function render(picUrl) {
10743
10744
  return /*#__PURE__*/React.createElement("img", {
10744
10745
  style: {
@@ -10751,16 +10752,21 @@ var expandedColumns = [{
10751
10752
  }
10752
10753
  }, {
10753
10754
  dataIndex: 'marketPrice',
10754
- title: '市场价'
10755
+ title: '市场价',
10756
+ width: 140
10755
10757
  }, {
10756
10758
  dataIndex: 'retailPrice',
10757
- title: '零售价'
10759
+ title: '零售价',
10760
+ width: 140
10758
10761
  }, {
10759
10762
  dataIndex: 'memberPrice',
10760
- title: '会员价'
10763
+ title: '会员价',
10764
+ width: 140
10761
10765
  }];
10762
10766
  var dateFormat = 'YYYY-MM-DD HH:mm:ss';
10763
10767
  var GoodsModal$3 = function GoodsModal(props, ref) {
10768
+ var initStartTime = hooks().subtract(1, 'M');
10769
+ var initEndTime = hooks();
10764
10770
  useImperativeHandle(ref, function () {
10765
10771
  return {
10766
10772
  open: function open(shopCode) {
@@ -10768,7 +10774,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
10768
10774
  setPageNo(1);
10769
10775
  setSelect([]);
10770
10776
  setSelectIds([]);
10771
- queryItems(shopCode);
10777
+ form.setFieldsValue({
10778
+ dateTimePicker: [initStartTime, initEndTime],
10779
+ code: ''
10780
+ });
10772
10781
  // getShopList();
10773
10782
  }
10774
10783
  };
@@ -10810,27 +10819,23 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
10810
10819
  _useState16 = _slicedToArray(_useState15, 2),
10811
10820
  total = _useState16[0],
10812
10821
  setTotal = _useState16[1];
10813
- var _useState17 = useState(hooks().subtract(1, 'M').format(dateFormat)),
10814
- _useState18 = _slicedToArray(_useState17, 2),
10815
- startTime = _useState18[0],
10816
- setStartTime = _useState18[1];
10817
- var _useState19 = useState(hooks().format(dateFormat)),
10818
- _useState20 = _slicedToArray(_useState19, 2),
10819
- endTime = _useState20[0],
10820
- setEndTime = _useState20[1];
10821
10822
  var displaySelectList = useMemo(function () {
10822
10823
  return selectList.map(function (item, i) {
10823
10824
  item.index = i + 1;
10824
10825
  return item;
10825
10826
  });
10826
10827
  }, [selectList]);
10828
+ useEffect(function () {
10829
+ if (visible) {
10830
+ queryItems();
10831
+ }
10832
+ }, [pageNo, visible]);
10827
10833
  var _Form$useForm = Form.useForm(),
10828
10834
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
10829
10835
  form = _Form$useForm2[0];
10830
10836
  //选择页码
10831
10837
  var pageChange = function pageChange(page) {
10832
10838
  setPageNo(page);
10833
- queryItems();
10834
10839
  };
10835
10840
  /**
10836
10841
  * 查询商品
@@ -10838,10 +10843,23 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
10838
10843
  var queryItems = /*#__PURE__*/function () {
10839
10844
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
10840
10845
  var search,
10846
+ _formData$dateTimePic,
10847
+ _formData$dateTimePic2,
10848
+ _formData$dateTimePic3,
10849
+ _formData$dateTimePic4,
10850
+ _formData$dateTimePic5,
10851
+ _formData$dateTimePic6,
10852
+ formData,
10853
+ startTime,
10854
+ endTime,
10841
10855
  params,
10842
10856
  res,
10857
+ _res$data,
10843
10858
  _res$data$productList,
10844
10859
  productList,
10860
+ _res$data$total,
10861
+ _total,
10862
+ errorMsg,
10845
10863
  newProducts,
10846
10864
  _args = arguments;
10847
10865
  return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -10850,6 +10868,9 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
10850
10868
  search = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
10851
10869
  _context.prev = 1;
10852
10870
  setLoading(true);
10871
+ formData = form.getFieldsValue();
10872
+ startTime = ((_formData$dateTimePic = formData.dateTimePicker) === null || _formData$dateTimePic === void 0 ? void 0 : (_formData$dateTimePic2 = _formData$dateTimePic[0]) === null || _formData$dateTimePic2 === void 0 ? void 0 : (_formData$dateTimePic3 = _formData$dateTimePic2.format) === null || _formData$dateTimePic3 === void 0 ? void 0 : _formData$dateTimePic3.call(_formData$dateTimePic2, dateFormat)) || hooks().subtract(1, 'M').format(dateFormat);
10873
+ endTime = ((_formData$dateTimePic4 = formData.dateTimePicker) === null || _formData$dateTimePic4 === void 0 ? void 0 : (_formData$dateTimePic5 = _formData$dateTimePic4[1]) === null || _formData$dateTimePic5 === void 0 ? void 0 : (_formData$dateTimePic6 = _formData$dateTimePic5.format) === null || _formData$dateTimePic6 === void 0 ? void 0 : _formData$dateTimePic6.call(_formData$dateTimePic5, dateFormat)) || hooks().format(dateFormat);
10853
10874
  params = {
10854
10875
  // shopCode: shopCode,
10855
10876
  pageSize: pageSize,
@@ -10858,43 +10879,44 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
10858
10879
  startTime: startTime,
10859
10880
  endTime: endTime
10860
10881
  };
10861
- _context.next = 6;
10882
+ _context.next = 9;
10862
10883
  return extendRequest('/qy/gdfw/product/wdtListProduct', {
10863
10884
  method: 'post',
10864
10885
  data: params
10865
10886
  });
10866
- case 6:
10887
+ case 9:
10867
10888
  res = _context.sent;
10889
+ _res$data = res.data, _res$data$productList = _res$data.productList, productList = _res$data$productList === void 0 ? [] : _res$data$productList, _res$data$total = _res$data.total, _total = _res$data$total === void 0 ? 0 : _res$data$total, errorMsg = _res$data.errorMsg;
10868
10890
  if (res.success) {
10869
- _res$data$productList = res.data.productList, productList = _res$data$productList === void 0 ? [] : _res$data$productList;
10870
10891
  newProducts = productList.map(function (item, index) {
10871
10892
  return _objectSpread2(_objectSpread2({}, item), {}, {
10872
10893
  index: index + 1
10873
10894
  });
10874
10895
  });
10875
- initData(_toConsumableArray(newProducts));
10896
+ setGoodList(_toConsumableArray(newProducts));
10897
+ if (pageNo === 1) {
10898
+ setTotal(_total);
10899
+ }
10900
+ } else {
10901
+ setGoodList([]);
10902
+ setTotal(0);
10903
+ message.error(errorMsg || res.message);
10876
10904
  }
10877
- case 8:
10878
- _context.prev = 8;
10905
+ case 12:
10906
+ _context.prev = 12;
10879
10907
  setLoading(false);
10880
- return _context.finish(8);
10881
- case 11:
10908
+ return _context.finish(12);
10909
+ case 15:
10882
10910
  case "end":
10883
10911
  return _context.stop();
10884
10912
  }
10885
- }, _callee, null, [[1,, 8, 11]]);
10913
+ }, _callee, null, [[1,, 12, 15]]);
10886
10914
  }));
10887
10915
  return function queryItems() {
10888
10916
  return _ref.apply(this, arguments);
10889
10917
  };
10890
10918
  }();
10891
- var initData = function initData(list) {
10892
- setGoodList(_toConsumableArray(list));
10893
- setTotal(list.length);
10894
- setPageNo(1);
10895
- };
10896
10919
  var _onCancel = function onCancel() {
10897
- onReset();
10898
10920
  setVisible(false);
10899
10921
  };
10900
10922
  var onOk = function onOk() {
@@ -10909,7 +10931,16 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
10909
10931
  };
10910
10932
  var onReset = function onReset() {
10911
10933
  form.resetFields();
10912
- initData([]);
10934
+ form.setFieldsValue({
10935
+ dateTimePicker: [hooks().subtract(1, 'M'), hooks()],
10936
+ code: ''
10937
+ });
10938
+ setPageNo(function (prev) {
10939
+ if (prev === 1 && visible) {
10940
+ queryItems();
10941
+ }
10942
+ return 1;
10943
+ });
10913
10944
  };
10914
10945
  // const getShopList = async () => {
10915
10946
  // const { success, data } = await request('/qy/diamond/getConfigInfo', {
@@ -10936,10 +10967,6 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
10936
10967
  shopCode: changedValues.shopId
10937
10968
  });
10938
10969
  }
10939
- if (Array.isArray(changedValues.dateTimePicker)) {
10940
- setStartTime(changedValues.dateTimePicker[0].format(dateFormat));
10941
- setEndTime(changedValues.dateTimePicker[1].format(dateFormat));
10942
- }
10943
10970
  };
10944
10971
  var handleDelete = function handleDelete(record, index) {
10945
10972
  var newSelectList = selectList.filter(function (item) {
@@ -11012,7 +11039,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11012
11039
  columns: expandedColumns,
11013
11040
  dataSource: record.itemDetailList || [],
11014
11041
  pagination: false,
11015
- rowSelection: expandedRowSelection
11042
+ rowSelection: expandedRowSelection,
11043
+ scroll: {
11044
+ x: true
11045
+ }
11016
11046
  });
11017
11047
  };
11018
11048
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Modal, {
@@ -11030,13 +11060,16 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11030
11060
  layout: "inline",
11031
11061
  form: form,
11032
11062
  onFinish: onFinish,
11033
- onValuesChange: onValuesChange
11063
+ onValuesChange: onValuesChange,
11064
+ initialValues: {
11065
+ code: ''
11066
+ }
11034
11067
  }, /*#__PURE__*/React.createElement(Form.Item, {
11035
11068
  name: "dateTimePicker"
11036
11069
  }, /*#__PURE__*/React.createElement(RangePicker, {
11037
11070
  placeholder: ['开始日期', '结束日期'],
11038
11071
  showTime: true,
11039
- defaultValue: [hooks(startTime, dateFormat), hooks(endTime, dateFormat)]
11072
+ defaultValue: [hooks(initStartTime.format(dateFormat), dateFormat), hooks(initEndTime.format(dateFormat), dateFormat)]
11040
11073
  })), /*#__PURE__*/React.createElement(Form.Item, {
11041
11074
  name: "code"
11042
11075
  }, /*#__PURE__*/React.createElement(Input, {
@@ -11050,12 +11083,15 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11050
11083
  htmlType: "submit"
11051
11084
  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
11052
11085
  onClick: onReset
11053
- }, "\u91CD\u7F6E"))), /*#__PURE__*/React.createElement(Spin, {
11054
- spinning: loading
11086
+ }, "\u91CD\u7F6E"))), /*#__PURE__*/React.createElement("div", {
11087
+ style: {
11088
+ marginTop: '16px'
11089
+ }
11055
11090
  }, /*#__PURE__*/React.createElement(Table, {
11056
11091
  rowKey: 'goodNo',
11057
11092
  columns: columns$1,
11058
11093
  dataSource: goodList,
11094
+ loading: loading,
11059
11095
  scroll: {
11060
11096
  x: true,
11061
11097
  y: 250
@@ -11164,18 +11200,18 @@ var GoodItem = function GoodItem(props) {
11164
11200
  align: 'center',
11165
11201
  ellipsis: true,
11166
11202
  width: 100
11167
- }, {
11168
- dataIndex: 'specId',
11169
- title: "".concat(text, "SKUID"),
11170
- align: 'center',
11171
- ellipsis: true,
11172
- width: 100
11173
11203
  }, {
11174
11204
  dataIndex: 'goodName',
11175
11205
  title: "".concat(text, "\u5546\u54C1\u540D\u79F0"),
11176
11206
  align: 'center',
11177
11207
  ellipsis: true,
11178
11208
  width: 250
11209
+ }, {
11210
+ dataIndex: 'specId',
11211
+ title: "".concat(text, "SKUID"),
11212
+ align: 'center',
11213
+ ellipsis: true,
11214
+ width: 100
11179
11215
  }, {
11180
11216
  dataIndex: 'specNo',
11181
11217
  title: "".concat(text, "sku\u7F16\u7801"),
@@ -11190,7 +11226,7 @@ var GoodItem = function GoodItem(props) {
11190
11226
  width: 250
11191
11227
  }, {
11192
11228
  dataIndex: 'orderPrice',
11193
- title: "\u5B9E\u4ED8\u91D1\u989D",
11229
+ title: "\u5B9E\u4ED8\u603B\u91D1\u989D",
11194
11230
  align: 'center',
11195
11231
  ellipsis: true,
11196
11232
  width: 100
@@ -11229,7 +11265,7 @@ var GoodItem = function GoodItem(props) {
11229
11265
  width: 70
11230
11266
  }, {
11231
11267
  dataIndex: 'giftType',
11232
- title: "\u8D60\u54C1\u7C7B\u578B",
11268
+ title: "\u8D60\u54C1\u65B9\u5F0F",
11233
11269
  align: 'center',
11234
11270
  ellipsis: true,
11235
11271
  width: 100,
package/dist/index.js CHANGED
@@ -10713,43 +10713,44 @@ var columns$1 = [{
10713
10713
  }, {
10714
10714
  dataIndex: 'goodName',
10715
10715
  title: '商品名称',
10716
- with: 200,
10716
+ width: 200,
10717
10717
  ellipsis: true
10718
10718
  }, {
10719
10719
  dataIndex: 'goodNo',
10720
10720
  title: '商品spu编码',
10721
- with: 200,
10722
- ellipsis: true
10721
+ width: 200
10722
+ // ellipsis: true,
10723
10723
  }, {
10724
10724
  dataIndex: 'goodId',
10725
10725
  title: 'SPUID',
10726
- with: 200,
10727
- ellipsis: true
10726
+ width: 200
10727
+ // ellipsis: true,
10728
10728
  }, {
10729
10729
  dataIndex: 'specCount',
10730
10730
  title: '规格数',
10731
- with: 200,
10732
- ellipsis: true
10731
+ width: 160
10732
+ // ellipsis: true,
10733
10733
  }];
10734
+
10734
10735
  var expandedColumns = [{
10735
10736
  dataIndex: 'specName',
10736
10737
  title: '商品sku名称',
10737
- with: 200,
10738
+ width: 200,
10738
10739
  ellipsis: true
10739
10740
  }, {
10740
10741
  dataIndex: 'specNo',
10741
10742
  title: '商品sku编码',
10742
- with: 200,
10743
- ellipsis: true
10743
+ width: 200
10744
+ // ellipsis: true,
10744
10745
  }, {
10745
10746
  dataIndex: 'specId',
10746
10747
  title: 'SKUID',
10747
- with: 200,
10748
- ellipsis: true
10748
+ width: 200
10749
+ // ellipsis: true,
10749
10750
  }, {
10750
10751
  dataIndex: 'imgUrl',
10751
10752
  title: '商品图片',
10752
- with: 200,
10753
+ width: 100,
10753
10754
  render: function render(picUrl) {
10754
10755
  return /*#__PURE__*/React__default['default'].createElement("img", {
10755
10756
  style: {
@@ -10762,16 +10763,21 @@ var expandedColumns = [{
10762
10763
  }
10763
10764
  }, {
10764
10765
  dataIndex: 'marketPrice',
10765
- title: '市场价'
10766
+ title: '市场价',
10767
+ width: 140
10766
10768
  }, {
10767
10769
  dataIndex: 'retailPrice',
10768
- title: '零售价'
10770
+ title: '零售价',
10771
+ width: 140
10769
10772
  }, {
10770
10773
  dataIndex: 'memberPrice',
10771
- title: '会员价'
10774
+ title: '会员价',
10775
+ width: 140
10772
10776
  }];
10773
10777
  var dateFormat = 'YYYY-MM-DD HH:mm:ss';
10774
10778
  var GoodsModal$3 = function GoodsModal(props, ref) {
10779
+ var initStartTime = hooks().subtract(1, 'M');
10780
+ var initEndTime = hooks();
10775
10781
  React.useImperativeHandle(ref, function () {
10776
10782
  return {
10777
10783
  open: function open(shopCode) {
@@ -10779,7 +10785,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
10779
10785
  setPageNo(1);
10780
10786
  setSelect([]);
10781
10787
  setSelectIds([]);
10782
- queryItems(shopCode);
10788
+ form.setFieldsValue({
10789
+ dateTimePicker: [initStartTime, initEndTime],
10790
+ code: ''
10791
+ });
10783
10792
  // getShopList();
10784
10793
  }
10785
10794
  };
@@ -10821,27 +10830,23 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
10821
10830
  _useState16 = _slicedToArray(_useState15, 2),
10822
10831
  total = _useState16[0],
10823
10832
  setTotal = _useState16[1];
10824
- var _useState17 = React.useState(hooks().subtract(1, 'M').format(dateFormat)),
10825
- _useState18 = _slicedToArray(_useState17, 2),
10826
- startTime = _useState18[0],
10827
- setStartTime = _useState18[1];
10828
- var _useState19 = React.useState(hooks().format(dateFormat)),
10829
- _useState20 = _slicedToArray(_useState19, 2),
10830
- endTime = _useState20[0],
10831
- setEndTime = _useState20[1];
10832
10833
  var displaySelectList = React.useMemo(function () {
10833
10834
  return selectList.map(function (item, i) {
10834
10835
  item.index = i + 1;
10835
10836
  return item;
10836
10837
  });
10837
10838
  }, [selectList]);
10839
+ React.useEffect(function () {
10840
+ if (visible) {
10841
+ queryItems();
10842
+ }
10843
+ }, [pageNo, visible]);
10838
10844
  var _Form$useForm = antd.Form.useForm(),
10839
10845
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
10840
10846
  form = _Form$useForm2[0];
10841
10847
  //选择页码
10842
10848
  var pageChange = function pageChange(page) {
10843
10849
  setPageNo(page);
10844
- queryItems();
10845
10850
  };
10846
10851
  /**
10847
10852
  * 查询商品
@@ -10849,10 +10854,23 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
10849
10854
  var queryItems = /*#__PURE__*/function () {
10850
10855
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
10851
10856
  var search,
10857
+ _formData$dateTimePic,
10858
+ _formData$dateTimePic2,
10859
+ _formData$dateTimePic3,
10860
+ _formData$dateTimePic4,
10861
+ _formData$dateTimePic5,
10862
+ _formData$dateTimePic6,
10863
+ formData,
10864
+ startTime,
10865
+ endTime,
10852
10866
  params,
10853
10867
  res,
10868
+ _res$data,
10854
10869
  _res$data$productList,
10855
10870
  productList,
10871
+ _res$data$total,
10872
+ _total,
10873
+ errorMsg,
10856
10874
  newProducts,
10857
10875
  _args = arguments;
10858
10876
  return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -10861,6 +10879,9 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
10861
10879
  search = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
10862
10880
  _context.prev = 1;
10863
10881
  setLoading(true);
10882
+ formData = form.getFieldsValue();
10883
+ startTime = ((_formData$dateTimePic = formData.dateTimePicker) === null || _formData$dateTimePic === void 0 ? void 0 : (_formData$dateTimePic2 = _formData$dateTimePic[0]) === null || _formData$dateTimePic2 === void 0 ? void 0 : (_formData$dateTimePic3 = _formData$dateTimePic2.format) === null || _formData$dateTimePic3 === void 0 ? void 0 : _formData$dateTimePic3.call(_formData$dateTimePic2, dateFormat)) || hooks().subtract(1, 'M').format(dateFormat);
10884
+ endTime = ((_formData$dateTimePic4 = formData.dateTimePicker) === null || _formData$dateTimePic4 === void 0 ? void 0 : (_formData$dateTimePic5 = _formData$dateTimePic4[1]) === null || _formData$dateTimePic5 === void 0 ? void 0 : (_formData$dateTimePic6 = _formData$dateTimePic5.format) === null || _formData$dateTimePic6 === void 0 ? void 0 : _formData$dateTimePic6.call(_formData$dateTimePic5, dateFormat)) || hooks().format(dateFormat);
10864
10885
  params = {
10865
10886
  // shopCode: shopCode,
10866
10887
  pageSize: pageSize,
@@ -10869,43 +10890,44 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
10869
10890
  startTime: startTime,
10870
10891
  endTime: endTime
10871
10892
  };
10872
- _context.next = 6;
10893
+ _context.next = 9;
10873
10894
  return extendRequest('/qy/gdfw/product/wdtListProduct', {
10874
10895
  method: 'post',
10875
10896
  data: params
10876
10897
  });
10877
- case 6:
10898
+ case 9:
10878
10899
  res = _context.sent;
10900
+ _res$data = res.data, _res$data$productList = _res$data.productList, productList = _res$data$productList === void 0 ? [] : _res$data$productList, _res$data$total = _res$data.total, _total = _res$data$total === void 0 ? 0 : _res$data$total, errorMsg = _res$data.errorMsg;
10879
10901
  if (res.success) {
10880
- _res$data$productList = res.data.productList, productList = _res$data$productList === void 0 ? [] : _res$data$productList;
10881
10902
  newProducts = productList.map(function (item, index) {
10882
10903
  return _objectSpread2(_objectSpread2({}, item), {}, {
10883
10904
  index: index + 1
10884
10905
  });
10885
10906
  });
10886
- initData(_toConsumableArray(newProducts));
10907
+ setGoodList(_toConsumableArray(newProducts));
10908
+ if (pageNo === 1) {
10909
+ setTotal(_total);
10910
+ }
10911
+ } else {
10912
+ setGoodList([]);
10913
+ setTotal(0);
10914
+ antd.message.error(errorMsg || res.message);
10887
10915
  }
10888
- case 8:
10889
- _context.prev = 8;
10916
+ case 12:
10917
+ _context.prev = 12;
10890
10918
  setLoading(false);
10891
- return _context.finish(8);
10892
- case 11:
10919
+ return _context.finish(12);
10920
+ case 15:
10893
10921
  case "end":
10894
10922
  return _context.stop();
10895
10923
  }
10896
- }, _callee, null, [[1,, 8, 11]]);
10924
+ }, _callee, null, [[1,, 12, 15]]);
10897
10925
  }));
10898
10926
  return function queryItems() {
10899
10927
  return _ref.apply(this, arguments);
10900
10928
  };
10901
10929
  }();
10902
- var initData = function initData(list) {
10903
- setGoodList(_toConsumableArray(list));
10904
- setTotal(list.length);
10905
- setPageNo(1);
10906
- };
10907
10930
  var _onCancel = function onCancel() {
10908
- onReset();
10909
10931
  setVisible(false);
10910
10932
  };
10911
10933
  var onOk = function onOk() {
@@ -10920,7 +10942,16 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
10920
10942
  };
10921
10943
  var onReset = function onReset() {
10922
10944
  form.resetFields();
10923
- initData([]);
10945
+ form.setFieldsValue({
10946
+ dateTimePicker: [hooks().subtract(1, 'M'), hooks()],
10947
+ code: ''
10948
+ });
10949
+ setPageNo(function (prev) {
10950
+ if (prev === 1 && visible) {
10951
+ queryItems();
10952
+ }
10953
+ return 1;
10954
+ });
10924
10955
  };
10925
10956
  // const getShopList = async () => {
10926
10957
  // const { success, data } = await request('/qy/diamond/getConfigInfo', {
@@ -10947,10 +10978,6 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
10947
10978
  shopCode: changedValues.shopId
10948
10979
  });
10949
10980
  }
10950
- if (Array.isArray(changedValues.dateTimePicker)) {
10951
- setStartTime(changedValues.dateTimePicker[0].format(dateFormat));
10952
- setEndTime(changedValues.dateTimePicker[1].format(dateFormat));
10953
- }
10954
10981
  };
10955
10982
  var handleDelete = function handleDelete(record, index) {
10956
10983
  var newSelectList = selectList.filter(function (item) {
@@ -11023,7 +11050,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11023
11050
  columns: expandedColumns,
11024
11051
  dataSource: record.itemDetailList || [],
11025
11052
  pagination: false,
11026
- rowSelection: expandedRowSelection
11053
+ rowSelection: expandedRowSelection,
11054
+ scroll: {
11055
+ x: true
11056
+ }
11027
11057
  });
11028
11058
  };
11029
11059
  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
@@ -11041,13 +11071,16 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11041
11071
  layout: "inline",
11042
11072
  form: form,
11043
11073
  onFinish: onFinish,
11044
- onValuesChange: onValuesChange
11074
+ onValuesChange: onValuesChange,
11075
+ initialValues: {
11076
+ code: ''
11077
+ }
11045
11078
  }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
11046
11079
  name: "dateTimePicker"
11047
11080
  }, /*#__PURE__*/React__default['default'].createElement(RangePicker, {
11048
11081
  placeholder: ['开始日期', '结束日期'],
11049
11082
  showTime: true,
11050
- defaultValue: [hooks(startTime, dateFormat), hooks(endTime, dateFormat)]
11083
+ defaultValue: [hooks(initStartTime.format(dateFormat), dateFormat), hooks(initEndTime.format(dateFormat), dateFormat)]
11051
11084
  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
11052
11085
  name: "code"
11053
11086
  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
@@ -11061,12 +11094,15 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11061
11094
  htmlType: "submit"
11062
11095
  }, "\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
11063
11096
  onClick: onReset
11064
- }, "\u91CD\u7F6E"))), /*#__PURE__*/React__default['default'].createElement(antd.Spin, {
11065
- spinning: loading
11097
+ }, "\u91CD\u7F6E"))), /*#__PURE__*/React__default['default'].createElement("div", {
11098
+ style: {
11099
+ marginTop: '16px'
11100
+ }
11066
11101
  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
11067
11102
  rowKey: 'goodNo',
11068
11103
  columns: columns$1,
11069
11104
  dataSource: goodList,
11105
+ loading: loading,
11070
11106
  scroll: {
11071
11107
  x: true,
11072
11108
  y: 250
@@ -11175,18 +11211,18 @@ var GoodItem = function GoodItem(props) {
11175
11211
  align: 'center',
11176
11212
  ellipsis: true,
11177
11213
  width: 100
11178
- }, {
11179
- dataIndex: 'specId',
11180
- title: "".concat(text, "SKUID"),
11181
- align: 'center',
11182
- ellipsis: true,
11183
- width: 100
11184
11214
  }, {
11185
11215
  dataIndex: 'goodName',
11186
11216
  title: "".concat(text, "\u5546\u54C1\u540D\u79F0"),
11187
11217
  align: 'center',
11188
11218
  ellipsis: true,
11189
11219
  width: 250
11220
+ }, {
11221
+ dataIndex: 'specId',
11222
+ title: "".concat(text, "SKUID"),
11223
+ align: 'center',
11224
+ ellipsis: true,
11225
+ width: 100
11190
11226
  }, {
11191
11227
  dataIndex: 'specNo',
11192
11228
  title: "".concat(text, "sku\u7F16\u7801"),
@@ -11201,7 +11237,7 @@ var GoodItem = function GoodItem(props) {
11201
11237
  width: 250
11202
11238
  }, {
11203
11239
  dataIndex: 'orderPrice',
11204
- title: "\u5B9E\u4ED8\u91D1\u989D",
11240
+ title: "\u5B9E\u4ED8\u603B\u91D1\u989D",
11205
11241
  align: 'center',
11206
11242
  ellipsis: true,
11207
11243
  width: 100
@@ -11240,7 +11276,7 @@ var GoodItem = function GoodItem(props) {
11240
11276
  width: 70
11241
11277
  }, {
11242
11278
  dataIndex: 'giftType',
11243
- title: "\u8D60\u54C1\u7C7B\u578B",
11279
+ title: "\u8D60\u54C1\u65B9\u5F0F",
11244
11280
  align: 'center',
11245
11281
  ellipsis: true,
11246
11282
  width: 100,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "0.23.1-beta.15",
3
+ "version": "0.23.1-beta.17",
4
4
  "description": "> TODO: description",
5
5
  "homepage": "",
6
6
  "license": "ISC",
@@ -64,5 +64,5 @@
64
64
  "publishConfig": {
65
65
  "access": "public"
66
66
  },
67
- "gitHead": "3ca079b7e16ea45b440c80b4e49222fa21b1a545"
67
+ "gitHead": "10da0e957795edc5323d4983a28eb1126d9e13ae"
68
68
  }