Skip to content

Commit

Permalink
Merge pull request #8571 from element-plus/dev
Browse files Browse the repository at this point in the history
D2M
  • Loading branch information
iamkun committed Jul 1, 2022
2 parents 29180f7 + 3a436a0 commit b2823ba
Show file tree
Hide file tree
Showing 260 changed files with 3,599 additions and 3,862 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/pr-docs-build.yml
Expand Up @@ -2,6 +2,10 @@ name: PR Docs Build

on: pull_request

concurrency:
group: ${{ github.workflow }}-${{ github.event.number || github.sha }}
cancel-in-progress: true

jobs:
build:
name: Build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docs-deploy-manual.yml
Expand Up @@ -51,7 +51,7 @@ jobs:
DOC_ENV: production

- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4.3.3
uses: JamesIves/github-pages-deploy-action@v4.3.4
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
Expand All @@ -61,7 +61,7 @@ jobs:
commit-message: website deploy

- name: Deploy to vercel
uses: JamesIves/github-pages-deploy-action@v4.3.3
uses: JamesIves/github-pages-deploy-action@v4.3.4
with:
token: ${{ secrets.EP_BOT_TOKEN }}
branch: main
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docs-deploy.yml
Expand Up @@ -58,7 +58,7 @@ jobs:
DOC_ENV: production

- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4.3.3
uses: JamesIves/github-pages-deploy-action@v4.3.4
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
Expand All @@ -68,7 +68,7 @@ jobs:
commit-message: website deploy

- name: Deploy to vercel
uses: JamesIves/github-pages-deploy-action@v4.3.3
uses: JamesIves/github-pages-deploy-action@v4.3.4
with:
token: ${{ secrets.EP_BOT_TOKEN }}
branch: main
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/staging-docs.yml
Expand Up @@ -5,6 +5,10 @@ on:
branches:
- 'dev'

concurrency:
group: ${{ github.workflow }}-${{ github.event.number || github.sha }}
cancel-in-progress: true

jobs:
build:
name: Build
Expand Down Expand Up @@ -62,7 +66,7 @@ jobs:
NODE_OPTIONS: --max-old-space-size=4096

- name: Deploy staging website
uses: JamesIves/github-pages-deploy-action@v4.3.3
uses: JamesIves/github-pages-deploy-action@v4.3.4
with:
token: ${{ secrets.EP_BOT_TOKEN }}
branch: main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/test-unit.yml
Expand Up @@ -4,6 +4,10 @@ name: πŸ§ͺ Unit Test

on: pull_request

concurrency:
group: ${{ github.workflow }}-${{ github.event.number || github.sha }}
cancel-in-progress: true

jobs:
build:
name: Unit Test (${{ matrix.node-name }})
Expand Down
48 changes: 48 additions & 0 deletions CHANGELOG.en-US.md
@@ -1,5 +1,53 @@
## Changelog

### 2.2.7

_2022-07-01_

#### Features

- Components close all messages of the specified type (#8415 by @Lete114)
- Components [message-box] add autofocus attribute (#8445 by @YunYouJun)
- Components [autocomplete] expose blur event (#8364 by @tolking)

#### Bug fixes

- Components [tabs] fix change acitve cannot scroll in view (#8332 by @xiahouwei)
- Components [select] collapse-tags-tooltip drop first item (#8344 by @chenxch)
- Components [message-box] the focus error when used ElMessageBox (#8336 by @LinZhanMing)
- Components [autocomplete] the popup still appears after select (#8350 by @tolking)
- Components [tooltip] not disappear when <keep-alive> change (#8301 by @sunnyCoCosun)
- Components [space] missing empty string size (#8039 by @HeftyKoo)
- Components [message]: offset (#8379 by @sxzz)
- Components [select] multiple init height (#8423 by @chenxch)
- Theme-chalk [pagination] style if selected value is disabled (#8447 by @ryuhangyeong)
- Components [select] fix select dropdown width (#8396 by @Cheerwhy) (#8435)
- Components [select-v2] fix select-v2 dropdown width (#8442 by @Cheerwhy)
- Components [popover] fix dark mode background color (#8133 by @holazz)
- Components [color-picker] can't select predefine value (#8205 by @btea)
- Components [radio] Divide attrs into label and input (#8476 by @chenxch)
- Components [tabs] name is number 0 become a string (#8469 by @chenxch)
- Style(components): [transfer] modify import order (#8345 by @holazz)

#### Refactors

- Components [image-viewer] simplify emits type checking (#8329 by @ryuhangyeong)
- Components [dialog] using addUnit in the use-dialog (#8304 by @ryuhangyeong)
- Components [switch] deprecate value prop (#8335 by @sxzz)
- Components [upload] use JSX in Unit test (#8268 by @sxzz)
- Components [descriptions] use JSX in Unit test (#8351 by @ryuhangyeong)
- Components [message] fix typings and switch to script setup (#8378 by @sxzz)
- Components [switch] switch to script-setup syntax (#7792 by @chenxch)
- Components [space] refactor (#8386 by @holazz)
- Components [slider] use JSX in Unit test (#8225 by @holazz)
- Components [popover] switch to script-setup syntax (#8273 by @holazz)
- Add ts-nocheck and check all files (#8401 by @sxzz)
- Components [space] use JSX in Unit test (#8433 by @holazz)
- Components [popconfirm] changed button type (#8436 by @ryuhangyeong)
- Components [drawer] replace with addUnit (#8463 by @ryuhangyeong)
- Components [only-child] simplify conditions (#8480 by @ryuhangyeong)
- Components [transfer] switch to script-setup syntax (#8343 by @holazz)

### 2.2.6

_2022-06-17_
Expand Down
5 changes: 4 additions & 1 deletion docs/.vitepress/vitepress/styles/css-vars.scss
@@ -1,4 +1,5 @@
@use './mixins' as *;

// css variables
:root {
// layouts
Expand All @@ -14,6 +15,7 @@
--bg-brand-color: var(--el-color-primary-light-9);

--bg-color: var(--el-bg-color);
--bg-color-filter: #ffffffb3;
--bg-color-soft: #fafafa;
--bg-color-mute: #f2f2f2;
--border-color: var(--el-border-color);
Expand Down Expand Up @@ -53,7 +55,7 @@
--content-min-width: 16rem;
--content-max-width: 48rem;

--nav-z-index: 20;
--nav-z-index: 10;
--sub-nav-z-index: 10;
--sidebar-z-index: 40;
--overlay-z-index: 30;
Expand All @@ -77,4 +79,5 @@
.dark {
--bg-color-soft: #242424;
--bg-color-mute: #2c2c2c;
--bg-color-filter: #141414b3;
}
8 changes: 7 additions & 1 deletion docs/.vitepress/vitepress/styles/navbar.scss
Expand Up @@ -8,8 +8,11 @@
@include with-bg;
position: relative;
border-bottom: 1px solid var(--border-color);
padding: 0 12px 0 24px;
height: var(--header-height);
padding: 0 12px 0 24px;
backdrop-filter: saturate(50%) blur(8px);
background: var(--bg-color-filter);
-webkit-backdrop-filter: saturate(50%) blur(8px);
top: 0;

@include respond-to('md') {
Expand Down Expand Up @@ -54,6 +57,7 @@
left: 0;
position: relative;
z-index: var(--nav-z-index);

@include respond-to('lg') {
position: fixed;
width: 100%;
Expand All @@ -63,9 +67,11 @@
.menu + .appearance {
margin-left: 8px;
}

.menu + .social-links {
margin-left: 12px;
}

.appearance + .social-links {
margin-left: 12px;
}
2 changes: 1 addition & 1 deletion docs/components.d.ts
@@ -1,6 +1,6 @@
// generated by unplugin-vue-components
// We suggest you to commit this file into source control
// Read more: https://github.com/vuejs/vue-next/pull/3399
// Read more: https://github.com/vuejs/core/pull/3399
import '@vue/runtime-core'

declare module '@vue/runtime-core' {
Expand Down
20 changes: 8 additions & 12 deletions docs/en-US/component/autocomplete.md
Expand Up @@ -60,18 +60,13 @@ autocomplete/remote-search

## Autocomplete Slots

| Name | Description |
| ------- | ------------------------------- |
| prefix | content as Input prefix |
| suffix | content as Input suffix |
| prepend | content to prepend before Input |
| append | content to append after Input |

## Autocomplete Scoped Slot

| Name | Description |
| ---- | --------------------------------------------------------------------- |
| β€” | Custom content for input suggestions. The scope parameter is { item } |
| Name | Description |
| ------- | --------------------------------------------------------------------- |
| β€” | Custom content for input suggestions. The scope parameter is { item } |
| prefix | content as Input prefix |
| suffix | content as Input suffix |
| prepend | content to prepend before Input |
| append | content to append after Input |

## Autocomplete Events

Expand All @@ -85,3 +80,4 @@ autocomplete/remote-search
| Method | Description | Parameters |
| ------ | ----------------------- | ---------- |
| focus | focus the input element | β€” |
| blur | blur the input element | β€” |
32 changes: 16 additions & 16 deletions docs/en-US/component/dropdown.md
Expand Up @@ -79,22 +79,22 @@ dropdown/sizes

## Dropdown Attributes

| Attribute | Description | Type | Accepted Values | Default |
| -------------- | --------------------------------------------------------------------------------------------------------------------- | --------------- | ------------------------------------------------------------------ | ------------------------------------------------------- |
| type | menu button type, refer to `Button` Component, only works when `split-button` is true | string | β€” | β€” |
| size | menu size, also works on the split button | string | large / default / small | default |
| max-height | the max height of menu | string / number | β€” | β€” |
| split-button | whether a button group is displayed | boolean | β€” | false |
| disabled | Whether to disable | boolean | β€” | false |
| placement | placement of pop menu | string | top/top-start/top-end/bottom/bottom-start/bottom-end | bottom |
| trigger | how to trigger | string | hover/click/contextmenu | hover |
| hide-on-click | whether to hide menu after clicking menu-item | boolean | β€” | true |
| show-timeout | Delay time before show a dropdown (only works when trigger is `hover`) | number | β€” | 250 |
| hide-timeout | Delay time before hide a dropdown (only works when trigger is `hover`) | number | β€” | 150 |
| role | The ARIA role attribute for the dropdown menu. Depending on the use case, you may want to change this to 'navigation' | string | β€” | 'menu' |
| tabindex | [tabindex](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/tabindex) of Dropdown | number | β€” | 0 |
| popper-class | custom class name for Dropdown's dropdown | string | β€” | β€” |
| popper-options | [popper.js](https://popper.js.org/documentation.html) parameters | Object | refer to [popper.js](https://popper.js.org/documentation.html) doc | `{ boundariesElement: 'body', gpuAcceleration: false }` |
| Attribute | Description | Type | Accepted Values | Default |
| -------------- | --------------------------------------------------------------------------------------------------------------------- | --------------- | -------------------------------------------------------- | ------------------------------------------------------- |
| type | menu button type, refer to `Button` Component, only works when `split-button` is true | string | β€” | β€” |
| size | menu size, also works on the split button | string | large / default / small | default |
| max-height | the max height of menu | string / number | β€” | β€” |
| split-button | whether a button group is displayed | boolean | β€” | false |
| disabled | Whether to disable | boolean | β€” | false |
| placement | placement of pop menu | string | top/top-start/top-end/bottom/bottom-start/bottom-end | bottom |
| trigger | how to trigger | string | hover/click/contextmenu | hover |
| hide-on-click | whether to hide menu after clicking menu-item | boolean | β€” | true |
| show-timeout | Delay time before show a dropdown (only works when trigger is `hover`) | number | β€” | 250 |
| hide-timeout | Delay time before hide a dropdown (only works when trigger is `hover`) | number | β€” | 150 |
| role | The ARIA role attribute for the dropdown menu. Depending on the use case, you may want to change this to 'navigation' | string | β€” | 'menu' |
| tabindex | [tabindex](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/tabindex) of Dropdown | number | β€” | 0 |
| popper-class | custom class name for Dropdown's dropdown | string | β€” | β€” |
| popper-options | [popper.js](https://popper.js.org/docs/v2/) parameters | Object | refer to [popper.js](https://popper.js.org/docs/v2/) doc | `{ boundariesElement: 'body', gpuAcceleration: false }` |

## Dropdown Slots

Expand Down

0 comments on commit b2823ba

Please sign in to comment.