wargerm 0.2.12 → 0.2.16

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
@@ -523,39 +523,48 @@ var WSelect = function WSelect(props) {
523
523
  valueEnumList = _useState4[0],
524
524
  setValueEnumList = _useState4[1];
525
525
 
526
- useEffect(function () {
527
- _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
528
- var res, node;
529
- return regeneratorRuntime.wrap(function _callee$(_context) {
530
- while (1) {
531
- switch (_context.prev = _context.next) {
532
- case 0:
533
- if (!request) {
534
- _context.next = 7;
535
- break;
536
- }
537
-
538
- _context.next = 3;
539
- return request();
526
+ var _useState5 = useState(null),
527
+ _useState6 = _slicedToArray(_useState5, 2),
528
+ resList = _useState6[0],
529
+ setResList = _useState6[1];
540
530
 
541
- case 3:
542
- res = _context.sent;
543
- onLoad && onLoad(res);
544
- node = res.map(function (item) {
545
- return /*#__PURE__*/React.createElement(_Select.Option, {
546
- key: item.value,
547
- value: item.value
548
- }, item.label);
549
- });
550
- setChildrenNode(node);
531
+ useEffect(function () {
532
+ if (!resList) {
533
+ _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
534
+ var res, node;
535
+ return regeneratorRuntime.wrap(function _callee$(_context) {
536
+ while (1) {
537
+ switch (_context.prev = _context.next) {
538
+ case 0:
539
+ if (!request) {
540
+ _context.next = 9;
541
+ break;
542
+ }
551
543
 
552
- case 7:
553
- case "end":
554
- return _context.stop();
544
+ console.log('request');
545
+ _context.next = 4;
546
+ return request();
547
+
548
+ case 4:
549
+ res = _context.sent;
550
+ setResList(res);
551
+ onLoad && onLoad(res);
552
+ node = res.map(function (item) {
553
+ return /*#__PURE__*/React.createElement(_Select.Option, {
554
+ key: item.value,
555
+ value: item.value
556
+ }, item.label);
557
+ });
558
+ setChildrenNode(node);
559
+
560
+ case 9:
561
+ case "end":
562
+ return _context.stop();
563
+ }
555
564
  }
556
- }
557
- }, _callee);
558
- }))();
565
+ }, _callee);
566
+ }))();
567
+ }
559
568
 
560
569
  var valueEnumNode = [];
561
570
  var options = [];
@@ -585,7 +594,7 @@ var WSelect = function WSelect(props) {
585
594
 
586
595
  onLoad && onLoad(options);
587
596
  setValueEnumList(valueEnumNode);
588
- }, []);
597
+ }, [resList]);
589
598
  return /*#__PURE__*/React.createElement(_Select, _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
590
599
  };
591
600
 
@@ -7550,7 +7559,8 @@ var WForm = function WForm(props, ref) {
7550
7559
 
7551
7560
  var _Form$useForm = _Form.useForm(),
7552
7561
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
7553
- form = _Form$useForm2[0];
7562
+ form = _Form$useForm2[0]; // const columnsFieldsRef = useRef<any>({});
7563
+
7554
7564
 
7555
7565
  var _useState = useState({}),
7556
7566
  _useState2 = _slicedToArray(_useState, 2),
@@ -7623,6 +7633,9 @@ var WForm = function WForm(props, ref) {
7623
7633
  placeholder: "\u8BF7\u9009\u62E9",
7624
7634
  disabled: disabled,
7625
7635
  onLoad: function onLoad(opt) {
7636
+ // if (columnsFieldsRef.current) {
7637
+ // columnsFieldsRef.current[c.dataIndex] = opt;
7638
+ // }
7626
7639
  setColumnsFields(function (preColumnsFields) {
7627
7640
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
7628
7641
  });
@@ -7760,7 +7773,10 @@ var WForm = function WForm(props, ref) {
7760
7773
 
7761
7774
  if (c.options) {
7762
7775
  options = c.options;
7763
- }
7776
+ } // if (columnsFieldsRef.current) {
7777
+ // columnsFieldsRef.current[c.dataIndex] = options;
7778
+ // }
7779
+
7764
7780
 
7765
7781
  setColumnsFields(function (preColumnsFields) {
7766
7782
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
@@ -7806,7 +7822,10 @@ var WForm = function WForm(props, ref) {
7806
7822
  value: _key
7807
7823
  });
7808
7824
  }
7809
- }
7825
+ } // if (columnsFieldsRef.current) {
7826
+ // columnsFieldsRef.current[c.dataIndex] = options;
7827
+ // }
7828
+
7810
7829
 
7811
7830
  setColumnsFields(function (preColumnsFields) {
7812
7831
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options));
@@ -7866,7 +7885,10 @@ var WForm = function WForm(props, ref) {
7866
7885
  _labelCol6.style = {
7867
7886
  width: search.labelWidth
7868
7887
  };
7869
- }
7888
+ } // if (columnsFieldsRef.current) {
7889
+ // columnsFieldsRef.current[c.dataIndex] = options;
7890
+ // }
7891
+
7870
7892
 
7871
7893
  setColumnsFields(function (preColumnsFields) {
7872
7894
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options2));
@@ -7926,7 +7948,8 @@ var WForm = function WForm(props, ref) {
7926
7948
  var baseitem = c.renderFormItem(c, _objectSpread2(_objectSpread2({}, c), {}, {
7927
7949
  formItemProps: c.formItemProps,
7928
7950
  fieldProps: c.fieldProps,
7929
- columnsFields: columnsFields
7951
+ columnsFields: columnsFields // columnsFieldsRef,
7952
+
7930
7953
  }), form);
7931
7954
  return baseitem ? /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
7932
7955
  style: {
@@ -8023,7 +8046,7 @@ var WForm = function WForm(props, ref) {
8023
8046
  }, c.fieldProps))));
8024
8047
  }
8025
8048
  });
8026
- }, [changedValues, columns, disabled, JSON.stringify(form.getFieldsValue())]);
8049
+ }, [changedValues, columns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
8027
8050
  var filterExtraColumnsForm = useMemo(function () {
8028
8051
  return filterExtraFormColumns.map(function (c) {
8029
8052
  var colProps = {};
@@ -8073,6 +8096,9 @@ var WForm = function WForm(props, ref) {
8073
8096
  placeholder: "\u8BF7\u9009\u62E9",
8074
8097
  disabled: disabled,
8075
8098
  onLoad: function onLoad(opt) {
8099
+ // if (columnsFieldsRef.current) {
8100
+ // columnsFieldsRef.current[c.dataIndex] = opt;
8101
+ // }
8076
8102
  setColumnsFields(function (preColumnsFields) {
8077
8103
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
8078
8104
  });
@@ -8210,7 +8236,10 @@ var WForm = function WForm(props, ref) {
8210
8236
 
8211
8237
  if (c.options) {
8212
8238
  options = c.options;
8213
- }
8239
+ } // if (columnsFieldsRef.current) {
8240
+ // columnsFieldsRef.current[c.dataIndex] = options;
8241
+ // }
8242
+
8214
8243
 
8215
8244
  setColumnsFields(function (preColumnsFields) {
8216
8245
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
@@ -8256,7 +8285,10 @@ var WForm = function WForm(props, ref) {
8256
8285
  value: _key3
8257
8286
  });
8258
8287
  }
8259
- }
8288
+ } // if (columnsFieldsRef.current) {
8289
+ // columnsFieldsRef.current[c.dataIndex] = options;
8290
+ // }
8291
+
8260
8292
 
8261
8293
  setColumnsFields(function (preColumnsFields) {
8262
8294
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options3));
@@ -8316,7 +8348,10 @@ var WForm = function WForm(props, ref) {
8316
8348
  _labelCol17.style = {
8317
8349
  width: search.labelWidth
8318
8350
  };
8319
- }
8351
+ } // if (columnsFieldsRef.current) {
8352
+ // columnsFieldsRef.current[c.dataIndex] = options;
8353
+ // }
8354
+
8320
8355
 
8321
8356
  setColumnsFields(function (preColumnsFields) {
8322
8357
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options4));
@@ -8376,7 +8411,8 @@ var WForm = function WForm(props, ref) {
8376
8411
  var baseitem = c.renderFormItem(c, _objectSpread2(_objectSpread2({}, c), {}, {
8377
8412
  formItemProps: c.formItemProps,
8378
8413
  fieldProps: c.fieldProps,
8379
- columnsFields: columnsFields
8414
+ columnsFields: columnsFields // columnsFieldsRef,
8415
+
8380
8416
  }), form);
8381
8417
  return baseitem ? /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
8382
8418
  style: {
@@ -8473,14 +8509,19 @@ var WForm = function WForm(props, ref) {
8473
8509
  }, c.fieldProps))));
8474
8510
  }
8475
8511
  });
8476
- }, [changedValues, extraColumns, disabled, JSON.stringify(form.getFieldsValue())]);
8512
+ }, [changedValues, extraColumns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
8477
8513
 
8478
8514
  var handleSearch = function handleSearch(v) {
8479
8515
  var searchForm = form.getFieldsValue();
8480
8516
  filterFormColumns.forEach(function (c) {
8481
8517
  if (c.search && c.search.transform) {
8482
- searchForm = _objectSpread2(_objectSpread2({}, searchForm), c.search.transform(searchForm[c.dataIndex]));
8483
- delete searchForm[c.dataIndex];
8518
+ var transformObj = c.search.transform(searchForm[c.dataIndex]);
8519
+ searchForm = _objectSpread2(_objectSpread2({}, searchForm), transformObj);
8520
+
8521
+ if (!transformObj[c.dataIndex]) {
8522
+ delete searchForm[c.dataIndex];
8523
+ }
8524
+
8484
8525
  return false;
8485
8526
  }
8486
8527
 
@@ -8785,12 +8826,12 @@ var Index$7 = function Index(props) {
8785
8826
  Index$7.defaultProps = {};
8786
8827
 
8787
8828
  var _excluded$8 = ["list", "render", "partSize"];
8788
- var autoScrollInterval = null;
8789
8829
 
8790
8830
  function AutoScroll(props) {
8791
8831
  var inner1 = useRef();
8792
8832
  var inner2 = useRef();
8793
8833
  var outer = useRef();
8834
+ var timer = useRef(null);
8794
8835
  useImperativeHandle(props.cref, function () {
8795
8836
  return {
8796
8837
  tryScroll: tryScroll
@@ -8811,8 +8852,8 @@ function AutoScroll(props) {
8811
8852
 
8812
8853
 
8813
8854
  var startScroll = function startScroll() {
8814
- if (!autoScrollInterval) {
8815
- autoScrollInterval = setInterval(function () {
8855
+ if (!timer.current) {
8856
+ timer.current = setInterval(function () {
8816
8857
  // 如果已经滚动到inner1的底部,则重置滚动的位置到inner1的头部
8817
8858
  if (outer.current.scrollTop >= inner1.current.offsetHeight) {
8818
8859
  outer.current.scrollTop = 0; // 触发complete事件
@@ -8832,8 +8873,11 @@ function AutoScroll(props) {
8832
8873
 
8833
8874
 
8834
8875
  var stopScroll = function stopScroll() {
8835
- clearInterval(autoScrollInterval);
8836
- autoScrollInterval = null;
8876
+ if (timer.current) {
8877
+ clearInterval(timer.current);
8878
+ }
8879
+
8880
+ timer.current = null;
8837
8881
  };
8838
8882
 
8839
8883
  useEffect(function () {
@@ -8844,7 +8888,7 @@ function AutoScroll(props) {
8844
8888
  return function () {
8845
8889
  stopScroll();
8846
8890
  };
8847
- }, []);
8891
+ }, [timer]);
8848
8892
  return /*#__PURE__*/React.createElement("div", {
8849
8893
  className: "autoScroll-outer ".concat(props.className),
8850
8894
  ref: outer,
package/dist/index.js CHANGED
@@ -556,39 +556,48 @@ var WSelect = function WSelect(props) {
556
556
  valueEnumList = _useState4[0],
557
557
  setValueEnumList = _useState4[1];
558
558
 
559
- React.useEffect(function () {
560
- _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
561
- var res, node;
562
- return regeneratorRuntime.wrap(function _callee$(_context) {
563
- while (1) {
564
- switch (_context.prev = _context.next) {
565
- case 0:
566
- if (!request) {
567
- _context.next = 7;
568
- break;
569
- }
570
-
571
- _context.next = 3;
572
- return request();
559
+ var _useState5 = React.useState(null),
560
+ _useState6 = _slicedToArray(_useState5, 2),
561
+ resList = _useState6[0],
562
+ setResList = _useState6[1];
573
563
 
574
- case 3:
575
- res = _context.sent;
576
- onLoad && onLoad(res);
577
- node = res.map(function (item) {
578
- return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'].Option, {
579
- key: item.value,
580
- value: item.value
581
- }, item.label);
582
- });
583
- setChildrenNode(node);
564
+ React.useEffect(function () {
565
+ if (!resList) {
566
+ _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
567
+ var res, node;
568
+ return regeneratorRuntime.wrap(function _callee$(_context) {
569
+ while (1) {
570
+ switch (_context.prev = _context.next) {
571
+ case 0:
572
+ if (!request) {
573
+ _context.next = 9;
574
+ break;
575
+ }
584
576
 
585
- case 7:
586
- case "end":
587
- return _context.stop();
577
+ console.log('request');
578
+ _context.next = 4;
579
+ return request();
580
+
581
+ case 4:
582
+ res = _context.sent;
583
+ setResList(res);
584
+ onLoad && onLoad(res);
585
+ node = res.map(function (item) {
586
+ return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'].Option, {
587
+ key: item.value,
588
+ value: item.value
589
+ }, item.label);
590
+ });
591
+ setChildrenNode(node);
592
+
593
+ case 9:
594
+ case "end":
595
+ return _context.stop();
596
+ }
588
597
  }
589
- }
590
- }, _callee);
591
- }))();
598
+ }, _callee);
599
+ }))();
600
+ }
592
601
 
593
602
  var valueEnumNode = [];
594
603
  var options = [];
@@ -618,7 +627,7 @@ var WSelect = function WSelect(props) {
618
627
 
619
628
  onLoad && onLoad(options);
620
629
  setValueEnumList(valueEnumNode);
621
- }, []);
630
+ }, [resList]);
622
631
  return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'], _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
623
632
  };
624
633
 
@@ -7583,7 +7592,8 @@ var WForm = function WForm(props, ref) {
7583
7592
 
7584
7593
  var _Form$useForm = _Form__default['default'].useForm(),
7585
7594
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
7586
- form = _Form$useForm2[0];
7595
+ form = _Form$useForm2[0]; // const columnsFieldsRef = useRef<any>({});
7596
+
7587
7597
 
7588
7598
  var _useState = React.useState({}),
7589
7599
  _useState2 = _slicedToArray(_useState, 2),
@@ -7656,6 +7666,9 @@ var WForm = function WForm(props, ref) {
7656
7666
  placeholder: "\u8BF7\u9009\u62E9",
7657
7667
  disabled: disabled,
7658
7668
  onLoad: function onLoad(opt) {
7669
+ // if (columnsFieldsRef.current) {
7670
+ // columnsFieldsRef.current[c.dataIndex] = opt;
7671
+ // }
7659
7672
  setColumnsFields(function (preColumnsFields) {
7660
7673
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
7661
7674
  });
@@ -7793,7 +7806,10 @@ var WForm = function WForm(props, ref) {
7793
7806
 
7794
7807
  if (c.options) {
7795
7808
  options = c.options;
7796
- }
7809
+ } // if (columnsFieldsRef.current) {
7810
+ // columnsFieldsRef.current[c.dataIndex] = options;
7811
+ // }
7812
+
7797
7813
 
7798
7814
  setColumnsFields(function (preColumnsFields) {
7799
7815
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
@@ -7839,7 +7855,10 @@ var WForm = function WForm(props, ref) {
7839
7855
  value: _key
7840
7856
  });
7841
7857
  }
7842
- }
7858
+ } // if (columnsFieldsRef.current) {
7859
+ // columnsFieldsRef.current[c.dataIndex] = options;
7860
+ // }
7861
+
7843
7862
 
7844
7863
  setColumnsFields(function (preColumnsFields) {
7845
7864
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options));
@@ -7899,7 +7918,10 @@ var WForm = function WForm(props, ref) {
7899
7918
  _labelCol6.style = {
7900
7919
  width: search.labelWidth
7901
7920
  };
7902
- }
7921
+ } // if (columnsFieldsRef.current) {
7922
+ // columnsFieldsRef.current[c.dataIndex] = options;
7923
+ // }
7924
+
7903
7925
 
7904
7926
  setColumnsFields(function (preColumnsFields) {
7905
7927
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options2));
@@ -7959,7 +7981,8 @@ var WForm = function WForm(props, ref) {
7959
7981
  var baseitem = c.renderFormItem(c, _objectSpread2(_objectSpread2({}, c), {}, {
7960
7982
  formItemProps: c.formItemProps,
7961
7983
  fieldProps: c.fieldProps,
7962
- columnsFields: columnsFields
7984
+ columnsFields: columnsFields // columnsFieldsRef,
7985
+
7963
7986
  }), form);
7964
7987
  return baseitem ? /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
7965
7988
  style: {
@@ -8056,7 +8079,7 @@ var WForm = function WForm(props, ref) {
8056
8079
  }, c.fieldProps))));
8057
8080
  }
8058
8081
  });
8059
- }, [changedValues, columns, disabled, JSON.stringify(form.getFieldsValue())]);
8082
+ }, [changedValues, columns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
8060
8083
  var filterExtraColumnsForm = React.useMemo(function () {
8061
8084
  return filterExtraFormColumns.map(function (c) {
8062
8085
  var colProps = {};
@@ -8106,6 +8129,9 @@ var WForm = function WForm(props, ref) {
8106
8129
  placeholder: "\u8BF7\u9009\u62E9",
8107
8130
  disabled: disabled,
8108
8131
  onLoad: function onLoad(opt) {
8132
+ // if (columnsFieldsRef.current) {
8133
+ // columnsFieldsRef.current[c.dataIndex] = opt;
8134
+ // }
8109
8135
  setColumnsFields(function (preColumnsFields) {
8110
8136
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
8111
8137
  });
@@ -8243,7 +8269,10 @@ var WForm = function WForm(props, ref) {
8243
8269
 
8244
8270
  if (c.options) {
8245
8271
  options = c.options;
8246
- }
8272
+ } // if (columnsFieldsRef.current) {
8273
+ // columnsFieldsRef.current[c.dataIndex] = options;
8274
+ // }
8275
+
8247
8276
 
8248
8277
  setColumnsFields(function (preColumnsFields) {
8249
8278
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
@@ -8289,7 +8318,10 @@ var WForm = function WForm(props, ref) {
8289
8318
  value: _key3
8290
8319
  });
8291
8320
  }
8292
- }
8321
+ } // if (columnsFieldsRef.current) {
8322
+ // columnsFieldsRef.current[c.dataIndex] = options;
8323
+ // }
8324
+
8293
8325
 
8294
8326
  setColumnsFields(function (preColumnsFields) {
8295
8327
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options3));
@@ -8349,7 +8381,10 @@ var WForm = function WForm(props, ref) {
8349
8381
  _labelCol17.style = {
8350
8382
  width: search.labelWidth
8351
8383
  };
8352
- }
8384
+ } // if (columnsFieldsRef.current) {
8385
+ // columnsFieldsRef.current[c.dataIndex] = options;
8386
+ // }
8387
+
8353
8388
 
8354
8389
  setColumnsFields(function (preColumnsFields) {
8355
8390
  return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options4));
@@ -8409,7 +8444,8 @@ var WForm = function WForm(props, ref) {
8409
8444
  var baseitem = c.renderFormItem(c, _objectSpread2(_objectSpread2({}, c), {}, {
8410
8445
  formItemProps: c.formItemProps,
8411
8446
  fieldProps: c.fieldProps,
8412
- columnsFields: columnsFields
8447
+ columnsFields: columnsFields // columnsFieldsRef,
8448
+
8413
8449
  }), form);
8414
8450
  return baseitem ? /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
8415
8451
  style: {
@@ -8506,14 +8542,19 @@ var WForm = function WForm(props, ref) {
8506
8542
  }, c.fieldProps))));
8507
8543
  }
8508
8544
  });
8509
- }, [changedValues, extraColumns, disabled, JSON.stringify(form.getFieldsValue())]);
8545
+ }, [changedValues, extraColumns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
8510
8546
 
8511
8547
  var handleSearch = function handleSearch(v) {
8512
8548
  var searchForm = form.getFieldsValue();
8513
8549
  filterFormColumns.forEach(function (c) {
8514
8550
  if (c.search && c.search.transform) {
8515
- searchForm = _objectSpread2(_objectSpread2({}, searchForm), c.search.transform(searchForm[c.dataIndex]));
8516
- delete searchForm[c.dataIndex];
8551
+ var transformObj = c.search.transform(searchForm[c.dataIndex]);
8552
+ searchForm = _objectSpread2(_objectSpread2({}, searchForm), transformObj);
8553
+
8554
+ if (!transformObj[c.dataIndex]) {
8555
+ delete searchForm[c.dataIndex];
8556
+ }
8557
+
8517
8558
  return false;
8518
8559
  }
8519
8560
 
@@ -8818,12 +8859,12 @@ var Index$7 = function Index(props) {
8818
8859
  Index$7.defaultProps = {};
8819
8860
 
8820
8861
  var _excluded$8 = ["list", "render", "partSize"];
8821
- var autoScrollInterval = null;
8822
8862
 
8823
8863
  function AutoScroll(props) {
8824
8864
  var inner1 = React.useRef();
8825
8865
  var inner2 = React.useRef();
8826
8866
  var outer = React.useRef();
8867
+ var timer = React.useRef(null);
8827
8868
  React.useImperativeHandle(props.cref, function () {
8828
8869
  return {
8829
8870
  tryScroll: tryScroll
@@ -8844,8 +8885,8 @@ function AutoScroll(props) {
8844
8885
 
8845
8886
 
8846
8887
  var startScroll = function startScroll() {
8847
- if (!autoScrollInterval) {
8848
- autoScrollInterval = setInterval(function () {
8888
+ if (!timer.current) {
8889
+ timer.current = setInterval(function () {
8849
8890
  // 如果已经滚动到inner1的底部,则重置滚动的位置到inner1的头部
8850
8891
  if (outer.current.scrollTop >= inner1.current.offsetHeight) {
8851
8892
  outer.current.scrollTop = 0; // 触发complete事件
@@ -8865,8 +8906,11 @@ function AutoScroll(props) {
8865
8906
 
8866
8907
 
8867
8908
  var stopScroll = function stopScroll() {
8868
- clearInterval(autoScrollInterval);
8869
- autoScrollInterval = null;
8909
+ if (timer.current) {
8910
+ clearInterval(timer.current);
8911
+ }
8912
+
8913
+ timer.current = null;
8870
8914
  };
8871
8915
 
8872
8916
  React.useEffect(function () {
@@ -8877,7 +8921,7 @@ function AutoScroll(props) {
8877
8921
  return function () {
8878
8922
  stopScroll();
8879
8923
  };
8880
- }, []);
8924
+ }, [timer]);
8881
8925
  return /*#__PURE__*/React__default['default'].createElement("div", {
8882
8926
  className: "autoScroll-outer ".concat(props.className),
8883
8927
  ref: outer,
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "wargerm",
4
- "version": "0.2.12",
4
+ "version": "0.2.16",
5
5
  "scripts": {
6
6
  "dev": "dumi dev",
7
7
  "docs:build": "dumi build",