Skip to content

Commit

Permalink
Merge pull request #48 from eyunhua/master
Browse files Browse the repository at this point in the history 
v0.10.0-dev
  • Loading branch information
@eyunhua
eyunhua authored May 14, 2018
2 parents 381ec93 + c4ca5f7 commit 5c7ff7b
Show file tree
Hide file tree
Showing 30 changed files with 520 additions and 420 deletions.
13 changes: 12 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
## 0.9.0-dev
## 0.10.0-dev(veui版本为1.0.0-alpha.12)

### 🐞 问题修复

* [^] 修改 `Searchbox` 组件重构后引起的样式问题
* [^] `Checkbox` 组件增加切换选择时的动画效果
* [^] 修改 `Input` 组件删除按钮默认和hover状态样式
* [^] 修改 `Pagnination` 组件非路由跳转时，选中页字体颜色为灰色问题
* [^] `Radio` 组件增加切换选择时的动画效果
* [^] 修改 `Select` 组件样式错乱问题

## 0.9.0-dev(veui版本为1.0.0-alpha.11)

### 🐞 问题修复

Expand Down
18 changes: 9 additions & 9 deletions demo/components/Carousel.vue
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<template>
<article>
<h1><code>&lt;veui-carousel&gt;</code></h1>
<p><code>index</code>: <input type="number" v-model.number="index" min="0" :max="items.length - 1"></p>
<p><code>interval</code>: <input type="number" v-model.number="interval" min="0"></p>
<p><code>index</code>: <veui-number-input ui="tiny" v-model="index" :min="0" :max="items.length - 1"/></p>
<p><code>interval</code>: <veui-number-input ui="tiny" v-model="interval" :min="0" :step="1000"/></p>
<p><veui-checkbox v-model="loose"><code>ui="loose"</code></veui-checkbox></p>
<p><veui-checkbox v-model="autoplay"><code>autoplay</code></veui-checkbox></p>
<p><veui-checkbox v-model="wrap"><code>wrap</code></veui-checkbox></p>
<p><veui-checkbox v-model="pauseOnHover"><code>pause-on-hover</code></veui-checkbox></p>
<p><veui-radio-group v-model="trigger" :items="triggers"></veui-radio-group></p>
<p><veui-radio-group v-model="size" :items="sizes"></veui-radio-group></p>
<p><veui-radio-group v-model="indicator" :items="indicators"></veui-radio-group></p>
<p><veui-radio-group v-model="trigger" :items="triggers"/></p>
<p><veui-radio-group v-model="size" :items="sizes"/></p>
<p><veui-radio-group v-model="indicator" :items="indicators"/></p>
<section>
<veui-carousel :datasource="items" :index.sync="index" :ui="ui" :interval="interval" :pause-on-hover="pauseOnHover"
:switch-trigger="trigger" :wrap="wrap" :indicator="indicator" :autoplay="autoplay"></veui-carousel>
Expand All @@ -18,14 +18,14 @@
</template>

<script>
import { Carousel, Checkbox, RadioGroup } from 'veui'
import { Carousel, Checkbox, RadioGroup, NumberInput } from 'veui'
export default {
name: 'carousel-demo',
components: {
'veui-carousel': Carousel,
'veui-checkbox': Checkbox,
'veui-radio-group': RadioGroup
'veui-radio-group': RadioGroup,
'veui-number-input': NumberInput
},
data () {
return {
Expand Down Expand Up @@ -78,4 +78,4 @@ export default {
}
}
}
</script>
</script>
49 changes: 17 additions & 32 deletions demo/components/Input.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</veui-field>

<veui-field label="姓名：">
<veui-input v-model="name" @focus="log('focus')"></veui-input>
<veui-input v-model="name" @focus="log('focus')" clearable></veui-input>
<veui-input v-model="name" readonly></veui-input>
<veui-input v-model="name" disabled></veui-input>
</veui-field>
Expand All @@ -49,28 +49,24 @@
<section>
<h3>After Slot / 方向键操作指令 v-nudge </h3>
<veui-field label="价格：">
<veui-input class="input-nudge" v-nudge.y="{
update: handleThumbNudgeUpdate
}" v-model="price" @focus="log('focus')">
<span class="input-after-slot" slot="after">元</span>
<veui-input
clearable
class="input-nudge"
v-nudge.y="{
update: handleThumbNudgeUpdate
}"
v-model="price" @focus="log('focus')"
>
<template slot="after">元</template>
</veui-input>
<veui-input class="input-nudge" v-model="price" readonly>
<span class="input-after-slot" slot="after">元</span>
<veui-input class="input-nudge" v-model="price" clearable readonly>
<template slot="after">元</template>
</veui-input>
<veui-input class="input-nudge" v-model="price" disabled>
<span class="input-after-slot" slot="after">元</span>
<template slot="after">元</template>
</veui-input>
</veui-field>
</section>

<section>
<h3>Textarea 模式 （@Deprecated 请移步 <a href="#/textarea">Veui-Textarea</a>）</h3>
<veui-field label="多行：">
<veui-input class="auto-height" type="textarea" v-model="textarea1" rows=5 @input="log"/>
<veui-input class="fixed-height" type="textarea" v-model="textarea2" readonly/>
<veui-input type="textarea" v-model="textarea3" disabled/>
</veui-field>
</section>
</veui-form>
</article>
</template>
Expand Down Expand Up @@ -98,9 +94,6 @@ export default {
phone: '13800138000',
password: null,
hiddenValue: '隐藏值',
textarea1: '1. 使用rows\n2. 固定5行高度\n3. 不包括padding',
textarea2: '设置高度',
textarea3: '默认高度',
poem: '兩岸猿聲啼不住，輕舟已過萬重山',
price: '1024'
}
Expand Down Expand Up @@ -160,24 +153,16 @@ section {
height: 200px;
}
}
/deep/ .veui-input-after {
padding-right: 5px;
}
}
.five-sizes {
& /deep/ .veui-form-label {
text-transform: capitalize;
width: 60px;
color: #999;
}
}
.input-nudge {
position: relative;
/deep/ input {
padding-right: 20px;
}
}
.input-after-slot {
position: absolute;
right: 5px;
top: 0;
z-index: 1;
}
</style>
14 changes: 10 additions & 4 deletions demo/components/NumberInput.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
<section>
<veui-form>
<veui-field label="Micro：" ui="micro">
<veui-number-input ui="micro" v-model="number"/>
<veui-number-input ui="micro" v-model="number">
<template slot="before">Value:</template>
</veui-number-input>
</veui-field>
<veui-field label="Tiny：" ui="tiny" tip="精确到小数点后 1 位">
<veui-number-input ui="tiny" v-model="number1" :decimal-place="1"/>
Expand All @@ -21,11 +23,14 @@
<veui-field label="DecimalPlace = -1：" tip="不处理精度问题">
<veui-number-input v-model="number5" :decimal-place="-1"/>
</veui-field>
<veui-field label="Max &amp;&amp; Min：" :rules="[{name: 'min', value: -1}]" tip="最大值不大于 10，最小值不小于 -1">
<veui-number-input v-model="number6" :max="10"/>
</veui-field>
<veui-field label="Readonly：">
<veui-number-input readonly v-model="number6"/>
<veui-number-input readonly v-model="number7"/>
</veui-field>
<veui-field label="Disabled：" disabled>
<veui-number-input v-model="number6"/>
<veui-number-input v-model="number7"/>
</veui-field>
</veui-form>
</section>
Expand All @@ -50,7 +55,8 @@ export default {
number3: null,
number4: null,
number5: null,
number6: 1024
number6: null,
number7: 1024
}
}
}
Expand Down
53 changes: 35 additions & 18 deletions demo/components/Radio.vue
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,54 @@
<template>
<article>
<h1><code>&lt;veui-radio&gt;</code></h1>
<p>
<veui-radio name="a" value="normal" v-model="a1">正常状态</veui-radio>
</p>
<p>
<section>
<h3><code>v-model</code></h3>
<p><veui-button ui="small" @click="size = size === 'normal' ? 'small' : 'normal'">Toggle</veui-button></p>
<p>
<veui-radio value="normal" name="size" v-model="size">正常状态</veui-radio>
<veui-radio value="small" checked name="size" v-model="size">正常状态</veui-radio>
</p>
<p>Size: {{ size }}</p>
</section>
<section>
<h3><code>:checked.sync</code></h3>
<p><veui-button ui="small" @click="checked = !checked">Toggle</veui-button></p>
<p><veui-radio :checked.sync="checked">绑定状态：{{ checked }}</veui-radio></p>
</section>
<section>
<veui-radio checked>选中状态</veui-radio>
</p>
<!-- <p>
<veui-radio checked disabled>选中无效状态</veui-radio>
</p> -->
<p>
<veui-radio disabled v-model="a2">选中无效状态</veui-radio>
</p>
<p>
<veui-radio disabled>未选无效状态</veui-radio>
</p>
</section>
<section>
<veui-radio disabled checked>选中禁用状态</veui-radio>
</section>
<section>
<veui-radio disabled>未选禁用状态</veui-radio>
</section>
</article>
</template>

<script>
import { Radio } from 'veui'
import { Radio, Button } from 'veui'
export default {
name: 'radio-demo',
components: {
'veui-radio': Radio
'veui-radio': Radio,
'veui-button': Button
},
data () {
return {
a1: false,
a2: true
size: null,
checked: false
}
}
}
</script>
<style lang="less" scoped>
.veui-radio {
margin-right: 10px;
}
section {
margin-bottom: 20px;
}
</style>
22 changes: 13 additions & 9 deletions demo/components/Searchbox.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<h2>ui模式：<span class="veui-font-level-2d">类型ui="primary"</span></h2>
<p>
<span class="veui-font-level-1b">小尺寸：</span>
<span class="veui-font-level-2d">ui="small"</span>
<span class="veui-font-level-2d">ui="small"(focus)</span>
</p>
<p>
<veui-searchbox
Expand All @@ -75,13 +75,14 @@
:name="name"
:placeholder="placeholder"
:suggestions="suggestions2"
replaceOnSelect
replace-on-select
suggest-trigger="focus"
@input="handleInput('2', $event)"
@search="log($event)"></veui-searchbox>
</p>
<p>
<span class="veui-font-level-1b">默认尺寸：</span>
<span class="veui-font-level-2d">不传ui</span>
<span class="veui-font-level-2d">不传ui(input)</span>
</p>
<p>
<veui-searchbox
Expand All @@ -90,20 +91,22 @@
:name="name"
:placeholder="placeholder"
:suggestions="suggestions2"
replaceOnSelect
suggest-trigger="input"
replace-on-select
@input="handleInput('2', $event)"
@search="log($event)"></veui-searchbox>
</p>
<p>
<span class="veui-font-level-1b">大尺寸：</span>
<span class="veui-font-level-2d">ui="large"</span>
<span class="veui-font-level-2d">ui="large"(input, submit)</span>
</p>
<p>
<veui-searchbox
ui="primary large"
:name="name"
:placeholder="placeholder"
:suggestions="suggestions3"
:suggest-trigger="['input', 'submit']"
@input="handleInput('3', $event)"
@search="log($event)"></veui-searchbox>
</p>
Expand All @@ -113,7 +116,7 @@
<p>
<veui-searchbox
ui="primary large"
replaceOnSelect
replace-on-select
:name="name"
:placeholder="placeholder"
:suggestions="suggestions4"
Expand All @@ -126,7 +129,7 @@
<h2>禁用全局搜索框</h2>
<p>
<veui-searchbox
ui="alt primary large"
ui="primary large"
disabled
:name="name"
:placeholder="placeholder"
Expand All @@ -139,7 +142,6 @@
<h2>自定义Suggestion样式1</h2>
<p>
<veui-searchbox
ui="alt"
:name="name"
:placeholder="placeholder"
:suggestions="suggestions6"
Expand Down Expand Up @@ -195,14 +197,16 @@ export default {
name: 'name',
value: '测试值',
value2: '测试值',
valueis: '测试值',
placeholder: '百度(placeholder)',
suggestions1: [],
suggestions2: [],
suggestions3: [],
suggestions4: [],
suggestions5: [],
suggestions6: [],
suggestions7: []
suggestions7: [],
suggestionsis: []
}
},
methods: {
Expand Down
Loading

0 comments on commit 5c7ff7b

Please sign in to comment.