yanyu/antd-tiny-vue
1
0
Fork 0
mirror of https://github.com/antd-tiny-vue/antd-tiny-vue.git synced 2025-11-04 18:41:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve reflict

Browse Source
This commit is contained in:
zhuzhengjian
2023-03-17 15:48:39 +08:00
parent 2b480ce73c 6f22f963b4
commit 6c7f67df60
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/button/button.tsx
View File

@@ -1,7 +1,7 @@
import { computed, defineComponent } from 'vue'
import { useProviderConfigState } from '../config-provider/context'
import useStyle from './style'
export default defineComponent({
const Button = defineComponent({
name: 'AButton',
inheritAttrs: false,
props: {
@@ -9,7 +9,7 @@ export default defineComponent({
type: String
}
},
setup(props, { slots }) {
setup(props, { slots, attrs }) {
const { getPrefixCls } = useProviderConfigState()
const prefixCls = computed(() => getPrefixCls('btn', props.prefixCls))
const [wrapSSR, hashId] = useStyle(prefixCls)
@@ -18,7 +18,9 @@ export default defineComponent({
[prefixCls.value]: true,
[hashId.value]: true
}
return wrapSSR(<button class={cls}>{slots.default?.()}</button>)
return wrapSSR(<button class={[cls, attrs.class]}>{slots.default?.()}</button>)
}
}
})
export default Button