Skip to content

Commit

Permalink
Merge pull request #29 from eyunhua/master
Browse files Browse the repository at this point in the history 
v0.5.0-dev
  • Loading branch information
@eyunhua
eyunhua authored Mar 13, 2018
2 parents 5999443 + c6921c0 commit 2e3bab5
Show file tree
Hide file tree
Showing 32 changed files with 448 additions and 375 deletions.
22 changes: 20 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
## 0.5.0-dev

### 💡 主要变更

* [+] 新增 `CheckButtonGroup` 组件样式。
* [+] 新增 `DatePicker` 组件样式。
* [+] 新增 `RadioButtonGroup` 组件样式。
* [+] 新增 `Progress` 组件样式。
* [+] 新增 `Select` 组件样式。
* [+] 新增 `Switch` 组件样式。
* [+] 新增 `Toast` 组件样式。
* [+] 新增 `Tooltip` 组件样式。
* [-] 移除 `ButtonGroup` 组件ui=primary和alt类型以及大小ui样式。

### 🐞 问题修复

* [^] 修复 `Button` 组件ui=small时的字体大小不符合设计规范问题

## 0.4.0-dev

### 💡 主要变更
Expand All @@ -11,8 +29,8 @@

### 🐞 问题修复

* [^] 修复 `pagination` 组件按钮默认无背景色问题。
* [^] 修复 `checkbox` 组件默认样式和large样式不符合规范问题
* [^] 修复 `Pagination` 组件按钮默认无背景色问题。
* [^] 修复 `Checkbox` 组件默认样式和large样式不符合规范问题

## 0.3.0-dev

Expand Down
8 changes: 2 additions & 6 deletions demo/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
<ul>
<li v-for="(route, index) in routes" :key="index">
<router-link :to='route'>{{route.name}}
<span v-if="route.isComplete === true" class="red">(ok)</span>
<span v-if="route.isComplete === 'noDev'" class="gray">(暂不开发)</span>
<span v-if="route.isComplete === 'noUi'" class="orange">(无ui)</span>
<span v-if="route.isComplete" class="red">(done)</span>
<span v-else class="gray">(developing)</span>
</router-link>
</li>
</ul>
Expand Down Expand Up @@ -136,9 +135,6 @@ export default {
.red {
color: #ff0000;
}
.orange {
color: #FF701A;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion demo/components/Button.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</p>
<p>
<veui-button ui="primary">提交</veui-button>
<span class="veui-font-level-2d">中尺寸按钮，控制大小ui可不传</span>
<span class="veui-font-level-2d">默认尺寸按钮，控制大小ui可不传</span>
</p>
<p>
<veui-button ui="primary large">提交</veui-button>
Expand Down
52 changes: 2 additions & 50 deletions demo/components/ButtonGroup.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,63 +7,15 @@
<section>
<p>
<span class="veui-font-level-1b">普通按钮：</span>
<span class="veui-font-level-2d">不传ui</span>
</p>
<p>
<span class="veui-font-level-2d">大样式：ui="large"</span>
</p>
<veui-button-group ui="large" :items="items2" :disabled="disabled"></veui-button-group>
<p>
<span class="veui-font-level-2d">中样式：ui=""（不传）</span>
</p>
<veui-button-group :items="items2" :disabled="disabled"></veui-button-group>
<p>
<span class="veui-font-level-2d">小样式：ui="small"</span>
</p>
<veui-button-group ui="small" :items="items2" :disabled="disabled"></veui-button-group>
</section>
<section>
<p>
<span class="veui-font-level-1b">强调（蓝色）：</span>
<span class="veui-font-level-2d">ui="primary"</span>
</p>
<p>
<span class="veui-font-level-2d">大样式：ui="large"</span>
</p>
<veui-button-group ui="primary large" :items="items1" :disabled="disabled"></veui-button-group>
<p>
<span class="veui-font-level-2d">中样式：ui=""（不传）</span>
</p>
<veui-button-group ui="primary" :items="items1" :disabled="disabled"></veui-button-group>
<p>
<span class="veui-font-level-2d">小样式：ui="small"</span>
</p>
<veui-button-group ui="primary small" :items="items1" :disabled="disabled"></veui-button-group>
</section>
<section>
<p>
<span class="veui-font-level-1b">辅助按钮：</span>
<span class="veui-font-level-2d">ui="alt"</span>
</p>
<p>
<span class="veui-font-level-2d">大样式：ui="large"</span>
</p>
<veui-button-group ui="alt large" :items="items4" :disabled="disabled"></veui-button-group>
<p>
<span class="veui-font-level-2d">中样式：ui=""（不传）</span>
</p>
<veui-button-group ui="alt" :items="items4" :disabled="disabled"></veui-button-group>
<p>
<span class="veui-font-level-2d">小样式：ui="small"</span>
</p>
<veui-button-group ui="alt small" :items="items4" :disabled="disabled"></veui-button-group>
</section>
<section>
<p>
<span class="veui-font-level-1b">间隙排列按钮：</span>
<span class="veui-font-level-2d">ui="interval"(可与大小和类型ui样式共同使用)</span>
<span class="veui-font-level-2d">ui="interval"</span>
</p>
<veui-button-group ui="interval small" :items="items2" :disabled="disabled"></veui-button-group>
<veui-button-group ui="interval" :items="items2" :disabled="disabled"></veui-button-group>
</section>
</article>
</template>
Expand Down
24 changes: 14 additions & 10 deletions demo/components/CheckButtonGroup.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,34 @@
<veui-checkbox v-model="disabled">禁用</veui-checkbox>
</section>
<section>
<p>
<span class="veui-font-level-1b">普通按钮：</span>
</p>
<p>
<veui-check-button-group :items="data1" v-model="picked1" :disabled="disabled">
<template slot-scope="props">{{ props.label }}</template>
</veui-check-button-group>
</p>
<p>value: {{ picked1 }}</p>
</section>
<section>
<p>
<veui-check-button-group :items="data2" ui="small alt" v-model="picked2" :disabled="disabled">
<template slot-scope="props">{{ props.label }}</template>
<veui-check-button-group :items="data3" v-model="picked3" :disabled="disabled">
<template slot-scope="props">
<veui-icon :name="props.icon" />
</template>
</veui-check-button-group>
</p>
<p>value: {{ picked2 }}</p>
<p>value: {{ picked3 }}</p>
</section>
<section>
<p>
<veui-check-button-group :items="data3" ui="micro" v-model="picked3" :disabled="disabled">
<template slot-scope="props">
<veui-icon :name="props.icon" />
</template>
<span class="veui-font-level-1b">间隙排列按钮：</span>
<span class="veui-font-level-2d">ui="interval"</span>
</p>
<p>
<veui-check-button-group :items="data2" ui="interval" v-model="picked2" :disabled="disabled">
<template slot-scope="props">{{ props.label }}</template>
</veui-check-button-group>
</p>
<p>value: {{ picked3 }}</p>
</section>
</article>
</template>
Expand Down
21 changes: 1 addition & 20 deletions demo/components/DatePicker.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
<h2>普通</h2>
<p>
<veui-date-picker v-model="selected1"></veui-date-picker>
&nbsp;&nbsp;&nbsp;&nbsp;
<veui-date-picker ui="micro" v-model="selected1"></veui-date-picker>
</p>
</section>
<section>
Expand All @@ -19,7 +17,7 @@
</section>
<section>
<h2>范围选择</h2>
<p><veui-date-picker v-model="selected2" range :shortcuts="shortcuts" ui="alt"></veui-date-picker></p>
<p><veui-date-picker v-model="selected2" range :shortcuts="shortcuts"></veui-date-picker></p>
</section>
<section>
<h2>可清除范围选择</h2>
Expand All @@ -29,23 +27,6 @@
<h2>范围禁用</h2>
<p><veui-date-picker v-model="selected2" range disabled></veui-date-picker></p>
</section>
<section style="height: 500px;"></section>
<section>
<h2>普通</h2>
<p><veui-date-picker v-model="selected1"></veui-date-picker></p>
</section>
<section>
<h2>可清除选择</h2>
<p><veui-date-picker v-model="selected1" clearable ui="alt"></veui-date-picker></p>
</section>
<section>
<h2>范围选择</h2>
<p><veui-date-picker v-model="selected2" range></veui-date-picker></p>
</section>
<section>
<h2>可清除范围选择</h2>
<p><veui-date-picker v-model="selected2" range clearable :panel="3"></veui-date-picker></p>
</section>
</article>
</template>

Expand Down
9 changes: 8 additions & 1 deletion demo/components/RadioButtonGroup.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<veui-checkbox v-model="disabled">禁用</veui-checkbox>
</section>
<section>
<p>
<span class="veui-font-level-1b">普通按钮：</span>
</p>
<p>
<veui-radio-button-group :items="data1" name="111" v-model="picked1" :disabled="disabled">
<template slot-scope="props">{{ props.label }}</template>
Expand All @@ -14,7 +17,11 @@
</section>
<section>
<p>
<veui-radio-button-group :items="data2" ui="small alt" v-model="picked2" :disabled="disabled">
<span class="veui-font-level-1b">间隙排列按钮：</span>
<span class="veui-font-level-2d">ui="interval"</span>
</p>
<p>
<veui-radio-button-group :items="data2" ui="interval" v-model="picked2" :disabled="disabled">
<template slot-scope="props">{{ props.label }}</template>
</veui-radio-button-group>
</p>
Expand Down
39 changes: 33 additions & 6 deletions demo/components/Select.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,34 @@
<h1><code>&lt;veui-select&gt;</code></h1>
<section>
<h2>默认样式：</h2>
<veui-select v-bind="attrs" v-model="defaultValue1" placeholder="全部" clearable></veui-select>
<p>
<span class="veui-font-level-1b">小尺寸：</span>
<span class="veui-font-level-2d">ui="tiny"</span>
</p>
<p>
<veui-select v-bind="attrs" v-model="defaultValue1" placeholder="全部" ui="tiny" clearable></veui-select>
</p>
<p>
<span class="veui-font-level-1b">偏小尺寸：</span>
<span class="veui-font-level-2d">ui="small"</span>
</p>
<p>
<veui-select v-bind="attrs" v-model="defaultValue1" placeholder="全部" ui="small" clearable></veui-select>
</p>
<p>
<span class="veui-font-level-1b">默认尺寸：</span>
<span class="veui-font-level-2d">ui="normal"</span>
</p>
<p>
<veui-select v-bind="attrs" v-model="defaultValue1" placeholder="全部" clearable></veui-select>
</p>
<p>
<span class="veui-font-level-1b">大尺寸：</span>
<span class="veui-font-level-2d">ui="large"</span>
</p>
<p>
<veui-select v-bind="attrs" v-model="defaultValue1" placeholder="全部" ui="large" clearable></veui-select>
</p>
</section>
<section>
<h2>显示已选图标样式：</h2>
Expand All @@ -15,7 +42,7 @@
</section>
<section>
<h2>Slot[name=option-label] 样式：</h2>
<veui-select v-bind="attrs" v-model="defaultValue3" ui="alt">
<veui-select v-bind="attrs" v-model="defaultValue3">
<template slot="option-label" slot-scope="props">
<span class="veui-option-custom-label">{{ props.label }}</span>
</template>
Expand All @@ -38,7 +65,7 @@
</template>
</veui-select>
</section>
<section style="margin-top:500px;">
<section style="margin-top:200px;">
<h2>默认分组样式：</h2>
<veui-select v-bind="optGroupAttrs" v-model="defaultValue5"></veui-select>
</section>
Expand Down Expand Up @@ -260,17 +287,17 @@ export default {
}
.veui-option-custom {
position: relative;
padding-left: 10px;
padding-left: 15px;
&::after {
content: '❤️';
position: absolute;
top: 50%;
left: -10px;
left: 0;
transform: translateY(-50%);
}
&-label {
color: rgb(80, 170, 39);
color: #666666;
}
}
</style>
18 changes: 15 additions & 3 deletions demo/components/Switch.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,29 @@
<article>
<h1><code>&lt;veui-switch&gt;</code></h1>
<section>
<veui-switch ui="small" v-model="value1">夜间模式</veui-switch>
<p>
<span class="veui-font-level-1b">小开关：</span>
<span class="veui-font-level-2d">ui="small"</span>
</p>
<veui-switch ui="small" v-model="value1"></veui-switch>
<veui-switch ui="small" v-model="value1" readonly></veui-switch>
<veui-switch ui="small" v-model="value1" disabled></veui-switch>
</section>
<section>
<veui-switch v-model="value2">勿扰模式</veui-switch>
<p>
<span class="veui-font-level-1b">默认开关：</span>
<span class="veui-font-level-2d">不传ui</span>
</p>
<veui-switch v-model="value2"></veui-switch>
<veui-switch v-model="value2" readonly></veui-switch>
<veui-switch v-model="value2" disabled></veui-switch>
</section>
<section>
<veui-switch ui="large" v-model="value3">飞行模式</veui-switch>
<p>
<span class="veui-font-level-1b">大开关：</span>
<span class="veui-font-level-2d">ui="large"</span>
</p>
<veui-switch ui="large" v-model="value3"></veui-switch>
<veui-switch ui="large" v-model="value3" readonly></veui-switch>
<veui-switch ui="large" v-model="value3" disabled></veui-switch>
</section>
Expand Down
10 changes: 5 additions & 5 deletions demo/components/Toast.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<h1><code>&lt;veui-toast&gt;</code></h1>
<p>
<div class="toast-title">全局提示</div>
<veui-button ui="aux" @click="showToast('all')">全部</veui-button>
<veui-button ui="aux" @click="showToast('success')">成功</veui-button>
<veui-button ui="aux" @click="showToast('warn')">警告</veui-button>
<veui-button ui="aux" @click="showToast('info')">提醒</veui-button>
<veui-button ui="aux" @click="showToast('error')">错误</veui-button>
<veui-button @click="showToast('all')">全部</veui-button>
<veui-button @click="showToast('success')">成功</veui-button>
<veui-button @click="showToast('warn')">警告</veui-button>
<veui-button @click="showToast('info')">提醒</veui-button>
<veui-button @click="showToast('error')">错误</veui-button>
</p>
</article>
</template>
Expand Down
5 changes: 4 additions & 1 deletion demo/components/Tooltip.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
<article>
<h1><code>&lt;veui-tooltip&gt;</code></h1>
<section>
<veui-button ui="primary" @click="ui = ui ? '' : 'alt'">切换皮肤</veui-button>
<veui-button ui="primary" @click="ui = ui ? '' : 'dark'">切换皮肤</veui-button>
<p>
<span class="veui-font-level-2d">ui="{{ui}}"</span>
</p>
</section>
<section>
<div class="demo-wrap">
Expand Down
Loading

0 comments on commit 2e3bab5

Please sign in to comment.