Skip to content

Commit c7aa278

Browse files
committed
feat(loading): 替换新规范图标,支持渐变色样式
1 parent 3fa2933 commit c7aa278

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

examples/sites/demos/pc/app/icon/iconGroups.js

+1
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ export const iconGroups = {
356356
'IconHeartempty',
357357
'IconHelpful',
358358
'IconLoading',
359+
'IconLoadingShadow',
359360
'IconLock',
360361
'IconMale',
361362
'IconMeh',
+16-18
Loading

packages/vue/src/loading/src/pc.vue

+6-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
>
2020
<component v-if="state.spinner" :is="state.spinner" class="tiny-icon-loading" />
2121
<img v-else-if="state.loadingImg" class="circular" :style="state.iconStyle" :src="state.loadingImg" />
22-
<svg v-else class="circular" viewBox="25 25 50 50">
23-
<circle class="path" cx="50" cy="50" r="24" fill="none" />
24-
</svg>
22+
<!-- 新规范适配 -->
23+
<tiny-icon-loading-shadow v-else class="circular"></tiny-icon-loading-shadow>
2524
<p v-if="state.text" class="tiny-loading__text">{{ state.text }}</p>
2625
</div>
2726
</div>
@@ -32,13 +31,17 @@
3231
import { $prefix, setup, props, defineComponent } from '@opentiny/vue-common'
3332
import { renderless, api } from '@opentiny/vue-renderless/loading/vue'
3433
import '@opentiny/vue-theme/loading/index.less'
34+
import { iconLoadingShadow } from '@opentiny/vue-icon'
3535
import type { ILoadingApi } from '@opentiny/vue-renderless/types/loading.type'
3636
3737
export default defineComponent({
3838
inheritAttrs: false,
3939
name: $prefix + 'Loading',
4040
emits: ['after-leave'],
4141
props: [...props, '_constants', 'loadingImg', 'size'],
42+
components: {
43+
TinyIconLoadingShadow: iconLoadingShadow()
44+
},
4245
setup(props, context) {
4346
return setup({ props, context, renderless, api }) as unknown as ILoadingApi
4447
}

0 commit comments

Comments
 (0)