mali-applet-ui 1.0.76 → 1.0.77

package/config/store.js

@@ -56,6 +56,25 @@ const globalStore = {
       resultHint: '请检查输入是否正确'
     }
   },
+  // 分页器
+  pager: {
+    pageSize: 30,
+    pageProp: {
+      pageSize: 'limit',
+      currentPage: 'page'
+    },
+    resProps: {
+      result: 'datas',
+      total: 'total'
+    },
+    notData: {
+      emptyUrl: '',
+      emptyText: '暂无记录',
+      resultUrl: '',
+      resultText: '暂无相关结果',
+      resultHint: '请检查输入是否正确'
+    }
+  },
   notData: {
     emptyUrl: '',
     emptyText: '暂无记录'

package/lib/components/ml-pager/ml-pager.vue

@@ -13,9 +13,14 @@
     </view>
     <ml-fixed-footer>
       <ml-button>上一页</ml-button>
-      <ml-button>{{ pageVO.currPage }}/{{ pageCount }}</ml-button>
+      <ml-button @click="openPageEvent">{{ pageVO.currPage }}/{{ pageCount }}</ml-button>
       <ml-button>下一页</ml-button>
     </ml-fixed-footer>
+
+    <ml-modal v-model="showPopup" title="跳往页码" showConfirmButton showCancelButton>
+      <view>自定义内容</view>
+      <ml-number-input v-model="val3" border controls />
+    </ml-modal>
   </view>
 </template>
 
@@ -44,10 +49,11 @@ export default {
     return {
       loading: false,
       pageVO: {
-        pageSize: globalStore.loadMore.pageSize,
+        pageSize: globalStore.pager.pageSize,
         currPage: 1,
         total: 0
       },
+      showPopup: false,
       emptyUrl: '',
       emptyText: '',
       emptyHint: ''
@@ -67,7 +73,7 @@ export default {
       return !this.value || !this.value.length
     },
     pagePropOpts () {
-      return { ...globalStore.loadMore.pageProp, ...this.pageProps }
+      return { ...globalStore.pager.pageProp, ...this.pageProps }
     },
     hasFilters () {
       const fields = this.emptyOpts.fields || []
@@ -107,15 +113,15 @@ export default {
           this.requestMethod.call(this.currVM, this.getParams())
         ).then(res => {
           let data = []
-          if (XEUtils.isFunction(globalStore.loadMore.resProps.result)) {
-            data = globalStore.loadMore.resProps.result({ response: res }) || []
+          if (XEUtils.isFunction(globalStore.pager.resProps.result)) {
+            data = globalStore.pager.resProps.result({ response: res }) || []
           } else {
-            data = Array.isArray(res) ? res : XEUtils.get(res, globalStore.loadMore.resProps.result || 'datas')
+            data = Array.isArray(res) ? res : XEUtils.get(res, globalStore.pager.resProps.result || 'datas')
           }
-          if (XEUtils.isFunction(globalStore.loadMore.resProps.total)) {
-            this.pageVO.total = XEUtils.toNumber(globalStore.loadMore.resProps.total({ response: res }))
+          if (XEUtils.isFunction(globalStore.pager.resProps.total)) {
+            this.pageVO.total = XEUtils.toNumber(globalStore.pager.resProps.total({ response: res }))
           } else {
-            this.pageVO.total = XEUtils.toNumber(XEUtils.get(res, globalStore.loadMore.resProps.total || 'total'))
+            this.pageVO.total = XEUtils.toNumber(XEUtils.get(res, globalStore.pager.resProps.total || 'total'))
           }
           this.loading = false
           return data
@@ -141,41 +147,30 @@ export default {
         if (this.$loading) {
           this.$loading.hide()
         }
-        uni.stopPullDownRefresh()
         this.$emit('input', data)
       } catch (e) {
         if (this.$loading) {
           this.$loading.hide()
         }
-        uni.stopPullDownRefresh()
         console.error(e)
       }
       this.updateEmptyStatus()
     },
-    async loadMore () {
-      if (this.showPage && !this.loading && this.loadStatus === 'more') {
-        try {
-          this.pageVO.currPage++
-          const data = await this.getList()
-          const moreList = (this.value || []).concat(data)
-          this.$emit('input', moreList)
-        } catch (e) {
-          console.error(e)
-        }
-      }
-    },
     updateEmptyStatus () {
       this.$nextTick(() => {
         if (this.hasFilters) {
-          this.emptyUrl = this.emptyOpts.resultUrl || globalStore.loadMore.notData.resultUrl || ''
-          this.emptyText = XEUtils.template(this.emptyOpts.resultText || globalStore.loadMore.notData.resultText, this.filterForm) || ''
-          this.emptyHint = XEUtils.template(this.emptyOpts.resultHint || globalStore.loadMore.notData.resultHint, this.filterForm) || ''
+          this.emptyUrl = this.emptyOpts.resultUrl || globalStore.pager.notData.resultUrl || ''
+          this.emptyText = XEUtils.template(this.emptyOpts.resultText || globalStore.pager.notData.resultText, this.filterForm) || ''
+          this.emptyHint = XEUtils.template(this.emptyOpts.resultHint || globalStore.pager.notData.resultHint, this.filterForm) || ''
         } else {
-          this.emptyUrl = this.emptyOpts.emptyUrl || globalStore.loadMore.notData.emptyUrl || ''
-          this.emptyText = this.emptyOpts.emptyText || globalStore.loadMore.notData.emptyText || ''
-          this.emptyHint = this.emptyOpts.emptyHint || globalStore.loadMore.notData.emptyHint || ''
+          this.emptyUrl = this.emptyOpts.emptyUrl || globalStore.pager.notData.emptyUrl || ''
+          this.emptyText = this.emptyOpts.emptyText || globalStore.pager.notData.emptyText || ''
+          this.emptyHint = this.emptyOpts.emptyHint || globalStore.pager.notData.emptyHint || ''
         }
       })
+    },
+    openPageEvent () {
+
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.0.76",
+  "version": "1.0.77",
   "description": "码里云小程序组件库",
   "files": [
     "lib",