Success Text
@@ -33,20 +59,42 @@ exports[`renders ./components/alert/demo/description.md correctly 1`] = `
exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
-
Success Tips
-
Informational Notes
-
Warning
-
Error
-
Success Tips Detailed description and advices about successful copywriting.
-
Informational Notes Additional description and informations about copywriting.
-
Warning This is a warning notice about copywriting.
-
Error This is an error message about copywriting.
+
+
+
+
+
+ Success Tips Detailed description and advices about successful copywriting.
+
+ Informational Notes Additional description and informations about copywriting.
+
+ Warning This is a warning notice about copywriting.
+
+ Error This is an error message about copywriting.
0
1
2
3
4
5
6
7
8
9
0
1
2
3
4
5
6
7
8
9
0
1
2
3
4
5
6
7
8
9
-
+
0
1
2
3
4
5
6
7
8
9
0
1
2
3
4
5
6
7
8
9
0
1
2
3
4
5
6
7
8
9
/ Application List /
+
`;
diff --git a/components/breadcrumb/demo/index.vue b/components/breadcrumb/demo/index.vue
index bbea90951..aec8c2f4a 100644
--- a/components/breadcrumb/demo/index.vue
+++ b/components/breadcrumb/demo/index.vue
@@ -31,6 +31,7 @@
category: 'Components',
subtitle: '面包屑',
type: 'Navigation',
+ zhType: '导航',
title: 'Breadcrumb',
render () {
return (
diff --git a/components/button/__tests__/__snapshots__/demo.test.js.snap b/components/button/__tests__/__snapshots__/demo.test.js.snap
index 3dab9dde4..4dff6fe2a 100644
--- a/components/button/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/button/__tests__/__snapshots__/demo.test.js.snap
@@ -11,10 +11,19 @@ exports[`renders ./components/button/demo/button-group.md correctly 1`] = `
L M R
L M M R
With Icon
-
+ Go forward
+ Primary Default Dashed danger
`;
-exports[`renders ./components/button/demo/icon.md correctly 1`] = `Search Search Search Search
`;
+exports[`renders ./components/button/demo/icon.md correctly 1`] = `
+
+
+ Search
+
+ Search
+
+ Search
+
+ Search Loading Loading mouseenter me! 延迟1s
`;
+exports[`renders ./components/button/demo/loading.md correctly 1`] = `
+
+ Loading
+ Loading mouseenter me!
+ 延迟1s
+
+ Primary secondary
- Actions
+ Actions
+
`;
exports[`renders ./components/button/demo/size.md correctly 1`] = `
`;
diff --git a/components/button/__tests__/__snapshots__/index.test.js.snap b/components/button/__tests__/__snapshots__/index.test.js.snap
index 0a9dc15e2..834e92354 100644
--- a/components/button/__tests__/__snapshots__/index.test.js.snap
+++ b/components/button/__tests__/__snapshots__/index.test.js.snap
@@ -6,15 +6,35 @@ exports[`Button fixbug renders {0} , 0 and {false} 2`] = `
`;
-exports[`Button renders Chinese characters correctly 1`] = `
按钮 `;
+exports[`Button renders Chinese characters correctly 1`] = `
+
+ 按钮
+`;
-exports[`Button renders Chinese characters correctly 2`] = `
`;
+exports[`Button renders Chinese characters correctly 2`] = `
+
+
+`;
-exports[`Button renders Chinese characters correctly 3`] = `
按钮 `;
+exports[`Button renders Chinese characters correctly 3`] = `
+
+ 按钮
+`;
-exports[`Button renders Chinese characters correctly 4`] = `
按钮 `;
+exports[`Button renders Chinese characters correctly 4`] = `
+
+ 按钮
+`;
-exports[`Button renders Chinese characters correctly 5`] = `
按 钮 `;
+exports[`Button renders Chinese characters correctly 5`] = `
+
+ 按 钮
+`;
exports[`Button renders correctly 1`] = `
Follow `;
diff --git a/components/button/button.jsx b/components/button/button.jsx
index 7a49ebffa..36a21e8fb 100644
--- a/components/button/button.jsx
+++ b/components/button/button.jsx
@@ -65,7 +65,10 @@ export default {
methods: {
fixTwoCNChar () {
// Fix for HOC usage like
- const node = this.$el
+ const node = this.$refs.buttonNode
+ if (!node) {
+ return
+ }
const buttonText = node.textContent || node.innerText
if (this.isNeedInserted() && isTwoCNChar(buttonText)) {
if (!this.hasTwoCNChar) {
@@ -76,9 +79,10 @@ export default {
}
},
handleClick (event) {
- // this.clicked = true
- // clearTimeout(this.timeout)
- // this.timeout = setTimeout(() => (this.clicked = false), 500)
+ const { sLoading } = this.$data
+ if (sLoading) {
+ return
+ }
this.$emit('click', event)
},
insertSpace (child, needInserted) {
@@ -101,6 +105,9 @@ export default {
const { htmlType, classes, icon,
disabled, handleClick,
sLoading, $slots, $attrs, $listeners } = this
+ const now = new Date()
+ const isChristmas = now.getMonth() === 11 && now.getDate() === 25
+ const title = isChristmas ? 'Ho Ho Ho!' : $attrs.title
const buttonProps = {
props: {
},
@@ -108,8 +115,9 @@ export default {
...$attrs,
type: htmlType,
disabled,
+ title,
},
- class: classes,
+ class: { ...classes, christmas: isChristmas },
on: {
...$listeners,
click: handleClick,
@@ -118,16 +126,17 @@ export default {
const iconType = sLoading ? 'loading' : icon
const iconNode = iconType ?
: null
const kids = $slots.default && $slots.default.length === 1 ? this.insertSpace($slots.default[0], this.isNeedInserted()) : $slots.default
+
if ('href' in $attrs) {
return (
-
+
{iconNode}{kids}
)
} else {
return (
-
+
{iconNode}{kids}
diff --git a/components/button/demo/index.vue b/components/button/demo/index.vue
index a39748f17..29c380c90 100644
--- a/components/button/demo/index.vue
+++ b/components/button/demo/index.vue
@@ -26,6 +26,7 @@ const md = {
export default {
category: 'Components',
type: 'General',
+ zhType: '通用',
title: 'Button',
subtitle: '按钮',
render () {
diff --git a/components/button/index.en-US.md b/components/button/index.en-US.md
index 01844a0d4..9c3ea1361 100644
--- a/components/button/index.en-US.md
+++ b/components/button/index.en-US.md
@@ -17,7 +17,7 @@ To get a customized button, just set `type`/`shape`/`size`/`loading`/`disabled`.
### events
| Events Name | Description | Arguments |
| --- | --- | --- |
-| click | set the handler to handle `click` event | function(e) |
+| click | set the handler to handle `click` event | (event) => void |
`
Hello world! ` will be rendered into `
Hello world! `, and all the properties which are not listed above will be transferred to the `
` tag.
diff --git a/components/button/index.zh-CN.md b/components/button/index.zh-CN.md
index 80971eafc..afd88a3a8 100644
--- a/components/button/index.zh-CN.md
+++ b/components/button/index.zh-CN.md
@@ -19,7 +19,7 @@
### 事件
| 事件名称 | 说明 | 回调参数 |
| --- | --- | --- |
-| click | `click` 事件的 handler | function(e) |
+| click | 点击按钮时的回调 | (event) => void |
-`Hello world! ` 最终会被渲染为 `Hello world! Hello world! ` 最终会被渲染为 `Hello world!
+
+
+
+
+
+
+ Su Mo Tu We Th Fr Sa
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
)
},
+ getDefaultLocale () {
+ const result = {
+ ...enUS,
+ ...this.$props.locale,
+ }
+ result.lang = {
+ ...result.lang,
+ ...(this.$props.locale || {}).lang,
+ }
+ return result
+ },
},
render () {
return (