Skip to content
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.

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

Feature/skyline #2659

Merged
merged 127 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
55c6f5e
feat(button): 示例支持skyline,button组件适配改造
jin0209 Mar 11, 2024
9bdde23
feat(button): button组件增加content判空
jin0209 Mar 12, 2024
685ab02
feat(button): 示例支持skyline,button组件适配改造
jin0209 Mar 11, 2024
c7a7655
feat(button): button组件增加content判空
jin0209 Mar 12, 2024
56d6f77
fix(skyline-navbar): resolved positioning problem
anlyyao Mar 12, 2024
90ba156
feat(Icon): support skyline
anlyyao Mar 12, 2024
96c149a
fix(skyline-button): update demo
anlyyao Mar 12, 2024
838d5b1
Merge branch 'feature/skyline' of https://github.com/Tencent/tdesign-…
jin0209 Mar 12, 2024
1a5b75b
feat(Popup): support skyline
anlyyao Mar 12, 2024
742963d
feat(divider): 示例支持skyline,divider组件适配改造
jarmywang Mar 13, 2024
a588162
feat(Layout): support skyline
anlyyao Mar 13, 2024
a8f872c
feat(Loading): support skyline(except circular theme)
anlyyao Mar 13, 2024
8f48dbe
feat(Skeleton): support skyline
anlyyao Mar 14, 2024
034e83c
feat(Image): support skyline
anlyyao Mar 14, 2024
acc461d
feat(button): button示例增加skyline适配
jin0209 Mar 14, 2024
969841b
fix(Loading): update demo for skyline
anlyyao Mar 14, 2024
0f6f52c
feat(Reault&Empty): support skyline
anlyyao Mar 14, 2024
a6c5975
feat(textarea): 示例支持skyline
jarmywang Mar 14, 2024
6668072
feat(CountDown): support skyline
anlyyao Mar 15, 2024
6a18451
chore: 增加skyline相关behavior
jarmywang Mar 15, 2024
4d8cfe6
feat: button示例增加SkylineBehaviors
jin0209 Mar 15, 2024
12771b9
feat(navbar): navbar组件新增skyline示例
jin0209 Mar 15, 2024
21dd33a
feat: navbar新增skyline示例
jin0209 Mar 15, 2024
c91e9a4
feat(badge): 新增badge的skyline示例
jin0209 Mar 15, 2024
f345600
chore: update project.config.json
jarmywang Mar 16, 2024
2a24ae3
feat(textarea): 示例增加skyline适配
jarmywang Mar 16, 2024
36003da
feat(input): 示例增加skyline适配
jarmywang Mar 17, 2024
e75f5e1
feat(slide): 新增slide组件的skyline示例
jin0209 Mar 18, 2024
b4f923c
feat(slide): 新增slide组件的skyline示例
jin0209 Mar 18, 2024
3539c69
Merge branch 'feature/skyline' of https://github.com/Tencent/tdesign-…
jin0209 Mar 18, 2024
f5ee643
feat(badge): 修改navbar名称
jin0209 Mar 18, 2024
75065b1
Merge remote-tracking branch 'origin/feature/skyline-badge' into feat…
jin0209 Mar 18, 2024
010800c
feat(Steps): support skyline
anlyyao Mar 18, 2024
de86563
feat(toast): feat(toast) 新增toast的skyline示例
jin0209 Mar 18, 2024
fe233a6
Merge remote-tracking branch 'origin/feature/skyline-toast' into feat…
jin0209 Mar 18, 2024
2aa2a6b
feat(Picker&Cell): support skyline
anlyyao Mar 18, 2024
7f6647e
feat(divider): divider组件适配skyline
jarmywang Mar 18, 2024
3a2e96c
feat(Tag): 示例增加适配skyline
jarmywang Mar 19, 2024
6062bf9
feat(badge): badge样式还原
jin0209 Mar 19, 2024
83b37d3
Merge remote-tracking branch 'origin/feature/skyline-badge' into feat…
jin0209 Mar 19, 2024
c77e7f2
chore(Icon): remove applye-shared
anlyyao Mar 22, 2024
949e04c
feat(Progress): add skyline page
anlyyao Mar 22, 2024
322594f
feat(Layout): migrate addGlobleClass options to JSON
anlyyao Mar 22, 2024
1bfe36d
feat(Steps): migrate addGlobleClass options to JSON
anlyyao Mar 22, 2024
ff52d54
feat(Picker): migrate addGlobleClass options to JSON
anlyyao Mar 22, 2024
3fe25dd
feat(Cell): migrate addGlobleClass options to JSON
anlyyao Mar 22, 2024
a9de0dd
feat(CountDown): migrate addGlobleClass options to JSON
anlyyao Mar 22, 2024
c3b9c75
feat(Empty): migrate addGlobleClass options to JSON
anlyyao Mar 22, 2024
703ac04
feat(Result): migrate addGlobleClass options to JSON
anlyyao Mar 22, 2024
7fa1b31
feat(Skeleton): migrate addGlobleClass options to JSON
anlyyao Mar 22, 2024
e42d924
feat(Loading): migrate addGlobleClass options to JSON
anlyyao Mar 22, 2024
dad16fc
feat(Image): migrate addGlobleClass options to JSON
anlyyao Mar 22, 2024
820f501
feat(Popup): migrate addGlobleClass options to JSON
anlyyao Mar 22, 2024
1327332
feat(Overlay): migrate addGlobleClass options to JSON
anlyyao Mar 22, 2024
3e6e70d
feat(Link): support skyline page
anlyyao Mar 22, 2024
bfe0aae
feat(footer): footer组件适配skyline (#2663)
sporeg Mar 25, 2024
f02b6c1
feat(Fab): support skyline
anlyyao Mar 25, 2024
dbac5c0
feat(dialog): dialog组件适配skyline (#2665)
sporeg Mar 26, 2024
9b6c5cf
feat(Checkbox): support skyline page
anlyyao Mar 26, 2024
19a3601
feat(Radio): support skyline page
anlyyao Mar 26, 2024
cd3ef0d
feat(back-top): 新增back-top的skyline示例
jin0209 Mar 27, 2024
6266803
Merge branch 'feature/skyline' of https://github.com/Tencent/tdesign-…
jin0209 Mar 27, 2024
bf2213b
feat(css): skyline模式下,transform需要设置origin
jin0209 Mar 27, 2024
34d9c5c
feat(tab-bar): tab-bar组件新增skyline示例
jin0209 Mar 27, 2024
8064e4e
feat(component): 去掉组件的styleIsolation属性
jin0209 Mar 27, 2024
dc77a3b
feat(Swiper): support skyline
anlyyao Mar 27, 2024
58e3bd8
feat(button): 组合按钮示例样式优化
jin0209 Mar 28, 2024
2ed274b
feat(button): 按钮边框样式兼容skyline
jin0209 Mar 28, 2024
22ccf22
feat(ImageViewer): support skyline
anlyyao Mar 28, 2024
e872e98
fix(Picker): resolved height calculation error
anlyyao Apr 1, 2024
b7a8234
feat(Stepper): 示例增加skyline适配
jarmywang Apr 1, 2024
9f05e54
feat(tab-bar): tabbar组件更新标题
jin0209 Apr 2, 2024
8547a27
feat(badge): badge组件适配skyline
jin0209 Apr 2, 2024
c1fe1d3
feat(skyline): skyline渲染设置
jin0209 Apr 2, 2024
ecfaa22
feat(datetimepicker): datetimepicker适配skyline (#2675)
sporeg Apr 4, 2024
d275864
chore: home add skyline entry
jarmywang Apr 8, 2024
8e6d0cf
feat(Input): 示例skyline适配
jarmywang Apr 8, 2024
2dfcebd
feat(PulldownRefresh): support skyline for demo
anlyyao Apr 9, 2024
45368c8
feat(Divider): 示例skyline适配完成
jarmywang Apr 11, 2024
cdcb88e
feat(Collapse): 示例skyline适配
jarmywang Apr 11, 2024
0b224bc
feat(Drawer): 示例skyline适配
jarmywang Apr 19, 2024
a2a1fb1
feat(skyline): 确定一期发布组件列表
jin0209 Apr 23, 2024
a6f79e1
feat(skyline): skyline模式暂不支持组件使用loading属性
jin0209 Apr 23, 2024
06f6389
feat(develop): merge remote-tracking branch 'origin/develop' into fea…
jin0209 Apr 25, 2024
57cda8f
feat(component): 移除json中的addGlobalClass
jin0209 Apr 25, 2024
ac014a8
feat(component): skyline增加badge和tabbar
jin0209 Apr 25, 2024
feef422
feat(badge): 修改skyline示例
jin0209 Apr 25, 2024
6a71e38
chore: remove addGlobalClass in js file
anlyyao Apr 25, 2024
7047967
feat(Tag): 示例skyline适配
jarmywang Apr 25, 2024
b90c909
chore: remove addGlobalClass in instantiationDecorator
anlyyao Apr 25, 2024
e9cf420
feat(Link): add link
anlyyao Apr 25, 2024
e705d06
feat(Tag): 示例skyline适配
jarmywang Apr 25, 2024
2aa2a03
chore(Steps): update demo
anlyyao Apr 25, 2024
159f066
fix(Fab): resolve computedSize function is not executed
anlyyao Apr 25, 2024
6871039
feat(Drawer): 示例skyline适配
jarmywang Apr 25, 2024
ca72b96
feat(backtop): 样式调整
jin0209 Apr 25, 2024
938da60
feat(component): 去掉skyline下重复的navbar
jin0209 Apr 25, 2024
4bb871a
feat(componnet): 去掉navbar的capsule属性
jin0209 Apr 25, 2024
00160be
Merge branch 'feature/skyline' of https://github.com/Tencent/tdesign-…
jin0209 Apr 25, 2024
4e600d0
fix(Radio): update demo for radio
anlyyao Apr 25, 2024
a463fb6
feat(Drawer): 示例footer调整
jarmywang Apr 25, 2024
7afcaf4
chore: release empty and result and footer components
anlyyao Apr 25, 2024
f7a5f52
feat: 涉及popup、overlay部分组件增加usingCustomNavbar适配
jarmywang Apr 25, 2024
a9b4ec9
feat(Steps): 去掉示例多余的navBar
jarmywang Apr 25, 2024
9dd1ea9
chore: use the content attribute, not the default slot in button temp…
anlyyao Apr 26, 2024
665c376
fix(custom-navbar): resolved title style error
anlyyao Apr 26, 2024
159fc0e
feat(Tag): skyline适配增加mask支持
jarmywang Apr 28, 2024
439c7dc
feat(Dialog): skyline适配速记padding属性
jarmywang Apr 28, 2024
1474f55
feat(Stepper): skyline适配速记border属性
jarmywang Apr 28, 2024
d153c8e
feat(toast): 去掉js中的styleIsolation
jin0209 Apr 28, 2024
b0bba9c
Merge branch 'feature/skyline' of https://github.com/Tencent/tdesign-…
jin0209 Apr 28, 2024
8f991e2
fix(ImageViewer): usingCustomNavbar value defaults to true
anlyyao Apr 28, 2024
0b0d179
fix(Collapse): 去掉!important
jarmywang Apr 28, 2024
5f11066
fix(Divider): demo去掉多余写法
jarmywang Apr 28, 2024
56d6de1
fix(Drawer): padding简写拆开以适配skyline
jarmywang Apr 28, 2024
559e8be
fix(Tag): 恢复之前内容dom
jarmywang Apr 28, 2024
edb7c36
chore: gen-demo-test去掉skyline目录
jarmywang Apr 28, 2024
9c3a3b4
feat(toast): 文档优化
jin0209 Apr 29, 2024
d76198e
feat(textarea): 统一SkylineBehavior
jin0209 Apr 29, 2024
4e6a89b
test: add behaviors module name
betavs Apr 29, 2024
394446c
test: update snap
betavs Apr 29, 2024
16b9abd
fix(Popup): update demo
anlyyao Apr 30, 2024
0143c77
fix(Slider): 更新测试用例
jarmywang May 6, 2024
f2b3759
test(slider): value is over limited
betavs May 6, 2024
9755a89
docs(Progress): update docs
anlyyao May 6, 2024
94d9a3a
docs(Loading): update docs
anlyyao May 6, 2024
e8145c7
feat(Avatar): add skyline demo page
anlyyao May 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
58 changes: 52 additions & 6 deletions example/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,55 +3,90 @@
"pages": [
"pages/home/home",
"pages/button/button",
"pages/button/skyline/button",
"pages/tabs/tabs",
"pages/icon/icon",
"pages/icon/skyline/icon",
"pages/loading/loading",
"pages/loading/skyline/loading",
"pages/progress/progress",
"pages/progress/skyline/progress",
"pages/cascader/cascader",
"pages/cell/cell",
"pages/cell/skyline/cell",
"pages/cell-group/cell-group",
"pages/collapse/collapse",
"pages/collapse/skyline/collapse",
"pages/input/input",
"pages/input/skyline/input",
"pages/badge/badge",
"pages/badge/skyline/badge",
"pages/textarea/textarea",
"pages/textarea/skyline/textarea",
"pages/message/message",
"pages/toast/toast",
"pages/toast/skyline/toast",
"pages/stepper/stepper",
"pages/stepper/skyline/stepper",
"pages/slider/slider",
"pages/slider/skyline/slider",
"pages/radio/radio",
"pages/radio/skyline/radio",
"pages/switch/switch",
"pages/sticky/sticky",
"pages/tag/tag",
"pages/tag/skyline/tag",
"pages/checkbox/checkbox",
"pages/checkbox/skyline/checkbox",
"pages/gulp-error/index",
"pages/fab/fab",
"pages/fab/skyline/fab",
"pages/tab-bar/tab-bar",
"pages/tab-bar/skyline/tab-bar",
"pages/transition/transition",
"pages/popup/popup",
"pages/popup/skyline/popup",
"pages/steps/steps",
"pages/steps/skyline/steps",
"pages/dropdown-menu/dropdown-menu",
"pages/drawer/drawer",
"pages/drawer/skyline/drawer",
"pages/pull-down-refresh/pull-down-refresh",
"pages/pull-down-refresh/skyline/pull-down-refresh",
"pages/skeleton/skeleton",
"pages/skeleton/skyline/skeleton",
"pages/footer/footer",
"pages/footer/skyline/footer",
"pages/divider/divider",
"pages/divider/skyline/divider",
"pages/empty/empty",
"pages/empty/skyline/empty",
"pages/back-top/back-top",
"pages/back-top/skyline/back-top",
"pages/grid/grid",
"pages/upload/upload",
"pages/count-down/count-down",
"pages/count-down/skyline/count-down",
"pages/overlay/overlay",
"pages/overlay/skyline/overlay",
"pages/image/image",
"pages/image/skyline/image",
"pages/search/search",
"pages/home/navigateFail/navigateFail",
"pages/navbar/navbar",
"pages/navbar/skyline/navbar",
"pages/date-time-picker/date-time-picker",
"pages/date-time-picker/skyline/date-time-picker",
"pages/notice-bar/notice-bar",
"pages/image-viewer/image-viewer",
"pages/image-viewer/skyline/image-viewer",
"pages/result/result",
"pages/result/skyline/result",
"pages/result/result-page",
"pages/link/link",
"pages/col/col"
"pages/link/skyline/link",
"pages/col/col",
"pages/col/skyline/col"
],
"subpackages": [
{
Expand All @@ -64,27 +99,27 @@
},
{
"root": "pages/avatar/",
"pages": ["avatar"]
"pages": ["avatar", "skyline/avatar"]
},
{
"root": "pages/calendar/",
"pages": ["calendar"]
},
{
"root": "pages/dialog/",
"pages": ["dialog"]
"pages": ["dialog", "skyline/dialog"]
},
{
"root": "pages/picker/",
"pages": ["picker"]
"pages": ["picker", "skyline/picker"]
},
{
"root": "pages/rate/",
"pages": ["rate"]
},
{
"root": "pages/swiper/",
"pages": ["swiper"]
"pages": ["swiper", "skyline/swiper"]
},
{
"root": "pages/swipe-cell/",
Expand All @@ -111,5 +146,16 @@
"navigationStyle": "custom",
"navigationBarTextStyle": "@navTxtStyle"
},
"sitemapLocation": "sitemap.json"
"resolveAlias": {
"@behaviors/*": "behaviors/*"
},
"sitemapLocation": "sitemap.json",
"lazyCodeLoading": "requiredComponents",
"rendererOptions": {
"skyline": {
"defaultDisplayBlock": true,
"defaultContentBox": true,
"sdkVersionBegin": "3.4.2"
}
}
}
13 changes: 11 additions & 2 deletions example/app.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ page {
--bg-color-demo-secondary: #fff;
--td-navbar-bg-color: #f6f6f6;
--td-navbar-color: black;
--td-navbar-title-font-size: 26rpx;
--td-navbar-title-font-weight: 400;
--td-color-demo-notice-icon: rgba(0, 0, 0, 0.9);
--td-avatar-border-color: var(--bg-color-demo);
--td-progress-circle-inner-bg-color: var(--bg-color-demo);
Expand Down Expand Up @@ -39,6 +37,17 @@ page {
}
}

.skyline {
display: flex;
flex-direction: column;
height: 100vh;

.scroll-view {
flex: 1;
height: 0;
}
}

.demo {
padding-bottom: 56rpx;

Expand Down
10 changes: 10 additions & 0 deletions example/behaviors/skyline.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module.exports = Behavior({
data: {
skylineRender: false,
},
lifetimes: {
created() {
this.setData({ skylineRender: this.renderer === 'skyline' });
},
},
});
3 changes: 2 additions & 1 deletion example/components/demo-block/index.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"component": true
"component": true,
"styleIsolation": "apply-shared"
}
5 changes: 4 additions & 1 deletion example/components/demo-block/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@
margin-top: @spacer-2;

&.with-padding {
margin: @spacer-2 @spacer-2 0;
margin-top: @spacer-2;
margin-left: @spacer-2;
margin-right: @spacer-2;
margin-bottom: 0;
}
}
}
Expand Down
7 changes: 3 additions & 4 deletions example/components/demo-block/index.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
Component({
options: {
multipleSlots: true,
addGlobalClass: true,
},
properties: {
title: {
type: String,
default: '',
value: '',
},
desc: {
type: String,
default: '',
value: '',
},
operList: Array,
padding: {
type: Boolean,
default: false,
value: false,
},
},
methods: {
Expand Down
34 changes: 33 additions & 1 deletion example/pages/home/data/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,36 @@ const base = {
],
};

export default base;
const skylineBase = {
name: '基础',
icon: 'app',
childArr: [
{
name: 'Button',
label: '按钮',
},
{
name: 'Divider',
label: '分割线',
},
{
name: 'Fab',
label: '悬浮按钮',
},
{
name: 'Icon',
label: '图标',
},
{
name: 'Link',
label: '链接',
},
{
name: 'Layout',
label: '布局',
path: '/pages/col/skyline/col',
},
],
};

export { base, skylineBase };
65 changes: 64 additions & 1 deletion example/pages/home/data/display.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,67 @@ const display = {
],
};

export default display;
const skylineDisplay = {
name: '数据展示',
icon: 'image',
childArr: [
{
name: 'Avatar',
label: '头像',
},
{
name: 'Badge',
label: '徽标',
},
{
name: 'Cell',
label: '单元格',
},
// {
// name: 'Collapse',
// label: '折叠面板',
// },
{
name: 'CountDown',
label: '倒计时',
},
{
name: 'Empty',
label: '空状态',
},
{
name: 'Footer',
label: '页脚',
},
{
name: 'Image',
label: '图片',
},
{
name: 'ImageViewer',
label: '图片预览',
},
{
name: 'Progress',
label: '进度条',
},
{
name: 'Result',
label: '结果',
},
{
name: 'Skeleton',
label: '骨架屏',
},
{
name: 'Swiper',
label: '轮播图',
},
{
name: 'Tag',
label: '标签',
},
],
};

export { display, skylineDisplay };
41 changes: 40 additions & 1 deletion example/pages/home/data/form.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,43 @@ const form = {
],
};

export default form;
const skylineForm = {
name: '输入',
icon: 'bulletpoint',
childArr: [
{
name: 'Checkbox',
label: '多选框',
},
// {
// name: 'DateTimePicker',
// label: '时间选择器',
// },
{
name: 'Input',
label: '输入框',
},
// {
// name: 'Picker',
// label: '选择器',
// },
{
name: 'Radio',
label: '单选框',
},
// {
// name: 'Slider',
// label: '滑动选择器',
// },
{
name: 'Stepper',
label: '步进器',
},
{
name: 'Textarea',
label: '多行文本框',
},
],
};

export { form, skylineForm };
16 changes: 10 additions & 6 deletions example/pages/home/data/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import base from './base';
import nav from './nav';
import display from './display';
import form from './form';
import ux from './ux';
import { base, skylineBase } from './base';
import { nav, skylineNav } from './nav';
import { display, skylineDisplay } from './display';
import { form, skylineForm } from './form';
import { ux, skylineUx } from './ux';

export default [base, nav, form, display, ux];
const list = [base, nav, form, display, ux];

const skylineList = [skylineBase, skylineNav, skylineForm, skylineDisplay, skylineUx];

export { list, skylineList };
Loading
Loading