diff --git a/src/components/Application/src/AppLogo.vue b/src/components/Application/src/AppLogo.vue index 359688cb..86aaf76a 100644 --- a/src/components/Application/src/AppLogo.vue +++ b/src/components/Application/src/AppLogo.vue @@ -87,6 +87,7 @@ font-size: 16px; font-weight: 700; transition: all 0.5s; + line-height: normal; } } diff --git a/src/components/Loading/src/Loading.vue b/src/components/Loading/src/Loading.vue index 3a7407bc..f626b181 100644 --- a/src/components/Loading/src/Loading.vue +++ b/src/components/Loading/src/Loading.vue @@ -1,5 +1,10 @@ @@ -35,6 +40,9 @@ background: { type: String as PropType, }, + theme: { + type: String as PropType<'dark' | 'light'>, + }, }, }); @@ -60,8 +68,12 @@ } html[data-theme='dark'] { - .full-loading { + .full-loading:not(.light) { background-color: @modal-mask-bg; } } + + .full-loading.dark { + background-color: @modal-mask-bg; + } diff --git a/src/views/demo/comp/loading/index.vue b/src/views/demo/comp/loading/index.vue index 318d7139..351277fd 100644 --- a/src/views/demo/comp/loading/index.vue +++ b/src/views/demo/comp/loading/index.vue @@ -6,7 +6,13 @@ 全屏 Loading 容器内 Loading - + @@ -37,6 +43,8 @@ const compState = reactive({ absolute: false, loading: false, + theme: 'dark', + background: 'rgba(111,111,111,.7)', tip: '加载中...', }); const [openFullLoading, closeFullLoading] = useLoading({