From 2404849c30fd0eacb0d40352335d66a274f42379 Mon Sep 17 00:00:00 2001
From: leonine <326026108@qq.com>
Date: Mon, 20 Feb 2017 09:53:10 +0800
Subject: [PATCH] 合并原作者更新

---
 package.json                     |  2 +-
 src/components/table/table.vue   | 12 ++++++++----
 src/components/transfer/list.vue |  2 +-
 test/routers/table.vue           | 23 +++++++++++++++--------
 test/routers/transfer.vue        |  4 ++++
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index fb7e821..79b9a66 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iview",
-  "version": "0.9.17",
+  "version": "1.0.0",
   "title": "iView",
   "description": "A high quality  UI components Library with Vue.js",
   "homepage": "http://www.iviewui.com",
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index bbd73cc..50a700e 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -548,12 +548,16 @@
                 this.data.forEach((row, index) => {
                     const newRow = deepCopy(row);// todo 直接替换
                     newRow._isHover = false;
-                    if(newRow.checked){// 传checked:true 可以设置该行为默认选中状态
-                        newRow._isChecked = newRow.checked;
-                    }else{
+                    if (newRow._checked) {
+                        newRow._isChecked = newRow._checked;
+                    } else {
                         newRow._isChecked = false;
                     }
-                    newRow._isHighlight = false;
+                    if (newRow._highlight) {
+                        newRow._isHighlight = newRow._highlight;
+                    } else {
+                        newRow._isHighlight = false;
+                    }
                     data[index] = newRow;
                 });
                 return data;
diff --git a/src/components/transfer/list.vue b/src/components/transfer/list.vue
index e8e323e..9f5fc8b 100644
--- a/src/components/transfer/list.vue
+++ b/src/components/transfer/list.vue
@@ -18,7 +18,7 @@
                     :class="itemClasses(item)"
                     @click.prevent="select(item)">
                     <Checkbox :checked="isCheck(item)" :disabled="item.disabled"></Checkbox>
-                    <span>{{ showLabel(item) }}</span>
+                    <span>{{{ showLabel(item) }}}</span>
                 </li>
                 <li :class="prefixCls + '-content-not-found'">{{ notFoundText }}</li>
             </ul>
diff --git a/test/routers/table.vue b/test/routers/table.vue
index 99b2926..b8e7a24 100644
--- a/test/routers/table.vue
+++ b/test/routers/table.vue
@@ -1,8 +1,5 @@
 <template>
-    <i-table border :content="self" :columns="columns7" :data="data6"></i-table>
-
-     默认选中行
-     <i-table border :content="self" :columns="columns8" :data="data8"></i-table>
+    <i-table highlight-row border :content="self" :columns="columns7" :data="data6"></i-table>
 </template>
 <script>
     export default {
@@ -11,6 +8,11 @@
                 self: this,
                 columns7: [
                     {
+                        type: 'selection',
+                        width: 60,
+                        align: 'center'
+                    },
+                    {
                         title: '姓名',
                         key: 'name',
                         render (row, column, index) {
@@ -50,22 +52,27 @@
                     {
                         name: '王小明',
                         age: 18,
-                        address: '北京市朝阳区芍药居'
+                        address: '北京市朝阳区芍药居',
+                        _highlight: true,
+                        _checked: true
                     },
                     {
                         name: '张小刚',
                         age: 25,
-                        address: '北京市海淀区西二旗'
+                        address: '北京市海淀区西二旗',
+                        _checked: true
                     },
                     {
                         name: '李小红',
                         age: 30,
-                        address: '上海市浦东新区世纪大道'
+                        address: '上海市浦东新区世纪大道',
+                        _checked: true
                     },
                     {
                         name: '周小伟',
                         age: 26,
-                        address: '深圳市南山区深南大道'
+                        address: '深圳市南山区深南大道',
+                        _checked: true
                     }
                 ],
                 columns8:[
diff --git a/test/routers/transfer.vue b/test/routers/transfer.vue
index 7b04e0c..a8c0ba4 100644
--- a/test/routers/transfer.vue
+++ b/test/routers/transfer.vue
@@ -3,6 +3,7 @@
             :data="data2"
             :target-keys="targetKeys2"
             filterable
+            :render-format="rf"
             :filter-method="filterMethod"
             @on-change="handleChange2"></Transfer>
 </template>
@@ -37,6 +38,9 @@
             },
             filterMethod (data, query) {
                 return data.label.indexOf(query) > -1;
+            },
+            rf (data) {
+                return '<i class="ivu-icon ivu-icon-alert"></i>' + data.label;
             }
         }
     }
--
libgit2 0.21.4