mali-applet-ui 1.0.19 → 1.0.21

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

@@ -43,6 +43,11 @@ export default {
       cvsHeight: ''
     }
   },
+  watch: {
+    options () {
+      this.loadChart()
+    }
+  },
   mounted  () {
     if (!this.lazyLoad) {
       this.init()

package/lib/components/ml-echarts/wx-canvas.js

@@ -1,168 +1,168 @@
-function strLen (str) {
-  let len = 0
-  for (let i = 0; i < str.length; i++) {
-    if (str.charCodeAt(i) > 0 && str.charCodeAt(i) < 128) {
-      len++
-    } else {
-      len += 2
-    }
-  }
-  return len
-}
-
-export default class WxCanvas {
-  constructor (ctx, canvasId, isNew, canvasNode) {
-    this.ctx = ctx
-    this.canvasId = canvasId
-    this.chart = null
-    this.isNew = isNew
-
-    if (isNew) {
-      this.canvasNode = canvasNode
-    } else {
-      this._initCanvas(ctx)
-      this._initStyle(ctx)
-    }
-
-    this._initEvent()
-  }
-
-  getContext (contextType) {
-    if (contextType === '2d') {
-      return this.ctx
-    }
-  }
-
-  setChart (chart) {
-    this.chart = chart
-  }
-
-  attachEvent () {
-    // noop
-  }
-
-  detachEvent () {
-    // noop
-  }
-
-  _initCanvas (ctx) {
-    // #ifdef MP-ALIPAY
-    if (!ctx.measureText) {
-      // 钉钉钉钉小程序框架不支持 measureText 方法，用此方法 mock
-      ctx.measureText = (text) => {
-        let fontSize = 12
-        const font = ctx.__font
-        if (font) {
-          fontSize = parseInt(font.split(' ')[3], 10)
-        }
-        fontSize /= 2
-        return {
-          width: strLen(text) * fontSize
-        }
-      }
-    }
-    // #endif
-
-    if (!ctx.transform) {
-      ctx.transform = () => {
-      }
-    }
-
-    if (!ctx.setLineDash) {
-      ctx.setLineDash = () => {
-      }
-    }
-  }
-
-  _initStyle (ctx) {
-    // #ifdef MP-ALIPAY
-    const styles = [
-      'fillStyle',
-      'strokeStyle',
-      'globalAlpha',
-      'textAlign',
-      'textBaseAlign',
-      'shadow',
-      'lineWidth',
-      'lineCap',
-      'lineJoin',
-      'lineDash',
-      'miterLimit',
-      'fontSize'
-    ]
-    styles.forEach(key => {
-      Object.defineProperty(ctx, key, {
-        get () {
-          return styles[key]
-        },
-        set (value) {
-          if ((key !== 'fillStyle' && key !== 'strokeStyle') || (value !== 'none' && value !== null)) {
-            ctx['set' + key.charAt(0).toUpperCase() + key.slice(1)](value)
-          }
-        }
-      })
-    })
-    // #endif
-
-    ctx.createRadialGradient = (...args) => {
-      return ctx.createCircularGradient(...args)
-    }
-  }
-
-  _initEvent () {
-    this.event = {}
-    const eventNames = [
-      {
-        wxName: 'touchStart',
-        ecName: 'mousedown'
-      },
-      {
-        wxName: 'touchMove',
-        ecName: 'mousemove'
-      },
-      {
-        wxName: 'touchEnd',
-        ecName: 'mouseup'
-      },
-      {
-        wxName: 'touchEnd',
-        ecName: 'click'
-      }
-    ]
-    eventNames.forEach(name => {
-      this.event[name.wxName] = e => {
-        const touch = e.touches[0]
-        this.chart.getZr().handler.dispatch(name.ecName, {
-          zrX: name.wxName === 'tap' ? touch.clientX : touch.x,
-          zrY: name.wxName === 'tap' ? touch.clientY : touch.y
-        })
-      }
-    })
-  }
-
-  set width (w) {
-    if (this.canvasNode) {
-      this.canvasNode.width = w
-    }
-  }
-
-  set height (h) {
-    if (this.canvasNode) {
-      this.canvasNode.height = h
-    }
-  }
-
-  get width () {
-    if (this.canvasNode) {
-      return this.canvasNode.width
-    }
-    return 0
-  }
-
-  get height () {
-    if (this.canvasNode) {
-      return this.canvasNode.height
-    }
-    return 0
-  }
-}
+function strLen (str) {
+  let len = 0
+  for (let i = 0; i < str.length; i++) {
+    if (str.charCodeAt(i) > 0 && str.charCodeAt(i) < 128) {
+      len++
+    } else {
+      len += 2
+    }
+  }
+  return len
+}
+
+export default class WxCanvas {
+  constructor (ctx, canvasId, isNew, canvasNode) {
+    this.ctx = ctx
+    this.canvasId = canvasId
+    this.chart = null
+    this.isNew = isNew
+
+    if (isNew) {
+      this.canvasNode = canvasNode
+    } else {
+      this._initCanvas(ctx)
+      this._initStyle(ctx)
+    }
+
+    this._initEvent()
+  }
+
+  getContext (contextType) {
+    if (contextType === '2d') {
+      return this.ctx
+    }
+  }
+
+  setChart (chart) {
+    this.chart = chart
+  }
+
+  attachEvent () {
+    // noop
+  }
+
+  detachEvent () {
+    // noop
+  }
+
+  _initCanvas (ctx) {
+    // #ifdef MP-ALIPAY
+    if (!ctx.measureText) {
+      // 钉钉钉钉小程序框架不支持 measureText 方法，用此方法 mock
+      ctx.measureText = (text) => {
+        let fontSize = 12
+        const font = ctx.__font
+        if (font) {
+          fontSize = parseInt(font.split(' ')[3], 10)
+        }
+        fontSize /= 2
+        return {
+          width: strLen(text) * fontSize
+        }
+      }
+    }
+    // #endif
+
+    if (!ctx.transform) {
+      ctx.transform = () => {
+      }
+    }
+
+    if (!ctx.setLineDash) {
+      ctx.setLineDash = () => {
+      }
+    }
+  }
+
+  _initStyle (ctx) {
+    // #ifdef MP-ALIPAY
+    const styles = [
+      'fillStyle',
+      'strokeStyle',
+      'globalAlpha',
+      'textAlign',
+      'textBaseAlign',
+      'shadow',
+      'lineWidth',
+      'lineCap',
+      'lineJoin',
+      'lineDash',
+      'miterLimit',
+      'fontSize'
+    ]
+    styles.forEach(key => {
+      Object.defineProperty(ctx, key, {
+        get () {
+          return styles[key]
+        },
+        set (value) {
+          if ((key !== 'fillStyle' && key !== 'strokeStyle') || (value !== 'none' && value !== null)) {
+            ctx['set' + key.charAt(0).toUpperCase() + key.slice(1)](value)
+          }
+        }
+      })
+    })
+    // #endif
+
+    ctx.createRadialGradient = (...args) => {
+      return ctx.createCircularGradient(...args)
+    }
+  }
+
+  _initEvent () {
+    this.event = {}
+    const eventNames = [
+      {
+        wxName: 'touchStart',
+        ecName: 'mousedown'
+      },
+      {
+        wxName: 'touchMove',
+        ecName: 'mousemove'
+      },
+      {
+        wxName: 'touchEnd',
+        ecName: 'mouseup'
+      },
+      {
+        wxName: 'touchEnd',
+        ecName: 'click'
+      }
+    ]
+    eventNames.forEach(name => {
+      this.event[name.wxName] = e => {
+        const touch = e.touches[0]
+        this.chart.getZr().handler.dispatch(name.ecName, {
+          zrX: name.wxName === 'tap' ? touch.clientX : touch.x,
+          zrY: name.wxName === 'tap' ? touch.clientY : touch.y
+        })
+      }
+    })
+  }
+
+  set width (w) {
+    if (this.canvasNode) {
+      this.canvasNode.width = w
+    }
+  }
+
+  set height (h) {
+    if (this.canvasNode) {
+      this.canvasNode.height = h
+    }
+  }
+
+  get width () {
+    if (this.canvasNode) {
+      return this.canvasNode.width
+    }
+    return 0
+  }
+
+  get height () {
+    if (this.canvasNode) {
+      return this.canvasNode.height
+    }
+    return 0
+  }
+}

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

@@ -153,6 +153,5 @@ export default {
 <style lang="scss">
 .ml-form {
   display: block;
-  font-size: $uni-font-size-base;
 }
 </style>

package/lib/components/ml-form-group/ml-form-group.vue

@@ -31,6 +31,7 @@ export default {
 <style lang="scss">
 .ml-form-group {
   margin-bottom: 20rpx;
+  font-size: $ml-base-font-size;
   .ml-form-group-header {
     display: flex;
     flex-direction: row;

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

@@ -1,6 +1,6 @@
 <template>
   <view class="ml-form-item" :class="[className || '', itemTitleAlign ? `title-align-${itemTitleAlign}` : '', itemAlign ? `align-${itemAlign}` : '', {'is-border': isFormBorder, 'is-vertical': itemVertical, 'is-required': isRequired, 'is-error': itemErrRule}]">
-    <view class="ml-form-item-header" :style="titleStyle">
+    <view v-if="title || $slots.title" class="ml-form-item-header" :style="titleStyle">
       <view v-if="isRequired" class="ml-form-item-header-asterisk">*</view>
       <view class="ml-form-item-header-title">
         <slot name="title">{{ title }}</slot>
@@ -185,8 +185,8 @@ export default {
   position: relative;
   display: flex;
   flex-direction: row;
-  font-size: $uni-font-size-base;
   padding: 10rpx 20rpx;
+  font-size: $ml-base-font-size;
   &.is-border {
     border-bottom: 1px solid #e5e5e5;
   }
@@ -207,6 +207,7 @@ export default {
   }
   .ml-form-item-header-title {
     display: inline;
+    color: #171A1D;
   }
   &.is-vertical {
     flex-direction: column;
@@ -256,12 +257,11 @@ export default {
 .ml-form-item-content {
   position: relative;
   display: flex;
-  align-items: center;
+  justify-content: center;
   flex-direction: column;
   flex-grow: 1;
 }
 .ml-form-item-content-warpper {
-  flex-grow: 1;
   width: 100%;
   padding: 10rpx 0;
 }
@@ -269,9 +269,6 @@ export default {
   vertical-align: middle;
 }
 .ml-form-item-content-error {
-  position: absolute;
-  left: 0;
-  bottom: -20rpx;
   width: 100%;
   color: $uni-color-error;
   font-size: 24rpx;