From 9563a8da20532c63bf192f9c71127ffa68b0c19d Mon Sep 17 00:00:00 2001
From: Lawrence Lee <lawrence.lee@foxmail.com>
Date: Thu, 8 Jun 2017 10:13:33 +0800
Subject: [PATCH] add disable-highlight prop to Table

---
 build/webpack.ssr.config.js    | 42 ------------------------------------------
 examples/routers/table.vue     |  2 +-
 src/components/table/table.vue |  6 +++---
 3 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 build/webpack.ssr.config.js

diff --git a/build/webpack.ssr.config.js b/build/webpack.ssr.config.js
deleted file mode 100644
index 9facd9c..0000000
--- a/build/webpack.ssr.config.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * 本地预览
- */
-
-var path = require('path');
-var webpack = require('webpack');
-// var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var HtmlWebpackPlugin = require('html-webpack-plugin');
-var merge = require('webpack-merge');
-var webpackBaseConfig = require('./webpack.base.config.js');
-var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin');
-
-module.exports = merge(webpackBaseConfig, {
-    // 入口
-    entry: {
-        main: './examples/main',
-        vendors: ['vue', 'vue-router']
-    },
-    // 输出
-    output: {
-        path: path.join(__dirname, '../examples/dist'),
-        publicPath: '',
-        filename: '[name].js'
-        // chunkFilename: '[name].chunk.js'
-    },
-    resolve: {
-        alias: {
-            iview: '../../src/index',
-            // vue: 'vue/dist/vue.js'
-            vue: 'vue/dist/vue.runtime.js'
-        }
-    },
-    plugins: [
-        // new webpack.optimize.CommonsChunkPlugin({ name: 'vendors', filename: 'vendor.bundle.js' }),
-        new HtmlWebpackPlugin({
-            inject: true,
-            filename: path.join(__dirname, '../examples/dist/index.html'),
-            template: path.join(__dirname, '../examples/index.html')
-        }),
-        new FriendlyErrorsPlugin()
-    ]
-});
diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index 05e15c5..92be727 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <Table border :columns="columns7" :data="data6" :hover-highlight="false"></Table>
+        <Table border :columns="columns7" :data="data6" disable-highlight></Table>
     </div>
 </template>
 <script>
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 87ddb12..3520581 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -153,7 +153,7 @@
             noFilteredDataText: {
                 type: String
             },
-            hoverHighlight: {
+            disableHighlight: {
                 type: Boolean
             }
         },
@@ -354,12 +354,12 @@
                 });
             },
             handleMouseIn (_index) {
-                if (!this.hoverHighlight) return;
+                if (this.disableHighlight) return;
                 if (this.objData[_index]._isHover) return;
                 this.objData[_index]._isHover = true;
             },
             handleMouseOut (_index) {
-                if (!this.hoverHighlight) return;
+                if (this.disableHighlight) return;
                 this.objData[_index]._isHover = false;
             },
             highlightCurrentRow (_index) {
--
libgit2 0.21.4