fix(Loading): add theme prop, The repair background prop does not tak… (#1271)

* fix(Loading): add theme prop, The repair background prop does not take effect

* fix(AppLogo): fix title line height
This commit is contained in:
nsk 2021-10-12 09:12:10 +08:00 committed by GitHub
parent d6f65d476e
commit a530ec867b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 3 deletions

View File

@ -87,6 +87,7 @@
font-size: 16px; font-size: 16px;
font-weight: 700; font-weight: 700;
transition: all 0.5s; transition: all 0.5s;
line-height: normal;
} }
} }
</style> </style>

View File

@ -1,5 +1,10 @@
<template> <template>
<section class="full-loading" :class="{ absolute }" v-show="loading"> <section
class="full-loading"
:class="{ absolute, [theme]: !!theme }"
:style="[background ? `background-color: ${background}` : '']"
v-show="loading"
>
<Spin v-bind="$attrs" :tip="tip" :size="size" :spinning="loading" /> <Spin v-bind="$attrs" :tip="tip" :size="size" :spinning="loading" />
</section> </section>
</template> </template>
@ -35,6 +40,9 @@
background: { background: {
type: String as PropType<string>, type: String as PropType<string>,
}, },
theme: {
type: String as PropType<'dark' | 'light'>,
},
}, },
}); });
</script> </script>
@ -60,8 +68,12 @@
} }
html[data-theme='dark'] { html[data-theme='dark'] {
.full-loading { .full-loading:not(.light) {
background-color: @modal-mask-bg; background-color: @modal-mask-bg;
} }
} }
.full-loading.dark {
background-color: @modal-mask-bg;
}
</style> </style>

View File

@ -6,7 +6,13 @@
全屏 Loading 全屏 Loading
</a-button> </a-button>
<a-button class="my-4" type="primary" @click="openCompAbsolute"> 容器内 Loading </a-button> <a-button class="my-4" type="primary" @click="openCompAbsolute"> 容器内 Loading </a-button>
<Loading :loading="loading" :absolute="absolute" :tip="tip" /> <Loading
:loading="loading"
:absolute="absolute"
:theme="theme"
:background="background"
:tip="tip"
/>
<a-alert message="函数方式" /> <a-alert message="函数方式" />
@ -37,6 +43,8 @@
const compState = reactive({ const compState = reactive({
absolute: false, absolute: false,
loading: false, loading: false,
theme: 'dark',
background: 'rgba(111,111,111,.7)',
tip: '加载中...', tip: '加载中...',
}); });
const [openFullLoading, closeFullLoading] = useLoading({ const [openFullLoading, closeFullLoading] = useLoading({