mali-applet-ui 1.0.173 → 1.0.175

package/lib/components/fix-uni-datetime-picker/calendar.vue

@@ -564,6 +564,9 @@ export default {
         this.tempRange.before = this.cale.multipleStatus.before
         this.tempRange.after = this.cale.multipleStatus.after
       }
+      if (!this.time) {
+        this.time = this.hideSecond ? '00:00' : '00:00:00'
+      }
       this.change()
     },
     /**

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

@@ -0,0 +1,34 @@
+<template>
+  <image class="ml-image" :src="url" :mode="mode" :style="imgStyles"></image>
+</template>
+
+<script>
+export default {
+  name: 'MlImage',
+  props: {
+    url: String,
+    mode: {
+      type: String,
+      default: 'aspectFit'
+    },
+    width: [String, Number],
+    height: [String, Number]
+  },
+  computed: {
+    imgStyles () {
+      const width = this.width
+      const height = this.height
+      const wSty = width ? `width: ${isNaN(width) ? width : `${width}rpx`};` : ''
+      const hSty = height ? `height: ${isNaN(height) ? height : `${height}rpx`};` : ''
+      return `${wSty}${hSty}`
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.ml-image {
+  width: 80rpx;
+  height: 80rpx;
+}
+</style>

package/lib/components/ml-load-more/ml-load-more.vue

@@ -102,6 +102,10 @@ export default {
       return this.showPage
         ? {
             pageObj: this.pageVO,
+            pageData: {
+              [this.pagePropOpts.currentPage || 'page']: this.pageVO.currPage,
+              [this.pagePropOpts.pageSize || 'limit']: this.pageVO.pageSize
+            },
             data: {
               [this.pagePropOpts.currentPage || 'page']: this.pageVO.currPage,
               [this.pagePropOpts.pageSize || 'limit']: this.pageVO.pageSize

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

@@ -1,10 +1,10 @@
 <template>
-  <view class="ml-switch" :style="styles">
-    <view v-if="openLabel && closeLabel" class="ml-switch-warpper" @tap="toggleEvent">
-      <view class="ml-switch-btn" :class="{'is-active': checked}">{{ openLabel }}</view>
-      <view class="ml-switch-btn" :class="{'is-active': !checked}">{{ closeLabel }}</view>
+  <view class="ml-switch" :class="[isChecked ? 'is--on' : 'is--off', {'is--disabled': disabled,'is--animat': this.hasAnimat}]">
+    <view class="ml-switch--button" @tap="clickEvent">
+      <view class="ml-switch--label ml-switch--label-on">{{ onShowLabel }}</view>
+      <view class="ml-switch--label ml-switch--label-off">{{ offShowLabel }}</view>
+      <view class="ml-switch--icon"></view>
     </view>
-    <switch v-else class="ml-switch-native" :class="className" :checked="checked" :color="color" @change="changeEvent"></switch>
   </view>
 </template>
 
@@ -16,10 +16,6 @@ export default {
   },
   props: {
     value: [String, Number, Boolean],
-    color: {
-      type: String,
-      default: '#007aff'
-    },
     width: String,
     openLabel: String,
     closeLabel: String,
@@ -31,27 +27,42 @@ export default {
       type: [String, Number, Boolean],
       default: false
     },
+    disabled: Boolean,
     className: String
   },
+  data () {
+    return {
+      isActivated: false,
+      hasAnimat: false
+    }
+  },
   computed: {
-    styles () {
-      const wSys = this.width ? `width: ${this.width};` : ''
-      return `${wSys}`
-    },
-    checked () {
+    isChecked () {
       return this.value === this.openValue
+    },
+    onShowLabel () {
+      return this.openLabel || ''
+    },
+    offShowLabel () {
+      return this.closeLabel || ''
     }
   },
   methods: {
-    changeEvent (e) {
-      const value = e.detail.value ? this.openValue : this.closeValue
-      this.$emit('input', value)
-      this.$emit('change', { value })
-    },
-    toggleEvent  () {
-      const value = this.checked ? this.closeValue : this.openValue
-      this.$emit('input', value)
-      this.$emit('change', { value })
+    clickEvent (evnt) {
+      if (!this.disabled) {
+        clearTimeout(this.activeTimeout)
+        const value = this.isChecked ? this.closeValue : this.openValue
+        this.hasAnimat = true
+        this.$emit('input', value)
+        this.$emit('change', { value })
+        // 自动更新校验状态
+        if (this.$xeform && this.$xeformiteminfo) {
+          this.$xeform.triggerItemEvent(evnt, this.$xeformiteminfo.itemConfig.field, value)
+        }
+        this.activeTimeout = setTimeout(() => {
+          this.hasAnimat = false
+        }, 400)
+      }
     }
   }
 }
@@ -59,28 +70,103 @@ export default {
 
 <style lang="scss">
 .ml-switch {
-  display: inline-flex;
-  .ml-switch-native {
-    transform: scale(0.8);
-  }
-  .ml-switch-warpper {
-    display: inline-flex;
-    flex-direction: row;
-    padding: 8rpx;
-    border-radius: $ml-border-radius;
-    background: #e5e6e8;
-    .ml-switch-btn {
-      flex-grow: 1;
-      padding: 0 24rpx;
-      height: 44rpx;
-      line-height: 44rpx;
-      font-size: $ml-describe-font-size;
+  display: inline-block;
+  color: $ml-font-color;
+  vertical-align: middle;
+  padding: 12rpx;
+  user-select: none;
+  text-align: center;
+  &.is--animat {
+    .ml-switch--button {
+      transition: border-color .3s, background-color .3s;
+    }
+    .ml-switch--icon {
       transition: all 0.3s;
-      &.is-active {
-        background: #ffffff;
-        border-radius: $ml-border-radius;
+    }
+  }
+  &.is--on {
+    .ml-switch--button {
+      padding-right: 40rpx;
+      background-color: $ml-theme-primary-color;
+    }
+    .ml-switch--icon {
+      left: 100%;
+      transform: translateX(-38rpx);
+    }
+  }
+  &.is--off {
+    .ml-switch--button {
+      padding-left: 40rpx;
+      background-color: rgba(0,0,0,0.35);
+    }
+    .ml-switch--icon {
+      left: 6rpx;
+      transform: translateX(0);
+    }
+  }
+  &.is--on .ml-switch--label-off,
+  &.is--off .ml-switch--label-on {
+    height: 0;
+    visibility: hidden;
+    overflow: hidden;
+  }
+  &.is--on,
+  &.is--off {
+    .ml-switch--label {
+      opacity: 1;
+    }
+  }
+  &:not(.is--disabled) {
+    .ml-switch--button {
+      cursor: pointer;
+      &:focus {
+        box-shadow: 0 0 8rpx 0 #246BFD;
       }
     }
   }
+  &.is--disabled {
+    .ml-switch--button {
+      cursor: no-drop;
+    }
+    &.is--on {
+      .ml-switch--button {
+        background-color: lighten(#246BFD, 20%);
+      }
+    }
+    &.is--off {
+      .ml-switch--button {
+        background-color: rgba(0,0,0,0.15)
+      }
+    }
+  }
+  .ml-switch--button {
+    display: block;
+    position: relative;
+    height: 46rpx;
+    line-height: 46rpx;
+    min-width: 80rpx;
+    padding: 0 14rpx;
+    border-radius: 46rpx;
+    border: 0;
+    outline: 0;
+  }
+  .ml-switch--label {
+    opacity: 0;
+    display: block;
+    color: #fff;
+    font-size: 22rpx;
+  }
+  .ml-switch--icon {
+    position: absolute;
+    top: 7rpx;
+    left: 0;
+    width: 34rpx;
+    height: 34rpx;
+    border-radius: 50%;
+    background-color: #fff;
+  }
+  .ml-switch--label-icon {
+    margin-right: 10rpx;
+  }
 }
 </style>

package/package.json

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

package/utils/applet.js

@@ -3,21 +3,23 @@
  */
 export function checkForUpdate () {
   const updateManager = uni.getUpdateManager()
-  updateManager.onCheckForUpdate((res) => {
-    console.log('检查版本', res.hasUpdate)
-  })
-  updateManager.onUpdateReady(() => {
-    uni.showModal({
-      title: '更新提示',
-      content: '新版本已经准备好，是否重启应用？',
-      success (res) {
-        if (res.confirm) {
-          // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-          updateManager.applyUpdate()
+  if (updateManager) {
+    updateManager.onCheckForUpdate((res) => {
+      console.log('检查版本', res.hasUpdate)
+    })
+    updateManager.onUpdateReady(() => {
+      uni.showModal({
+        title: '更新提示',
+        content: '新版本已经准备好，是否重启应用？',
+        success (res) {
+          if (res.confirm) {
+            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+            updateManager.applyUpdate()
+          }
         }
-      }
+      })
     })
-  })
+  }
 }
 
 /**