From 0039b1be38a46b74919454f58edd5d17bdad4cc8 Mon Sep 17 00:00:00 2001
From: xrkffgg <xrkffgg@vip.qq.com>
Date: Thu, 4 Jun 2020 16:49:53 +0800
Subject: [PATCH 1/3] feat: update result

---
 components/result/index.jsx | 23 ++++++++++++-----------
 examples/index.js           |  2 ++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/components/result/index.jsx b/components/result/index.jsx
index a2dff4f919..8c861834fb 100644
--- a/components/result/index.jsx
+++ b/components/result/index.jsx
@@ -1,11 +1,11 @@
+import { inject } from 'vue';
 import PropTypes from '../_util/vue-types';
-import { getComponentFromProp } from '../_util/props-util';
+import { getComponent } from '../_util/props-util';
 import { ConfigConsumerProps } from '../config-provider';
 import CheckCircleFilled from '@ant-design/icons-vue/CheckCircleFilled';
 import CloseCircleFilled from '@ant-design/icons-vue/CloseCircleFilled';
 import ExclamationCircleFilled from '@ant-design/icons-vue/ExclamationCircleFilled';
 import WarningFilled from '@ant-design/icons-vue/WarningFilled';
-import Base from '../base';
 import noFound from './noFound';
 import serverError from './serverError';
 import unauthorized from './unauthorized';
@@ -55,18 +55,20 @@ const renderExtra = (h, prefixCls, extra) =>
 const Result = {
   name: 'AResult',
   props: ResultProps,
-  inject: {
-    configProvider: { default: () => ConfigConsumerProps },
+  setup() {
+    return {
+      configProvider: inject('configProvider', ConfigConsumerProps),
+    };
   },
   render(h) {
     const { prefixCls: customizePrefixCls, status } = this;
     const getPrefixCls = this.configProvider.getPrefixCls;
     const prefixCls = getPrefixCls('result', customizePrefixCls);
 
-    const title = getComponentFromProp(this, 'title');
-    const subTitle = getComponentFromProp(this, 'subTitle');
-    const icon = getComponentFromProp(this, 'icon');
-    const extra = getComponentFromProp(this, 'extra');
+    const title = getComponent(this, 'title');
+    const subTitle = getComponent(this, 'subTitle');
+    const icon = getComponent(this, 'icon');
+    const extra = getComponent(this, 'extra');
 
     return (
       <div class={`${prefixCls} ${prefixCls}-${status}`}>
@@ -86,8 +88,7 @@ Result.PRESENTED_IMAGE_404 = ExceptionMap[404];
 Result.PRESENTED_IMAGE_500 = ExceptionMap[500];
 
 /* istanbul ignore next */
-Result.install = function(Vue) {
-  Vue.use(Base);
-  Vue.component(Result.name, Result);
+Result.install = function(app) {
+  app.component(Result.name, Result);
 };
 export default Result;
diff --git a/examples/index.js b/examples/index.js
index 7cc4fd1853..4e7bd72ba4 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -7,6 +7,7 @@ import Affix from 'ant-design-vue/affix';
 import Alert from 'ant-design-vue/alert';
 import Divider from 'ant-design-vue/divider';
 import ConfigProvider from 'ant-design-vue/config-provider';
+import Result from 'ant-design-vue/Result';
 import Spin from 'ant-design-vue/Spin';
 import Empty from 'ant-design-vue/empty';
 import 'ant-design-vue/style.js';
@@ -18,6 +19,7 @@ createApp(App)
   .use(Affix)
   .use(Alert)
   .use(Divider)
+  .use(Result)
   .use(Spin)
   .use(Empty)
   .mount('#app');

From 4d6bbda8cf16f0c85550a26521e38a439b8a05a6 Mon Sep 17 00:00:00 2001
From: xrkffgg <xrkffgg@vip.qq.com>
Date: Sat, 6 Jun 2020 09:58:52 +0800
Subject: [PATCH 2/3] fix: upate

---
 examples/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/index.js b/examples/index.js
index 4e7bd72ba4..91c12fc993 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -7,8 +7,8 @@ import Affix from 'ant-design-vue/affix';
 import Alert from 'ant-design-vue/alert';
 import Divider from 'ant-design-vue/divider';
 import ConfigProvider from 'ant-design-vue/config-provider';
-import Result from 'ant-design-vue/Result';
-import Spin from 'ant-design-vue/Spin';
+import Result from 'ant-design-vue/result';
+import Spin from 'ant-design-vue/spin';
 import Empty from 'ant-design-vue/empty';
 import 'ant-design-vue/style.js';
 

From ab89b201bb65f99f84cdb8754aa6b34dff5965ba Mon Sep 17 00:00:00 2001
From: xrkffgg <xrkffgg@vip.qq.com>
Date: Sat, 6 Jun 2020 10:05:57 +0800
Subject: [PATCH 3/3] fix: default

---
 components/result/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/result/index.jsx b/components/result/index.jsx
index 8c861834fb..a15307288a 100644
--- a/components/result/index.jsx
+++ b/components/result/index.jsx
@@ -75,7 +75,7 @@ const Result = {
         {renderIcon(h, prefixCls, { status, icon })}
         <div class={`${prefixCls}-title`}>{title}</div>
         {subTitle && <div class={`${prefixCls}-subtitle`}>{subTitle}</div>}
-        {this.$slots.default && <div class={`${prefixCls}-content`}>{this.$slots.default}</div>}
+        {this.$slots.default && <div class={`${prefixCls}-content`}>{this.$slots.default()}</div>}
         {renderExtra(h, prefixCls, extra)}
       </div>
     );