diff --git a/antdv-demo b/antdv-demo
index be126edd5..20a93889a 160000
--- a/antdv-demo
+++ b/antdv-demo
@@ -1 +1 @@
-Subproject commit be126edd50d4d5ac1c7a05eceb8d57d3c1169889
+Subproject commit 20a93889a18d1c061e56e715094234fa0c1bdd21
diff --git a/components/icon/index.js b/components/icon/index.js
index dc20bd4f7..191d98f00 100644
--- a/components/icon/index.js
+++ b/components/icon/index.js
@@ -1,5 +1,4 @@
import warning from '../_util/warning';
-import Base from '../base';
const Icon = {
name: 'AIcon',
@@ -10,9 +9,8 @@ const Icon = {
};
/* istanbul ignore next */
-Icon.install = function(Vue) {
- Vue.use(Base);
- Vue.component(Icon.name, Icon);
+Icon.install = function(app) {
+ app.component(Icon.name, Icon);
};
export default Icon;
diff --git a/components/result/noFound.jsx b/components/result/noFound.jsx
index 4c7f77a8f..7c8e15967 100644
--- a/components/result/noFound.jsx
+++ b/components/result/noFound.jsx
@@ -1,292 +1,289 @@
-const NoFound = {
- functional: true,
- render() {
- return (
-
+ );
};
export default NoFound;
diff --git a/components/result/serverError.jsx b/components/result/serverError.jsx
index 986d03372..505e6c2b3 100644
--- a/components/result/serverError.jsx
+++ b/components/result/serverError.jsx
@@ -1,334 +1,331 @@
-const ServerError = {
- functional: true,
- render() {
- return (
-
+ );
};
export default ServerError;
diff --git a/components/result/unauthorized.jsx b/components/result/unauthorized.jsx
index 9fd2f4ac5..6547dda00 100644
--- a/components/result/unauthorized.jsx
+++ b/components/result/unauthorized.jsx
@@ -1,283 +1,280 @@
-const Unauthorized = {
- functional: true,
- render() {
- return (
-
- );
- },
+const Unauthorized = () => {
+ return (
+
+ );
};
export default Unauthorized;
diff --git a/examples/App.vue b/examples/App.vue
index 9563fb326..2b7319034 100644
--- a/examples/App.vue
+++ b/examples/App.vue
@@ -5,7 +5,7 @@