From 74abc40bf3861960b45a91f9b39f6af64e6354e5 Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Wed, 7 Sep 2016 14:18:17 +0800
Subject: [PATCH 1/3] add footer-nav

---
 examples/components/footer-nav.vue        | 105 ++++++++++++++++++++++
 examples/docs/pagination.md               |   8 +-
 examples/entry.js                         |   2 +
 examples/nav.config.json                  |   2 +-
 examples/pages/component.vue              |   4 +-
 packages/table/src/table-body.js          |   6 +-
 packages/theme-default/src/pagination.css |   2 +-
 7 files changed, 115 insertions(+), 14 deletions(-)
 create mode 100644 examples/components/footer-nav.vue

diff --git a/examples/components/footer-nav.vue b/examples/components/footer-nav.vue
new file mode 100644
index 000000000..66c60883e
--- /dev/null
+++ b/examples/components/footer-nav.vue
@@ -0,0 +1,105 @@
+<template>
+  <div class="footer-nav">
+    <span
+      v-if="leftNav"
+      class="footer-nav-link footer-nav-left"
+      @click="handleNavClick('prev')">
+      <i class="el-icon-arrow-left"></i>
+      {{ leftNav.title || leftNav.name }}
+    </span>
+    <span
+      v-if="rightNav"
+      class="footer-nav-link footer-nav-right"
+      @click="handleNavClick('next')">
+      {{ rightNav.title || rightNav.name }}
+      <i class="el-icon-arrow-right"></i>
+    </span>
+  </div>
+</template>
+
+<style>
+  .footer-nav {
+    padding: 24px;
+    color: #99a9bf;
+    font-size: 14px;
+    
+    &::after {
+      content: '';
+      display: block;
+      clear: both;
+    }
+     
+    & i {
+      color: #d9def1;
+      vertical-align: baseline;
+    }
+  }
+  
+  .footer-nav-link {
+    cursor: pointer;
+    
+    &:hover {
+      color: #5e6d82;
+     
+      & i {
+        color: #5e6d82;
+      }
+    }
+  }
+  
+  .footer-nav-left {
+    float: left;
+  }
+  
+  .footer-nav-right {
+    float: right;
+  }
+</style>
+
+<script>
+  import navConfig from '../nav.config.json';
+
+  export default {
+    data() {
+      return {
+        currentComponent: null,
+        nav: [],
+        currentIndex: -1,
+        leftNav: null,
+        rightNav: null
+      };
+    },
+
+    watch: {
+      '$route.path'() {
+        this.updateNav();
+      }
+    },
+
+    methods: {
+      updateNav() {
+        this.currentComponent = '/' + this.$route.path.split('/')[2];
+        for (let i = 0, len = this.nav.length; i < len; i++) {
+          if (this.nav[i].path === this.currentComponent) {
+            this.currentIndex = i;
+            break;
+          }
+        }
+        this.leftNav = this.nav[this.currentIndex - 1];
+        this.rightNav = this.nav[this.currentIndex + 1];
+      },
+
+      handleNavClick(direction) {
+        this.$router.push(`/component${ direction === 'prev' ? this.leftNav.path : this.rightNav.path }`);
+      }
+    },
+
+    created() {
+      navConfig[0].groups.map(group => group.list).forEach(list => {
+        this.nav = this.nav.concat(list);
+      });
+      this.nav = this.nav.concat(navConfig[1].children);
+      this.updateNav();
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/examples/docs/pagination.md b/examples/docs/pagination.md
index 1619ddc6c..134830c4c 100644
--- a/examples/docs/pagination.md
+++ b/examples/docs/pagination.md
@@ -14,7 +14,7 @@
   </el-pagination>
 </div>
 <div class="block">
-  <span class="demonstration">大于7页时的效果</span>
+  <span class="demonstration">大于 7 页时的效果</span>
     <el-pagination
       layout="prev, pager, next"
       :total="1000">
@@ -129,7 +129,7 @@
   }
 </script>
 <style>
-  .demo-pagination .first {
+  .demo-pagination .source.first {
     padding: 0;
     display: flex;
   }
@@ -152,7 +152,7 @@
     margin-bottom: 20px;
   }
 
-  .demo-pagination .last {
+  .demo-pagination .source.last {
     padding: 0;
   }
 
@@ -174,7 +174,7 @@
   .demo-pagination .last .demonstration + .el-pagination {
     float: right;
     width: 70%;
-    margin-right: 20px;
+    margin: 5px 20px 0 0;
   }
 </style>
 
diff --git a/examples/entry.js b/examples/entry.js
index 7878657b6..ccee6cd53 100644
--- a/examples/entry.js
+++ b/examples/entry.js
@@ -8,6 +8,7 @@ import demoBlock from './components/demo-block.vue';
 import MainFooter from './components/footer.vue';
 import MainHeader from './components/header.vue';
 import SideNav from './components/side-nav';
+import FooterNav from './components/footer-nav';
 
 Vue.use(Element);
 Vue.use(VueRouter);
@@ -15,6 +16,7 @@ Vue.component('demo-block', demoBlock);
 Vue.component('main-footer', MainFooter);
 Vue.component('main-header', MainHeader);
 Vue.component('side-nav', SideNav);
+Vue.component('footer-nav', FooterNav);
 
 const scrollBehavior = (to, from, savedPosition) => {
   if (savedPosition) {
diff --git a/examples/nav.config.json b/examples/nav.config.json
index 5cd6e0735..aec82d90a 100644
--- a/examples/nav.config.json
+++ b/examples/nav.config.json
@@ -6,7 +6,7 @@
       "list": [
         {
           "path": "/layout",
-          "name": "按钮 (button)",
+          "name": "布局 (layout)",
           "title": "Layout 布局",
           "description": ""
         },
diff --git a/examples/pages/component.vue b/examples/pages/component.vue
index 103c23d70..dfc08d0b7 100644
--- a/examples/pages/component.vue
+++ b/examples/pages/component.vue
@@ -45,6 +45,7 @@
       </el-col>
       <el-col :span="18">
         <router-view class="content"></router-view>
+        <footer-nav></footer-nav>
       </el-col>
     </el-row>
   </div>
@@ -56,9 +57,6 @@
       return {
         navsData: navs
       };
-    },
-    updated() {
-      console.log(this.navsData);
     }
   };
 </script>
diff --git a/packages/table/src/table-body.js b/packages/table/src/table-body.js
index 7bf5ffd3d..63e31f299 100644
--- a/packages/table/src/table-body.js
+++ b/packages/table/src/table-body.js
@@ -120,11 +120,7 @@ export default {
       // 判断是否text-overflow, 如果是就显示tooltip
       const cellChild = getChild(event);
 
-      if (cellChild.scrollWidth > cellChild.offsetWidth) {
-        this.tooltipDisabled = false;
-      } else {
-        this.tooltipDisabled = true;
-      }
+      this.tooltipDisabled = cellChild.scrollWidth <= cellChild.offsetWidth;
     },
 
     handleCellMouseLeave(event) {
diff --git a/packages/theme-default/src/pagination.css b/packages/theme-default/src/pagination.css
index 2e3442050..7df2c719c 100644
--- a/packages/theme-default/src/pagination.css
+++ b/packages/theme-default/src/pagination.css
@@ -108,7 +108,7 @@
     }
 
     @e total {
-      margin-left: 10px;
+      margin: 0 10px;
     }
 
     @e rightwrapper {

From c5c050a52ad50dd2f89d21553e0a537834ddf9da Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Wed, 7 Sep 2016 18:38:51 +0800
Subject: [PATCH 2/3] update footer-nav

---
 examples/components/footer-nav.vue |  4 ++-
 packages/select/src/select.vue     | 40 ++++++++++++++++--------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/examples/components/footer-nav.vue b/examples/components/footer-nav.vue
index 66c60883e..9db5eba23 100644
--- a/examples/components/footer-nav.vue
+++ b/examples/components/footer-nav.vue
@@ -30,6 +30,7 @@
     }
      
     & i {
+      transition: .3s;
       color: #d9def1;
       vertical-align: baseline;
     }
@@ -37,6 +38,7 @@
   
   .footer-nav-link {
     cursor: pointer;
+    transition: .3s;
     
     &:hover {
       color: #5e6d82;
@@ -101,5 +103,5 @@
       this.nav = this.nav.concat(navConfig[1].children);
       this.updateNav();
     }
-  }
+  };
 </script>
\ No newline at end of file
diff --git a/packages/select/src/select.vue b/packages/select/src/select.vue
index 88883b6ba..dc1b488f7 100644
--- a/packages/select/src/select.vue
+++ b/packages/select/src/select.vue
@@ -183,29 +183,31 @@
           this.valueChangeBySelected = false;
           return;
         }
-        if (this.multiple && Array.isArray(val)) {
-          this.$nextTick(() => {
-            this.resetInputHeight();
-          });
-          this.selectedInit = true;
-          this.selected = [];
-          val.forEach(item => {
-            let option = this.options.filter(option => option.value === item)[0];
+        this.$nextTick(() => {
+          if (this.multiple && Array.isArray(val)) {
+            this.$nextTick(() => {
+              this.resetInputHeight();
+            });
+            this.selectedInit = true;
+            this.selected = [];
+            val.forEach(item => {
+              let option = this.options.filter(option => option.value === item)[0];
+              if (option) {
+                this.$emit('addOptionToValue', option);
+              }
+            });
+          }
+          if (!this.multiple) {
+            let option = this.options.filter(option => option.value === val)[0];
             if (option) {
               this.$emit('addOptionToValue', option);
+            } else {
+              this.selected = {};
+              this.selectedLabel = '';
             }
-          });
-        }
-        if (!this.multiple) {
-          let option = this.options.filter(option => option.value === val)[0];
-          if (option) {
-            this.$emit('addOptionToValue', option);
-          } else {
-            this.selected = {};
-            this.selectedLabel = '';
           }
-        }
-        this.resetHoverIndex();
+          this.resetHoverIndex();
+        });
       },
 
       selected(val) {

From 906503ec71b69e4df42cf46d75608878eb64eea0 Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Wed, 7 Sep 2016 18:42:38 +0800
Subject: [PATCH 3/3] update check size

---
 packages/theme-default/src/select.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/theme-default/src/select.css b/packages/theme-default/src/select.css
index 3af371ae9..0b9dbe86a 100644
--- a/packages/theme-default/src/select.css
+++ b/packages/theme-default/src/select.css
@@ -116,7 +116,7 @@
           right: 10px;
           font-family: 'element-icons';
           content: "\E608";
-          font-size: 13px;
+          font-size: 11px;
           -webkit-font-smoothing: antialiased;
           -moz-osx-font-smoothing: grayscale;
         }