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

package/README.md

@@ -18,4 +18,4 @@ yarn start
 - common 公共组件
 - config 公共方法
 - assets 静态资源 
-- 
+- 

package/dist/index.esm.js

@@ -7664,6 +7664,7 @@ var SubForm = function SubForm(props) {
     disabled = props.disabled,
     platform = props.platform;
   var ref = useRef(null);
+  var isRequest = useRef(false);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -7817,8 +7818,9 @@ var SubForm = function SubForm(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newList);
   };
   var onScrollCapture = function onScrollCapture(e) {
-    if (e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight) {
-      if (hasMore) {
+    if (e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight - 20) {
+      if (hasMore && !isRequest.current) {
+        isRequest.current = true;
         getWorkOrderList({
           pageNo: pageNo + 1
         });
@@ -7893,11 +7895,13 @@ var SubForm = function SubForm(props) {
                 return params;
               });
               if (pageNo === 1) {
+                ref.current && (ref.current.scrollTop = 0);
                 setList(newList);
               } else {
                 setList([].concat(_toConsumableArray(list), _toConsumableArray(newList)));
               }
               setHasMore((data === null || data === void 0 ? void 0 : data.list.length) === pageSize);
+              isRequest.current = false;
             }
           case 10:
           case "end":
@@ -14248,7 +14252,9 @@ var wdtReissue = function wdtReissue(props) {
     var _typeMap$type25;
     return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.wdtSystemOrderNo]);
   }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.wdtSystemOrderNo]]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, null, /*#__PURE__*/React.createElement(Col, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
+    gutter: 8
+  }, /*#__PURE__*/React.createElement(Col, {
     className: "gutter-row",
     xs: {
       span: 11
@@ -14280,9 +14286,6 @@ var wdtReissue = function wdtReissue(props) {
     },
     md: {
       span: 6
-    },
-    style: {
-      marginLeft: '8px'
     }
   }, /*#__PURE__*/React.createElement(Cascader, {
     style: {

package/dist/index.js

@@ -7676,6 +7676,7 @@ var SubForm = function SubForm(props) {
     disabled = props.disabled,
     platform = props.platform;
   var ref = React.useRef(null);
+  var isRequest = React.useRef(false);
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -7829,8 +7830,9 @@ var SubForm = function SubForm(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newList);
   };
   var onScrollCapture = function onScrollCapture(e) {
-    if (e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight) {
-      if (hasMore) {
+    if (e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight - 20) {
+      if (hasMore && !isRequest.current) {
+        isRequest.current = true;
         getWorkOrderList({
           pageNo: pageNo + 1
         });
@@ -7905,11 +7907,13 @@ var SubForm = function SubForm(props) {
                 return params;
               });
               if (pageNo === 1) {
+                ref.current && (ref.current.scrollTop = 0);
                 setList(newList);
               } else {
                 setList([].concat(_toConsumableArray(list), _toConsumableArray(newList)));
               }
               setHasMore((data === null || data === void 0 ? void 0 : data.list.length) === pageSize);
+              isRequest.current = false;
             }
           case 10:
           case "end":
@@ -14260,7 +14264,9 @@ var wdtReissue = function wdtReissue(props) {
     var _typeMap$type25;
     return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.wdtSystemOrderNo]);
   }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.wdtSystemOrderNo]]);
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, null, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
+    gutter: 8
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     className: "gutter-row",
     xs: {
       span: 11
@@ -14292,9 +14298,6 @@ var wdtReissue = function wdtReissue(props) {
     },
     md: {
       span: 6
-    },
-    style: {
-      marginLeft: '8px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "1.8.1-beta.4",
+  "version": "1.8.1",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "1.8.1-beta.1",
+    "@kmkf-fe-packages/kmkf-utils": "1.8.1",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.8",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fd7e1a40c05c5463b16f831ad17d3f448c4e04ff"
+  "gitHead": "7b78950f60bfd8e91913f2d7debf5218b0959d87"
 }