diff --git a/package.json b/package.json
index 91516256..019c8491 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "iview",
- "version": "0.9.9-rc-4",
+ "version": "0.9.9-rc-5",
"title": "iView",
"description": "A high quality UI components Library with Vue.js",
"homepage": "http://www.iviewui.com",
@@ -19,7 +19,7 @@
"src"
],
"scripts": {
- "dev": "webpack-dev-server --content-base test/ --open --inline --hot --compress --history-api-fallback --port 8081 --config build/webpack.dev.config.js",
+ "dev": "webpack-dev-server --content-base test/ --open --inline --host 172.30.116.62 --hot --compress --history-api-fallback --port 8081 --config build/webpack.dev.config.js",
"dist:style": "gulp --gulpfile build/build-style.js",
"dist:dev": "webpack --config build/webpack.dist.dev.config.js",
"dist:prod": "webpack --config build/webpack.dist.prod.config.js",
diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue
index 9b603441..60039ee7 100644
--- a/src/components/table/table-head.vue
+++ b/src/components/table/table-head.vue
@@ -36,10 +36,10 @@
@@ -98,6 +98,22 @@
}
]
},
+ itemClasses (column, item) {
+ return [
+ `${this.prefixCls}-filter-select-item`,
+ {
+ [`${this.prefixCls}-filter-select-item-selected`]: column._filterChecked[0] === item.value
+ }
+ ]
+ },
+ itemAllClasses (column) {
+ return [
+ `${this.prefixCls}-filter-select-item`,
+ {
+ [`${this.prefixCls}-filter-select-item-selected`]: !column._filterChecked.length
+ }
+ ]
+ },
renderHeader (column, $index) {
if ('renderHeader' in this.columns[$index]) {
return this.columns[$index].renderHeader(column, $index);
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 480ee8a4..f9db9a49 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -368,7 +368,11 @@
if (this.cloneColumns[index].sortMethod) {
return this.cloneColumns[index].sortMethod(a, b);
} else {
- return type === 'asc' ? a[key] > b[key] : a[key] < b[key];
+ if (type === 'asc') {
+ return a[key] > b[key] ? 1 : -1;
+ } else if (type === 'desc') {
+ return a[key] < b[key] ? 1 : -1;
+ }
}
});
return data;
diff --git a/test/routers/table.vue b/test/routers/table.vue
index 09355af7..b35f0231 100644
--- a/test/routers/table.vue
+++ b/test/routers/table.vue
@@ -1,65 +1,90 @@
-
-
-
+