mali-applet-ui 1.0.19 → 1.0.20

package/README.md

@@ -4,6 +4,8 @@ Mali-Applet-UI 码里云小程序组件库
 
 ## 发布npm
 
+需要先登陆
+
 ```
 npm run release
 ```

package/config/index.js

@@ -6,4 +6,4 @@ function config (options) {
   return globalStore
 }
 
-export default config
+export default config

package/config/store.js

@@ -28,13 +28,13 @@ const globalStore = {
       optionMethod: null
     },
     types: [
-      { value: 0, label: '起草中', color: '#353535', background: '#F0F2F5' },
-      { value: 1, label: '审批中', color: '#ffffff', background: '#246BFD' },
-      { value: 2, label: '已通过', color: '#ffffff', background: '#00D35C' },
-      { value: 3, label: '已驳回', color: '#ffffff', background: '#FF5064' },
-      { value: 4, label: '会签中', color: '#ffffff', background: '#FF9C00' },
-      { value: 5, label: '处理中', color: '#ffffff', background: '#246BFD' },
-      { value: 6, label: '已完成', color: '#ffffff', background: '#00D35C' }
+      { value: 0, label: '起草中', color: '#353535', background: '#eaebed' },
+      { value: 1, label: '审批中', color: '#007FFF', background: '#e0efff' },
+      { value: 2, label: '已通过', color: '#00B042', background: '#e0f5e8' },
+      { value: 3, label: '已驳回', color: '#FF5064', background: '#ffeaec' },
+      { value: 4, label: '会签中', color: '#007FFF', background: '#e0efff' },
+      { value: 5, label: '处理中', color: '#007FFF', background: '#e0efff' },
+      { value: 6, label: '已完成', color: '#00B042', background: '#e0f5e8' }
     ]
   },
   // 上拉加载更多

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

@@ -215,7 +215,7 @@ export default {
   display: flex;
   flex-direction: row;
   .ml-amount-input-placeholder {
-    color: $uni-text-color-placeholder;
+    color: $ml-input-color-placeholder;;
   }
   .ml-amount-input-readonly-content {
     padding: 20rpx 4rpx;
@@ -263,7 +263,7 @@ export default {
   }
   .ml-amount-input-inp,
   .ml-amount-input-simulate {
-    font-size: $uni-font-size-base;
+    font-size: $ml-base-font-size;
     width: 100%;
     height: 70rpx;
     padding: 0 10rpx;

package/lib/components/ml-approval-type/ml-approval-type.vue

@@ -38,8 +38,8 @@ export default {
 <style lang="scss">
 .ml-approval-type {
   display: inline-block;
-  padding: 8rpx 16rpx;
+  padding: 6rpx 20rpx;
   border-radius: $ml-border-radius;
-  font-size: 24rpx;
+  font-size: $ml-describe-font-size;
 }
 </style>

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

@@ -1,5 +1,12 @@
 <template>
-  <button class="ml-button" :class="[className || '', `type-${type}`, size ? `size-${size}` : '', status ? `ss-${status}` : '', {'is-round': round, 'is-underline': underline, 'is-disabled': disabled}]" :disabled="disabled" :open-type="openType" :style="styles" @tap="tapEvent" @click="clickEvent">
+  <button
+    class="ml-button"
+    :class="[className || '', `type-${type}`, size ? `size-${size}` : '', status ? `ss-${status}` : '', {'is-round': round, 'is-underline': underline, 'is-disabled': disabled}]"
+    :disabled="disabled"
+    :open-type="openType"
+    :style="styles"
+    @tap="tapEvent"
+    @click="clickEvent">
     <slot>{{ content }}</slot>
   </button>
 </template>
@@ -72,7 +79,19 @@ export default {
     line-height: 1.5;
     vertical-align: middle;
     background: transparent;
-    font-size: $uni-font-size-base;
+    font-size: $ml-base-font-size;
+    &.size-large {
+      font-size: 40rpx;
+    }
+    &.size-medium {
+      font-size: 36rpx;
+    }
+    &.size-small {
+      font-size: 28rpx;
+    }
+    &.size-mini {
+      font-size: 24rpx;
+    }
     &.is-underline {
       text-decoration: underline;
     }

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

@@ -1,5 +1,5 @@
 <template>
-  <view class="ml-card"  :class="{'is-bg': background, 'is-padding': padding}">
+  <view class="ml-card"  :class="{'is-bg': background, 'is-padding': padding, 'is-border': border}">
     <view v-if="title || showHeader" class="ml-card-header">
       <view class="ml-card-title">
         <slot name="title">{{ title }}</slot>
@@ -22,6 +22,7 @@ export default {
   },
   props: {
     title: String,
+    border: Boolean,
     background: {
       type: Boolean,
       default: true
@@ -42,6 +43,9 @@ export default {
   &.is-bg {
     background: #fff;
   }
+  &.is-border {
+    border: 1px solid #e5e5e5;
+  }
   &.is-padding {
     .ml-card-body {
       padding: 0 20rpx 20rpx 20rpx;

package/lib/components/ml-chunk-item/ml-chunk-item.vue

@@ -60,7 +60,7 @@ export default {
   flex-direction: column;
   padding: 20rpx;
   line-height: 50rpx;
-  font-size: $uni-font-size-base;
+  font-size: $ml-describe-font-size;
   $spans: 4.16667%, 8.33333%, 12.5%, 16.66667%, 20.83333%, 25%, 29.16667%, 33.33333%,
           37.5%, 41.66667%, 45.83333%, 50%, 54.16667%, 58.33333%, 62.5%, 66.66667%,
           70.83333%, 75%, 79.16667%, 83.33333%, 87.5%, 91.66667%, 95.83333%, 100%;

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

@@ -51,9 +51,9 @@ export default {
   }
   &.is-important {
     padding-bottom: 10rpx;
-    font-size: 30rpx;
+    font-size: $ml-base-font-size;
   }
-  &.normal-shrink {
+  &.is-shrink {
     flex-shrink: 0;
   }
   &.is-ellipsis {

package/lib/components/ml-date-range-picker/ml-date-range-picker.vue

@@ -41,4 +41,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/lib/components/ml-datetime-picker/ml-datetime-picker.vue

@@ -40,4 +40,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/lib/components/ml-datetime-range-picker/ml-datetime-range-picker.vue

@@ -45,4 +45,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/lib/components/ml-echart2/ec-canvas.vue

@@ -0,0 +1,140 @@
+<template>
+  <view class="ml-echarts" :class="className" :style="{height: height || '400rpx', width: width || '100%'}">
+    <canvas class="ec-canvas ec-canvas ec-canvas-aaa" ref="saveChildRef0" :id="canvasId" :width="width" :height="height" @touchStart="touchStart" @touchMove="touchMove" @touchEnd="touchEnd" @init="init"></canvas>
+  </view>
+</template>
+
+<script>
+/* eslint-disable */
+import WxCanvas from './wx-canvas'
+import echarts from './echarts'
+import { getAppDpr } from '../../../utils'
+
+let ctx
+
+function wrapTouch (event) {
+  for (let i = 0; i < event.touches.length; ++i) {
+    const touch = event.touches[i]
+    touch.offsetX = touch.x
+    touch.offsetY = touch.y
+  }
+
+  return event
+}
+
+export default {
+  props: {
+    options: Object,
+    height: String,
+    width: String,
+    lazyLoad: Boolean,
+    formatLegend: Function,
+    className: String
+  },
+  data () {
+    return {
+      canvasId: 'aaa',
+      width: '',
+      height: ''
+    }
+  },
+  mounted  () {
+    this.init()
+  },
+  methods: {
+    init: function () {
+      ctx = uni.createCanvasContext(this.canvasId, this)
+      const canvas = new WxCanvas(ctx, this.canvasId)
+      echarts.setCanvasCreator(() => {
+        return canvas
+      })
+
+      const query = uni.createSelectorQuery().in(this)
+
+      const selector = '.ec-canvas-' + this.canvasId
+      const ratio = getAppDpr()
+      query
+        .select(selector)
+        .boundingClientRect(res => {
+          const _w = ratio * res.width
+
+          const _h = ratio * res.height
+
+          const w = res.width
+          const h = res.height
+          this.width= _w
+            this.height= _h
+
+            const chart = echarts.init(canvas, null, {
+                width: w,
+                height: h
+              })
+              canvas.setChart(chart)
+            chart.setOption(this.options)
+        })
+        .exec()
+    },
+
+    canvasToTempFilePath (opt) {
+      if (!opt.canvasId) {
+        opt.canvasId = this.canvasId
+      }
+
+      ctx.draw(true, () => {
+        uni.canvasToTempFilePath(opt, this)
+      })
+    },
+
+    touchStart (e) {
+      if (this.chart && e.touches.length > 0) {
+        const touch = e.touches[0]
+        const handler = this.chart.getZr().handler
+        handler.dispatch('mousedown', {
+          zrX: touch.x,
+          zrY: touch.y
+        })
+        handler.dispatch('mousemove', {
+          zrX: touch.x,
+          zrY: touch.y
+        })
+        handler.processGesture(wrapTouch(e), 'start')
+      }
+    },
+
+    touchMove (e) {
+      if (this.chart && e.touches.length > 0) {
+        const touch = e.touches[0]
+        const handler = this.chart.getZr().handler
+        handler.dispatch('mousemove', {
+          zrX: touch.x,
+          zrY: touch.y
+        })
+        handler.processGesture(wrapTouch(e), 'change')
+      }
+    },
+
+    touchEnd (e) {
+      if (this.chart) {
+        const touch = e.changedTouches ? e.changedTouches[0] : {}
+        const handler = this.chart.getZr().handler
+        handler.dispatch('mouseup', {
+          zrX: touch.x,
+          zrY: touch.y
+        })
+        handler.dispatch('click', {
+          zrX: touch.x,
+          zrY: touch.y
+        })
+        handler.processGesture(wrapTouch(e), 'end')
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.ml-canvas {
+  width: 100%;
+  height: 100%;
+}
+</style>

package/lib/components/ml-echart2/echarts.js

@@ -0,0 +1,11 @@
+import * as echarts from './echarts.simple.min.js'
+import { getAppDpr } from '../../../utils'
+
+/* eslint-disable */
+const eInit = echarts.init
+echarts.init = function (p1, p2, opts = {}) {
+  opts.devicePixelRatio = opts.devicePixelRatio || getAppDpr()
+  return eInit.call(this, p1, p2, opts)
+}
+
+export default echarts