Table add check & highlight default setting in data

Table add check & highlight default setting in data #275 #265
view-design · Feb 18, 2017 · c13e7ce · c13e7ce
1 parent 3fd9788
commit c13e7ce
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git 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
@@ -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
@@ -1,12 +1,17 @@
 <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 {
         data () {
             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
                     }
                 ]
             }