Merge pull request #43 from eyunhua/master

v0.8.0-dev

CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.8.0-dev
+
+### 🐞 问题修复
+
+* [^] 修改 `Switch` 组件ui=small时，关闭状态左侧有空隙（#38）
+* [^] 修改 `Radio` 组件高度和设计稿不相同（#39）
+* [^] 修改 `Checkbox` 组件的高度及按钮和文字的距离
+* [^] 修改 `Dropdown` 组件ui=large和ui=small样式
+* [^] 去除 `Input` 组件veui-input-input的float属性
+* [^] 修改 `NumberInput` 组件向上增加按钮丢失问题
+* [^] 修改 `Searchbox` 组件placeholder字体与输入字体大小不一致问题（#40）
+* [^] 修改 `Input` 组件placeholder字体颜色（#40）
+* [^] 修改 `Pagnination` 组件按钮间隙、字体大小、active和hover状态无border（#41）
+* [^] 修改 `Datepicker` 组件选中状态样式、展开浮层大小（#42）
+* [^] 更新demo左侧链接，灰色样式不可点击组件表示组件样式未完成
+
+
 ## 0.7.0-dev
 
 ### 💡 主要变更

demo/App.vue

@@ -4,9 +4,8 @@
  <h1><a href="https://github.com/ecomfe/veui">VEUI components</a><icon name="github" scale="6"></icon></h1>
  <ul>
  <li v-for="(route, index) in routes" :key="index">
- <router-link :to='route'>{{route.name}}
- <span v-if="route.isComplete" class="red">(done)</span>
- <span v-else class="gray">(developing)</span>
+ <span v-if="route.noComplete" class="gray noCompleteNav">{{route.name}}</span>
+ <router-link v-else :to='route'>{{route.name}}
  </router-link>
  </li>
  </ul>
@@ -118,7 +117,8 @@ export default {
  }
 
  li {
- a {
+ a,
+ .noCompleteNav {
  display: block;
  padding: .5em 24px;
  text-decoration: none;
@@ -136,6 +136,12 @@ export default {
  color: #ff0000;
  }
  }
+ .noCompleteNav {
+ color: #dadada;
+ &:hover {
+ font-weight: normal;
+ }
+ }
  }
 
  .router-link-active {

demo/components/Checkbox.vue

@@ -2,7 +2,7 @@
  <article>
  <h1><code>&lt;veui-checkbox&gt;</code></h1>
  <p>
- <veui-checkbox v-model="current" true-value="已选" false-value="未选">当前数据：</veui-checkbox> {{ current }}
+ <veui-checkbox v-model="current" true-value="已选" false-value="未选">当前数据：</veui-checkbox><span class="selected-val">{{ current }}</span>
  </p>
  <section>
  <p>
@@ -151,5 +151,14 @@ export default {
 section {
  margin-bottom: 20px;
 }
+.veui-checkbox {
+ vertical-align: middle;
+}
+.selected-val {
+ height: 14px;
+ line-height: 14px;
+ display: inline-block;
+ vertical-align: middle;
+}
 </style>
 

demo/components/Input.vue

@@ -3,7 +3,7 @@
  <h1><code>&lt;veui-input&gt;</code></h1>
  <veui-form>
  <section class="five-sizes">
- <h3>5 种大小：</h3>
+ <h3>3种大小：</h3>
  <veui-field ui="small" label="small">
  <veui-input ui="small" v-model="poem"></veui-input>
  </veui-field>
@@ -177,6 +177,7 @@ section {
 .input-after-slot {
  position: absolute;
  right: 5px;
+ top: 0;
  z-index: 1;
 }
 </style>

demo/components/index.js

@@ -40,32 +40,27 @@ export default [
  {
  path: '/alert',
  name: 'Alert',
- component: Alert,
- isComplete: true
+ component: Alert
  },
  {
  path: '/breadcrumb',
  name: 'Breadcrumb',
- component: Breadcrumb,
- isComplete: true
+ component: Breadcrumb
  },
  {
  path: '/button',
  name: 'Button',
- component: Button,
- isComplete: true
+ component: Button
  },
  {
  path: '/button-group',
  name: 'ButtonGroup',
- component: ButtonGroup,
- isComplete: true
+ component: ButtonGroup
  },
  {
  path: '/calendar',
  name: 'Calendar',
- component: Calendar,
- isComplete: true
+ component: Calendar
  },
  {
  path: '/carousel',
@@ -75,66 +70,59 @@ export default [
  {
  path: '/checkbox',
  name: 'Checkbox',
- component: Checkbox,
- isComplete: true
+ component: Checkbox
  },
  {
  path: '/check-button-group',
  name: 'CheckButtonGroup',
- component: CheckButtonGroup,
- isComplete: true
+ component: CheckButtonGroup
  },
  {
  path: '/checkbox-group',
  name: 'CheckboxGroup',
- component: CheckboxGroup,
- isComplete: true
+ component: CheckboxGroup
  },
  {
  path: '/date-picker',
  name: 'DatePicker',
- component: DatePicker,
- isComplete: true
+ component: DatePicker
  },
  {
  path: '/dialog',
  name: 'Dialog',
- component: Dialog
+ component: Dialog,
+ noComplete: true
  },
  {
  path: '/dropdown',
  name: 'Dropdown',
- component: Dropdown,
- isComplete: true
+ component: Dropdown
  },
  {
  path: '/form',
  name: 'Form',
- component: Form,
- isComplete: true
+ component: Form
  },
  {
  path: '/font',
  name: 'Font',
- component: Font,
- isComplete: true
+ component: Font
  },
  {
  path: '/icon',
  name: 'Icon',
- component: Icon,
- isComplete: true
+ component: Icon
  },
  {
  path: '/input',
  name: 'Input',
- component: Input,
- isComplete: true
+ component: Input
  },
  {
  path: '/number-input',
  name: 'NumberInput',
- component: NumberInput
+ component: NumberInput,
+ noComplete: true
  },
  {
  path: '/overlay',
@@ -144,32 +132,27 @@ export default [
  {
  path: '/pagination/:page?',
  name: 'Pagination',
- component: Pagination,
- isComplete: true
+ component: Pagination
  },
  {
  path: '/progress',
  name: 'Progress',
- component: Progress,
- isComplete: true
+ component: Progress
  },
  {
  path: '/radio',
  name: 'Radio',
- component: Radio,
- isComplete: true
+ component: Radio
  },
  {
  path: '/radio-button-group',
  name: 'RadioButtonGroup',
- component: RadioButtonGroup,
- isComplete: true
+ component: RadioButtonGroup
  },
  {
  path: '/radio-group',
  name: 'RadioGroup',
- component: RadioGroup,
- isComplete: true
+ component: RadioGroup
  },
  {
  path: '/region-picker',
@@ -190,31 +173,28 @@ export default [
  {
  path: '/searchbox',
  name: 'Searchbox',
- component: Searchbox,
- isComplete: true
+ component: Searchbox
  },
  {
  path: '/select',
  name: 'Select',
- component: Select,
- isComplete: true
+ component: Select
  },
  {
  path: '/steps',
  name: 'Steps',
- component: Steps,
- isComplete: true
+ component: Steps
  },
  {
  path: '/switch',
  name: 'Switch',
- component: Switch,
- isComplete: true
+ component: Switch
  },
  {
  path: '/table',
  name: 'Table',
- component: Table
+ component: Table,
+ noComplete: true
  },
  {
  path: '/tabs',
@@ -234,35 +214,33 @@ export default [
  path: 'progress',
  component: Progress
  }
- ]
+ ],
+ noComplete: true
  },
  {
  path: '/textarea',
  name: 'Textarea',
- component: Textarea,
- isComplete: true
+ component: Textarea
  },
  {
  path: '/toast',
  name: 'Toast',
- component: Toast,
- isComplete: true
+ component: Toast
  },
  {
  path: '/tooltip',
  name: 'Tooltip',
- component: Tooltip,
- isComplete: true
+ component: Tooltip
  },
  {
  path: '/transfer',
  name: 'Transfer',
- component: Transfer
+ component: Transfer,
+ noComplete: true
  },
  {
  path: '/uploader',
  name: 'Uploader',
- component: Uploader,
- isComplete: true
+ component: Uploader
  }
 ]

package.json

@@ -1,6 +1,6 @@
 {
  "name": "veui-theme-blue",
- "version": "0.7.0-dev",
+ "version": "0.8.0-dev",
  "description": "blue Theme for VEUI",
  "author": "BI FE",
  "private": false,

src/common.less

@@ -16,7 +16,7 @@
 }
 
 html {
- font-size: 12px;
+ font-size: 14px;
  font-weight: @veui-font-weight-normal;
 }