Skip to content

Commit

Permalink
Merge branch 'dev' into release-3.17.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zzcr authored Jul 31, 2024
2 parents 6f186c2 + 3aee085 commit 31f71c6
Show file tree
Hide file tree
Showing 858 changed files with 13,998 additions and 11,722 deletions.
15 changes: 13 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ The commit message should be in the form of a `type(scope): description of the m
3. Example title:

- Supplement alert component document: `docs(alert): [alert] xxxxxxxxxxxxxxx`, `docs(site): [alert] xxxxxxxxxxxxxxx`
- Supplement alet component test case: `test(alert): [alert] xxxxxxxxxxxxxx`
- Fixed bug in alet component @opentiny/vue-renderless: `fix(vue-renderless/alert): [alert] xxxxxxxxxxxxxx`
- Supplement alert component test case: `test(alert): [alert] xxxxxxxxxxxxxx`
- Fixed bug in alert component @opentiny/vue-renderless: `fix(vue-renderless/alert): [alert] xxxxxxxxxxxxxx`

#### Pull Request Description

Expand Down Expand Up @@ -135,3 +135,14 @@ If you have submitted Issue or PR to OpenTiny, you can comment on Issue or Pull
```

For detailed rules, please refer to [https://allcontributors.org/docs/en/bot/usage](https://allcontributors.org/docs/en/bot/usage)

## Contributors

We sincerely thank all the contributors who have participated in the TinyVue project!
In recognition of the contributions of our contributors, we have added a 'Contributors' section at the bottom of each component documentation, displaying the GitHub information of each contributor, including their profile picture, username, and GitHub personal page.
Due to the current manpower constraints, only information of internal members (or former members) of the TinyVue team is currently being recorded. Open source contributors are welcome to supplement their own information.
The file that record contributors info is:

```
/examples/sites/src/data/contributorMap.js
```
14 changes: 12 additions & 2 deletions CONTRIBUTING.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ commit 信息要以 `type(scope): 描述信息` 的形式填写,例如 `fix(vu
3. 标题示例:

- 补充 alert 组件文档: `docs(alert): [alert] xxxxxxxxxxxxxxx`, `docs(site): [alert] xxxxxxxxxxxxxxx`
- 补充 alet 组件测试用例: `test(alert): [alert] xxxxxxxxxxxxxx`
- 修复 alet 组件 @opentiny/vue-renderless 下的缺陷: `fix(vue-renderless/alert): [alert] xxxxxxxxxxxxxx`
- 补充 alert 组件测试用例: `test(alert): [alert] xxxxxxxxxxxxxx`
- 修复 alert 组件 @opentiny/vue-renderless 下的缺陷: `fix(vue-renderless/alert): [alert] xxxxxxxxxxxxxx`

#### Pull Request 的描述

Expand Down Expand Up @@ -135,3 +135,13 @@ pnpm dev:vue2
```

详细规则可以参考:[https://allcontributors.org/docs/en/bot/usage](https://allcontributors.org/docs/en/bot/usage)

## 贡献者

我们诚挚感谢每位参与过TinyVue项目的贡献者们!
为彰显贡献者们的付出,我们在每个组件文档底部增加“贡献者”模块,陈列各位贡献者的github信息,包括头像、昵称、github个人主页等。由于当前团队人力较为紧张,目前只录入TinyVue团队内部成员(或前组员)信息,欢迎各位开源贡献者自行补充信息。
贡献者信息记录的文件路径为:

```
/examples/sites/src/data/contributorMap.js
```
2 changes: 0 additions & 2 deletions examples/docs/newsrc/mobile-first.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@
<div v-html="state.currDemo?.desc['zh-CN']"></div>
</div>
<!-- 预览 -->
<!-- modeState.demoId === 'preview-in-dialog' 修复preview-in-dialog demo弹窗内容被遮罩层遮挡 -->
<div
:id="state.currDemo?.demoId"
class="rel px20 minh200"
:style="{ transform: modeState.demoId === 'preview-in-dialog' ? '' : 'translateX(0)' }"
>
<config-provider :design="design">
<component :is="state.comp"></component>
Expand Down
4 changes: 2 additions & 2 deletions examples/react-site/src/tools/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ const $split = (target, splitor = '/', pos = 0) => target.split(splitor).slice(p

/**
* 延时函数
* @example $delay(300).then(()=>{ })
* @example $delay(300).then(() =>{ })
*/
const $delay = time => new Promise(resolve => setTimeout(resolve, time));

/**
* 空闲函数
* @example $idle().then(()=>{ })
* @example $idle().then(() =>{ })
*/
const $idle = () => new Promise(resolve => (window.requestIdleCallback || window.requestAnimationFrame)(resolve));

Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/apis/action-sheet.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export default {
'en-US': 'Panel Title'
},
mode: ['mobile-first'],
mfDemo: 'actoin'
mfDemo: 'action'
},
{
name: 'type',
Expand Down
5 changes: 3 additions & 2 deletions examples/sites/demos/apis/autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default {
defaultValue: '300',
desc: {
'zh-CN': '获取输入建议的去抖延时',
'en-US': 'Obtain the recommended input dejitter delay.'
'en-US': 'Obtain the recommended input debounce delay'
},
mode: ['pc'],
pcDemo: 'debounce'
Expand Down Expand Up @@ -90,7 +90,7 @@ export default {
defaultValue: '',
desc: {
'zh-CN': '等价于原生 input aria-label 属性',
'en-US': 'Equiphorus input aria-label attribute'
'en-US': 'Equals input aria-label attribute'
},
mode: ['pc'],
pcDemo: ''
Expand Down Expand Up @@ -319,6 +319,7 @@ export default {
{
name: 'IAutocompleteFetchSuggestions',
type: 'type',
depTypes: ['IAutocompleteSuggestionItem'],
code: `type IAutocompleteFetchSuggestions = (queryString: string, callback: (suggestions: IAutocompleteSuggestionItem[]) => void) => void`
}
]
Expand Down
4 changes: 2 additions & 2 deletions examples/sites/demos/apis/base-select.js
Original file line number Diff line number Diff line change
Expand Up @@ -880,8 +880,8 @@ interface ICacheOp {
highlightClass?: string // 个性化高亮 class 名称,默认:memorize-highlight
highlightNum?: number // 高亮个性化的条数,默认:Infinity
cacheNum?: number // 存储个性化的条数,默认:Infinity
serialize?: ()=> string // 本地存储序列化方法,默认:JSON.stringify
deserialize?: ()=> ICacheItem[] // 本地存储序反列化方法,默认:JSON.parse
serialize?: () => string // 本地存储序列化方法,默认:JSON.stringify
deserialize?: () => ICacheItem[] // 本地存储序反列化方法,默认:JSON.parse
}
`
},
Expand Down
2 changes: 2 additions & 0 deletions examples/sites/demos/apis/breadcrumb.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ interface IOptionsItemTo {
{
name: 'IOptionsItem',
type: 'interface',
depTypes: ['IOptionsItemTo'],
code: `
interface IOptionsItem {
label?: string
Expand All @@ -181,6 +182,7 @@ interface IOptionsItem {
{
name: 'ISelectValue',
type: 'interface',
depTypes: ['IOptionsItem', 'IOptionsItemTo'],
code: `
interface ISelectValue {
event: Event
Expand Down
3 changes: 3 additions & 0 deletions examples/sites/demos/apis/button-group.js
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,9 @@ export default {
'zh-CN': '自定义数据为空时展示内容',
'en-US': 'customize content when data is empty'
},
metaData: {
new: '3.17.0'
},
mode: ['pc'],
pcDemo: 'slot-empty'
}
Expand Down
20 changes: 11 additions & 9 deletions examples/sites/demos/apis/calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export default {
props: [
{
name: 'events',
typeAnchorName: 'eventLists',
type: 'eventLists[]',
typeAnchorName: 'ICalendarEvent',
type: 'ICalendarEvent[]',
defaultValue: '',
desc: {
'zh-CN': '事件列表',
Expand Down Expand Up @@ -90,15 +90,17 @@ export default {
],
types: [
{
name: 'eventLists',
name: 'ICalendarEvent',
type: 'interface',
code: `
interface eventLists [{
time: 1534297845236, // 指定需要展示事件的日期
title: '消息', // 指定事件标题
content: '这是一条消息', // 指定事件的具体内容
type: 'info' // 事件主题类型,包括 warning、error、info、success。
}]`
type ICalendarEventType = 'info' | 'warning' | 'error' | 'info' | 'success'
interface ICalendarEvent {
time: number, // 指定需要展示事件的日期的时间戳
title: string, // 指定事件标题
content: string, // 指定事件的具体内容
type: ICalendarEventType // 事件主题类型
}`
}
]
}
5 changes: 5 additions & 0 deletions examples/sites/demos/apis/cascader-panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ export default {
{
name: 'ICascaderPanelNodePropValue',
type: 'type',
depTypes: ['ICascaderPanelNodeValue'],
code: `
type ICascaderPanelNodePropValue =
| ICascaderPanelNodeValue
Expand All @@ -261,6 +262,7 @@ type ICascaderPanelNodePropValue =
{
name: 'ICascaderPanelData',
type: 'type',
depTypes: ['ICascaderPanelNodeValue'],
code: `
type ICascaderPanelData = {
value?: ICascaderPanelNodeValue
Expand All @@ -274,6 +276,7 @@ type ICascaderPanelData = {
{
name: 'ICascaderPanelConfig',
type: 'interface',
depTypes: ['ICascaderPanelNode', 'ICascaderPanelData'],
code: `
interface ICascaderPanelConfig {
emitPath: boolean
Expand All @@ -296,6 +299,7 @@ interface ICascaderPanelConfig {
{
name: 'ICascaderPanelNode',
type: 'type',
depTypes: ['ICascaderPanelData', 'ICascaderPanelConfig', 'ICascaderPanelNodeValue'],
code: `
type ICascaderPanelNode = {
parent: ICascaderPanelNode | null
Expand All @@ -320,6 +324,7 @@ type ICascaderPanelNode = {
{
name: 'ICascaderPanelLazyLoad',
type: 'type',
depTypes: ['ICascaderPanelNode', 'ICascaderPanelData'],
code: `
type ICascaderPanelLazyLoad = (node: ICascaderPanelNode, resolve: (dataList: ICascaderPanelData[]) => void) => void
`
Expand Down
7 changes: 6 additions & 1 deletion examples/sites/demos/apis/cascader.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export default {
defaultValue: '300',
desc: {
'zh-CN': '搜索关键词输入的去抖延迟,单位毫秒',
'en-US': 'Dejitter delay of the search keyword, in milliseconds.'
'en-US': 'Debounce delay of the search keyword, in milliseconds.'
},
mode: ['pc'],
pcDemo: 'filterable'
Expand Down Expand Up @@ -536,6 +536,7 @@ export default {
{
name: 'ICascaderPanelNodePropValue',
type: 'type',
depTypes: ['ICascaderPanelNodeValue'],
code: `
type ICascaderPanelNodePropValue =
| ICascaderPanelNodeValue
Expand All @@ -545,6 +546,7 @@ type ICascaderPanelNodePropValue =
{
name: 'ICascaderPanelData',
type: 'type',
depTypes: ['ICascaderPanelNodeValue'],
code: `
type ICascaderPanelData = {
value?: ICascaderPanelNodeValue
Expand All @@ -558,6 +560,7 @@ type ICascaderPanelData = {
{
name: 'ICascaderPanelConfig',
type: 'interface',
depTypes: ['ICascaderPanelNode', 'ICascaderPanelData'],
code: `
interface ICascaderPanelConfig {
emitPath: boolean
Expand All @@ -580,6 +583,7 @@ interface ICascaderPanelConfig {
{
name: 'ICascaderPanelNode',
type: 'type',
depTypes: ['ICascaderPanelNode', 'ICascaderPanelData', 'ICascaderPanelConfig', 'ICascaderPanelNodeValue'],
code: `
type ICascaderPanelNode = {
parent: ICascaderPanelNode | null
Expand All @@ -604,6 +608,7 @@ type ICascaderPanelNode = {
{
name: 'ICascaderPanelLazyLoad',
type: 'type',
depTypes: ['ICascaderPanelNode', 'ICascaderPanelData'],
code: `
type ICascaderPanelLazyLoad = (node: ICascaderPanelNode, resolve: (dataList: ICascaderPanelData[]) => void) => void
`
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/apis/color-picker.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default {
events: [
{
name: 'cancel',
type: '()=>void',
type: '() =>void',
defaultValue: '',
desc: {
'zh-CN': '按下取消或点击外部的时触发该事件',
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/apis/color-select-panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default {
events: [
{
name: 'cancel',
type: '()=>void',
type: '() =>void',
defaultValue: '',
desc: {
'zh-CN': '按下取消或点击外部的时触发该事件',
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/apis/dialog-box.js
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ export default {
{
name: 'visible',
type: 'boolean',
defaultValue: 'true',
defaultValue: 'false',
desc: {
'zh-CN': '控制弹出框显示与关闭',
'en-US': 'Control pop-up display and closing'
Expand Down
1 change: 1 addition & 0 deletions examples/sites/demos/apis/dialog-select.js
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,7 @@ interface IDialogOption {
{
name: 'IGridOption',
type: 'interface',
depTypes: ['IColumnConfig'],
code: `
interface IGridOption {
// 表格列配置
Expand Down
3 changes: 3 additions & 0 deletions examples/sites/demos/apis/directives.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {
apis: []
}
2 changes: 2 additions & 0 deletions examples/sites/demos/apis/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ export default {
{
name: 'IMenuOption',
type: 'interface',
depTypes: ['IItemData'],
code: `
interface IMenuOption {
options: IItemData[]
Expand All @@ -498,6 +499,7 @@ interface IMenuOption {
{
name: 'IItemClickParam',
type: 'interface',
depTypes: ['IItemData'],
code: `
interface IItemClickParam {
itemData: IItemData
Expand Down
10 changes: 5 additions & 5 deletions examples/sites/demos/apis/file-upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export default {
type: 'Object',
defaultValue: '',
desc: {
'zh-CN': '配置 EDM 下载功能所需的参数,例如:edm:{download:{token:()=>{}}},token为鉴权token',
'zh-CN': '配置 EDM 下载功能所需的参数,例如:edm:{download:{token:() =>{}}},token为鉴权token',
'en-US': ''
},
mode: ['mobile-first'],
Expand Down Expand Up @@ -369,7 +369,7 @@ export default {
defaultValue: '',
desc: {
'zh-CN':
'配置为 true,启用 EDM 上传文件夹的功能,最多只能上传 5 层;{edm:upload:{isFolder:true,token:()=>{}}}',
'配置为 true,启用 EDM 上传文件夹的功能,最多只能上传 5 层;{edm:upload:{isFolder:true,token:() =>{}}}',
'en-US': ''
},
mode: ['mobile-first'],
Expand Down Expand Up @@ -524,7 +524,7 @@ export default {
type: 'Function',
defaultValue: '',
desc: {
'zh-CN': '配置 EDM 批量打包下载的 token;配置结构为 edm:{download:packageToken:()=>{}},返回一个 Promise',
'zh-CN': '配置 EDM 批量打包下载的 token;配置结构为 edm:{download:packageToken:() =>{}},返回一个 Promise',
'en-US': ''
},
mode: ['mobile-first'],
Expand Down Expand Up @@ -559,7 +559,7 @@ export default {
defaultValue: '',
desc: {
'zh-CN':
"配置 EDM 预览功能所需的参数,例如:edm:{preview:{plugin:util.default,previewUrl:./_index.html?appid=应用Id,packageName: 'jslib',token:()=>{}}}",
"配置 EDM 预览功能所需的参数,例如:edm:{preview:{plugin:util.default,previewUrl:./_index.html?appid=应用Id,packageName: 'jslib',token:() =>{}}}",
'en-US': ''
},
mode: ['mobile-first'],
Expand Down Expand Up @@ -718,7 +718,7 @@ export default {
type: 'Object',
defaultValue: '',
desc: {
'zh-CN': '配置 EDM 上传功能所需的参数,例如:edm:{upload:{token:()=>{}}}',
'zh-CN': '配置 EDM 上传功能所需的参数,例如:edm:{upload:{token:() =>{}}}',
'en-US': ''
},
mode: ['mobile-first'],
Expand Down
Loading

0 comments on commit 31f71c6

Please sign in to comment.