Skip to content

Commit

Permalink
fix(number-keyboard): numberkeyboard action (#479)
Browse files Browse the repository at this point in the history 
* fix(number-keyboard): number keys misuse & update style

#477

* test: update snapshots
  • Loading branch information
@xxyan0205
xxyan0205 authored Jul 5, 2019
1 parent 81ff17c commit f7eabae
Show file tree
Hide file tree
Showing 7 changed files with 156 additions and 155 deletions.
44 changes: 22 additions & 22 deletions components/captcha/test/__snapshots__/demo.spec.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ exports[`Captcha - Demo Customize 1`] = `
<div class="md-number-keyboard-container simple">
<div class="keyboard-number">
<ul class="keyboard-number-list">
<li class="keyboard-number-item">1</li>
<li class="keyboard-number-item">2</li>
<li class="keyboard-number-item">3</li>
<li class="keyboard-number-item">4</li>
<li class="keyboard-number-item">5</li>
<li class="keyboard-number-item">6</li>
<li class="keyboard-number-item">7</li>
<li class="keyboard-number-item">8</li>
<li class="keyboard-number-item">9</li>
<li class="keyboard-number-item"><span>1</span></li>
<li class="keyboard-number-item"><span>2</span></li>
<li class="keyboard-number-item"><span>3</span></li>
<li class="keyboard-number-item"><span>4</span></li>
<li class="keyboard-number-item"><span>5</span></li>
<li class="keyboard-number-item"><span>6</span></li>
<li class="keyboard-number-item"><span>7</span></li>
<li class="keyboard-number-item"><span>8</span></li>
<li class="keyboard-number-item"><span>9</span></li>
<li class="keyboard-number-item no-bg"></li>
<li class="keyboard-number-item">0</li>
<li class="keyboard-number-item no-bg delete"></li>
<li class="keyboard-number-item"><span>0</span></li>
<li class="keyboard-number-item no-bg delete"><span></span></li>
</ul>
</div>
<!---->
Expand Down Expand Up @@ -81,18 +81,18 @@ exports[`Captcha - Demo Inline display 1`] = `
<div class="md-number-keyboard-container simple">
<div class="keyboard-number">
<ul class="keyboard-number-list">
<li class="keyboard-number-item">1</li>
<li class="keyboard-number-item">2</li>
<li class="keyboard-number-item">3</li>
<li class="keyboard-number-item">4</li>
<li class="keyboard-number-item">5</li>
<li class="keyboard-number-item">6</li>
<li class="keyboard-number-item">7</li>
<li class="keyboard-number-item">8</li>
<li class="keyboard-number-item">9</li>
<li class="keyboard-number-item"><span>1</span></li>
<li class="keyboard-number-item"><span>2</span></li>
<li class="keyboard-number-item"><span>3</span></li>
<li class="keyboard-number-item"><span>4</span></li>
<li class="keyboard-number-item"><span>5</span></li>
<li class="keyboard-number-item"><span>6</span></li>
<li class="keyboard-number-item"><span>7</span></li>
<li class="keyboard-number-item"><span>8</span></li>
<li class="keyboard-number-item"><span>9</span></li>
<li class="keyboard-number-item no-bg"></li>
<li class="keyboard-number-item">0</li>
<li class="keyboard-number-item no-bg delete"></li>
<li class="keyboard-number-item"><span>0</span></li>
<li class="keyboard-number-item no-bg delete"><span></span></li>
</ul>
</div>
<!---->
Expand Down
22 changes: 11 additions & 11 deletions components/cashier/test/__snapshots__/demo.spec.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@ exports[`Cashier - Demo Baisc-captcha 1`] = `
<div class="md-number-keyboard-container simple">
<div class="keyboard-number">
<ul class="keyboard-number-list">
<li class="keyboard-number-item">1</li>
<li class="keyboard-number-item">2</li>
<li class="keyboard-number-item">3</li>
<li class="keyboard-number-item">4</li>
<li class="keyboard-number-item">5</li>
<li class="keyboard-number-item">6</li>
<li class="keyboard-number-item">7</li>
<li class="keyboard-number-item">8</li>
<li class="keyboard-number-item">9</li>
<li class="keyboard-number-item"><span>1</span></li>
<li class="keyboard-number-item"><span>2</span></li>
<li class="keyboard-number-item"><span>3</span></li>
<li class="keyboard-number-item"><span>4</span></li>
<li class="keyboard-number-item"><span>5</span></li>
<li class="keyboard-number-item"><span>6</span></li>
<li class="keyboard-number-item"><span>7</span></li>
<li class="keyboard-number-item"><span>8</span></li>
<li class="keyboard-number-item"><span>9</span></li>
<li class="keyboard-number-item no-bg"></li>
<li class="keyboard-number-item">0</li>
<li class="keyboard-number-item no-bg delete"></li>
<li class="keyboard-number-item"><span>0</span></li>
<li class="keyboard-number-item no-bg delete"><span></span></li>
</ul>
</div>
<!---->
Expand Down
100 changes: 50 additions & 50 deletions components/codebox/test/__snapshots__/demo.spec.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ exports[`Codebox Basic 1`] = `
<div class="md-number-keyboard-container simple">
<div class="keyboard-number">
<ul class="keyboard-number-list">
<li class="keyboard-number-item">1</li>
<li class="keyboard-number-item">2</li>
<li class="keyboard-number-item">3</li>
<li class="keyboard-number-item">4</li>
<li class="keyboard-number-item">5</li>
<li class="keyboard-number-item">6</li>
<li class="keyboard-number-item">7</li>
<li class="keyboard-number-item">8</li>
<li class="keyboard-number-item">9</li>
<li class="keyboard-number-item"><span>1</span></li>
<li class="keyboard-number-item"><span>2</span></li>
<li class="keyboard-number-item"><span>3</span></li>
<li class="keyboard-number-item"><span>4</span></li>
<li class="keyboard-number-item"><span>5</span></li>
<li class="keyboard-number-item"><span>6</span></li>
<li class="keyboard-number-item"><span>7</span></li>
<li class="keyboard-number-item"><span>8</span></li>
<li class="keyboard-number-item"><span>9</span></li>
<li class="keyboard-number-item no-bg"></li>
<li class="keyboard-number-item">0</li>
<li class="keyboard-number-item no-bg delete"></li>
<li class="keyboard-number-item"><span>0</span></li>
<li class="keyboard-number-item no-bg delete"><span></span></li>
</ul>
</div>
<!---->
Expand All @@ -49,18 +49,18 @@ exports[`Codebox Character mask 1`] = `
<div class="md-number-keyboard-container simple">
<div class="keyboard-number">
<ul class="keyboard-number-list">
<li class="keyboard-number-item">1</li>
<li class="keyboard-number-item">2</li>
<li class="keyboard-number-item">3</li>
<li class="keyboard-number-item">4</li>
<li class="keyboard-number-item">5</li>
<li class="keyboard-number-item">6</li>
<li class="keyboard-number-item">7</li>
<li class="keyboard-number-item">8</li>
<li class="keyboard-number-item">9</li>
<li class="keyboard-number-item"><span>1</span></li>
<li class="keyboard-number-item"><span>2</span></li>
<li class="keyboard-number-item"><span>3</span></li>
<li class="keyboard-number-item"><span>4</span></li>
<li class="keyboard-number-item"><span>5</span></li>
<li class="keyboard-number-item"><span>6</span></li>
<li class="keyboard-number-item"><span>7</span></li>
<li class="keyboard-number-item"><span>8</span></li>
<li class="keyboard-number-item"><span>9</span></li>
<li class="keyboard-number-item no-bg"></li>
<li class="keyboard-number-item">0</li>
<li class="keyboard-number-item no-bg delete"></li>
<li class="keyboard-number-item"><span>0</span></li>
<li class="keyboard-number-item no-bg delete"><span></span></li>
</ul>
</div>
<!---->
Expand All @@ -85,24 +85,24 @@ exports[`Codebox System keyboard 1`] = `
<div class="md-number-keyboard-container professional">
<div class="keyboard-number">
<ul class="keyboard-number-list">
<li class="keyboard-number-item">1</li>
<li class="keyboard-number-item">2</li>
<li class="keyboard-number-item">3</li>
<li class="keyboard-number-item">4</li>
<li class="keyboard-number-item">5</li>
<li class="keyboard-number-item">6</li>
<li class="keyboard-number-item">7</li>
<li class="keyboard-number-item">8</li>
<li class="keyboard-number-item">9</li>
<li class="keyboard-number-item">.</li>
<li class="keyboard-number-item">0</li>
<li class="keyboard-number-item slidedown"></li>
<li class="keyboard-number-item"><span>1</span></li>
<li class="keyboard-number-item"><span>2</span></li>
<li class="keyboard-number-item"><span>3</span></li>
<li class="keyboard-number-item"><span>4</span></li>
<li class="keyboard-number-item"><span>5</span></li>
<li class="keyboard-number-item"><span>6</span></li>
<li class="keyboard-number-item"><span>7</span></li>
<li class="keyboard-number-item"><span>8</span></li>
<li class="keyboard-number-item"><span>9</span></li>
<li class="keyboard-number-item"><span>.</span></li>
<li class="keyboard-number-item"><span>0</span></li>
<li class="keyboard-number-item slidedown"><span></span></li>
</ul>
</div>
<div class="keyboard-operate">
<ul class="keyboard-operate-list">
<li class="keyboard-operate-item delete"></li>
<li class="keyboard-operate-item confirm">确定</li>
<li class="keyboard-operate-item delete"><span></span></li>
<li class="keyboard-operate-item confirm"><span>确定</span></li>
</ul>
</div>
</div>
Expand All @@ -126,24 +126,24 @@ exports[`Codebox Unlimited length 1`] = `
<div class="md-number-keyboard-container professional">
<div class="keyboard-number">
<ul class="keyboard-number-list">
<li class="keyboard-number-item">1</li>
<li class="keyboard-number-item">2</li>
<li class="keyboard-number-item">3</li>
<li class="keyboard-number-item">4</li>
<li class="keyboard-number-item">5</li>
<li class="keyboard-number-item">6</li>
<li class="keyboard-number-item">7</li>
<li class="keyboard-number-item">8</li>
<li class="keyboard-number-item">9</li>
<li class="keyboard-number-item">.</li>
<li class="keyboard-number-item">0</li>
<li class="keyboard-number-item slidedown"></li>
<li class="keyboard-number-item"><span>1</span></li>
<li class="keyboard-number-item"><span>2</span></li>
<li class="keyboard-number-item"><span>3</span></li>
<li class="keyboard-number-item"><span>4</span></li>
<li class="keyboard-number-item"><span>5</span></li>
<li class="keyboard-number-item"><span>6</span></li>
<li class="keyboard-number-item"><span>7</span></li>
<li class="keyboard-number-item"><span>8</span></li>
<li class="keyboard-number-item"><span>9</span></li>
<li class="keyboard-number-item"><span>.</span></li>
<li class="keyboard-number-item"><span>0</span></li>
<li class="keyboard-number-item slidedown"><span></span></li>
</ul>
</div>
<div class="keyboard-operate">
<ul class="keyboard-operate-list">
<li class="keyboard-operate-item delete"></li>
<li class="keyboard-operate-item confirm">确定</li>
<li class="keyboard-operate-item delete"><span></span></li>
<li class="keyboard-operate-item confirm"><span>确定</span></li>
</ul>
</div>
</div>
Expand Down
28 changes: 14 additions & 14 deletions components/input-item/test/__snapshots__/demo.spec.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,24 +227,24 @@ exports[`InputItem - Demo input with controls 1`] = `
<div class="md-number-keyboard-container professional">
<div class="keyboard-number">
<ul class="keyboard-number-list">
<li class="keyboard-number-item">1</li>
<li class="keyboard-number-item">2</li>
<li class="keyboard-number-item">3</li>
<li class="keyboard-number-item">4</li>
<li class="keyboard-number-item">5</li>
<li class="keyboard-number-item">6</li>
<li class="keyboard-number-item">7</li>
<li class="keyboard-number-item">8</li>
<li class="keyboard-number-item">9</li>
<li class="keyboard-number-item">.</li>
<li class="keyboard-number-item">0</li>
<li class="keyboard-number-item slidedown"></li>
<li class="keyboard-number-item"><span>1</span></li>
<li class="keyboard-number-item"><span>2</span></li>
<li class="keyboard-number-item"><span>3</span></li>
<li class="keyboard-number-item"><span>4</span></li>
<li class="keyboard-number-item"><span>5</span></li>
<li class="keyboard-number-item"><span>6</span></li>
<li class="keyboard-number-item"><span>7</span></li>
<li class="keyboard-number-item"><span>8</span></li>
<li class="keyboard-number-item"><span>9</span></li>
<li class="keyboard-number-item"><span>.</span></li>
<li class="keyboard-number-item"><span>0</span></li>
<li class="keyboard-number-item slidedown"><span></span></li>
</ul>
</div>
<div class="keyboard-operate">
<ul class="keyboard-operate-list">
<li class="keyboard-operate-item delete"></li>
<li class="keyboard-operate-item confirm">确定</li>
<li class="keyboard-operate-item delete"><span></span></li>
<li class="keyboard-operate-item confirm"><span>确定</span></li>
</ul>
</div>
</div>
Expand Down
3 changes: 1 addition & 2 deletions components/number-keyboard/board.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,12 @@ export default {
&.confirm
padding-top 5px
color number-keyboard-key-confirm-color
font-size number-keyboard-key-font-size
font-size font-caption-large
background number-keyboard-key-confirm-bg
display flex
flex 1
align-items center
justify-content center
font-size font-caption-large
&:active
background-color number-keyboard-key-confirm-bg-tap
Expand Down
10 changes: 6 additions & 4 deletions components/number-keyboard/key.vue
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
<template>
<li
v-if="noTouch"
v-text="value"
:class="[active ? 'active' : '']"
@click="$_onFocus"
></li>
>
<span v-text="value"></span>
</li>
<li
v-else
v-text="value"
:class="[active ? 'active' : '']"
@touchstart="$_onFocus"
@touchmove="$_onBlur"
@touchend="$_onBlur"
@touchcancel="$_onBlur"
@click="$_onFocus"
></li>
>
<span v-text="value"></span>
</li>
</template>

<script>export default {
Expand Down
Loading

0 comments on commit f7eabae

Please sign in to comment.