Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(components): [carousel] height is adaptive when height is auto #11392

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
cf0739f
fix(components): [carousel] :height is auto and card direction vertical
qq282126990 Jan 16, 2023
23c729d
fix(components): [carousel] :height is auto and card direction vertical
qq282126990 Jan 16, 2023
0066489
Merge branch 'dev' into dev
qq282126990 Jan 18, 2023
c8966e9
Merge branch 'dev' into dev
qq282126990 Jan 20, 2023
486568e
Merge branch 'dev' into dev
qq282126990 Jan 29, 2023
26533c0
Merge branch 'element-plus:dev' into dev
qq282126990 Jan 30, 2023
9c1cfa5
Merge branch 'dev' into dev
qq282126990 Jan 31, 2023
6816636
Merge branch 'element-plus:dev' into dev
qq282126990 Feb 1, 2023
5626d4d
Merge branch 'dev' into dev
qq282126990 Feb 1, 2023
80618b6
Merge branch 'element-plus:dev' into dev
qq282126990 Feb 2, 2023
e30fa47
fix(components): [carousel] Added function: height is adaptive
qq282126990 Feb 2, 2023
01f5323
Merge branch 'carousel-height-auto' of https://github.com/qq282126990…
qq282126990 Feb 2, 2023
21a5338
fix(components): [carousel] card direction vertical
qq282126990 Feb 2, 2023
18dd9c5
fix(components): [carousel] Added function: height is adaptive
qq282126990 Feb 2, 2023
cc4b4af
fix(components): [carousel] Added function: card direction vertical
qq282126990 Feb 2, 2023
40b0d13
fix(components): [carousel] Added function: height is adaptive
qq282126990 Feb 2, 2023
7a2f42c
Merge branch 'dev' into card-vertical
qq282126990 Feb 2, 2023
71d162f
Merge branch 'dev' into carousel-height-auto
qq282126990 Feb 2, 2023
39dc68f
feat(components): [carousel] height is adaptive when height is auto
qq282126990 Feb 2, 2023
a519f2a
feat(components): [carousel] height is adaptive when height is auto
qq282126990 Feb 3, 2023
8afb9ff
Merge branch 'dev' into carousel-height-auto
qq282126990 Feb 4, 2023
d6ef2f3
Merge branch 'dev' into carousel-height-auto
qq282126990 Feb 6, 2023
69871f8
Merge branch 'dev' into carousel-height-auto
qq282126990 Feb 9, 2023
d1f1d2e
Merge branch 'dev' into carousel-height-auto
qq282126990 Feb 14, 2023
f362e21
Merge branch 'dev' into carousel-height-auto
qq282126990 Feb 17, 2023
03a6352
fix: tokens carousel
qq282126990 Apr 10, 2023
24ccf85
fix: carousel
qq282126990 Apr 10, 2023
4292f51
Merge branch 'card-vertical' into carousel-height-auto
qq282126990 Apr 10, 2023
7171a5b
fix: cascader.md
qq282126990 Apr 10, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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. [Playground](https://element-plus.run/) 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. [JSFiddle](https://jsfiddle.net/) 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. [Playground](https://element-plus.run/) 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. [JSFiddle](https://jsfiddle.net/) 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. [Playground](https://element-plus.run/) 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. [JSFiddle](https://jsfiddle.net/) 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 的版本号,并提供操作系统和浏览器信息。推荐使用 [Playground](https://element-plus.run/) 生成在线 demo,这能够更直观地重现问题。
- 请说明 Element Plus 和 Vue 的版本号,并提供操作系统和浏览器信息。推荐使用 [JSFiddle](https://jsfiddle.net/) 生成在线 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://element-plus.run) 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://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.

你好 @${{ github.event.issue.user.login }}, 我们需要你提供一个在线的重现实例以便于我们帮你排查问题。可以通过点击 [此处](https://element-plus.run) 创建或者提供一个最小化的 GitHub 仓库。3 天内未跟进此 issue 将会被自动关闭。
你好 @${{ github.event.issue.user.login }}, 我们需要你提供一个在线的重现实例以便于我们帮你排查问题。可以通过点击 [此处](https://codepen.io/iamkun/pen/YzWMaVr) 创建或者提供一个最小化的 GitHub 仓库。3 天内未跟进此 issue 将会被自动关闭。

- name: invalid
if: github.event.label.name == 'invalid'
Expand Down
188 changes: 0 additions & 188 deletions CHANGELOG.en-US.md
Original file line number Diff line number Diff line change
@@ -1,192 +1,4 @@
## Changelog

### 2.3.3

_2023-04-07_

#### Features

- Components [color-picker] add `show` `hide` expose (#11942 by @xiterjia)
- Components [date-picker] support numpadEnter (#12323 by @chenxch)

#### Bug fixes

- Components [tree-select] add to global components (#12255 by @btea)
- Components [upload] add before-upload test (#12287 by @chenxch)
- Components [text] add to global components (#12317 by @Altermoe)
- Components [statistic] add to global components (#12324 by @btea)
- Components [menu] Avoid call router when index is not provided (#12206 by @HeftyKoo)
- Components [popover] default trigger (#12321 by @MrWeilian)
- Revert "fix(components): [popover] default trigger" (#12341 by @chenxch)
#### Refactors

- Components [table] remove useless brackets (#12283 by @MrWeilian)

### 2.3.2

_2023-03-31_

#### Features

- Components [form] scroll-into-view options (#12164 by @ryuhangyeong)

#### Bug fixes

- Components [select-v2] reset hoverindex when close dropdown list (#12090 by @btea)
- Components [input] scrollbar not hide after autosize (#10137 by @HeftyKoo)
- Docs [tabs] example type error (#12160 by @bigsnowballhehe)
- Components [input] textarea height calc (#12087 by @MrWeilian)
- Components [select] multiple disabled style (#12015 by @MrWeilian)
- Components [pagination] delete input value display empty string (#12134 by @btea)
- Upload data is not independent (#12029 by @jianjunyuu)
- Style(components): [Tabs] Modify tabs to flex layout (#12048 by @kooriookami)

### 2.3.1

_2023-03-19_

#### Bug fixes

- Components [select] iOS keyboard not appear when focus (#11498 by @MrWeilian)
- Components [cascader] clickoutside (#11997 by @chenxch)
- Components [table-column] first default column set placeholder (#11705 by @MrWeilian)
- Components [input-number] modelValue incorrect update (#12007 by @Mario34)
- Hooks vm may be null (#12058 by @liulinboyi)
- Hooks [use-delayed-toggle] clear timer when call onClose (#12056 by @wangcch)
- Style [message-box] border box (#12086 by @jw-foss)
- Style(theme-chalk): use variable instead of '-' (#11889 by @fishermanxzx)
- Style(theme-chalk): [select-v2] text overflow (#11969 by @emojiiii)
- Style(components): [input] update exceed style (#12094 by @btea)

### 2.3.0

_2023-03-12_

#### Features

- Components [select-v2] Add max-collapse-tags prop (#11405 by @kooriookami)
- Components [select] Add max-collapse-tags prop (#11378 by @kooriookami)
- Components [cascader] Adjust expose and typo (#11781 by @chenxch)
- Components add el-text component (#11653 by @gimjin)

#### Bug fixes

- [message-box] lock scroll (#11921 by @jw-foss)
- Components [popover | tooltip] keep autoClose prop (#11833 by @wangcch)
- Components [table-v2] endReached triggered twice when first (#11928 by @MrWeilian)
- Components [input] update input value length calculate (#11816 by @btea)
- Components [loading] namespace config (#11956 by @btea)
- Components [tooltip] remove mousemove listener when unmount (#11940 by @zt123123)
- Style(components): [select-v2] input-icon margin-left (not first) (#11830 by @wangcch)
- Chore(components): [pagination] accessibility improvement (#11817 by @tolking)
- Style(theme-chalk): [rate] size (#11920 by @chenxch)

### 2.2.36

_2023-03-08_

#### Bug fixes

- Components [select] Filter duplicate emits of "update options" (#11884 by @godxiaoji)
- Components [table] useZIndex is called outside setup (#11895 by @Mario34) (#11900)
- Components [select] filter all ElOption item labels (#11909 by @godxiaoji)
- Components [global-config] global injection (#11899 by @jw-foss)

### 2.2.35

_2023-03-07_

#### Bug fixes

- Components [select] console warning (#11868 by @jw-foss)
- Components [global-config] (#11866 by @jw-foss)
- Components [overlay] namespace issue (#11881 by @jw-foss)

### 2.2.34

_2023-03-06_

#### Bug fixes

- Components [table-v2] class of column is not valid (#11815 by @tolking)
- Components [tree-select] cache data update incorrect (#11225 by @yujinpan)
- Components [global-config] (#11847 by @jw-foss)

### 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

_2023-02-19_

#### Bug fixes

- Components [table] fix an undefined reference in table-layout (#11204 by @jaa134)
- Components [cascader] add focus and blur event when set filterable (#11273 by @btea)
- Components [dropdown] unmounted error (#11649 by @chenxch)

### 2.2.31

_2023-02-17_

#### Features

- Components [cascader] add togglePopperVisible for expose (#11559 by @MrWeilian)
- Components [descriptions] render null when empty label (#11575 by @wangcch)

#### Bug fixes

- Components [carousel] delete the indicator props (#11483 by @ryuhangyeong)
- Components [cascader-panel] clear active style (#11495 by @esttom)
- Components [upload-dragger] Avoid firefox open file (#11092 by @acyza)
- Hooks [use-lockscreen] prevent flaky unit tests (#11404 by @robert-wloch-iits)
- Translate arabic language (#11510 by @itsalimanuel)
- Components [input] box-shadow noise (#11518 by @chenxch)
- Components [select] ensure select options respect filter query during initialization (#11205 by @jaa134)
- Components [select] i18n issue of select placeholder (#11508 by @wonderl17)
- Components [input] fix textarea autosize (#11376 by @acyza)
- Components [tree] setCheckedKeys keys attribute add type (#11390 by @qq282126990)
- Components [dropdown] fix focus after close (#11586 by @Giwayume)‘
- Enhancement(theme-chalk): [checkbox] refactor checkbox disabled style (#11503 by @Geekhyt)

#### Refactors

- Components [empty] (#11494 by @ryuhangyeong)
- Components [menu] add deprecated mark to popperAppendToBody (#11509 by @tolking)

### 2.2.30

Expand Down
9 changes: 5 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,17 @@ Ah, now you have installed the code correctly, you can choose:
```shell
# If you would like to modify the website source code of https://element-plus.org
# It was made with [VitePress](https://vitepress.vuejs.org)
pnpm docs:gen-locale # This generates locale files for your local development
pnpm docs:dev
pnpm run docs:gen-locale # This generates locale files for your local development
pnpm run docs:dev
```

### Making changes to the component instead of website

```shell
# If you would like to run a local playground to test out your changes against
# Some specific component
pnpm dev
touch play/src/App.vue # Adding an entry for the play to run.
pnpm run dev
```

You can follow the [LOCAL DEVELOPMENT GUIDE](https://element-plus.org/en-US/guide/dev-guide.html) to do development more quickly.
Expand All @@ -81,7 +82,7 @@ pnpm build
If you would like to compile the website code locally:

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

## Pulling request
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ You can also try Element Plus out with the components built-in playground.
<tbody>
<tr>
<td align="center" valign="middle">
<a href="https://www.vform666.com/" target="_blank">
<a href="https://vform666.com/vform3.html?from=element_plus" target="_blank">
<img width="150px" src="https://user-images.githubusercontent.com/17680888/156870588-b25a42d5-888b-4943-8b1b-5239dfd8f4d2.png">
</a>
</td>
Expand Down
4 changes: 2 additions & 2 deletions docs/.vitepress/config/sponsors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const leftCustomImgSponsors = [
{
name: 'VForm',
img: '/images/vform.png',
url: 'https://www.vform666.com/',
url: 'https://vform666.com/vform3.html?from=element_plus',
slogan: 'Vue 2/3 Visual/Low-Code Forms',
slogan_cn: 'Vue 2/3 可视化低代码表单',
banner_img: '/images/vform-banner.png',
Expand All @@ -44,7 +44,7 @@ export const leftCustomImgSponsors = [
slogan: 'JNPF low code development platform to develop simple!',
slogan_cn: 'JNPF 低代码开发平台,让开发变得简单!',
className: 'jnpf',
banner_img: '/images/sponsors/jnpfsoft.jpg',
banner_img: '/images/jnpfsoft.jpg',
},
]

Expand Down
3 changes: 0 additions & 3 deletions docs/.vitepress/crowdin/en-US/component/api-typing.json

This file was deleted.

4 changes: 0 additions & 4 deletions docs/.vitepress/crowdin/en-US/component/navbar.json

This file was deleted.

3 changes: 0 additions & 3 deletions docs/.vitepress/crowdin/en-US/component/skip-link.json

This file was deleted.

3 changes: 1 addition & 2 deletions docs/.vitepress/crowdin/en-US/component/translation.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"help": "Help Translate 😉",
"language": "Choose the language that you want"
"help": "Help Translate 😉"
}
5 changes: 0 additions & 5 deletions docs/.vitepress/crowdin/en-US/pages/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@
"link": "/link",
"text": "Link"
},
{
"link": "/text",
"text": "Text",
"promotion": "2.3.0"
},
{
"link": "/scrollbar",
"text": "Scrollbar"
Expand Down
11 changes: 3 additions & 8 deletions docs/.vitepress/plugins/markdown-transform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,9 @@ const combineMarkdown = (
headers: string[],
footers: string[]
) => {
const frontmatterEnds = code.indexOf('---\n\n')
const firstHeader = code.search(/\n#{1,6}\s.+/)
const sliceIndex =
firstHeader < 0
? frontmatterEnds < 0
? 0
: frontmatterEnds + 4
: firstHeader
const frontmatterEnds = code.indexOf('---\n\n') + 4
const firstSubheader = code.search(/\n## \w/)
const sliceIndex = firstSubheader < 0 ? frontmatterEnds : firstSubheader

if (headers.length > 0)
code =
Expand Down
4 changes: 2 additions & 2 deletions docs/.vitepress/vitepress/components/common/vp-switch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</script>

<template>
<button class="switch" role="switch">
<div class="switch" role="switch">
<div class="switch__action">
<div class="switch__icon">
<slot />
</div>
</div>
</button>
</div>
</template>
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
<script setup lang="ts">
import CommonThemeToggler from '../common/vp-theme-toggler.vue'
import { isDark, toggleDark } from '../../composables/dark'
import { useNavbarLocale } from '../../composables/navbar-locale'

const locale = useNavbarLocale()
import { toggleDark } from '../../composables/dark'
</script>

<template>
<div class="full-screen-theme-toggler">
<span>Theme</span>
<CommonThemeToggler
:aria-label="locale['theme-toggler']"
:aria-checked="isDark"
@click="toggleDark()"
/>
<CommonThemeToggler @click="toggleDark()" />
</div>
</template>

Expand Down