Skip to content

Commit

Permalink
Merge pull request #11805 from element-plus/dev
Browse files Browse the repository at this point in the history
D2M
  • Loading branch information
iamkun committed Mar 3, 2023
2 parents 7928954 + 19b2f76 commit cada1a0
Show file tree
Hide file tree
Showing 195 changed files with 1,107 additions and 812 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ We are excited that you are interested in contributing to Element Plus. Before s

- Before submitting an issue, please check if similar problems have already been issued.

- Please specify which version of `Element Plus` and `Vue` you are using, and provide OS and browser information. [JSFiddle](https://jsfiddle.net/) is recommended to build a live demo so that your issue can be reproduced clearly.
- Please specify which version of `Element Plus` and `Vue` you are using, and provide OS and browser information. [Playground](https://element-plus.run/) is recommended to build a live demo so that your issue can be reproduced clearly.

## Pull Request Guidelines

Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.es.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Estamos orgullosos de que usted esta interesado en contribuir al proyecto `Eleme

- Antes de someter un informe sobre algún problema, sírvase de revisar sí ya hubo un informe.

- Por favor especifique que versión de `Element Plus` y `Vue` que esta utilizando, y que versión de sistema operativo y que versión de navegador web que está utilizando. [JSFiddle](https://jsfiddle.net/) esta recomendado para crear un entorno para reproducir el problema claramente.
- Por favor especifique que versión de `Element Plus` y `Vue` que esta utilizando, y que versión de sistema operativo y que versión de navegador web que está utilizando. [Playground](https://element-plus.run/) esta recomendado para crear un entorno para reproducir el problema claramente.

## Guías para un “Pull Request (PR)”

Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.fr-FR.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Nous sommes ravis que vous souhaitiez contribuer à Element Plus. Avant de soume

- Avant de soumettre une issue, veuillez vérifier si des problèmes similaires n'ont pas déjà été signalés.

- Veuillez spécifier la version de `Element Plus` et `Vue` que vous utilisez, et fournir des informations sur le système d'exploitation et le navigateur. [JSFiddle](https://jsfiddle.net/) est recommandé afin de construire une démo pour que votre problème puisse être reproduit clairement.
- Veuillez spécifier la version de `Element Plus` et `Vue` que vous utilisez, et fournir des informations sur le système d'exploitation et le navigateur. [Playground](https://element-plus.run/) est recommandé afin de construire une démo pour que votre problème puisse être reproduit clairement.

## Concernant les pull requests

Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Element Plus 的成长离不开大家的支持,如果你愿意为 Element Plus

- 在提交 issue 之前,请搜索相关内容是否已被提出。

- 请说明 Element Plus 和 Vue 的版本号,并提供操作系统和浏览器信息。推荐使用 [JSFiddle](https://jsfiddle.net/) 生成在线 demo,这能够更直观地重现问题。
- 请说明 Element Plus 和 Vue 的版本号,并提供操作系统和浏览器信息。推荐使用 [Playground](https://element-plus.run/) 生成在线 demo,这能够更直观地重现问题。

## Pull Request 规范

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/issue-labeled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
actions: 'create-comment'
issue-number: ${{ github.event.issue.number }}
body: |
Hello @${{ github.event.issue.user.login }}. Please provide an online reproduction demo by clicking this [link](https://codepen.io/iamkun/pen/YzWMaVr) or a minimal GitHub repository. Issues marked with `need reproduction` will be closed if they have no activity within 3 days.
Hello @${{ github.event.issue.user.login }}. Please provide an online reproduction demo by clicking this [link](https://element-plus.run) or a minimal GitHub repository. Issues marked with `need reproduction` will be closed if they have no activity within 3 days.
你好 @${{ github.event.issue.user.login }}, 我们需要你提供一个在线的重现实例以便于我们帮你排查问题。可以通过点击 [此处](https://codepen.io/iamkun/pen/YzWMaVr) 创建或者提供一个最小化的 GitHub 仓库。3 天内未跟进此 issue 将会被自动关闭。
你好 @${{ github.event.issue.user.login }}, 我们需要你提供一个在线的重现实例以便于我们帮你排查问题。可以通过点击 [此处](https://element-plus.run) 创建或者提供一个最小化的 GitHub 仓库。3 天内未跟进此 issue 将会被自动关闭。
- name: invalid
if: github.event.label.name == 'invalid'
Expand Down
37 changes: 37 additions & 0 deletions CHANGELOG.en-US.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,41 @@
## Changelog

### 2.2.33

_2023-03-03_

#### Features

- Components [tree-v2] add item-size attribute (#11522 by @btea)

#### Bug fixes

- Theme-chalk [upload] wrong hover style when disabled (#11635 by @wonderl17)
- Components [input-number] prevent input wheel events (#11677 by @Mario34)
- Components [tooltip] display tooltip correctly (#11643 by @acyza)
- Components [autocomplete] clearable and disabled props not working (#11714 by @richex-cn)
- Docs [search] fix navigate error when enter pressed (#11718 by @wonderl17)
- Components adjust menu close api (#11682 by @chenxch)
- Components [select] fix the hoverIndex display error (#11297 by @btea)
- Components [tabs] add deep attribute to watch (#11724 by @tolking)
- Components [select] add popper-options prop (#11734 by @ryuhangyeong)
- Components [select] support custom height (#10840 by @MrWeilian) (#10847)
- Components [tabs] tab-bar need to adapt to tabs width change (#11731 by @godxiaoji)
- Components [autocomplete] the blur event is not triggered (#10091 by @tolking)
- Components circular referencing issue (#11777 by @jw-foss)
- Theme-chalk [tab] correct padding of card item on hover (#11283 by @makedopamine)

#### Refactors

- Components [slider] remove useless code (#11681 by @Geekhyt)
- Tokens - [form] (#11743 by @jw-foss)
- Components [config-provider] (#11749 by @jw-foss)
- Tooltip replace any to OnlyChildExpose (#11660 by @Lck6de1p)
- Project removing packages/tokens (#11769 by @jw-foss)
- Components [color-picker] alpha-slider (#10332 by @jw-foss)
- Components [steps] (#10427 by @Simon-He95)
- Chore(components): [table] fix table config typo (#11700 by @wonderl17)
- Style(components): [breadcrumb] item use inline-flex (#11683 by @chenxch)

### 2.2.32

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ pnpm build
If you would like to compile the website code locally:

```shell
DOC_ENV=production yarn docs:build
pnpm docs:build
```

## Pulling request
Expand Down
8 changes: 8 additions & 0 deletions docs/.vitepress/config/sponsors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@ export const leftCustomImgSponsors = [
className: 'jnpf',
banner_img: '/images/jnpfsoft.jpg',
},
{
name: 'JeePlus',
img: '/images/sponsors/jeeplus.png',
url: 'http://www.jeeplus.org/#/demo?from=ele',
slogan: 'JeePlus development platform',
slogan_cn: 'JeePlus 快速开发平台',
banner_img: '/images/sponsors/jeeplus_banner.jpg',
},
]

export const platinumSponsors = [
Expand Down
15 changes: 10 additions & 5 deletions docs/.vitepress/plugins/markdown-transform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,24 @@ export function MarkdownTransform(): Plugin {
}

const combineScriptSetup = (codes: string[]) =>
`\n<script setup>
`<script setup>
${codes.join('\n')}
</script>
</script>\n
`

const combineMarkdown = (
code: string,
headers: string[],
footers: string[]
) => {
const frontmatterEnds = code.indexOf('---\n\n') + 4
const firstSubheader = code.search(/\n## \w/)
const sliceIndex = firstSubheader < 0 ? frontmatterEnds : firstSubheader
const frontmatterEnds = code.indexOf('---\n\n')
const firstSubheader = code.search(/## \w/)
const sliceIndex =
firstSubheader < 0
? frontmatterEnds < 0
? 0
: frontmatterEnds + 5
: firstSubheader

if (headers.length > 0)
code =
Expand Down
8 changes: 4 additions & 4 deletions docs/.vitepress/vitepress/components/navbar/vp-search.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,19 @@ function initialize(userOptions: any) {
// }),
navigator: {
navigate: ({ suggestionUrl }: { suggestionUrl: string }) => {
navigate: ({ itemUrl }: { itemUrl: string }) => {
if (!isClient) return
const { pathname: hitPathname } = new URL(
window.location.origin + suggestionUrl
window.location.origin + itemUrl
)
// Router doesn't handle same-page navigation so we use the native
// browser location API for anchor navigation
if (route.path === hitPathname) {
window.location.assign(window.location.origin + suggestionUrl)
window.location.assign(window.location.origin + itemUrl)
} else {
router.go(suggestionUrl)
router.go(itemUrl)
}
},
},
Expand Down
1 change: 1 addition & 0 deletions docs/en-US/component/date-picker.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ Note, date time locale (month name, first day of the week ...) are also configur
| type | type of the picker | string | year/month/date/dates/datetime/ week/datetimerange/daterange/ monthrange | date |
| format | format of the displayed value in the input box | string | see [date formats](/en-US/component/date-picker#date-formats) | YYYY-MM-DD |
| popper-class | custom class name for DatePicker's dropdown | string |||
| popper-options | Customized popper option see more at [popper.js](https://popper.js.org/docs/v2/) | object |||
| range-separator | range separator | string || '-' |
| default-value | optional, default date of the calendar | Date / [Date, Date] |||
| default-time | optional, the time value to use when selecting date range | Date / [Date, Date] |||
Expand Down
8 changes: 7 additions & 1 deletion docs/en-US/component/form.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ form/accessibility

| Method | Description | Type |
| --------------- | ------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------- |
| `validate` | Validate the whole form. Receives a callback or returns `Promise`. | `(callback?: (isValid: boolean, invalidFields?: ValidateFieldsError) => void) => Promise<boolean>` |
| `validate` | Validate the whole form. Receives a callback or returns `Promise`. | `(callback?: (isValid: boolean, invalidFields?: ValidateFieldsError) => void) => Promise<boolean>` |
| `validateField` | Validate specified fields. | `(props?: Arrayable<FormItemProp>, callback?: (isValid: boolean, invalidFields?: ValidateFieldsError) => void) => Promise<void>` |
| `resetFields` | Reset specified fields and remove validation result. | `(props?: Arrayable<FormItemProp>) => void` |
| `scrollToField` | Scroll to the specified fields. | `(prop: FormItemProp) => void` |
Expand Down Expand Up @@ -199,6 +199,12 @@ form/accessibility
| ------- | ------------------------------- | --------------------------- | ------- |
| trigger | How the validator is triggered. | ^[enum]`'blur' \| 'change'` ||

:::tip

If you don't want to trigger the validator based on input events, set the `validate-event` attribute as `false` on the corresponding input type components (`<el-input>`, `<el-radio>`, `<el-select>`, ...).

:::

### FormItem Slots

| Name | Description | Type |
Expand Down

0 comments on commit cada1a0

Please sign in to comment.