Merge branch 'dev'

CHANGELOG.en-US.md

@@ -3,6 +3,14 @@ title: Change Log
 toc: hidden
 ---
 
+### 2.5.5
+
+`2019-11-08`
+
+- Fix
+  - Fix the problem of size exception caused by window size change when `TabBar` were used in `keep-alive`[#608](https://github.com/didi/mand-mobile/issues/608)
+  - Fix `Skeleton` title exception shows when it is empty
+
 ### 2.5.4
 
 `2019-11-02`

CHANGELOG.md

@@ -3,6 +3,14 @@ title: 更新日志
 toc: hidden
 ---
 
+### 2.5.5
+
+`2019-11-08`
+
+- Fix
+  - 修复`TabBar`在`keep-alive`中使用因窗口尺寸变更导致尺寸异常的问题[#608](https://github.com/didi/mand-mobile/issues/608)
+  - 修复`Skeleton`标题为空时也展示的问题
+
 ### 2.5.4
 
 `2019-11-02`

components/skeleton/index.vue

@@ -9,7 +9,7 @@
       }"
     ></div>
     <div class="md-skeleton-content">
-      <h4 class="md-skeleton-title" :style="{ width: getTitleWidth() }" />
+      <h4 v-if="title" class="md-skeleton-title" :style="{ width: getTitleWidth() }" />
       <div
         v-for="index in row"
         class="md-skeleton-row"
@@ -23,7 +23,8 @@
     <slot></slot>
   </div>
 </template>
-<script>const DEFUALT_TITLE_WIDTH = '40%'
+<script>
+const DEFUALT_TITLE_WIDTH = '40%'
 const DEFUALT_WIDTH = '100%'
 
 export default {
@@ -82,7 +83,8 @@ export default {
     },
   },
 }
-</script>
+
+</script>
 
 <style lang="stylus">
 placeHolder()

components/tab-bar/index.vue

@@ -128,6 +128,7 @@ export default {
       })
     },
     items() {
+      /* istanbul ignore next */
       this.$nextTick(function() {
         this.reflow()
       })
@@ -138,6 +139,7 @@ export default {
       })
     },
     scrollable() {
+      /* istanbul ignore next */
       this.scrollerTmpKey = Date.now()
     },
   },
@@ -151,6 +153,14 @@ export default {
   mounted() {
     this.$_resizeEnterBehavior()
   },
+  activated() {
+    /* istanbul ignore next */
+    this.$_resizeEnterBehavior()
+  },
+  deactivated() {
+    /* istanbul ignore next */
+    this.$_resizeLeaveBehavior()
+  },
   beforeDestroy() {
     this.$_resizeLeaveBehavior()
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mand-mobile",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "description": "A Vue.js 2.0 Mobile UI Toolkit",
   "homepage": "https://didi.github.io/mand-mobile",
   "main": "lib/mand-mobile.umd.js",

site/docs/started.en-US.md

@@ -127,23 +127,6 @@ Vue.use(mandMobile)
 
 #### Prepare Before Use
 
-##### FastClick
-
-To avoid click problems caused by [browser compatibility](https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile), [FastClick](https://github.com/ftlabs/fastclick) is recommended to import.
-
-```javascript
-import FastClick from 'fastclick'
-
-if ('addEventListener' in document && 'ontouchstart' in window) {
-  FastClick.prototype.focus = function (targetElement) {
-    targetElement.focus()
-  }
-  document.addEventListener('DOMContentLoaded', function () {
-    FastClick.attach(document.body)
-  }, false)
-}
-```
-
 ##### Release Package Directory
 
 [Release Package](https://unpkg.com/mand-mobile/) includes the following different directories, which are applicable in different scenarios. You can select one directory to load according to actual needs：

site/docs/started.md

@@ -127,23 +127,6 @@ Vue.use(mandMobile)
 
 #### 使用前准备
 
-##### FastClick
-
-为避免[浏览器兼容问题](https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile)引起的点击问题, 推荐引入[FastClick](https://github.com/ftlabs/fastclick)
-
-```javascript
-import FastClick from 'fastclick'
-
-if ('addEventListener' in document && 'ontouchstart' in window) {
-  FastClick.prototype.focus = function (targetElement) {
-    targetElement.focus()
-  }
-  document.addEventListener('DOMContentLoaded', function () {
-    FastClick.attach(document.body)
-  }, false)
-}
-```
-
 ##### 产出包目录
 
 [产出包](https://unpkg.com/mand-mobile/)中包含以下几种不同目录，分别适用于不同场景的代码，可根据实际需要选择一个目录加载：