mali-applet-ui 1.1.70 → 1.1.72

package/index.js

@@ -3,6 +3,7 @@ import MaliToast from './modal/toast'
 import MaliModal from './modal/modal'
 import MaliLoading from './modal/loading'
 import MaliStorage from './storage'
+import MaliWebview from './webview'
 import MaliI18n from './i18n/i18n'
 import MaliUtils from './utils'
 
@@ -18,6 +19,7 @@ const MaliUI = {
   MaliModal,
   MaliLoading,
   MaliStorage,
+  MaliWebview,
   MaliI18n
 }
 
@@ -27,6 +29,7 @@ export {
   MaliModal,
   MaliLoading,
   MaliStorage,
+  MaliWebview,
   MaliI18n
 }
 

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

@@ -0,0 +1,130 @@
+<template>
+  <view class="ml-countdown">
+    <slot name="prefix">
+      <view v-if="prefixText" class="ml-countdown-prefix">{{ prefixText || '' }}</view>
+    </slot>
+    <slot :secondVals="secondVals" :currVals="currVals" :timeDiffObj="timeDiffObj" :timeFormats="timeFormats" :timeLabels="timeLabels">
+      <view class="ml-countdown-item" :class="[`time-${type}`]" v-for="(type) in timeFormats" :key="type">
+        <text class="ml-countdown-time-num">{{ timeDiffObj[type] || 0 }}</text>
+        <text class="ml-countdown-time-label">{{ timeLabels[type] || '' }}</text>
+      </view>
+    </slot>
+    <slot name="suffix">
+      <view v-if="suffixText" class="ml-countdown-suffix">{{ suffixText || '' }}</view>
+    </slot>
+  </view>
+</template>
+
+<script>
+import XEUtils from 'xe-utils'
+
+export default {
+  name: 'MlCountdown',
+  props: {
+    value: [Number, String],
+    formats: Array,
+    prefixText: String,
+    suffixText: String
+  },
+  data () {
+    return {
+      secondVals: 0,
+      currVals: 0,
+      timeLabels: {
+        yyyy: '年',
+        MM: '月',
+        dd: '天',
+        HH: '时',
+        mm: '分',
+        ss: '秒'
+      },
+      htime: null
+    }
+  },
+  computed: {
+    timeDiffObj () {
+      return XEUtils.getDateDiff(Date.now(), Date.now() + this.currVals)
+    },
+    timeFormats () {
+      if (this.formats && this.formats.length) {
+        return this.formats
+      }
+      if (this.secondVals >= 31622400000) {
+        return ['yyyy', 'MM', 'dd', 'HH', 'mm', 'ss']
+      }
+      if (this.secondVals >= 2678400000) {
+        return ['MM', 'dd', 'HH', 'mm', 'ss']
+      }
+      if (this.secondVals >= 86400000) {
+        return ['dd', 'HH', 'mm', 'ss']
+      }
+      return ['HH', 'mm', 'ss']
+    }
+  },
+  watch: {
+    value () {
+      this.updateVal()
+      this.stop()
+      this.start()
+    }
+  },
+  created () {
+    this.updateVal()
+    this.start()
+  },
+  beforeDestroy () {
+    this.stop()
+  },
+  methods: {
+    updateVal () {
+      this.secondVals = XEUtils.toNumber(this.value || 0)
+      this.currVals = this.secondVals
+    },
+    handleTime () {
+      if (this.currVals > 1000) {
+        this.currVals -= 1000
+        this.htime = setTimeout(this.handleTime, 1000)
+      } else {
+        this.currVals = 0
+        this.stop()
+      }
+    },
+    start () {
+      this.$emit('start', {})
+      this.handleTime()
+    },
+    stop () {
+      if (this.htime != null) {
+        this.$emit('stop', {})
+        clearTimeout(this.htime)
+        this.htime = null
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.ml-countdown {
+  padding: 0 16rpx;
+  .ml-countdown-prefix {
+    display: inline-block;
+    padding-right: 16rpx;
+  }
+  .ml-countdown-item {
+    display: inline-block;
+  }
+  .ml-countdown-suffix {
+    display: inline-block;
+    padding-left: 16rpx;
+  }
+  .ml-countdown-time-num {
+    color: $ml-theme-primary-color;
+    padding: 0 8rpx;
+    font-size: 1.6em;
+  }
+  .ml-countdown-time-label {
+    padding: 0 8rpx;
+  }
+}
+</style>

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

@@ -33,7 +33,7 @@ export default {
       type: [Boolean, Number, String],
       default: null
     },
-    content: String,
+    content: [Number, String],
     vertical: Boolean,
     disabled: Boolean,
     prefixIcon: String,

package/lib/components/ml-list-item-describe/ml-list-item-describe.vue

@@ -25,7 +25,7 @@ export default {
       type: Boolean,
       default: true
     },
-    content: String
+    content: [Number, String]
   },
   computed: {
     leftStyle () {

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

@@ -42,7 +42,7 @@ export default {
   border: 2rpx solid #e8e8e8;
   margin: 0 8rpx;
   border-radius: 8rpx;
-  font-size: 24rpx;
+  font-size: $ml-base-font-size;
   &.is-round {
     border-radius: $ml-border-radius;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.1.70",
+  "version": "1.1.72",
   "description": "码里UI-小程序组件库(vue2)",
   "files": [
     "lib",
@@ -13,6 +13,7 @@
     "modal",
     "store",
     "storage",
+    "webview",
     "index.js",
     "theme.scss"
   ],

package/types/index.d.ts

@@ -5,9 +5,21 @@ import { MaliStorage, MlStorageCore } from './storage'
 import { MaliModal } from './modal'
 import { MaliToast } from './toast'
 import { MaliLoading } from './loading'
+import { MaliWebview, MlWebviewCore } from './webview'
 import { MaliI18n, MlI18nCore } from './i18n'
 
 export interface ConfigOptions {
+  webview?: {
+    setStorage(params: {
+      data: any
+    }): void
+  }
+  loading?: any
+  upload?: any
+  loadMore?: any
+  pager?: any
+  notData?: any
+  listSelectUserPage?: any
   [key: string]: any
 }
 
@@ -19,8 +31,9 @@ export const MaliUI: {
   MaliToast: typeof MaliToast
   MaliModal: typeof MaliModal
   MaliLoading: typeof MaliLoading
-  MaliI18n: MlI18nCore
   MaliStorage: MlStorageCore
+  MaliI18n: MlI18nCore
+  MaliWebview: MlWebviewCore
 }
 
 export {
@@ -30,6 +43,7 @@ export {
   MaliLoading,
   MaliI18n,
   MaliStorage,
+  MaliWebview
 }
 
 export default MaliUI

package/types/webview/index.d.ts

@@ -0,0 +1,7 @@
+import { ComponentOptions } from 'vue'
+
+export interface MlWebviewCore {
+  defineH5Transfer(compOptions: ComponentOptions): ComponentOptions
+}
+
+export const MaliWebview: MlWebviewCore

package/webview/index.js

@@ -0,0 +1,35 @@
+import XEUtils from 'xe-utils'
+import globalStore from '../config/store'
+
+export function defineH5Transfer (vueOpts = {}) {
+  return {
+    ...vueOpts,
+    onLoad (options) {
+      if (options) {
+        const { _url, _method, _syncStorage } = options
+        let data = {}
+        if (options && _syncStorage) {
+          data = XEUtils.toStringJSON(decodeURIComponent(_syncStorage))
+        }
+        if (globalStore.webview && globalStore.webview.setStorage) {
+          globalStore.webview.setStorage({ data })
+        }
+        if (vueOpts.onStorage) {
+          vueOpts.onStorage.call(this, { data })
+        }
+        if (vueOpts.onLoad) {
+          vueOpts.onLoad.call(this, data)
+        }
+        if (_url && _method && uni[_method]) {
+          uni[_method]({ url: decodeURIComponent(_url) })
+        }
+      }
+    }
+  }
+}
+
+const MaliWebview = {
+  defineH5Transfer
+}
+
+export default MaliWebview