mali-applet-ui 1.0.76 → 1.0.78

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-amount-input/ml-amount-input.vue

@@ -137,24 +137,27 @@ export default {
       this.inpVal = eqEmptyNull(value) ? '' : XEUtils.toFixed(XEUtils.toNumber(value), 2)
     },
     checkValue  () {
-      // 如果是空值，则不处理
-      if (eqEmptyNull(this.inpVal) && eqEmptyNull(this.value)) {
-        return { status: false, value: this.inpVal }
-      }
       const numVal = XEUtils.toNumber(this.inpVal)
       if (this.minNum !== null && (numVal < this.minNum)) {
-        this.$emit('input', this.minNum)
         this.updateModel = true
+        this.updateValue(this.minNum)
+        this.$emit('input', this.minNum)
         return { status: false, value: this.minNum }
       }
       if (this.maxNum !== null && (numVal > this.maxNum)) {
-        this.$emit('input', this.maxNum)
         this.updateModel = true
+        this.updateValue(this.maxNum)
+        this.$emit('input', this.maxNum)
         return { status: false, value: this.maxNum }
       }
+      // 如果是空值，则不处理
+      if (eqEmptyNull(this.inpVal) && eqEmptyNull(this.value)) {
+        return { status: false, value: this.inpVal }
+      }
       const val = XEUtils.floor(numVal, 2)
       if (`${val}` !== `${this.value}`) {
         this.updateModel = true
+        this.updateValue(val)
         this.$emit('input', val)
         return { status: false, value: val }
       }

package/lib/components/ml-number-input/ml-number-input.vue

@@ -126,34 +126,39 @@ export default {
       this.inpVal = eqEmptyNull(value) ? '' : String(XEUtils.toNumber(value))
     },
     checkValue  () {
-      // 如果是空值，则不处理
-      if (eqEmptyNull(this.inpVal) && eqEmptyNull(this.value)) {
-        return { status: true, value: this.inpVal }
-      }
       const numVal = XEUtils.toNumber(XEUtils.toValueString(this.inpVal).slice(0, this.maxLength))
       if (this.minNum !== null && (numVal < this.minNum)) {
         this.updateModel = true
+        this.inpVal = this.minNum
         this.$emit('input', this.minNum)
         return { status: false, value: this.minNum }
       }
       if (this.maxNum !== null && (numVal > this.maxNum)) {
         this.updateModel = true
+        this.inpVal = this.maxNum
         this.$emit('input', this.maxNum)
         return { status: false, value: this.maxNum }
       }
+      // 如果是空值，则不处理
+      if (eqEmptyNull(this.inpVal) && eqEmptyNull(this.value)) {
+        return { status: true, value: this.inpVal }
+      }
       if (this.type === 'integer' && !/^-?[0-9]+$/.test(numVal)) {
         const value = XEUtils.toInteger(numVal)
         this.updateModel = true
+        this.inpVal = value
         this.$emit('input', value)
         return { status: false, value: value }
       }
       if (`${numVal}` !== this.inpVal) {
         this.updateModel = true
+        this.inpVal = numVal
         this.$emit('input', numVal)
         return { status: false, value: numVal }
       }
       if (`${numVal}` !== `${this.value}`) {
         this.updateModel = true
+        this.inpVal = numVal
         this.$emit('input', numVal)
         return { status: false, value: numVal }
       }
@@ -272,6 +277,7 @@ export default {
     width: 80rpx;
     border: 1px solid #e5e5e5;
     font-size: 36rpx;
+    padding: 0 16rpx;
     background: #F2F2F6;
   }
   .ml-number-input-minus-btn {

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

@@ -12,10 +12,22 @@
       </slot>
     </view>
     <ml-fixed-footer>
-      <ml-button>上一页</ml-button>
-      <ml-button>{{ pageVO.currPage }}/{{ pageCount }}</ml-button>
-      <ml-button>下一页</ml-button>
+      <ml-button :disabled="pageVO.currPage <= 1" @click="prevPage()">上一页</ml-button>
+      <ml-button @click="openPageEvent">{{ pageVO.currPage }}/{{ pageCount }}</ml-button>
+      <ml-button :disabled="pageVO.currPage >= pageCount" @click="nextPage()">下一页</ml-button>
     </ml-fixed-footer>
+
+    <ml-modal v-model="showPopup" title="跳往页码" height="200rpx" showConfirmButton showCancelButton @confirm="confirmEvent">
+      <view class="ml-pager-jump-popup-warpper">
+        <view class="ml-pager-jump-popup-left">
+          <ml-number-input v-model="tempCurrPage" :min="1" :max="pageCount" border />
+        </view>
+        <view class="ml-pager-jump-popup-content">/</view>
+        <view class="ml-pager-jump-popup-right">
+          <view class="ml-pager-jump-popup-count">{{ pageCount }}</view>
+        </view>
+      </view>
+    </ml-modal>
   </view>
 </template>
 
@@ -44,10 +56,12 @@ export default {
     return {
       loading: false,
       pageVO: {
-        pageSize: globalStore.loadMore.pageSize,
+        pageSize: globalStore.pager.pageSize,
         currPage: 1,
         total: 0
       },
+      tempCurrPage: 0,
+      showPopup: false,
       emptyUrl: '',
       emptyText: '',
       emptyHint: ''
@@ -55,7 +69,10 @@ export default {
   },
   computed: {
     pageCount () {
-      return Math.floor(this.pageVO.pageSize / this.pageVO.total) + 1
+      if (this.pageVO.total) {
+        return XEUtils.ceil(this.pageVO.total / this.pageVO.pageSize)
+      }
+      return 1
     },
     loadStatus () {
       if (this.loading) {
@@ -67,7 +84,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 +124,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 +158,50 @@ 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 () {
+      this.tempCurrPage = this.pageVO.currPage
+      this.showPopup = true
+    },
+    confirmEvent () {
+      this.showPopup = false
+      if (String(this.pageVO.currPage) !== String(this.tempCurrPage)) {
+        this.pageVO.currPage = XEUtils.toNumber(this.tempCurrPage)
+        this.load()
+      }
+    },
+    prevPage () {
+      if (this.pageVO.currPage > 1) {
+        this.pageVO.currPage--
+        this.load()
+      }
+    },
+    nextPage () {
+      if (this.pageVO.currPage < this.pageCount) {
+        this.pageVO.currPage++
+        this.load()
+      }
     }
   }
 }
@@ -192,4 +218,27 @@ export default {
     text-align: center;
   }
 }
+.ml-pager-jump-popup-warpper {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: 0 40rpx;
+  .ml-pager-jump-popup-left,
+  .ml-pager-jump-popup-right {
+    flex-grow: 1;
+    width: 40%;
+    text-align: center;
+  }
+  .ml-pager-jump-popup-content {
+    flex-shrink: 0;
+    text-align: center;
+    width: 80rpx;
+  }
+  .ml-pager-jump-popup-count {
+    height: 70rpx;
+    line-height: 70rpx;
+    border-radius: $ml-border-radius;
+    background: #F2F2F6;
+  }
+}
 </style>

package/package.json

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