fix: update button

antdv-demo

@@ -1 +1 @@
-Subproject commit f3b049411f17e556d8795f40d41bfadb471ae630
+Subproject commit adbfcd30aeb6c125defa35102ed659f1be03c672

components/button/button-group.jsx

@@ -1,4 +1,5 @@
-import { filterEmpty } from '../_util/props-util';
+import { inject } from 'vue';
+import { filterEmpty, getSlot } from '../_util/props-util';
 import PropTypes from '../_util/vue-types';
 import { ConfigConsumerProps } from '../config-provider';
 
@@ -14,8 +15,11 @@ export { ButtonGroupProps };
 export default {
   name: 'AButtonGroup',
   props: ButtonGroupProps,
-  inject: {
+  setup() {
-    configProvider: { default: () => ConfigConsumerProps },
+    const configProvider = inject('configProvider') || ConfigConsumerProps;
+    return {
+      configProvider,
+    };
   },
   data() {
     return {
@@ -26,7 +30,7 @@ export default {
     };
   },
   render() {
-    const { prefixCls: customizePrefixCls, size, $slots } = this;
+    const { prefixCls: customizePrefixCls, size } = this;
     const getPrefixCls = this.configProvider.getPrefixCls;
     const prefixCls = getPrefixCls('btn-group', customizePrefixCls);
 
@@ -47,6 +51,6 @@ export default {
       [`${prefixCls}`]: true,
       [`${prefixCls}-${sizeCls}`]: sizeCls,
     };
-    return <div class={classes}>{filterEmpty($slots.default)}</div>;
+    return <div class={classes}>{filterEmpty(getSlot(this))}</div>;
   },
 };

components/button/button.jsx

@@ -69,7 +69,7 @@ export default {
         $slots,
         $attrs,
       } = this;
-      const getPrefixCls = this.configProvider().getPrefixCls;
+      const getPrefixCls = this.configProvider.getPrefixCls;
       const prefixCls = getPrefixCls('btn', customizePrefixCls);
       const autoInsertSpace = this.configProvider.autoInsertSpaceInButton !== false;
 

components/config-provider/index.jsx

@@ -10,7 +10,7 @@ function getWatch(keys = []) {
   const watch = {};
   keys.forEach(k => {
     watch[k] = function(value) {
-      this._proxyVm._data[k] = value;
+      this.configProvider[k] = value;
     };
   });
   return watch;
@@ -28,21 +28,19 @@ const ConfigProvider = {
     pageHeader: PropTypes.object,
     transformCellText: PropTypes.func,
   },
-  setup(props, context) {
+  setup(props) {
-    provide(
+    const configProvider = reactive({
-      'configProvider',
-      reactive({
       ...props,
-        getPrefixCls: context.getPrefixCls,
+      getPrefixCls: undefined,
-        renderEmpty: context.renderEmptyComponent,
+      renderEmpty: undefined,
-      }),
+    });
-    );
+    provide('configProvider', configProvider);
+    return { configProvider };
+  },
+  created() {
+    this.configProvider.getPrefixCls = this.getPrefixCls;
+    this.configProvider.renderEmpty = this.renderEmpty;
   },
-  // provide() {
-  //   return {
-  //     configProvider: this._proxyVm,
-  //   };
-  // },
   watch: {
     ...getWatch([
       'prefixCls',

examples/App.vue

@@ -1,14 +1,18 @@
 <template>
-  <a-config-provider prefixCls="ss">
+  <a-config-provider>
-    jdjj
+    <a-button-group class="dddd" style="color: red" @click="onClick">
-    <div>ddd</div>
+      <a-button>Cancel</a-button>
+      <a-button type="primary">
+        OK
+      </a-button>
+    </a-button-group>
     <a-button
       :class="['test']"
       class="aaa"
       style="display: inline"
       block
-      @click="onClick"
       :type="type"
+      @click="onClick"
     >
       Primary
     </a-button>