Skip to content

Commit

Permalink
Merge pull request #16211 from element-plus/dev
Browse files Browse the repository at this point in the history
D2M
  • Loading branch information
iamkun committed Mar 22, 2024
2 parents a954233 + 2ae51dd commit c41e9dd
Show file tree
Hide file tree
Showing 96 changed files with 1,005 additions and 140 deletions.
23 changes: 23 additions & 0 deletions CHANGELOG.en-US.md
@@ -1,5 +1,28 @@
## Changelog

### 2.6.2

_2024-03-22_

#### Features

- Components [breadcrumb] aria-label uses locale (#16089 by @btea)

#### Bug fixes

- Components [anchor] `type` default value typo (#16102 by @cullyfung)
- Components [tree] remove duplicate type declaration (#16106 by @inside5545)
- Components [cascader] form nested causing clear icon invalid (#16068 by @btea)
- Components [anchor,tour] the `type` type typo (#16119 by @warmthsea)
- Components [select] stop the click event propagation of `header/footer` slot (#16151 by @warmthsea)
- Components [tree] the value of append can be zero (#16130 by @btea)
- Components [select & select-v2] click toggleMenu add prevent (#16149 by @kooriookami)
- Theme-chalk replace `gulp-clean-css` with `cssnano` (#16056 by @zhixiaotong)
- Components [tag] remove duplicate style (#16174 by @btea)
- Hooks SSR hydration error caused by z-index (#16175 by @tolking)
- Components [cascader-panel] get the reactive proxy of `node` to trigger side effects (#16198 by @makedopamine)
- Style(components): [anchor] marker transition expression incorrect (#16100 by @zeyongTsai)

### 2.6.1

_2024-03-08_
Expand Down
13 changes: 9 additions & 4 deletions docs/.vitepress/vitepress/components/globals/overview.vue
Expand Up @@ -84,9 +84,14 @@ const filteredSidebars = computed(() =>
.slice(1)
.map((group) => ({
...group,
children: group.children.filter((item) =>
item.text.toLowerCase().includes(query.value.trim().toLowerCase())
),
children: group.children.filter((item) => {
const value = query.value.trim().toLowerCase()
return (
group.text.toLowerCase().includes(value) ||
item.text.toLowerCase().includes(value) ||
item.promotion?.includes(value)
)
}),
}))
.filter((group) => group.children.length)
)
Expand Down Expand Up @@ -133,7 +138,7 @@ const getIcon = (link: string) => {
grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
gap: 16px;
::v-deep(.el-card) {
:deep(.el-card) {
cursor: pointer;
.el-card__header {
Expand Down
2 changes: 1 addition & 1 deletion docs/en-US/component/anchor.md
Expand Up @@ -84,7 +84,7 @@ anchor/affix
| bound | the offset of the element starting to trigger the anchor. | `number` | 15 |
| duration | set the scroll duration of the container, in milliseconds. | `number` | 300 |
| marker | whether to show the marker. | ^[boolean] | true |
| type | set Anchor type. | ^[enum]`'defalut' \| 'underline'` | `default` |
| type | set Anchor type. | ^[enum]`'default' \| 'underline'` | `default` |
| direction | Set Anchor direction. | ^[enum]`'vertical' \| 'horizontal'` | `vertical` |

### Anchor Events
Expand Down
2 changes: 1 addition & 1 deletion docs/en-US/component/checkbox.md
Expand Up @@ -132,7 +132,7 @@ checkbox/with-border
| max | maximum number of checkbox checked | ^[number] ||
| label | label for screen reader | ^[string] ||
| text-color | font color when button is active | ^[string] | #ffffff |
| fill | border and background color when button is active | ^[string] | #409EFF |
| fill | border and background color when button is active | ^[string] | #409eff |
| tag | element tag of the checkbox group | ^[string] | div |
| validate-event | whether to trigger form validation | ^[boolean] | true |

Expand Down
2 changes: 1 addition & 1 deletion docs/en-US/component/drawer.md
Expand Up @@ -98,7 +98,7 @@ Drawer provides an API called `destroyOnClose`, which is a flag variable that in
| custom-class ^(deprecated) | Extra class names for Drawer | ^[string] ||
| destroy-on-close | Indicates whether children should be destroyed after Drawer closed | ^[boolean] | false |
| modal | Should show shadowing layer | ^[boolean] | true |
| direction | Drawer's opening direction | ^[enum]`'rtl' \| 'ltr' \| 'ttb' \| 'btt' \| 'rtl'` | rtl |
| direction | Drawer's opening direction | ^[enum]`'rtl' \| 'ltr' \| 'ttb' \| 'btt'` | rtl |
| show-close | Should show close button at the top right of Drawer | ^[boolean] | true |
| size | Drawer's size, if Drawer is horizontal mode, it effects the width property, otherwise it effects the height property, when size is `number` type, it describes the size by unit of pixels; when size is `string` type, it should be used with `x%` notation, other wise it will be interpreted to pixel unit | ^[number] / ^[string] | 30% |
| title | Drawer's title, can also be set by named slot, detailed descriptions can be found in the slot form | ^[string] ||
Expand Down
4 changes: 2 additions & 2 deletions docs/en-US/component/icon.md
Expand Up @@ -129,7 +129,7 @@ import { Edit, Share, Delete, Search, Loading } from '@element-plus/icons-vue'
<el-icon :size="20">
<Edit />
</el-icon>
<el-icon color="#409EFC" class="no-inherit">
<el-icon color="#409efc" class="no-inherit">
<Share />
</el-icon>
<el-icon>
Expand All @@ -156,7 +156,7 @@ import { Edit, Share, Delete, Search, Loading } from '@element-plus/icons-vue'
<ElIcon :size="20">
<Edit />
</ElIcon>
<ElIcon color="#409EFC" class="no-inherit">
<ElIcon color="#409efc" class="no-inherit">
<Share />
</ElIcon>
<ElIcon>
Expand Down
2 changes: 1 addition & 1 deletion docs/en-US/component/menu.md
Expand Up @@ -72,7 +72,7 @@ menu/popper-offset
| popper-offset ^(2.4.4) | offset of the popper (effective for all submenus) | number || 6 |
| background-color | background color of Menu (hex format) (deprecated, use `--bg-color` instead) | string || #ffffff |
| text-color | text color of Menu (hex format) (deprecated, use `--text-color` instead) | string || #303133 |
| active-text-color | text color of currently active menu item (hex format) (deprecated, use `--active-color` instead) | string || #409EFF |
| active-text-color | text color of currently active menu item (hex format) (deprecated, use `--active-color` instead) | string || #409eff |
| default-active | index of active menu on page load | string |||
| default-openeds | array that contains indexes of currently active sub-menus | Array |||
| unique-opened | whether only one sub-menu can be active | boolean || false |
Expand Down
2 changes: 1 addition & 1 deletion docs/en-US/component/message-box.md
Expand Up @@ -187,7 +187,7 @@ The corresponding methods are: `ElMessageBox`, `ElMessageBox.alert`, `ElMessageB
| input-type | type of input | ^[string] | text |
| input-value | initial value of input | ^[string] | null |
| input-pattern | regexp for the input | ^[regexp] | null |
| input-validator | validation function for the input. Should returns a boolean or string. If a string is returned, it will be assigned to inputErrorMessage | ^[Function]`(value: string) => boolea \| string` | null |
| input-validator | validation function for the input. Should returns a boolean or string. If a string is returned, it will be assigned to inputErrorMessage | ^[Function]`(value: string) => boolean \| string` | null |
| input-error-message | error message when validation fails | ^[string] | Illegal input |
| center | whether to align the content in center | ^[boolean] | false |
| draggable | whether MessageBox is draggable | ^[boolean] | false |
Expand Down
2 changes: 1 addition & 1 deletion docs/en-US/component/radio.md
Expand Up @@ -99,7 +99,7 @@ radio/with-borders
| size | the size of radio buttons or bordered radios | ^[string] | default |
| disabled | whether the nesting radios are disabled | ^[boolean] | false |
| text-color | font color when button is active | ^[string] | #ffffff |
| fill | border and background color when button is active | ^[string] | #409EFF |
| fill | border and background color when button is active | ^[string] | #409eff |
| validate-event | whether to trigger form validation | ^[boolean] | true |
| label ^(a11y) | same as `aria-label` in RadioGroup | ^[string] ||
| name | native `name` attribute | ^[string] ||
Expand Down
6 changes: 3 additions & 3 deletions docs/en-US/component/rate.md
Expand Up @@ -96,9 +96,9 @@ Use `css/scss` language to change the global or local color. We set some global
| allow-half | whether picking half start is allowed | ^[boolean] | false |
| low-threshold | threshold value between low and medium level. The value itself will be included in low level | ^[number] | 2 |
| high-threshold | threshold value between medium and high level. The value itself will be included in high level | ^[number] | 4 |
| colors | colors for icons. If array, it should have 3 elements, each of which corresponds with a score level, else if object, the key should be threshold value between two levels, and the value should be corresponding color | ^[object]`string[] \| Record<number, string>` | ['#F7BA2A', '#F7BA2A', '#F7BA2A'] |
| void-color | color of unselected icons | ^[string] | #C6D1DE |
| disabled-void-color | color of unselected read-only icons | ^[string] | #EFF2F7 |
| colors | colors for icons. If array, it should have 3 elements, each of which corresponds with a score level, else if object, the key should be threshold value between two levels, and the value should be corresponding color | ^[object]`string[] \| Record<number, string>` | ['#f7ba2a', '#f7ba2a', '#f7ba2a'] |
| void-color | color of unselected icons | ^[string] | #c6d1de |
| disabled-void-color | color of unselected read-only icons | ^[string] | #eff2f7 |
| icons | icon components. If array, it should have 3 elements, each of which corresponds with a score level, else if object, the key should be threshold value between two levels, and the value should be corresponding icon component | ^[object]`string[] \| Component[] \| Record<number, string \| Component>` | [StarFilled, StarFilled, StarFilled] |
| void-icon | component of unselected icons | ^[string] / ^[Component] | Star |
| disabled-void-icon | component of unselected read-only icons | ^[string] / ^[Component] | StarFilled |
Expand Down

0 comments on commit c41e9dd

Please sign in to comment.