Skip to content

chore(Loading): support skyline render #4152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
anlyyao wants to merge 3 commits into from
Closed

chore(Loading): support skyline render #4152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9208f4
fix(Progress): fix style
anlyyao Dec 31, 2025
fcaab9f
chore(Loading): support skyline render
anlyyao Dec 31, 2025
cbb7bc5
feat(Loading): update demo
anlyyao Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/components/common/style/theme/_components.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,8 @@

--td-switch-dot-disabled-color: var(--td-font-white-2);
--td-switch-loading-color: var(--td-font-white-1);

--td-progress-circle-inner-bg-color: var(--bg-color-page);
--td-loading-circular-inner-bg-color: var(--bg-color-page);
}
}
8 changes: 4 additions & 4 deletions packages/components/loading/__test__/__snapshots__/demo.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ exports[`Loading Loading duration demo works fine 1`] = `
<duration>
<t-loading
duration="{{1200}}"
size="52rpx"
size="44rpx"
tClassText="text-l"
text="加载中..."
theme="circular"
Expand Down Expand Up @@ -87,7 +87,7 @@ exports[`Loading Loading size demo works fine 1`] = `
>
<t-loading
class="large"
size="64rpx"
size="52rpx"
text="加载中..."
theme="circular"
/>
Expand All @@ -98,7 +98,7 @@ exports[`Loading Loading size demo works fine 1`] = `
</wx-view>
<t-loading
class="medium"
size="56rpx"
size="44rpx"
text="加载中..."
theme="circular"
/>
Expand All @@ -108,7 +108,7 @@ exports[`Loading Loading size demo works fine 1`] = `
小尺寸
</wx-view>
<t-loading
size="48rpx"
size="40rpx"
text="加载中..."
theme="circular"
/>
Expand Down
6 changes: 1 addition & 5 deletions packages/components/loading/_example/base/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
import SkylineBehavior from '@behaviors/skyline.js';

Component({
behaviors: [SkylineBehavior],
});
Component({});
2 changes: 1 addition & 1 deletion packages/components/loading/_example/base/index.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<view class="loading-container-flex">
<t-loading wx:if="{{!skylineRender}}" theme="circular" size="40rpx" class="wrapper" />
<t-loading theme="circular" size="40rpx" class="wrapper" />
<t-loading theme="spinner" size="40rpx" class="wrapper" />
<t-loading theme="dots" size="80rpx" class="wrapper" />
<t-loading theme="custom" class="wrapper">
Expand Down
4 changes: 0 additions & 4 deletions packages/components/loading/_example/duration/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import SkylineBehavior from '@behaviors/skyline.js';

Component({
behaviors: [SkylineBehavior],

data: {
duration: 800,
},
Expand Down
4 changes: 2 additions & 2 deletions packages/components/loading/_example/duration/index.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<t-loading
theme="{{ skylineRender ? 'spinner' : 'circular'}}"
size="52rpx"
theme="circular"
size="44rpx"
text="加载中..."
t-class-text="text-l"
duration="{{2000 - duration}}"
Expand Down
6 changes: 1 addition & 5 deletions packages/components/loading/_example/horizontal/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
import SkylineBehavior from '@behaviors/skyline.js';

Component({
behaviors: [SkylineBehavior],
});
Component({});
2 changes: 1 addition & 1 deletion packages/components/loading/_example/horizontal/index.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<view class="loading-container-flex">
<t-loading wx:if="{{!skylineRender}}" theme="circular" size="40rpx" text="加载中..." class="wrapper" />
<t-loading theme="circular" size="40rpx" text="加载中..." class="wrapper" />
<t-loading theme="spinner" size="40rpx" text="加载中..." inheritColor class="wrapper" />
</view>
6 changes: 1 addition & 5 deletions packages/components/loading/_example/size/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
import SkylineBehavior from '@behaviors/skyline.js';

Component({
behaviors: [SkylineBehavior],
});
Component({});
6 changes: 3 additions & 3 deletions packages/components/loading/_example/size/index.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<view class="loading-size-demo">
<t-loading theme="{{ skylineRender ? 'spinner' : 'circular'}}" size="64rpx" text="加载中..." class="large" />
<t-loading theme="circular" size="52rpx" text="加载中..." class="large" />

<view class="demo-desc">中尺寸</view>

<t-loading theme="{{ skylineRender ? 'spinner' : 'circular'}}" size="56rpx" text="加载中..." class="medium" />
<t-loading theme="circular" size="44rpx" text="加载中..." class="medium" />

<view class="demo-desc">小尺寸</view>

<t-loading theme="{{ skylineRender ? 'spinner' : 'circular'}}" size="48rpx" text="加载中..." />
<t-loading theme="circular" size="40rpx" text="加载中..." />
</view>
6 changes: 1 addition & 5 deletions packages/components/loading/_example/vertical/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
import SkylineBehavior from '@behaviors/skyline.js';

Component({
behaviors: [SkylineBehavior],
});
Component({});
8 changes: 1 addition & 7 deletions packages/components/loading/_example/vertical/index.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
<div class="box">
<t-loading
theme="{{ skylineRender ? 'spinner' : 'circular'}}"
size="40rpx"
text="加载中"
layout="vertical"
class="wrapper"
/>
<t-loading theme="circular" size="40rpx" text="加载中" layout="vertical" class="wrapper" />
<t-loading theme="spinner" size="40rpx" text="加载中" layout="vertical" class="wrapper" />
</div>
17 changes: 13 additions & 4 deletions packages/components/loading/loading.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
@loading-text-font: var(--td-loading-text-font, @font-body-small);
@loading-z-index: var(--td-loading-z-index, 3500);
@loading-full-bg-color: var(--td-loading-full-bg-color, rgba(255, 255, 255, 0.6));
@loading-circular-inner-bg-color: var(--td-loading-circular-inner-bg-color, @bg-color-container);

.@{loading} {
display: inline-flex;
Expand Down Expand Up @@ -66,20 +67,28 @@

&--circular {
.@{loading}__circular {
position: relative;
border-radius: 100%;
width: 100%;
height: 100%;
background: conic-gradient(
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%);
&-inner {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: calc(100% - 12rpx);
height: calc(100% - 12rpx);
border-radius: 100%;
background-color: @loading-circular-inner-bg-color;
}
}
}

Expand Down
4 changes: 3 additions & 1 deletion packages/components/loading/loading.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
wx:key="index"
class="{{classPrefix}}__dot {{classPrefix}}__dot-{{index}}"
/>
<view wx:if="{{ theme === 'circular' }}" class="{{classPrefix}}__circular" />
<view wx:if="{{ theme === 'circular' }}" class="{{classPrefix}}__circular">
<view class="{{classPrefix}}__circular-inner"></view>
</view>
<block wx:if="{{ theme === 'dots' }}">
<view
class="{{classPrefix}}__dot"
Expand Down
2 changes: 1 addition & 1 deletion packages/components/progress/progress.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
--td-progress-info-light-color,
@text-color-anti
); // 进度条浅色label字体颜色(在进度条色块内显示的色值)
@progress-circle-inner-bg-color: var(--td-progress-circle-inner-bg-color, @text-color-anti); // 环境进度条内圆背景色
@progress-circle-inner-bg-color: var(--td-progress-circle-inner-bg-color, @bg-color-container); // 环境进度条内圆背景色

@progress: ~'@{prefix}-progress';

Expand Down
1 change: 0 additions & 1 deletion packages/tdesign-miniprogram/example/app.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ page {
--bg-color-demo-secondary: var(--td-bg-color-container);
--td-navbar-bg-color: var(--td-bg-color-page);
--td-navbar-color: var(--td-text-color-primary);
--td-progress-circle-inner-bg-color: var(--bg-color-demo);
}

.skyline {
Expand Down
Loading