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 @@
+
+
+
+
+
+
+
\ 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 @@
- 大于7页时的效果
+ 大于 7 页时的效果
@@ -129,7 +129,7 @@
}
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 @@
+
@@ -56,9 +57,6 @@
return {
navsData: navs
};
- },
- updated() {
- console.log(this.navsData);
}
};
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 {