diff --git a/CHANGELOG.md b/CHANGELOG.md index ea476cd2..9d80aeda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - 修复 Tabs 切换后 Tab-panel 被销毁的问题 - 修复 TimePicker 错误的隐藏面板 +- 修复 Table Cell 的样式, #204 ### 1.0.0-rc.5 diff --git a/packages/button/src/button-group.js b/packages/button/src/button-group.js new file mode 100644 index 00000000..9b8f70fd --- /dev/null +++ b/packages/button/src/button-group.js @@ -0,0 +1,22 @@ +/** + * button + * @module components/basic/menu + * @desc 用于按钮组 + * @param {string} label - 名称 + */ +export default { + name: 'ElButtonGroup', + + functional: true, + + render(h, { slots, data }) { + return ( +
+ { slots().default } +
+ ); + } +}; diff --git a/packages/button/src/button-group.vue b/packages/button/src/button-group.vue deleted file mode 100644 index e562986a..00000000 --- a/packages/button/src/button-group.vue +++ /dev/null @@ -1,16 +0,0 @@ - - diff --git a/packages/button/src/button.js b/packages/button/src/button.js new file mode 100644 index 00000000..5e0157fa --- /dev/null +++ b/packages/button/src/button.js @@ -0,0 +1,65 @@ +export default { + name: 'ElButton', + + functional: true, + + props: { + type: { + type: String, + default: 'default' + }, + size: String, + icon: { + type: String, + default: '' + }, + nativeType: { + type: String, + default: 'button' + }, + loading: { + type: Boolean, + default: false + }, + disabled: { + type: Boolean, + default: false + }, + plain: { + type: Boolean, + default: false + } + }, + + render(h, { props, slots, data }) { + return ( + + ); + } +}; diff --git a/packages/button/src/button.vue b/packages/button/src/button.vue deleted file mode 100644 index 71433983..00000000 --- a/packages/button/src/button.vue +++ /dev/null @@ -1,54 +0,0 @@ - - diff --git a/packages/icon/index.js b/packages/icon/index.js index 2b43b70d..3c462171 100644 --- a/packages/icon/index.js +++ b/packages/icon/index.js @@ -1 +1 @@ -module.exports = require('./src/icon.vue'); +module.exports = require('./src/icon'); diff --git a/packages/icon/src/icon.js b/packages/icon/src/icon.js new file mode 100644 index 00000000..dc6c3d4b --- /dev/null +++ b/packages/icon/src/icon.js @@ -0,0 +1,19 @@ +export default { + name: 'ElIcon', + + functional: true, + + props: { + name: String + }, + + render(h, { props, data }) { + return ( + + + ); + } +}; diff --git a/packages/icon/src/icon.vue b/packages/icon/src/icon.vue deleted file mode 100644 index b53ac30b..00000000 --- a/packages/icon/src/icon.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/packages/theme-default/src/table.css b/packages/theme-default/src/table.css index 3a808d37..a8db7d17 100644 --- a/packages/theme-default/src/table.css +++ b/packages/theme-default/src/table.css @@ -50,6 +50,7 @@ & th { white-space: nowrap; + overflow: hidden; } & th, td { @@ -57,7 +58,6 @@ max-width: 250px; min-width: 0; box-sizing: border-box; - overflow: hidden; text-overflow: ellipsis; vertical-align: middle; position: relative; @@ -102,10 +102,6 @@ box-sizing: border-box; } - & td div { - display: block; - } - @e fixed { position: absolute; top: 0; @@ -180,7 +176,6 @@ & th > .cell { position: relative; word-wrap: normal; - overflow: hidden; text-overflow: ellipsis; display: inline-block; line-height: 20px;