Browse Source

fix: 检查报告分页调整

liweimin 2 years ago
parent
commit
86d60e5287

+ 1 - 0
antbuilder/industry/hospitalV2/components/components/scroll-fetch/index.axml

@@ -7,6 +7,7 @@
   onFetchData="onFetchData"
   style="height: {{ height }}"
   loadContent="{{ loadContent }}"
+  onScrollToLower="onScrollToLower"
 >
   <empty
     slot="empty"

+ 22 - 3
antbuilder/industry/hospitalV2/components/components/scroll-fetch/index.js

@@ -1,7 +1,8 @@
+// import { splitEvery, concat } from 'ramda'
 Component({
   props: {
     className: '',
-    pageSize: 10,
+    pageSize: 9999,
     height: '100vh',
     emptyTitle: '暂无数据',
     emptyMessage: '前不见古人、后不见来者',
@@ -10,13 +11,29 @@ Component({
   },
   data: {
     list: [],
-    loadContent: ['正在加载', '没有更多记录']
+    loadContent: ['正在加载', '没有更多记录'],
+    pageNum: 0
   },
   methods: {
     saveRef(ref) {
       this.scrollRef = ref;
     },
 
+    // 底部触底事件
+    // onScrollToLower () {
+    //   console.log('66666666');
+    //   const { list, pageNum } = this.data;
+    //   const that = this;
+    //   if (pageNum < list.length && list.length > 1) {
+    //     this.data.list = concat(list, list[pageNum + 1])
+    //     that.setData({
+    //       pageNum: pageNum + 1,
+    //     })
+    //   } else {
+    //     console.log('1111');
+    //   }
+    // },
+
     /* 分页逻辑 */
     async onFetchData(page, limit) {
       const {
@@ -33,8 +50,10 @@ Component({
         pageSize: limit
       });
       const newList = page === 1 ? list : [..._list, ...list];
+      // const theList = splitEvery(10, newList)
       this.setData({
-        list: newList
+        list: newList,
+        // pageNum: 0
       });
       const {
         total

+ 22 - 21
package.json

@@ -7,36 +7,37 @@
 		"replace:by-prod": "cross-env PLAT_ENV=by-prod node replaceEnv.js"
 	},
 	"dependencies": {
-		"we-validator": "2.1.14",
-		"@mas.io/mas-countdown": "0.0.9",
-		"qrcode": "^1.4.4",
-		"@mas.io/falcon-utils": "1.0.0",
-		"@mas.io/adc-rich-pro": "1.0.0",
-		"dayjs": "^1.8.20",
-		"mini-ali-ui-rpx": "^1.4.1",
+		"@mas.io/adc-address-item": "1.0.0",
 		"@mas.io/adc-datetime-picker": "^1.0.1",
-		"@mas.io/adc-tab": "^1.0.3",
-		"@mas.io/mas-notification-card": "^1.0.2",
-		"antd-mini": "^0.0.8",
+		"@mas.io/adc-flat-list": "^1.0.5",
+		"@mas.io/adc-map-marker": "^1.0.7",
 		"@mas.io/adc-nav-bar": "^1.0.4",
-		"@mas.io/mas-calendar": "^1.0.1",
-		"@whale.io/mini": "1.0.2",
+		"@mas.io/adc-rich-pro": "1.0.0",
 		"@mas.io/adc-stepper": "^1.0.3",
-		"@mas.io/adc-address-item": "1.0.0",
+		"@mas.io/adc-tab": "^1.0.3",
 		"@mas.io/falcon-core": "^1.0.5",
-		"@whale.io/common": "^1.0.1",
-		"query-string": "^7.0.0",
+		"@mas.io/falcon-utils": "1.0.0",
+		"@mas.io/mas-bar-code": "^0.0.1",
+		"@mas.io/mas-calendar": "^1.0.1",
+		"@mas.io/mas-countdown": "0.0.9",
+		"@mas.io/mas-infocheck": "^1.0.2",
+		"@mas.io/mas-notification-card": "^1.0.2",
 		"@mas.io/mas-qrcode": "^1.0.2",
+		"@mas.io/mas-tabs-list": "^0.0.19",
 		"@mas.io/pollen-utils": "1.0.1",
+		"@whale.io/common": "^1.0.1",
+		"@whale.io/mini": "1.0.2",
+		"antd-mini": "^0.0.8",
 		"applet-page-component": "^1.0.5",
-		"@mas.io/mas-tabs-list": "^0.0.19",
-		"mini-html-parser2": "^0.2.0",
+		"dayjs": "^1.8.20",
 		"herculex": "0.2.16-alpha.3",
 		"mini-ali-ui": "^1.3.7",
-		"@mas.io/mas-bar-code": "^0.0.1",
-		"@mas.io/adc-map-marker": "^1.0.7",
-		"@mas.io/mas-infocheck": "^1.0.2",
-		"@mas.io/adc-flat-list": "^1.0.5"
+		"mini-ali-ui-rpx": "^1.4.1",
+		"mini-html-parser2": "^0.2.0",
+		"qrcode": "^1.4.4",
+		"query-string": "^7.0.0",
+		"ramda": "^0.28.0",
+		"we-validator": "2.1.14"
 	},
 	"devDependencies": {
 		"cross-env": "^7.0.3"