Skip to content

Commit

Permalink
Merge pull request #16006 from element-plus/dev
Browse files Browse the repository at this point in the history
D2M
  • Loading branch information
iamkun committed Mar 1, 2024
2 parents 739b418 + 76b0d5f commit 4afdf04
Show file tree
Hide file tree
Showing 321 changed files with 12,421 additions and 1,692 deletions.
3 changes: 0 additions & 3 deletions .husky/commit-msg
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

pnpm exec commitlint --config commitlint.config.js --edit "${1}"
3 changes: 0 additions & 3 deletions .husky/pre-commit
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

pnpm exec lint-staged
34 changes: 34 additions & 0 deletions CHANGELOG.en-US.md
@@ -1,5 +1,39 @@
## Changelog

### 2.6.0

_2024-03-01_

#### Features

- Components anchor component (#15670 by @Fuphoenixes)
- Components [badge] add show-zero prop (#15944 by @IceyWu)
- Components [checkbox & radio] Use value instead of label act as value (#15525 by @kooriookami)
- Components [Carousel] Add motion blur functionality (#15603 by @JedediahXu)
- Components [date-picker] add type years for year multiple select (#15980 by @yuchenii)
- Components [select & select-v2] support empty string dynamically (#15995 by @kooriookami)

#### Bug fixes

- Components [upload] drag use before-upload to intercepting files (#15861 by @klren0312)
- Components [input] type hidden use class (#15865 by @chenxch)
- Components [drawer] use dynamic zIndex from useDialog hook(#15641 by @drylint) (#15900)
- Components [select] the font color does not change when disabled (#15920 by @betavs)
- Components [table-v2] header style error (#15950 by @btea)
- Components [tour] focusout error (#15970 by @Fuphoenixes)
- Components [input-number] fix default value reset error (#15725 by @nova1751) (#15725)
- Components [tour] floating-ui autoUpdate error (#15972 by @Fuphoenixes)
- Components [date-picker] selected value comparison logic error (#15918 by @betavs)
- Components [select-v2] show header and footer slots when empty (#15964 by @kooriookami)
- Components [select-v2] set modalValue when filtering display error (#15981 by @kooriookami)
- Components [menu] Fixing Menu component's flickering issue with surplus sub-items on insufficient page height. (#15953 by @ikkkp)
- Components [tree-select] remote method and selected override (#15974 by @yujinpan)
- Components [tree-v2] fix issue in tree-v2 for setCheckedKeys invalid (#15997 by @huangjw1997)
- Style(components): [message] Update message style (#15912 by @kooriookami)
- Style(components): [alert] Update alert style (#15911 by @kooriookami)
- Style(components): [button] remove focus styles, Fix outline flickering when foucs-visible (#16002 by @FrontEndDog)
- Perf(components): [select & select-v2] optimize performance (#15962 by @kooriookami)

### 2.5.6

_2024-02-18_
Expand Down
2 changes: 1 addition & 1 deletion docs/.vitepress/config/sponsors.ts
Expand Up @@ -47,7 +47,7 @@ export const leftCustomImgSponsors = [
url: 'https://vform666.com/',
slogan: 'Vue 2/3 Visual/Low-Code Forms',
slogan_cn: 'Vue 2/3 可视化低代码表单',
banner_img: '/images/vform-banner.png',
banner_img: '/images/sponsors/vform-banner.png',
},
{
name: 'JNPF',
Expand Down
3 changes: 3 additions & 0 deletions docs/.vitepress/crowdin/en-US/component/overview.json
@@ -0,0 +1,3 @@
{
"empty-description": "Oops! There's nothing~"
}
14 changes: 14 additions & 0 deletions docs/.vitepress/crowdin/en-US/pages/component.json
@@ -1,4 +1,13 @@
{
"overview": {
"text": "Overview",
"children": [
{
"link": "/overview",
"text": "Overview"
}
]
},
"basic": {
"text": "Basic",
"children": [
Expand Down Expand Up @@ -247,6 +256,11 @@
"link": "/affix",
"text": "Affix"
},
{
"link": "/anchor",
"text": "Anchor",
"promotion": "2.6.0"
},
{
"link": "/backtop",
"text": "Backtop"
Expand Down
2 changes: 1 addition & 1 deletion docs/.vitepress/crowdin/en-US/pages/sidebar.json
Expand Up @@ -6,7 +6,7 @@
},
{
"text": "Component",
"link": "/component/button",
"link": "/component/overview",
"activeMatch": "/component/"
},
{
Expand Down
@@ -1,8 +1,7 @@
<script setup lang="ts">
import { computed, ref } from 'vue'
import { computed } from 'vue'
import MarkdownIt from 'markdown-it'
import { useToc } from '../../composables/use-toc'
import { useActiveSidebarLinks } from '../../composables/active-bar'
import sponsorLocale from '../../../i18n/component/sponsor.json'
import { useLang } from '../../composables/lang'
Expand All @@ -15,9 +14,6 @@ import tag from '../../../plugins/tag'
const localMd = MarkdownIt().use(tag)
const headers = useToc()
const marker = ref()
const container = ref()
useActiveSidebarLinks(container, marker)
const lang = useLang()
const sponsor = computed(() => sponsorLocale[lang.value])
</script>
Expand All @@ -26,35 +22,28 @@ const sponsor = computed(() => sponsorLocale[lang.value])
<aside ref="container" class="toc-wrapper">
<nav class="toc-content">
<h3 class="toc-content__heading">Contents</h3>
<ul class="toc-items">
<li
v-for="{ link, text, children } in headers"
:key="link"
class="toc-item"
>
<a
class="toc-link"
<ClientOnly>
<el-anchor :offset="70" :bound="120">
<el-anchor-link
v-for="{ link, text, children } in headers"
:key="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"
>
<div v-html="localMd.render(text)" />
<template v-if="children" #sub-link>
<el-anchor-link
v-for="{ link: childLink, text: childText } in children"
:key="childLink"
:href="childLink"
:title="text"
v-html="localMd.render(childText)"
/>
</li>
</ul>
</li>
</ul>
<div ref="marker" class="toc-marker" />
>
<div v-html="localMd.render(childText)" />
</el-anchor-link>
</template>
</el-anchor-link>
</el-anchor>
</ClientOnly>
<!-- <SponsorLarge
class="mt-8 toc-ads flex flex-col"
item-style="width: 180px; height: 55px;"
Expand Down
176 changes: 176 additions & 0 deletions docs/.vitepress/vitepress/components/globals/overview.vue
@@ -0,0 +1,176 @@
<template>
<div class="overview-container">
<div class="search-content">
<el-input
v-model="query"
:prefix-icon="Search"
size="large"
placeholder="Search Components"
/>
</div>

<div class="main-content">
<div
v-for="(group, groupIndex) in filteredSidebars"
:key="groupIndex"
class="component-group"
>
<p class="component-title">
{{ group.text }}
<el-tag effect="dark" round size="small">
{{ group.children.length }}
</el-tag>
</p>
<div class="card-content">
<el-card
v-for="(item, index) in group.children"
:key="index"
shadow="hover"
@click="toPage(item.link)"
>
<template #header>
<el-text truncated>{{ item.text }}</el-text>
<span v-if="item.promotion" class="vp-tag">
{{ item.promotion }}
</span>
</template>

<template #default>
<component :is="getIcon(item.link)" v-if="getIcon(item.link)" />
<span v-else>Todo</span>
</template>
</el-card>
</div>
</div>

<el-empty
v-if="!filteredSidebars.length"
:description="locale['empty-description']"
/>

<p class="designed-by">
Icons designed by
<el-link
type="primary"
:underline="false"
href="https://github.com/daodaozz08"
target="_blank"
>
@叨叨
</el-link>
</p>
</div>
</div>
</template>

<script lang="ts" setup>
import { computed, ref } from 'vue'
import { useRouter } from 'vitepress'
import { Search } from '@element-plus/icons-vue'
import overviewLocale from '../../../i18n/component/overview.json'
import { useSidebar } from '~/composables/sidebar'
import { useLang } from '~/composables/lang'
import overviewIcons from '~/components/overview-icons'
const lang = useLang()
const router = useRouter()
const { sidebars } = useSidebar()
const query = ref('')
const locale = computed(() => overviewLocale[lang.value])
const filteredSidebars = computed(() =>
sidebars.value
.slice(1)
.map((group) => ({
...group,
children: group.children.filter((item) =>
item.text.toLowerCase().includes(query.value.trim().toLowerCase())
),
}))
.filter((group) => group.children.length)
)
const toPage = (link: string) => {
router.go(link)
}
const getIcon = (link: string) => {
const name = link.split('/').pop()
return name ? overviewIcons[name] : null
}
</script>

<style scoped lang="scss">
.overview-container {
position: relative;
.search-content {
position: sticky;
top: 60px;
z-index: 10;
.el-input {
background: var(--bg-color);
}
}
.main-content {
.component-group {
margin-top: 32px;
.component-title {
display: flex;
align-items: center;
font-size: 20px;
font-weight: 600;
color: var(--el-text-color-primary);
gap: 8px;
}
.card-content {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
gap: 16px;
::v-deep(.el-card) {
cursor: pointer;
.el-card__header {
display: flex;
justify-content: space-between;
align-items: center;
gap: 8px;
padding: 8px 12px;
.el-text {
font-size: 14px;
font-weight: 500;
color: var(--el-text-color-regular);
line-height: 24px;
}
}
.el-card__body {
padding: 0;
display: flex;
justify-content: center;
align-items: center;
aspect-ratio: 280 / 180;
svg {
width: 100%;
height: auto;
}
}
}
}
}
.designed-by {
text-align: right;
font-size: 14px;
}
}
}
</style>
11 changes: 0 additions & 11 deletions docs/.vitepress/vitepress/components/globals/parallax-home.vue
Expand Up @@ -260,17 +260,6 @@ useEventListener(window, 'scroll', handleScroll)
}
@media (max-width: 768px) {
.cards {
li {
width: 80%;
margin: 0 auto 20px;
float: none;
}
.card {
height: auto;
padding-bottom: 54px;
}
}
.banner-stars {
display: none;
}
Expand Down

0 comments on commit 4afdf04

Please sign in to comment.