blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

chore(Button): improve code

Browse Source
This commit is contained in:
chenjiahan 2021-04-13 20:58:26 +08:00 committed by neverland
parent 3224a8978f
commit 2be579975a
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/button/Button.tsx
View File

@ -77,9 +77,9 @@ export default defineComponent({
return ( return (
<Loading <Loading
class={bem('loading')}
size={props.loadingSize} size={props.loadingSize}
type={props.loadingType} type={props.loadingType}
class={bem('loading')}
/> />
); );
}; };
@ -116,9 +116,9 @@ export default defineComponent({
const getStyle = () => { const getStyle = () => {
const { color, plain } = props; const { color, plain } = props;
if (color) { if (color) {
const style: CSSProperties = {}; const style: CSSProperties = {
color: plain ? color : 'white',
style.color = plain ? color : 'white'; };
if (!plain) { if (!plain) {
// Use background instead of backgroundColor to make linear-gradient work // Use background instead of backgroundColor to make linear-gradient work
@ -139,8 +139,7 @@ export default defineComponent({
const onClick = (event: MouseEvent) => { const onClick = (event: MouseEvent) => {
if (props.loading) { if (props.loading) {
event.preventDefault(); event.preventDefault();
} } else if (!props.disabled) {
if (!props.loading && !props.disabled) {
emit('click', event); emit('click', event);
route(); route();
} }

4
src/composables/use-route.ts
View File

@ -30,7 +30,5 @@ export function route(vm: ComponentPublicInstance<RouteProps>) {
export function useRoute() { export function useRoute() {
const vm = getCurrentInstance()!.proxy as ComponentPublicInstance<RouteProps>; const vm = getCurrentInstance()!.proxy as ComponentPublicInstance<RouteProps>;
return () => { return () => route(vm);
route(vm);
};
} }