mali-applet-ui 0.0.54 → 0.0.57

package/components/ml-button/ml-button.vue

@@ -71,11 +71,13 @@ export default {
   }
   &.type-button {
     width: 100%;
-    margin: 0 10rpx;
     padding: 0 20rpx;
     line-height: 80rpx;
     border: 1px solid #e5e5e5;
     border-radius: 10rpx;
+    &+.ml-button {
+      margin-left: 20rpx;
+    }
     &.status-primary {
       color: #ffffff;
       background: $uni-color-primary;

package/components/ml-echarts/ml-echarts.vue

@@ -8,7 +8,6 @@
 import XEUtils from 'xe-utils'
 import WxCanvas from './wx-canvas';
 import * as echarts from './echarts';
-import globalStore from '../../config/store'
 
 export default {
   name: 'MlEcharts',
@@ -62,10 +61,7 @@ export default {
           opts.legend.formatter = this.customFormat
         }
       }
-      return {
-				color: globalStore.echarts.color,
-				...opts
-			}
+      return opts
     },
     customFormat (name) {
       return this.formatLegend(name, this.options || {})

package/components/ml-form-item/ml-form-item.vue

@@ -13,7 +13,7 @@
           <ml-select-picker v-else-if="matchComponent('MlSelectPicker')" :value="itemValue" :options="renderOpts.options" border @change="modelEvent"></ml-select-picker>
           <ml-textarea v-else-if="matchComponent('MlTextarea')" :value="itemValue" :rows="renderOpts.rows || 3" border @change="modelEvent"></ml-textarea>
           <ml-upload v-else-if="matchComponent('MlUpload')" :value="itemValue" :mediatype="renderOpts.mediatype || 'image'" @change="modelEvent"></ml-upload>
-          <ml-amount-input v-else-if="matchComponent('MlAmountInput')" :value="itemValue" @change="modelEvent"></ml-amount-input>
+          <ml-amount-input v-else-if="matchComponent('MlAmountInput')" :value="itemValue" border @change="modelEvent"></ml-amount-input>
           <ml-amount-text v-else-if="matchComponent('MlAmountText')" :value="itemValue" @change="modelEvent"></ml-amount-text>
           <text v-else class="ml-form-item-default-content">{{ itemValue }}</text>
         </slot>

package/components/ml-list-group/ml-list-group.vue

@@ -4,21 +4,125 @@
       <scroll-view scroll-y>
         <slot></slot>
       </scroll-view>
-      <uni-load-more v-if="loadMore" v-show="!loading" :status="loadStatus"></uni-load-more>
+      <uni-load-more v-if="showPage" :status="loadStatus"></uni-load-more>
     </view>
   </view>
 </template>
 
 <script>
+import globalStore from '../../config/store'
+import XEUtils from 'xe-utils'
+
 export default {
   name: 'MlListGroup',
   options: {
     virtualHost: true
   },
   props: {
+    value: Array,
+    showPage: Boolean,
+    autoload: {
+      type: Boolean,
+      default: true
+    },
+    pageProps: Object,
+    requestMethod: Function,
     title: String,
-    loadMore: Boolean,
     className: String
+  },
+  data () {
+    return {
+      loading: false,
+      pageVO: {
+        pageSize: globalStore.list.pageSize,
+        currPage: 1,
+        total: 0
+      }
+    }
+  },
+  computed: {
+    loadStatus () {
+      if (this.loading) {
+        return 'loading'
+      }
+      return this.pageVO.pageSize * this.pageVO.currPage < Number(this.pageVO.total) ? 'more' : 'noMore'
+    },
+    pagePropOpts () {
+      return { ...globalStore.list.pageProp, ...this.pageProps }
+    }
+  },
+  created () {
+    if (this.autoload && this.requestMethod) {
+      this.reload()
+    }
+  },
+  methods: {
+    getParams () {
+      return this.showPage ? {
+        pageObj: this.pageVO,
+        data: {
+          [this.pagePropOpts.currentPage || 'page']: this.pageVO.currPage,
+          [this.pagePropOpts.pageSize || 'limit']: this.pageVO.pageSize
+        }
+      } : {
+        data: {}
+      }
+    },
+    getList () {
+      this.loading = true
+      if (this.requestMethod) {
+        return Promise.resolve(
+          this.requestMethod(this.getParams())
+        ).then(res => {
+          let data = []
+          if (XEUtils.isFunction(globalStore.list.resProps.result)) {
+            data = globalStore.list.resProps.result({ response: res }) || []
+          } else {
+            data = Array.isArray(res) ? res : XEUtils.get(res, globalStore.list.resProps.result || 'datas')
+          }
+          if (this.showPage) {
+            if (XEUtils.isFunction(globalStore.list.resProps.total)) {
+              this.pageVO.total = XEUtils.toNumber(globalStore.list.resProps.total({ response: res }))
+            } else {
+              this.pageVO.total = XEUtils.toNumber(XEUtils.get(res, globalStore.list.resProps.total || 'total'))
+            }
+          }
+          this.loading = false
+          return data
+        }).catch(() => {
+          this.loading = false
+          return []
+        })
+      }
+      return Promise.resolve([])
+    },
+    async reload() {
+      uni.showLoading({
+        title: '加载中'
+      })
+      try {
+        const data = await this.getList()
+        uni.stopPullDownRefresh()
+        uni.hideLoading()
+        this.$emit('input', data)
+      } catch (e) {
+        uni.stopPullDownRefresh()
+        uni.hideLoading()
+        console.error(e)
+      }
+    },
+    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)
+        }
+      }
+    }
   }
 }
 </script>

package/components/ml-switch/ml-switch.vue

@@ -24,4 +24,10 @@ export default {
     }
   }
 }
-</script>
+</script>
+
+<style lang="scss">
+.ml-switch {
+  transform: scale(0.8);
+}
+</style>

package/config/store.js

@@ -28,9 +28,17 @@ const globalStore = {
       optionMethod: null
     }
   },
-  // 图表
-  echarts: {
-    color: ['#582D27', '#391085', '#13c2c2', '#04395E', '#5E503F', '#7C98B3', '#69C6DB', '#A98467', '#b37feb']
+  // 列表组件
+  list: {
+    pageSize: 30,
+    pageProp: {
+      pageSize: 'limit',
+      currentPage: 'page'
+    },
+    resProps: {
+      result: 'datas',
+      total: 'total'
+    }
   }
 }
 

package/package.json

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