@kmkf-fe-packages/basic-components 1.8.1-beta.1 → 1.8.1-beta.5

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 (3) hide show
  1. package/dist/index.esm.js +8 -3
  2. package/dist/index.js +8 -3
  3. package/package.json +2 -2
package/dist/index.esm.js CHANGED
@@ -7664,6 +7664,7 @@ var SubForm = function SubForm(props) {
7664
7664
  disabled = props.disabled,
7665
7665
  platform = props.platform;
7666
7666
  var ref = useRef(null);
7667
+ var isRequest = useRef(false);
7667
7668
  var _useState = useState(false),
7668
7669
  _useState2 = _slicedToArray(_useState, 2),
7669
7670
  open = _useState2[0],
@@ -7817,8 +7818,10 @@ var SubForm = function SubForm(props) {
7817
7818
  onChange === null || onChange === void 0 ? void 0 : onChange(newList);
7818
7819
  };
7819
7820
  var onScrollCapture = function onScrollCapture(e) {
7820
- if (e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight) {
7821
- if (hasMore) {
7821
+ console.log('scrollTop', e.target.scrollTop + e.target.clientHeight, e.target.scrollHeight, hasMore);
7822
+ if (e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight - 20) {
7823
+ if (hasMore && !isRequest.current) {
7824
+ isRequest.current = true;
7822
7825
  getWorkOrderList({
7823
7826
  pageNo: pageNo + 1
7824
7827
  });
@@ -7893,11 +7896,13 @@ var SubForm = function SubForm(props) {
7893
7896
  return params;
7894
7897
  });
7895
7898
  if (pageNo === 1) {
7899
+ ref.current && (ref.current.scrollTop = 0);
7896
7900
  setList(newList);
7897
7901
  } else {
7898
7902
  setList([].concat(_toConsumableArray(list), _toConsumableArray(newList)));
7899
- setHasMore((data === null || data === void 0 ? void 0 : data.list.length) === pageSize);
7900
7903
  }
7904
+ setHasMore((data === null || data === void 0 ? void 0 : data.list.length) === pageSize);
7905
+ isRequest.current = false;
7901
7906
  }
7902
7907
  case 10:
7903
7908
  case "end":
package/dist/index.js CHANGED
@@ -7676,6 +7676,7 @@ var SubForm = function SubForm(props) {
7676
7676
  disabled = props.disabled,
7677
7677
  platform = props.platform;
7678
7678
  var ref = React.useRef(null);
7679
+ var isRequest = React.useRef(false);
7679
7680
  var _useState = React.useState(false),
7680
7681
  _useState2 = _slicedToArray(_useState, 2),
7681
7682
  open = _useState2[0],
@@ -7829,8 +7830,10 @@ var SubForm = function SubForm(props) {
7829
7830
  onChange === null || onChange === void 0 ? void 0 : onChange(newList);
7830
7831
  };
7831
7832
  var onScrollCapture = function onScrollCapture(e) {
7832
- if (e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight) {
7833
- if (hasMore) {
7833
+ console.log('scrollTop', e.target.scrollTop + e.target.clientHeight, e.target.scrollHeight, hasMore);
7834
+ if (e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight - 20) {
7835
+ if (hasMore && !isRequest.current) {
7836
+ isRequest.current = true;
7834
7837
  getWorkOrderList({
7835
7838
  pageNo: pageNo + 1
7836
7839
  });
@@ -7905,11 +7908,13 @@ var SubForm = function SubForm(props) {
7905
7908
  return params;
7906
7909
  });
7907
7910
  if (pageNo === 1) {
7911
+ ref.current && (ref.current.scrollTop = 0);
7908
7912
  setList(newList);
7909
7913
  } else {
7910
7914
  setList([].concat(_toConsumableArray(list), _toConsumableArray(newList)));
7911
- setHasMore((data === null || data === void 0 ? void 0 : data.list.length) === pageSize);
7912
7915
  }
7916
+ setHasMore((data === null || data === void 0 ? void 0 : data.list.length) === pageSize);
7917
+ isRequest.current = false;
7913
7918
  }
7914
7919
  case 10:
7915
7920
  case "end":
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "1.8.1-beta.1",
3
+ "version": "1.8.1-beta.5",
4
4
  "description": "> TODO: description",
5
5
  "homepage": "",
6
6
  "license": "ISC",
@@ -65,5 +65,5 @@
65
65
  "publishConfig": {
66
66
  "access": "public"
67
67
  },
68
- "gitHead": "c63d1f0bf1e1f10c0befd8f18ca1617007f41a2a"
68
+ "gitHead": "425d7a92ccbadd72e18da9b211c50f5b6d41cd9c"
69
69
  }