Skip to content

Commit

Permalink
Merge pull request #507 from DaoCloud/release/1.0.2
Browse files Browse the repository at this point in the history
Release/1.0.2
  • Loading branch information
CIN authored May 16, 2018
2 parents ad343b4 + 5b6e8d8 commit bc963ab
Show file tree
Hide file tree
Showing 26 changed files with 1,014 additions and 570 deletions.
30 changes: 30 additions & 0 deletions changelogs/v1.0.2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<a name="1.0.2"></a>
# 1.0.2 (2018-05-16)


## Bug Fixes

- **dao-select:** 搜索完成没有清空
([737a947c](https://github.com/DaoCloud/dao-style-vue/commit/737a947c76b14c9434e8bf174593bce6e006ef4a))
- **dao-select-with-tab:** 修复dao-select with-tab 多出来的 padding
([4d41245e](https://github.com/DaoCloud/dao-style-vue/commit/4d41245e2b7deeb645b0f7688bdf321490025035))
- **dao-table:** 修复 table 中图标位置及添加表格 flex 布局
([9788803e](https://github.com/DaoCloud/dao-style-vue/commit/9788803e8dbf389a674adc9a496f4a71d0fb6714))
- **editable-table:** 修复 editable-table 中添加按钮的高度问题
([6e71aaaf](https://github.com/DaoCloud/dao-style-vue/commit/6e71aaaf06b4d897b60183143df2cfa16593e657))
- **select:** 修复 select 组件中参数 no-data-text 在没有 option-group 时不显示的问题
([db7357fb](https://github.com/DaoCloud/dao-style-vue/commit/db7357fbd0c335afe58d013eace07b3979a3b7ac))


## Features

- **DaoInfoCard:** add 'max' value to size property
([52344017](https://github.com/DaoCloud/dao-style-vue/commit/523440179eddfaa23de5299a589f265246315271))
- **DaoPanel:**
- add close button
([eddbbb21](https://github.com/DaoCloud/dao-style-vue/commit/eddbbb21530bd22563f2e8f6b27c6162ff43c95e))
- allow to set a prefered tab
([d0e4f4d6](https://github.com/DaoCloud/dao-style-vue/commit/d0e4f4d67573f5c42752676387fc61997a2978b2))
- **color-demo:** 添加 color demo
([3e1eec7a](https://github.com/DaoCloud/dao-style-vue/commit/3e1eec7adcc106b5bd8dfc7116051ada90eec38d))

4 changes: 2 additions & 2 deletions dist/dao-style.min.js

Large diffs are not rendered by default.

964 changes: 489 additions & 475 deletions dist/styles/dao-style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/dao-info-card.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ info-card 将以键值对和表格的混合形式展示

### size

只有 2 种选项 sm 和 lg, sm 将以 300px 的大小展示,lg 将以 610px 的大小展示
2 种定值宽度选项 sm 和 lg, sm 将以 300px 的大小展示,lg 将以 610px 的大小展示, 还可以指定宽度 max, 将以 100% 的大小展示

### config

Expand Down
61 changes: 0 additions & 61 deletions docs/dao-info-panel.md

This file was deleted.

63 changes: 63 additions & 0 deletions docs/dao-panel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# dao-panel

`dao-panel` 是一个位于页面底部的信息展示栏组件。代码请参照目录: [src/components/dao-panel](../src/components/dao-panel)

## 使用方法

### Vue 使用方法

```html
<template>
<dao-panel @changeTab="changeTab" size="size" minHeight="minHeight">
<dao-panel-item heading="f1">
<p>@p1</p>
</dao-panel-item>
<dao-panel-item heading="f2">
<p>@p2</p>
</dao-panel-item>
<dao-panel-item heading="f3">
<p>@p3</p>
</dao-panel-item>
<dao-panel-item heading="f444444444444444">
<img src="https://img.moegirl.org/common/thumb/4/41/Nicky.jpg/250px-Nicky.jpg" alt="???">
</dao-panel-item>
</dao-panel>
<template>

<script>
export default {
methods: {
changeTab(v) {
console.log(`change tab to: ${v}`);
},
},
};
</script>
```

## 组件参数

### dao-panel

#### 接受的参数

参数名 | 类型 | 说明 | 默认值 | 是否必填
-|-|-|-|-
size | String | 设置 dao-panel 的默认高度,可选值['l', 'm', 's'] | m | 否
minHeight | String | 设置 dao-panel 的最小高度,可填百分比或像素值,如 `30%``200px` | 0px | 否
visible | Boolean | 设置 dao-panel 显示和隐藏 | false | 否
defaultTab | String | 设置 dao-panel 打开时默认显示的标签页, 默认显示左起第一个标签页 | '' | 否

#### dao-panel 触发的事件

参数名 | 类型 | 说明 | 默认值 | 是否必填
-|-|-|-|-
changeTab | Function | dao-panel 的标签切换时的触发的回调 | - | 否

### dao-panel-item

#### 接受的参数

参数名 | 类型 | 说明 | 默认值 | 是否必填
-|-|-|-|-
heading | String | tab 标签名的内容 | - | 是
3 changes: 3 additions & 0 deletions examples/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ li + li {
<li>
<router-link to="/clipboard">Clipboard</router-link>
</li>
<li>
<router-link to='/color'>ColorDemo</router-link>
</li>
<li>
<router-link to="/dialog">Dialog</router-link>
</li>
Expand Down
4 changes: 4 additions & 0 deletions examples/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import table from './routers/table.vue';
import tooltip from './routers/tooltip.vue';
import tooltipDirective from './routers/tooltip-directive.vue';
import tableView from './routers/table-view.vue';
import daoColorDemo from './routers/color-demo.vue';

Vue.use(VueRouter);
Vue.use(daoStyle);
Expand Down Expand Up @@ -153,6 +154,9 @@ const router = new VueRouter({
}, {
path: '/table-view',
component: tableView,
}, {
path: '/color',
component: daoColorDemo,
}, {
path: '*',
redirect: '/button',
Expand Down
Loading

0 comments on commit bc963ab

Please sign in to comment.