Skip to content

Commit

Permalink
feat: sync release-3.14.0 to dev (opentiny#1515)
Browse files Browse the repository at this point in the history
* feat(theme): update theme index

* docs: add docs unplugin and changelog (opentiny#1476)

* docs: add v3.14.0 changelog

* chore: update @opentiny/unplugin-tiny-vue version

* docs: add auto import docs

* fix(vue): add new dependencies (opentiny#1482)

* fix(vue): add new dependencies

* fix(vue): add new dependencies

* docs(grid): update grid apis (opentiny#1480)

* Release 3.14.0 (opentiny#1494)

* fix(docs): fix MindMap's menu text

* fix(docs): update new components menu

* feat: switch browser address, error triggered close event issue when Modal is closed (opentiny#1493)

---------

Co-authored-by: Kagol <[email protected]>
Co-authored-by: gimmyhehe <[email protected]>
Co-authored-by: 申君健 <[email protected]>
Co-authored-by: James <[email protected]>
  • Loading branch information
5 people authored Mar 30, 2024
1 parent e419936 commit 02f9160
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 21 deletions.
27 changes: 7 additions & 20 deletions examples/sites/demos/pc/menus.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const cmpMenus = [
{ 'nameCn': '抽屉', 'name': 'Drawer', 'key': 'drawer' },
{ 'nameCn': '过滤器面板', 'name': 'FilterPanel', 'key': 'filter-panel' },
{ 'nameCn': '面板分割', 'name': 'Split', 'key': 'split' },
{ 'nameCn': '卡片', 'name': 'Card', 'key': 'card' }
{ 'nameCn': '卡片', 'name': 'Card', 'key': 'card', 'mark': { 'text': 'New' } }
]
},
{
Expand Down Expand Up @@ -211,7 +211,7 @@ export const cmpMenus = [
{ 'nameCn': '树形控件', 'name': 'Tree', 'key': 'tree' },
{ 'nameCn': '穿梭框', 'name': 'Transfer', 'key': 'transfer' },
{ 'nameCn': '无限滚动', 'name': 'InfiniteScroll', 'key': 'infinite-scroll' },
{ 'nameCn': '骨架屏', 'name': 'Skeleton', 'key': 'skeleton' },
{ 'nameCn': '骨架屏', 'name': 'Skeleton', 'key': 'skeleton', 'mark': { 'text': 'New' } },
{ 'nameCn': '统计', 'name': 'Statistic', 'key': 'statistic' }
]
},
Expand Down Expand Up @@ -277,26 +277,13 @@ export const cmpMenus = [
{ 'nameCn': '全屏显示', 'name': 'Fullscreen', 'key': 'fullscreen' },
{ 'nameCn': '全局设置', 'name': 'ConfigProvider', 'key': 'config-provider' },
{ 'nameCn': '分割线', 'name': 'Divider', 'key': 'divider' },
{
'nameCn': '二维码',
'name': 'QrCode',
'key': 'qr-code',
'mark': {
'text': 'New'
}
},
{
'nameCn': '水印',
'name': 'Watermark',
'key': 'watermark',
'mark': {
'text': 'New'
}
},
{ 'nameCn': '二维码', 'name': 'QrCode', 'key': 'qr-code' },
{ 'nameCn': '水印', 'name': 'Watermark', 'key': 'watermark' },
{
'nameCn': '脑图',
'name': 'mind-map',
'key': 'mind-map'
'name': 'MindMap',
'key': 'mind-map',
'mark': { 'text': 'New' }
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion packages/renderless/src/modal/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ export const handleGlobalKeydownEvent =
}

export const handleHashChange = (api: IModalApi) => (): void => {
api.close('close')
api.close('hide')
}

export const getBox =
Expand Down

0 comments on commit 02f9160

Please sign in to comment.