Merge pull request #12882 from element-plus/dev

D2M
element-plus · May 19, 2023 · f289012 · f289012
2 parents 61e6c41 + b21a0e3
commit f289012
Show file tree

Hide file tree

Showing 70 changed files with 1,173 additions and 285 deletions.
diff --git a/.github/triage.yml b/.github/triage.yml
@@ -13,3 +13,5 @@ PRGreetings: |
  👋 @{user}, thank you for contributing {repo}.
  - You can comment with `/label Components:[component_name]` to add a label for which component you are working on.
  - You may join our <img src="https://img.shields.io/discord/746646622431346728?label=Discord&logo=discord&style=flat" alt="Discord" style="vertical-align: middle;" /> for staying tuned.
+firstPRMergeComment: >
+ Thank you for your contribution!
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -1,5 +1,35 @@
 ## Changelog
 
+### 2.3.5
+
+_2023-05-19_
+
+#### Features
+
+- Docs right menu tag convert (#12606 by @btea)
+- Components [carousel] If the carousel height is auto apply item height (#12388 by @qq282126990)
+
+#### Bug fixes
+
+- Components [table] text node not have closest method (#12543 by @btea)
+- Components [loading] Compatible with vue3.2.0~12 (#12377 by @chenxch)
+- Components [tree] fix always trigger drag (#12612 by @init-qy)
+- Components [image] fixed lazyLoad scroll end not loading (#12596 by @cicada-ah)
+- Components [table-v2] Adjust the expandable (#12519 by @chenxch)
+- Components [upload] before-upload change data in promise (#12575 by @GenerQAQ)
+- Components [menu] calc slice index remove comment node (#12472 by @chenxch)
+- Components [input-number] add Judging if the max is greater than the min (#12741 by @zhengsixsix)
+- Components [tree] Fix TreeOptionProps (#12511 by @lyric-zemin)
+- Components [select] fix placeholder display (#11051 by @sleepyShen1989)
+- Components [TreeSelect] incorrect check event params (#12370 by @yujinpan)
+- Components [TreeSelect] checking node reset checked cache node (#12367 by @yujinpan)
+- Components [tree-select] incorrect selection when using `checkOnClickNode` without checkbox (#12826 by @yujinpan)
+- Improvement(locale) : update fa language. (#12677 by @4limirzaei)
+
+#### Refactors
+
+- Components [steps] optomizate class in code (#12672 by @wzc520pyfm)
+
 ### 2.3.4
 
 _2023-04-23_

diff --git a/docs/.vitepress/config/sponsors.ts b/docs/.vitepress/config/sponsors.ts
@@ -24,9 +24,9 @@ export const leftCustomImgSponsors = [
  name: 'JSDesign',
  name_cn: '即时设计',
  img: '/images/js-design.png',
- url: 'https://js.design?source=element-plus',
+ url: 'https://js.design/ai?source=element-plus&plan=ai',
  slogan: 'Professional online UI design tool',
- slogan_cn: '专业在线UI设计工具',
+ slogan_cn: '借助AI技术，快速生成创意十足的UI设计稿',
  banner_img: '/images/js-design-banner.jpg',
  },
  {

diff --git a/docs/.vitepress/vitepress/components/doc-content/vp-table-of-content.vue b/docs/.vitepress/vitepress/components/doc-content/vp-table-of-content.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
+import MarkdownIt from 'markdown-it'
 import { useToc } from '../../composables/use-toc'
 import { useActiveSidebarLinks } from '../../composables/active-bar'
 
@@ -8,8 +9,10 @@ import { useLang } from '../../composables/lang'
 import SponsorsButton from '../sponsors/sponsors-button.vue'
 import SponsorRightTextList from '../sponsors/right-richtext-list.vue'
 import SponsorRightLogoSmallList from '../sponsors/right-logo-small-list.vue'
+import tag from '../../../plugins/tag'
 // import SponsorLarge from '../vp-sponsor-large.vue'
 
+const localMd = MarkdownIt().use(tag)
 const headers = useToc()
 const marker = ref()
 const container = ref()
@@ -28,16 +31,24 @@ const sponsor = computed(() => sponsorLocale[lang.value])
  :key="link"
  class="toc-item"
  >
- <a class="toc-link" :href="link" :title="text">{{ text }}</a>
+ <a
+ class="toc-link"
+ :href="link"
+ :title="text"
+ v-html="localMd.render(text)"
+ />
  <ul v-if="children">
  <li
  v-for="{ link: childLink, text: childText } in children"
  :key="childLink"
  class="toc-item"
  >
- <a class="toc-link subitem" :href="childLink" :title="text">{{
- childText
- }}</a>
+ <a
+ class="toc-link subitem"
+ :href="childLink"
+ :title="text"
+ v-html="localMd.render(childText)"
+ />
  </li>
  </ul>
  </li>

diff --git a/docs/en-US/component/carousel.md b/docs/en-US/component/carousel.md
@@ -35,6 +35,16 @@ carousel/arrows
 
 :::
 
+## Auto height
+
+When the `height` of `carousel` is set to `auto`, the `carousel` height will be automatically set according to the height of the `carousel item`
+
+:::demo
+
+carousel/auto-height
+
+:::
+
 ## Card mode
 
 When a page is wide enough but has limited height, you can activate card mode for carousels

diff --git a/docs/en-US/component/config-provider.md b/docs/en-US/component/config-provider.md
@@ -49,8 +49,8 @@ In this section, you can learn how to use Config Provider to provide experimenta
 | size | global component size | ^[enum]`'large' \| 'default' \| 'small'` | default |
 | zIndex | global Initial zIndex | ^[number] | — |
 | namespace | global component className prefix (cooperated with [$namespace](https://github.com/element-plus/element-plus/blob/dev/packages/theme-chalk/src/mixins/config.scss#L1)) | ^[string] | el |
-| button | button related configuration, [see the following table](#button-attributes) | ^[object]`{autoInsertSpace?: boolean}` | see the following table |
-| message | message related configuration, [see the following table](#message-attributes) | ^[object]`{max?: number}` | see the following table |
+| button | button related configuration, [see the following table](#button-attribute)  | ^[object]`{autoInsertSpace?: boolean}` | see the following table |
+| message | message related configuration, [see the following table](#message-attribute)  | ^[object]`{max?: number}` | see the following table |
 | experimental-features | features at experimental stage to be added, all features are default to be set to false | ^[object] | — |
 
 ### Button Attribute

diff --git a/docs/en-US/component/empty.md b/docs/en-US/component/empty.md
@@ -66,18 +66,20 @@ But usually, if you want to change style, you need to change all color, because
 | --el-empty-fill-color-8 | #e0e3e9 |
 | --el-empty-fill-color-9 | #d5d7de |
 
-## Empty Attributes
+## API
 
-| Name | Description | Type | Acceptable Value | Default |
-| ----------- | ------------------ | ------ | ---------------- | ------- |
-| image | image URL | string | — | — |
-| image-size | image size (width) | number | — | — |
-| description | description | string | — | — |
+### Attributes
 
-## Empty Slots
+| Name | Description | Type | Default |
+| ----------- | --------------------------- | --------- | ------- |
+| image | image URL of empty | ^[string] | '' |
+| image-size | image size (width) of empty | ^[number] | — |
+| description | description of empty | ^[string] | '' |
 
-| Name | Description |
-| ----------- | --------------------- |
-| default | Custom bottom content |
-| image | Custom image |
-| description | Custom description |
+### Slots
+
+| Name | Description |
+| ----------- | ------------------------- |
+| default | content as bottom content |
+| image | content as image |
+| description | content as description |
diff --git a/docs/en-US/component/icon.md b/docs/en-US/component/icon.md
@@ -200,7 +200,7 @@ import { Edit, Share, Delete, Search, Loading } from '@element-plus/icons-vue'
  </div>
 </ElRow>
 
-## Icon Collection
+## Icon Collection{#icon-collection}
 
 :::tip
 

diff --git a/docs/en-US/component/infinite-scroll.md b/docs/en-US/component/infinite-scroll.md
@@ -27,10 +27,10 @@ infinite-scroll/disable-loading
 
 ## Directives
 
-| Name | Description | Type | Accepted values | Default |
-| ------------------------- | ---------------------------------------------------------------------------------------------------------------- | -------- | --------------- | ------- |
-| v-infinite-scroll | Load more data while reach bottom of the page | function | - | - |
-| infinite-scroll-disabled | is disabled | boolean | -  | false |
-| infinite-scroll-delay | throttle delay (ms) | number | -  | 200 |
-| infinite-scroll-distance | trigger distance (px) | number | -  | 0 |
-| infinite-scroll-immediate | Whether to execute the loading method immediately, in case the content cannot be filled up in the initial state. | boolean | -  | true |
+| Name | Description | Type   | Default |
+| ------------------------- | ---------------------------------------------------------------------------------------------------------------- | ----------- | ------- |
+| v-infinite-scroll | Load more data while reach bottom of the page | ^[Function] | — |
+| infinite-scroll-disabled | is disabled | ^[boolean] | false |
+| infinite-scroll-delay | throttle delay (ms) | ^[number] | 200 |
+| infinite-scroll-distance | trigger distance (px) | ^[number] | 0 |
+| infinite-scroll-immediate | Whether to execute the loading method immediately, in case the content cannot be filled up in the initial state. | ^[boolean] | true |
diff --git a/docs/en-US/component/page-header.md b/docs/en-US/component/page-header.md
@@ -98,27 +98,29 @@ The component is consisted of these parts
 </template>
 ```
 
-## Attributes
-
-| Name | Description | Type | Accepted Values | Default |
-| ------- | -------------- | --------------------- | --------------- | ------- |
-| icon | icon component | `string \| Component` | — | Back |
-| title | main title | string | — | Back |
-| content | content | string | — | — |
-
-## Events
-
-| Name | Description | Parameters |
-| ---- | ----------------------------------- | ---------- |
-| back | triggers when right side is clicked | — |
-
-## Slots
-
-| Name | Description |
-| ---------- | ------------------ |
-| icon | custom icon |
-| title | title content |
-| content | content |
-| extra | extra |
-| breadcrumb | breadcrumb content |
-| default | main content |
+## API
+
+### Attributes
+
+| Name | Description | Type | Default |
+| ------- | ------------------------------------------------------------- | ------------------------ | ------- |
+| icon | icon component of page header | ^[string] / ^[Component] | Back |
+| title | main title of page header, default is Back that built-in a11y | ^[string] | '' |
+| content | content of page header | ^[string] | '' |
+
+### Events
+
+| Name | Description | Type |
+| ---- | ----------------------------------- | ----------------------- |
+| back | triggers when right side is clicked | ^[Function]`() => void` |
+
+### Slots
+
+| Name | Description |
+| ---------- | --------------------- |
+| icon | content as icon |
+| title | content as title |
+| content | content |
+| extra | extra |
+| breadcrumb | content as breadcrumb |
+| default | main content |