@yilianjituan/yilian_dgerm 1.0.7-alpha.3 → 1.0.7-alpha.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.
|
@@ -163,10 +163,13 @@ var Index = function Index(props) {
|
|
|
163
163
|
// 下拉加载
|
|
164
164
|
var companyScroll = function companyScroll(e) {
|
|
165
165
|
var target = e.target;
|
|
166
|
-
var
|
|
166
|
+
var scrollTop = target.scrollTop,
|
|
167
167
|
scrollHeight = target.scrollHeight,
|
|
168
|
-
|
|
169
|
-
|
|
168
|
+
clientHeight = target.clientHeight;
|
|
169
|
+
|
|
170
|
+
// 使用更宽松的阈值来判断是否滚动到底部
|
|
171
|
+
var isBottom = Math.abs(scrollHeight - scrollTop - clientHeight) < 1;
|
|
172
|
+
if (isBottom) {
|
|
170
173
|
if (pageRef.current < totalPagesRef.current) {
|
|
171
174
|
// 检查当前页是否小于总页数
|
|
172
175
|
pageRef.current += 1; // 增加当前页码
|
|
@@ -113,10 +113,8 @@ var PageTemplate = function PageTemplate(props, ref) {
|
|
|
113
113
|
onSearch: function onSearch(param) {
|
|
114
114
|
// isRetainParam 是否保留参数
|
|
115
115
|
var _ref = param || {},
|
|
116
|
-
pageNo = _ref.pageNo
|
|
117
|
-
|
|
118
|
-
isRetainParam = _ref$isRetainParam === void 0 ? false : _ref$isRetainParam;
|
|
119
|
-
_onSearch(pageNo, isRetainParam);
|
|
116
|
+
pageNo = _ref.pageNo;
|
|
117
|
+
_onSearch(pageNo, true);
|
|
120
118
|
},
|
|
121
119
|
filters: _objectSpread({
|
|
122
120
|
pageNo: current,
|
|
@@ -181,6 +179,8 @@ var PageTemplate = function PageTemplate(props, ref) {
|
|
|
181
179
|
});
|
|
182
180
|
setColumns(_columns);
|
|
183
181
|
}, [props.columns, current, pageSizeRef.current]);
|
|
182
|
+
// 搜索
|
|
183
|
+
// isRetainParam 是否保留参数
|
|
184
184
|
var _onSearch = function _onSearch() {
|
|
185
185
|
var current = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
|
|
186
186
|
var isRetainParam = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|