From 3fd978800fb1d3e9d84c15cac13271836ed868cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 15 Feb 2017 17:30:30 +0800
Subject: [PATCH 1/2] Transfer renderFormat support html element

Transfer renderFormat support html element
---
 src/components/transfer/list.vue | 2 +-
 test/routers/transfer.vue        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/transfer/list.vue b/src/components/transfer/list.vue
index e8e323ec..9f5fc8bb 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/transfer.vue b/test/routers/transfer.vue
index 7b04e0cd..a8c0ba43 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;
             }
         }
     }

From c13e7cea814d5496357a4cff456edf1f77f99bda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Sat, 18 Feb 2017 21:57:11 +0800
Subject: [PATCH 2/2] Table add check & highlight default setting in data

Table add check & highlight default setting in data #275 #265
---
 package.json                   |  2 +-
 src/components/table/table.vue | 12 ++++++++++--
 test/routers/table.vue         | 20 +++++++++++++++-----
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index fb7e8210..79b9a66d 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 0898092e..50a700eb 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -548,8 +548,16 @@
                 this.data.forEach((row, index) => {
                     const newRow = deepCopy(row);// todo 直接替换
                     newRow._isHover = false;
-                    newRow._isChecked = false;
-                    newRow._isHighlight = false;
+                    if (newRow._checked) {
+                        newRow._isChecked = newRow._checked;
+                    } else {
+                        newRow._isChecked = false;
+                    }
+                    if (newRow._highlight) {
+                        newRow._isHighlight = newRow._highlight;
+                    } else {
+                        newRow._isHighlight = false;
+                    }
                     data[index] = newRow;
                 });
                 return data;
diff --git a/test/routers/table.vue b/test/routers/table.vue
index 101cd12f..be1f25ce 100644
--- a/test/routers/table.vue
+++ b/test/routers/table.vue
@@ -1,5 +1,5 @@
 <template>
-    <i-table border :content="self" :columns="columns7" :data="data6"></i-table>
+    <i-table highlight-row border :content="self" :columns="columns7" :data="data6"></i-table>
 </template>
 <script>
     export default {
@@ -7,6 +7,11 @@
             return {
                 self: this,
                 columns7: [
+                    {
+                        type: 'selection',
+                        width: 60,
+                        align: 'center'
+                    },
                     {
                         title: '姓名',
                         key: 'name',
@@ -47,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
                     }
                 ]
             }