diff --git a/packages/components/loading/_example/base/index.js b/packages/components/loading/_example/base/index.js index 2709d2b02..b79c5124b 100644 --- a/packages/components/loading/_example/base/index.js +++ b/packages/components/loading/_example/base/index.js @@ -1,5 +1 @@ -import SkylineBehavior from '@behaviors/skyline.js'; - -Component({ - behaviors: [SkylineBehavior], -}); +Component({}); diff --git a/packages/components/loading/_example/base/index.wxml b/packages/components/loading/_example/base/index.wxml index 24380fa18..cf4d8c268 100644 --- a/packages/components/loading/_example/base/index.wxml +++ b/packages/components/loading/_example/base/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/packages/components/loading/_example/duration/index.js b/packages/components/loading/_example/duration/index.js index 53e66cb56..61a404ba8 100644 --- a/packages/components/loading/_example/duration/index.js +++ b/packages/components/loading/_example/duration/index.js @@ -1,8 +1,4 @@ -import SkylineBehavior from '@behaviors/skyline.js'; - Component({ - behaviors: [SkylineBehavior], - data: { duration: 800, }, diff --git a/packages/components/loading/_example/duration/index.wxml b/packages/components/loading/_example/duration/index.wxml index f6b260df1..3c4da1729 100644 --- a/packages/components/loading/_example/duration/index.wxml +++ b/packages/components/loading/_example/duration/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/packages/components/loading/_example/size/index.js b/packages/components/loading/_example/size/index.js index 2709d2b02..b79c5124b 100644 --- a/packages/components/loading/_example/size/index.js +++ b/packages/components/loading/_example/size/index.js @@ -1,5 +1 @@ -import SkylineBehavior from '@behaviors/skyline.js'; - -Component({ - behaviors: [SkylineBehavior], -}); +Component({}); diff --git a/packages/components/loading/_example/size/index.wxml b/packages/components/loading/_example/size/index.wxml index e4663eec8..6100700d5 100644 --- a/packages/components/loading/_example/size/index.wxml +++ b/packages/components/loading/_example/size/index.wxml @@ -1,11 +1,11 @@ - + 中尺寸 - + 小尺寸 - + diff --git a/packages/components/loading/loading.less b/packages/components/loading/loading.less index fb84d23d2..d020c2672 100644 --- a/packages/components/loading/loading.less +++ b/packages/components/loading/loading.less @@ -73,13 +73,29 @@ from 180deg at 50% 50%, rgba(255, 255, 255, 0) 0deg, rgba(255, 255, 255, 0) 60deg, - currentColor 330deg, + @loading-color 330deg, rgba(255, 255, 255, 0) 360deg ); - mask: radial-gradient(transparent calc(50% - 1rpx), #fff 50%); - /* stylelint-disable-next-line */ - -webkit-mask: radial-gradient(transparent calc(50% - 1rpx), #fff 50%); + // skyline 下,1. mask 不支持渐变只支持图片;2. conic-gradient() 多层渐变效果不符合预期。问题一:改用伪元素+背景色实现,背景色灵活性会降低,待支持渐变后建议恢复用 mask 实现。问题二:待定 + // skyline: ✅ mask-image: image(url("xx")); + // skyline: ❌ mask-image: linear-gradient(x); + + // mask: radial-gradient(transparent calc(50% - 1rpx), #fff 50%); + // /* stylelint-disable-next-line */ + // -webkit-mask: radial-gradient(transparent calc(50% - 1rpx), #fff 50%); + + &::after { + content: ''; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + border-radius: 100%; + background-color: @bg-color-container; + width: 70%; + height: 70%; + } } } diff --git a/packages/tdesign-miniprogram/.changelog/pr-4184.md b/packages/tdesign-miniprogram/.changelog/pr-4184.md new file mode 100644 index 000000000..946e43d61 --- /dev/null +++ b/packages/tdesign-miniprogram/.changelog/pr-4184.md @@ -0,0 +1,6 @@ +--- +pr_number: 4184 +contributor: anlyyao +--- + +- feat(Loading): 支持在 `skyline` 下使用 `circular` 加载类型 @anlyyao ([#4184](https://github.com/Tencent/tdesign-miniprogram/pull/4184))