Skip to content

Commit

Permalink
Feature/skyline (#2659)
Browse files Browse the repository at this point in the history
* feat(button): 示例支持skyline,button组件适配改造

* feat(button): button组件增加content判空

* feat(button): 示例支持skyline,button组件适配改造

* feat(button): button组件增加content判空

* fix(skyline-navbar): resolved positioning problem

* feat(Icon): support skyline

* fix(skyline-button): update demo

* feat(Popup): support skyline

* feat(divider): 示例支持skyline,divider组件适配改造

* feat(Layout): support skyline

* feat(Loading): support skyline(except circular theme)

* feat(Skeleton): support skyline

* feat(Image): support skyline

* feat(button): button示例增加skyline适配

* fix(Loading): update demo for skyline

* feat(Reault&Empty): support skyline

* feat(textarea): 示例支持skyline

* feat(CountDown): support skyline

* chore: 增加skyline相关behavior

* feat: button示例增加SkylineBehaviors

* feat(navbar): navbar组件新增skyline示例

* feat: navbar新增skyline示例

* feat(badge): 新增badge的skyline示例

* chore: update project.config.json

* feat(textarea): 示例增加skyline适配

* feat(input): 示例增加skyline适配

* feat(slide): 新增slide组件的skyline示例

* feat(slide): 新增slide组件的skyline示例

* feat(badge): 修改navbar名称

* feat(Steps): support skyline

* feat(toast): feat(toast) 新增toast的skyline示例

* feat(Picker&Cell): support skyline

* feat(divider): divider组件适配skyline

* feat(Tag): 示例增加适配skyline

* feat(badge): badge样式还原

* chore(Icon): remove applye-shared

* feat(Progress): add skyline page

* feat(Layout): migrate addGlobleClass options to JSON

* feat(Steps): migrate addGlobleClass options to JSON

* feat(Picker): migrate addGlobleClass options to JSON

* feat(Cell): migrate addGlobleClass options to JSON

* feat(CountDown): migrate addGlobleClass options to JSON

* feat(Empty): migrate addGlobleClass options to JSON

* feat(Result): migrate addGlobleClass options to JSON

* feat(Skeleton): migrate addGlobleClass options to JSON

* feat(Loading): migrate addGlobleClass options to JSON

* feat(Image): migrate addGlobleClass options to JSON

* feat(Popup): migrate addGlobleClass options to JSON

* feat(Overlay): migrate addGlobleClass options to JSON

* feat(Link): support skyline page

* feat(footer): footer组件适配skyline (#2663)

* feat(Fab): support skyline

* feat(dialog): dialog组件适配skyline (#2665)

* feat(Checkbox): support skyline page

* feat(Radio): support skyline page

* feat(back-top): 新增back-top的skyline示例

* feat(css): skyline模式下,transform需要设置origin

* feat(tab-bar): tab-bar组件新增skyline示例

* feat(component): 去掉组件的styleIsolation属性

* feat(Swiper): support skyline

* feat(button): 组合按钮示例样式优化

* feat(button): 按钮边框样式兼容skyline

* feat(ImageViewer): support skyline

* fix(Picker): resolved height calculation error

* feat(Stepper): 示例增加skyline适配

* feat(tab-bar): tabbar组件更新标题

* feat(badge): badge组件适配skyline

* feat(skyline): skyline渲染设置

* feat(datetimepicker): datetimepicker适配skyline (#2675)

* chore: home add skyline entry

* feat(Input): 示例skyline适配

* feat(PulldownRefresh): support skyline for demo

* feat(Divider): 示例skyline适配完成

* feat(Collapse): 示例skyline适配

* feat(Drawer): 示例skyline适配

* feat(skyline): 确定一期发布组件列表

* feat(skyline): skyline模式暂不支持组件使用loading属性

* feat(component): 移除json中的addGlobalClass

* feat(component): skyline增加badge和tabbar

* feat(badge): 修改skyline示例

* chore: remove addGlobalClass in js file

* feat(Tag): 示例skyline适配

* chore: remove addGlobalClass in instantiationDecorator

* feat(Link): add link

* feat(Tag): 示例skyline适配

* chore(Steps): update demo

* fix(Fab): resolve computedSize function is not executed

* feat(Drawer): 示例skyline适配

* feat(backtop): 样式调整

* feat(component): 去掉skyline下重复的navbar

* feat(componnet): 去掉navbar的capsule属性

* fix(Radio): update demo for radio

* feat(Drawer): 示例footer调整

* chore: release empty and result and footer components

* feat: 涉及popup、overlay部分组件增加usingCustomNavbar适配

* feat(Steps): 去掉示例多余的navBar

* chore: use the content attribute, not the default slot in button template

* fix(custom-navbar): resolved title style error

* feat(Tag): skyline适配增加mask支持

* feat(Dialog): skyline适配速记padding属性

* feat(Stepper): skyline适配速记border属性

* feat(toast): 去掉js中的styleIsolation

* fix(ImageViewer): usingCustomNavbar value defaults to true

* fix(Collapse): 去掉!important

* fix(Divider): demo去掉多余写法

* fix(Drawer): padding简写拆开以适配skyline

* fix(Tag): 恢复之前内容dom

* chore: gen-demo-test去掉skyline目录

* feat(toast): 文档优化

* feat(textarea): 统一SkylineBehavior

* test: add behaviors module name

* test: update snap

* fix(Popup): update demo

* fix(Slider): 更新测试用例

* test(slider): value is over limited

* docs(Progress): update docs

* docs(Loading): update docs

* feat(Avatar): add skyline demo page

---------

Co-authored-by: anlyyao <anly_yaw@163.com>
Co-authored-by: jarmywang <awangjianjun9@gmail.com>
Co-authored-by: SporeG <sporeguo@gmail.com>
Co-authored-by: betavs <betavs@qq.com>
  • Loading branch information
5 people authored May 9, 2024
1 parent 9e3d00b commit d943b80
Show file tree
Hide file tree
Showing 410 changed files with 2,955 additions and 765 deletions.
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

0 comments on commit d943b80

Please sign in to comment.