From d070be113b72e1f29eb7fefe5a020e7c0b78ce26 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Fri, 29 Dec 2017 16:51:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96button?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/button/button.vue       | 90 ++++++++++++++++++++++--------
 components/button/demo/loading.vue |  8 +--
 2 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/components/button/button.vue b/components/button/button.vue
index ee249d272..1ce57def5 100644
--- a/components/button/button.vue
+++ b/components/button/button.vue
@@ -1,15 +1,7 @@
-<template>
-  <button :type="htmlType" :class="classes" :disabled="disabled"
-    @click="handleClick" @mouseout="mouseout" @mouseover="mouseover">
-    <Icon v-if="iconType" :type="iconType"></Icon>
-    <span v-if="this.$slots.default">
-      <slot></slot>
-    </span>
-  </button>
-</template>
 <script>
 import Icon from '../icon'
-
+const rxTwoCNChar = /^[\u4e00-\u9fa5]{2}$/
+const isTwoCNChar = rxTwoCNChar.test.bind(rxTwoCNChar)
 export default {
   name: 'Button',
   components: { Icon },
@@ -40,7 +32,7 @@ export default {
         return ['small', 'large', 'default'].includes(value)
       },
     },
-    loading: Boolean,
+    loading: [Boolean, Object],
     disabled: Boolean,
     ghost: Boolean,
   },
@@ -51,48 +43,100 @@ export default {
         small: 'sm',
       },
       clicked: false,
+      sLoading: !!this.loading,
     }
   },
+  watch: {
+    loading: {
+      handler: function (val) {
+        clearTimeout(this.delayTimeout)
+        if (typeof val !== 'boolean' && val && val.delay) {
+          this.delayTimeout = setTimeout(() => { this.sLoading = !!val }, val.delay)
+        } else {
+          this.sLoading = !!val
+        }
+      },
+      deep: true,
+    },
+  },
   computed: {
     classes () {
-      const { prefixCls, type, shape, size, loading, ghost, clicked, sizeMap } = this
+      const { prefixCls, type, shape, size, sLoading, ghost, clicked, sizeMap } = this
       const sizeCls = sizeMap[size] || ''
       return {
         [`${prefixCls}`]: true,
         [`${prefixCls}-${type}`]: type,
         [`${prefixCls}-${shape}`]: shape,
         [`${prefixCls}-${sizeCls}`]: sizeCls,
-        [`${prefixCls}-loading`]: loading,
+        [`${prefixCls}-loading`]: sLoading,
         [`${prefixCls}-clicked`]: clicked,
         [`${prefixCls}-background-ghost`]: ghost || type === 'ghost',
       }
     },
     iconType () {
-      const { loading, icon } = this
-      return loading ? 'loading' : icon
+      const { sLoading, icon } = this
+      return sLoading ? 'loading' : icon
     },
   },
   methods: {
     handleClick (event) {
-      if (this.clicked) {
-        return
-      }
       this.clicked = true
       clearTimeout(this.timeout)
       this.timeout = setTimeout(() => (this.clicked = false), 500)
       this.$emit('click', event)
     },
-    mouseover (event) {
-      this.$emit('mouseover', event)
-    },
-    mouseout (event) {
-      this.$emit('mouseout', event)
+    insertSpace (child, needInserted) {
+      // Check the child if is undefined or null.
+      if (child == null) {
+        return child
+      }
+      const SPACE = needInserted ? ' ' : ''
+      if (typeof child.text === 'string') {
+        let text = child.text.trim()
+        if (isTwoCNChar(text)) {
+          text = text.split('').join(SPACE)
+        }
+        return <span>{text}</span>
+      }
+      return child
     },
   },
+  render () {
+    const { htmlType, classes, disabled, handleClick, iconType, $slots, $attrs, _events } = this
+    const buttonProps = {
+      props: {
+      },
+      attrs: {
+        ...$attrs,
+        type: htmlType,
+        disabled,
+      },
+      class: classes,
+      on: {
+        click: handleClick,
+      },
+    }
+    for (const [k, event] of Object.entries(_events)) {
+      if (!buttonProps.on[k]) {
+        buttonProps.on[k] = event
+      }
+    }
+    const needInserted = $slots.default && $slots.default.length === 1 && (!iconType || iconType === 'loading')
+    const kids = $slots.default && $slots.default.length === 1 ? this.insertSpace($slots.default[0], needInserted) : $slots.default
+    return (
+      <button {...buttonProps}>
+        {iconType ? <Icon type={iconType}></Icon> : null}
+        {kids}
+      </button>
+    )
+  },
   beforeDestroy () {
     if (this.timeout) {
       clearTimeout(this.timeout)
     }
+    if (this.delayTimeout) {
+      clearTimeout(this.delayTimeout)
+    }
   },
 }
 </script>
diff --git a/components/button/demo/loading.vue b/components/button/demo/loading.vue
index 842bdf260..5e0ec2136 100644
--- a/components/button/demo/loading.vue
+++ b/components/button/demo/loading.vue
@@ -7,11 +7,11 @@
       Loading
     </AntButton>
     <br />
-    <AntButton type="primary" :loading="loading" @click="enterLoading">
-      Click me!
+    <AntButton type="primary" :loading="loading" @mouseenter="enterLoading">
+      mouseenter me!
     </AntButton>
     <AntButton type="primary" icon="poweroff" :loading="iconLoading" @click="enterIconLoading">
-      Click me!
+      延迟1s
     </AntButton>
     <br />
     <AntButton shape="circle" loading />
@@ -32,7 +32,7 @@ export default {
       this.loading = true
     },
     enterIconLoading () {
-      this.iconLoading = true
+      this.iconLoading = { delay: 1000 }
     },
   },
   components: {