fix: button添加主题色

hy · hy · commit c1175dd62dc2 · 2023-04-08T10:59:32.000+08:00
diff --git a/example/examples/src/routes/Button/index.tsx b/example/examples/src/routes/Button/index.tsx
@@ -16,29 +16,29 @@ export default class ButtonView extends React.Component<ButtonViewProps> {
       <Container>
         <Layout>
           <Header title={title} description={description} />
-          <Body>
+          <Body style={{ padding: 15 }}>
             <Card title="基础实例">
               <Flex>
-                <Button type="primary">默认按钮</Button>
+                <Button type="primary">蓝色按钮</Button>
                 <Spacing type="horizontal" />
-                <Button>默认按钮</Button>
+                <Button>主题色按钮</Button>
                 <Spacing type="horizontal" />
-                <Button>按钮</Button>
+                <Button type="success">绿色按钮</Button>
               </Flex>
               <Spacing />
-              <Button>默认按钮</Button>
+              <Button>主题色按钮</Button>
               <Spacing />
-              <Button disabled>默认禁用按钮</Button>
+              <Button disabled>禁用按钮</Button>
               <Spacing />
               <Button type="primary">主要按钮 primary </Button>
               <Spacing />
-              <Button type="danger" disabled>
+              <Button type="danger">
                 错误按钮 danger
               </Button>
               <Spacing />
               <Button type="success">成功按钮 success</Button>
               <Spacing />
-              <Button type="warning" disabled>
+              <Button type="warning">
                 警告禁用按钮 warning
               </Button>
               <Spacing />
@@ -50,14 +50,14 @@ export default class ButtonView extends React.Component<ButtonViewProps> {
                 亮按钮 light
               </Button>
               <Spacing />
-              <Button type="dark" loading disabled>
+              <Button type="dark" loading >
                 暗按钮 dark
               </Button>
               <Spacing />
-              <Button loading>默认按钮</Button>
+              <Button loading>主题色按钮</Button>
               <Spacing />
               <Button loading disabled>
-                默认按钮 禁用
+                主题色按钮 禁用
               </Button>
             </Card>
             <Card title="按钮圆角设置">
diff --git a/packages/core/src/Button/index.tsx b/packages/core/src/Button/index.tsx
@@ -85,7 +85,7 @@ export default function ButtonView<T>(props: ButtonProps) {
   }
   if (disabled) {
     textColor = colorF(theme.colors.disabled).alpha(0.1).rgb().string();
-    backgroundColor = colorF(backgroundColor).rgb().string();
+    backgroundColor = colorF(theme.colors.disabled).rgb().string();
   }
   if (buttonColor) {
     backgroundColor = colorF(buttonColor).rgb().string();

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ export default function ButtonView<T>(props: ButtonProps) {`
`85`	`85`	`}`
`86`	`86`	`if (disabled) {`
`87`	`87`	`textColor = colorF(theme.colors.disabled).alpha(0.1).rgb().string();`
`88`		`- backgroundColor = colorF(backgroundColor).rgb().string();`
	`88`	`+ backgroundColor = colorF(theme.colors.disabled).rgb().string();`
`89`	`89`	`}`
`90`	`90`	`if (buttonColor) {`
`91`	`91`	`backgroundColor = colorF(buttonColor).rgb().string();`