Merge branch 'dev'

.travis.yml

@@ -10,6 +10,7 @@ cache:
 branches:
   only:
   - master
+  - dev
 
 script:
   - npm test

CHANGELOG.en-US.md

@@ -3,6 +3,14 @@ title: Change Log
 toc: hidden
 ---
 
+### 2.4.1
+
+`2019-08-03`
+
+- Fix
+  - Fix the problem that `InputItem` cannot limit the max length of characters when using virtual keyboard input[#524](https://github.com/didi/mand-mobile/issues/524)
+  - Fix `Amount` with the loss of precision in animation mode
+
 ### 2.4.0
 
 `2019-07-29`

CHANGELOG.md

@@ -3,6 +3,14 @@ title: 更新日志
 toc: hidden
 ---
 
+### 2.4.1
+
+`2019-08-03`
+
+- Fix
+  - 修复`InputItem`使用虚拟键盘输入时无法限制字符长度的问题[#524](https://github.com/didi/mand-mobile/issues/524)
+  - 修复`Amount`使用动效时数字的精度问题
+
 ### 2.4.0
 
 `2019-07-29`

components/amount/index.vue

@@ -113,6 +113,10 @@ export default {
     $_doAnimateDisplay(fromValue = 0, toValue = 0) {
       /* istanbul ignore next  */
       const step = percent => {
+        if (percent === 1) {
+          this.formatValue = toValue
+          return
+        }
         this.formatValue = fromValue + (toValue - fromValue) * percent
       }
 

components/amount/test/index.spec.js

@@ -1,5 +1,5 @@
 import {Amount} from 'mand-mobile'
-import {shallowMount} from '@vue/test-utils'
+import {shallowMount, mount} from '@vue/test-utils'
 
 describe('Amount - Operation', () => {
   let wrapper
@@ -17,4 +17,37 @@ describe('Amount - Operation', () => {
     })
     expect(wrapper.vm.isMounted).toBe(true)
   })
+
+  test('should number animation not lose precision', done => {
+    wrapper = mount({
+      template: `
+          <md-amount
+          :value="val"
+          :duration="1000"
+          transition
+          ref="amount"
+        ></md-amount>
+      `,
+      components: {
+        [Amount.name]: Amount,
+      },
+      data() {
+        return {
+          val: 1000,
+        }
+      },
+    })
+
+    const instance = wrapper.vm.$refs.amount
+
+    setTimeout(() => {
+      expect(instance.formatValue).toBe(1000)
+      wrapper.vm.val = 20.66
+    }, 2000)
+
+    setTimeout(() => {
+      expect(instance.formatValue).toBe(20.66)
+      done()
+    }, 4000)
+  })
 })

components/input-item/index.vue

@@ -498,6 +498,9 @@ export default {
       }
     },
     $_onNumberKeyBoardEnter(val) {
+      if (this.$_trimValue(this.inputValue).length >= this.inputMaxLength) {
+        return
+      }
       this.inputValue = this.$_formateValue(this.inputValue + val).value
     },
     $_onNumberKeyBoardDelete() {

components/input-item/test/index.spec.js

@@ -83,6 +83,7 @@ describe('InputItem - Operation', () => {
       propsData: {
         type: 'money',
         isVirtualKeyboard: true,
+        maxlength: 4,
       },
     })
 
@@ -102,6 +103,11 @@ describe('InputItem - Operation', () => {
       keys.at(2).trigger('click')
       deleteBtn.trigger('click')
       expect(wrapper.vm.inputValue).toBe('2.3')
+      keys.at(2).trigger('click')
+      keys.at(2).trigger('click')
+      keys.at(2).trigger('click')
+      keys.at(2).trigger('click')
+      expect(wrapper.vm.inputValue).toBe('2.33')
       confirmBtn.trigger('click')
       expect(eventStub.calledWith('confirm')).toBe(true)
       wrapper.vm.blur()

package.json

@@ -1,8 +1,8 @@
 {
   "name": "mand-mobile",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "A Vue.js 2.0 Mobile UI Toolkit",
-  "homepage": "https://github.com/didi/mand-mobile",
+  "homepage": "https://didi.github.io/mand-mobile",
   "main": "lib/mand-mobile.umd.js",
   "style": "lib/mand-mobile.css",
   "module": "lib/mand-mobile.esm.js",

site/mfe.blog.config.js

@@ -88,6 +88,11 @@ module.exports = {
           text: '主题定制',
           markdown: resolve('site/docs/theme.md'),
         },
+        {
+          name: 'faq',
+          text: '常见问题',
+          link: 'https://github.com/didi/mand-mobile/wiki/FAQ---%E4%B8%AD%E6%96%87',
+        },
         // {
         //   name: 'preview',
         //   text: '组件概览',
@@ -199,6 +204,11 @@ module.exports = {
           text: 'Custom Theme',
           markdown: resolve('site/docs/theme.en-US.md'),
         },
+        {
+          name: 'faq',
+          text: 'FAQ',
+          link: 'https://github.com/didi/mand-mobile/wiki/FAQ',
+        },
         // {
         //   name: 'preview',
         //   text: 'Component Preview',

site/theme/default/components/Menu.vue

@@ -11,21 +11,27 @@
     </div>
     <ul class="menu-list-0">
       <li class="menu-item-0" v-for="(item0, index0) in menu" :key="index0">
+        <a :href="item0.link" v-if="item0.link" v-html="item0.text" target="_blank"></a>
         <router-link 
+          v-else
           :to="`/${lang}/${nav}/${item0.name}`"
           :class="{disabled: !item0.src && !item0.markdown}"
           v-html="item0.text">
         </router-link> 
         <ul class="menu-list-1" v-if="item0.menu">
           <li class="menu-item-1" v-for="(item1, index1) in item0.menu" :key="index1">
+            <a :href="item1.link" v-if="item1.link" v-html="item1.text" target="_blank"></a>
             <router-link 
+              v-else
               :to="`/${lang}/${nav}/${item0.name}/${item1.name}`"
               :class="{disabled: !item1.src && !item1.markdown}"
               v-html="item1.text">
             </router-link> 
             <ul class="menu-list-2" v-if="item1.menu">
               <li class="menu-item-2" v-for="(item2, index2) in item1.menu" :key="index2">
+                <a :href="item2.link" v-if="item2.link" v-html="item2.text" target="_blank"></a>
                 <router-link
+                  v-else
                   :to="`/${lang}/${nav}/${item0.name}/${item1.name}/${item2.name}`"
                   :class="{disabled: !item2.src && !item2.markdown}"
                   v-html="item2.text">