diff --git a/.gitignore b/.gitignore
index 9e1e0cfa1..f5915983f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ lib
examples/element-ui
fe.element/element-ui
.npmrc
+coverage
diff --git a/.travis.yml b/.travis.yml
index 543f504a7..6276b8b9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,20 @@
sudo: false
language: node_js
node_js:
- - "5"
-script: make dist
+ - 5
+cache:
+ bundler: true
+ directories:
+ - node_modules # NPM packages
+ - travis_phantomjs
+before_install:
+ # Upgrade PhantomJS to v2.1.1.
+ - "export PHANTOMJS_VERSION=2.1.1"
+ - "export PATH=$PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin:$PATH"
+ - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
+ - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then wget https://github.com/Medium/phantomjs/releases/download/v$PHANTOMJS_VERSION/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2; fi"
+ - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
+ - "phantomjs --version"
+script:
+ - "make dist"
+ - "npm t"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25c23d274..d22c37971 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,20 @@
## 更新日志
-### 1.0.0（待发布）
+### 1.0.0-rc.7
*2016-XX-XX*
+- Upload 新增 Data 属性支持额外数据的传输
+- DatePicker 修复 `$t` 报错
+- Popper 重构 vue-popper
+- Pagination 修复输入后再点击切换，输入框的值不更新
+- Step: 修复自定义 icon 的样式
+- 修复 Tree 组件 checkbox 点击失效的问题
+
+### 1.0.0-rc.6
+
+*2016-10-11*
+
- 修复 Tabs 切换后 Tab-panel 被销毁的问题
- 修复 TimePicker 错误的隐藏面板
- 修复 Table Cell 的样式, #204
@@ -17,6 +28,9 @@
- 修复 多选可搜索的 Select 下拉选项自动展开的问题
- 为 Dialog 添加 top 属性
- 修复 Menu 组件垂直模式下开启 router 属性会立刻跳转的问题 #295
+- Checkbox change 事件现在只能被人为的交互操作所触发
+- 新增 Checkbox checked 属性
+- 修复 Select 远程搜索时使用键盘选择选项无法更新 v-model 的问题
#### 非兼容性更新
diff --git a/build/config.js b/build/config.js
index 9e4361bee..ede163b3c 100644
--- a/build/config.js
+++ b/build/config.js
@@ -28,3 +28,27 @@ exports.alias = {
};
exports.jsexclude = /node_modules|utils\/popper\.js|utils\/date.\js/;
+
+exports.postcss = function(webapck) {
+ return [
+ require('postcss-salad')({
+ browser: ['ie > 8', 'last 2 version'],
+ features: {
+ 'partialImport': {
+ addDependencyTo: webapck
+ },
+ 'bem': {
+ 'shortcuts': {
+ 'component': 'b',
+ 'modifier': 'm',
+ 'descendent': 'e'
+ },
+ 'separators': {
+ 'descendent': '__',
+ 'modifier': '--'
+ }
+ }
+ }
+ })
+ ];
+};
diff --git a/build/cooking.demo.js b/build/cooking.demo.js
index 8da2f11c5..1d8d7e515 100644
--- a/build/cooking.demo.js
+++ b/build/cooking.demo.js
@@ -28,29 +28,7 @@ cooking.set({
sourceMap: true,
alias: config.alias,
extends: ['vue2', 'lint'],
- postcss: function(webapck) {
- return [
- require('postcss-salad')({
- browser: ['ie > 8', 'last 2 version'],
- features: {
- 'partialImport': {
- addDependencyTo: webapck
- },
- 'bem': {
- 'shortcuts': {
- 'component': 'b',
- 'modifier': 'm',
- 'descendent': 'e'
- },
- 'separators': {
- 'descendent': '__',
- 'modifier': '--'
- }
- }
- }
- })
- ];
- }
+ postcss: config.postcss
});
cooking.add('loader.md', {
diff --git a/build/cooking.test.js b/build/cooking.test.js
new file mode 100644
index 000000000..cdac935d7
--- /dev/null
+++ b/build/cooking.test.js
@@ -0,0 +1,25 @@
+var path = require('path');
+var cooking = require('cooking');
+var config = require('./config');
+var projectRoot = path.resolve(__dirname, '../');
+var ProgressBarPlugin = require('progress-bar-webpack-plugin');
+
+cooking.set({
+ entry: './src/index.js',
+ extends: ['vue2'],
+ minimize: false,
+ alias: config.alias,
+ postcss: config.postcss,
+ sourceMap: '#inline-source-map'
+});
+
+cooking.add('vue.loaders.js', 'isparta');
+cooking.add('loader.js.exclude', config.jsexclude);
+cooking.add('preLoader.js', {
+ test: /\.js$/,
+ loader: 'isparta-loader',
+ include: path.resolve(projectRoot, 'src')
+});
+
+cooking.add('plugins.process', new ProgressBarPlugin());
+module.exports = cooking.resolve();
diff --git a/examples/docs/zh-cn/badge.md b/examples/docs/zh-cn/badge.md
index c3371ca6b..0d1888d16 100644
--- a/examples/docs/zh-cn/badge.md
+++ b/examples/docs/zh-cn/badge.md
@@ -21,15 +21,20 @@
回复
-
-
- 评论
-
-
-
- 回复
-
-
+
+
+ 点我查看
+
+
+
+ 评论
+
+
+
+ 回复
+
+
+
```
:::
diff --git a/examples/docs/zh-cn/checkbox.md b/examples/docs/zh-cn/checkbox.md
index 8f1924bf1..42e8ac9da 100644
--- a/examples/docs/zh-cn/checkbox.md
+++ b/examples/docs/zh-cn/checkbox.md
@@ -4,16 +4,20 @@
return {
checkList: ['选中且禁用','复选框 A'],
// checkList2: ['复选框 A'],
- checked: true,
+ checked: false,
checked1: false,
checked2: true,
isValid: '可用'
};
+ },
+ methods: {
+ handleChange(ev) {
+ console.log(ev);
+ }
}
};
-