Skip to content

Commit

Permalink
fix: 修复 buttons丢失class配置的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
greper committed Mar 22, 2023
1 parent 20a0b4c commit 40a885d
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions packages/fast-crud/src/components/basic/fs-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,17 @@ export default defineComponent({

const buttonComp: any = resolveDynamicComponent(ui.button.name);

const btnProps = {
...ctx.attrs,
...isCircle,
//icon,
class: {
"fs-button": true,
"is-thin": !props.text && !ctx.slots.default
}
};
const btnProps = _.merge(
{
...isCircle,
//icon,
class: {
"fs-button": true,
"is-thin": !props.text && !ctx.slots.default
}
},
{ ...ctx.attrs }
);
if (iconProp) {
// @ts-ignore
btnProps.icon = iconProp;
Expand Down

0 comments on commit 40a885d

Please sign in to comment.