dolphin-weex-ui 2.4.21 → 2.4.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dolphin-weex-ui",
-  "version": "2.4.21",
+  "version": "2.4.23",
   "description": "inteligense cross platform frame",
   "main": "index.js",
   "directories": {

package/packages/dof-card/index.vue

@@ -135,6 +135,9 @@ export default {
     _tagBg() {
       if (this.tagBg) return this.tagBg
       return this._isColmo ? '#B35336' : '#00A4F2'
+    },
+    isHarmony() {
+      return weex.config.env.platform == 'harmony'
     }
   },
   mounted() {
@@ -146,7 +149,8 @@ export default {
         return
       }
       this.$nextTick(() => {
-        getBoundingClientRect(this.$refs.body, res => {
+        const dom = weex.requireModule('dom')
+        getBoundingClientRect(dom, this.$refs.body, res => {
           this.bodyHeight = res.size.height
           if (this.collapsed_) {
             this.collapseBody(0)
@@ -166,6 +170,10 @@ export default {
       this.$emit('clicked', (this.clicked_ = !this.clicked_))
     },
     onCollapse() {
+      if (this.isHarmony) {
+        if (this.clickLock) return
+        this.clickLock = true
+      }
       this.collapsed_ = !this.collapsed_
       this.$emit('collapse', this.collapsed_)
       if (this.collapsed_) {
@@ -175,6 +183,11 @@ export default {
         this.expandeBody()
         this.expandeArrow()
       }
+      if (this.isHarmony) {
+        setTimeout(() => {
+          this.clickLock = false
+        }, 100)
+      }
     },
     collapseBody(duration = 360) {
       Transition.Default()

package/packages/dof-checkbox/index.vue

@@ -344,16 +344,28 @@ export default {
         }
       }
       return {}
+    },
+    isHarmony() {
+      return weex.config.env.platform == 'harmony'
     }
   },
 
   methods: {
     dofCellClick() {
+      if (this.isHarmony) {
+        if (this.clickLock) return
+        this.clickLock = true
+      }
       const { disabled, innerChecked, value } = this
       if (!disabled) {
         this.innerChecked = !innerChecked
         this.$emit('dofCheckBoxItemChecked', { value, checked: this.innerChecked })
       }
+      if (this.isHarmony) {
+        setTimeout(() => {
+          this.clickLock = false
+        }, 100)
+      }
     },
     dynamicIsOverflow() {
       // ios下面 对于这个动态的设置flex=1,或者max-width都会 偶现不生效。

package/packages/dof-collapse-item/index.vue

@@ -64,7 +64,9 @@ export default {
   created() {},
   mounted() {
     this.$nextTick(() => {
+      const dom = weex.requireModule('dom')
       getBoundingClientRect(
+        dom,
         this.$refs.slotBody,
         res => {
           if (res.result) {
@@ -84,6 +86,9 @@ export default {
   computed: {
     accordion() {
       return this._activeData.accordion
+    },
+    isHarmony() {
+      return weex.config.env.platform == 'harmony'
     }
   },
   watch: {
@@ -119,6 +124,10 @@ export default {
   },
   methods: {
     onCollapseHandler() {
+      if (this.isHarmony) {
+        if (this.clickLock) return
+        this.clickLock = true
+      }
       this.collapsed_ = !this.collapsed_
       //手风琴-发送通知
       this.$parent.collapseClick({ collapsed: this.collapsed_, name: this.name })
@@ -131,6 +140,11 @@ export default {
           this.expandeArrow()
         }
       }
+      if (this.isHarmony) {
+        setTimeout(() => {
+          this.clickLock = false
+        }, 100)
+      }
     },
     collapseBody(duration = 360) {
       Transition.Default()

package/packages/dof-gear/index.vue

@@ -120,9 +120,10 @@ export default {
   },
   methods: {
     initRect() {
+      const dom = weex.requireModule('dom')
       this.ranges.forEach((range, i) => {
         if (range.gear) {
-          getBoundingClientRectBase(this.$refs['bar'][i], res => {
+          getBoundingClientRectBase(dom, this.$refs['bar'][i], res => {
             this.rects.push({
               ...range,
               left: res.size.left,

package/packages/dof-result/index.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="wrapper" v-if="show" :style="wrapStyle">
     <div class="dof-result" :style="{ top: setPaddingTop, backgroundColor: bgColor_ }">
-      <image class="result-image" :aria-hidden="true" :src="resultType.pic" :style="imgStyle"></image>
+      <image
+        :class="[isNewVersion ? 'result-image-new' : 'result-image']"
+        :aria-hidden="true"
+        :src="resultType.pic"
+        :style="imgStyle"
+      ></image>
       <slot name="text">
         <div class="result-content" v-if="resultType.content">
           <text class="content-text">{{ resultType.content }}</text>
@@ -48,6 +53,11 @@
   height: 320px;
 }
 
+.result-image-new {
+  width: 460x;
+  height: 384px;
+}
+
 .result-content {
   margin-top: 0px;
   align-items: center;
@@ -91,19 +101,23 @@ import DofButton from '../dof-button'
 import imgs from './imgs'
 import ColmoMixin from '../../mixins/colmo'
 import DiabloMixin from '../../mixins/diablo'
+import Utils from '../utils/index.js'
+
+const defaultPicBaseUrl = imageName => `meiju://common/emptyImage?imageName=${imageName}`
+const isNewVersion = Utils.compareVersionNew('11.4.15')
 const Types = {
   noNetwork: {
-    pic: imgs['noNetwork'],
+    pic: isNewVersion ? defaultPicBaseUrl('img_empty_02_disconnection') : imgs['noNetwork'],
     content: '网络异常，请检查您的网络设置'
     // button: '刷新'
   },
   noUpdate: {
-    pic: imgs['noUpdate'],
+    pic: isNewVersion ? defaultPicBaseUrl('img_empty_03_update') : imgs['noUpdate'],
     content: '当前版本较低',
     desc: '请更新到最新版APP'
   },
   noPage: {
-    pic: imgs['noPage'],
+    pic: isNewVersion ? defaultPicBaseUrl('img_empty_04_content') : imgs['noPage'],
     content: '找不到页面'
   },
   colmo: {
@@ -143,6 +157,9 @@ export default {
     }
   },
   computed: {
+    isNewVersion() {
+      return Utils.compareVersionNew('11.4.15')
+    },
     type_() {
       if (this.type) return this.type
       return this._isColmo ? 'colmo' : 'noPage'

package/packages/dof-slider-scale/index.vue

@@ -86,8 +86,9 @@ export default {
   },
   methods: {
     initElWidth() {
+      const dom = weex.requireModule('dom')
       const el = this.$refs['dof-slider-scale']
-      getBoundingClientRect(el, res => {
+      getBoundingClientRect(dom, el, res => {
         res.result && (this.elWidth = res.size.width)
       })
     }

package/packages/utils/dom.js

@@ -1,14 +1,13 @@
-const dom = weex.requireModule('dom')
-
-export function getBoundingClientRectBase(element, func) {
+const domModule = weex.requireModule('dom')
+export function getBoundingClientRectBase(dom, element, func) {
   dom && dom.getComponentRect(element, func)
 }
 
-export function getBoundingClientRect(element, func, delay = 50) {
+export function getBoundingClientRect(dom, element, func, delay = 50) {
   setTimeout(() => dom && dom.getComponentRect(element, func), delay)
 }
 
-export function getBoundingClientRectAsync(element) {
+export function getBoundingClientRectAsync(dom, element) {
   return new Promise(resolve => {
     setTimeout(() => dom && dom.getComponentRect(element, res => res.result && resolve(res.size)), 0)
   })

package/packages/utils/index.js

@@ -277,6 +277,21 @@ const Utils = {
     }
     return false
   },
+  toNum(a) {
+    a = a.toString()
+    var c = a.split('.')
+    var r = ['0000', '000', '00', '0', '']
+    for (var i = 0; i < c.length; i++) {
+      var len = c[i].length
+      c[i] = r[len] + c[i]
+    }
+    var res = c.join('')
+    return res
+  },
+  compareVersionNew(a) {
+    // 判断当前版本是否大于等于比较的版本
+    return this.toNum(weex.config.env.appVersion) >= this.toNum(a)
+  },
   /**
    * 分割数组
    * @param arr 被分割数组

package/packages/dof-actionsheet/dist/index.dev.js

@@ -1,15 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function get() {
-    return _index["default"];
-  }
-});
-
-var _index = _interopRequireDefault(require("./index.vue"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }