Skip to content

Commit

Permalink
Merge pull request #16594 from element-plus/dev
Browse files Browse the repository at this point in the history
D2M
  • Loading branch information
kooriookami committed Apr 20, 2024
2 parents 02b3617 + a997ff2 commit b0ce448
Show file tree
Hide file tree
Showing 102 changed files with 1,020 additions and 270 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.en-US.md
@@ -1,4 +1,22 @@
## Changelog

### 2.7.1

_2024-04-20_

#### Features

- Components [badge] Add badge-style and badge-class (#16585 by @kooriookami)

#### Bug fixes

- Hooks [empty-values] warning on modifying computead value (#16508 by @btea)
- Components [input-number] fix binding wheel event warning (#16495 by @Canroc)
- Components [table] fix cell tooltip display error (#16449 by @electroluxcode)
- Components [table] hover style error (#16517 by @dowinweb)
- Components [table] fix grouping head when dynamic column (#16433 by @Liao-js)
- Components [select-v2] fix has existing option when allow create (#16590 by @Liao-js)
- Components [table] table body rerendered when use row-key (#16544 by @Liao-js)

### 2.7.0

Expand Down
9 changes: 2 additions & 7 deletions README.md
Expand Up @@ -66,24 +66,19 @@ You can also try Element Plus out with the components built-in playground.
<table align="center" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td align="center" valign="middle">
<a href="https://js.design?source=element-plus" target="_blank">
<img width="150px" src="https://user-images.githubusercontent.com/17680888/160634485-df0d00af-8633-4ab8-9a72-aac2b65d1d36.png">
</a>
</td>
<td align="center" valign="middle">
<a href="https://www.vform666.com/" target="_blank">
<img width="150px" src="https://user-images.githubusercontent.com/17680888/156870588-b25a42d5-888b-4943-8b1b-5239dfd8f4d2.png">
</a>
</td>
<td align="center" valign="middle">
<a href="https://www.jnpfsoft.com/index.html?from=elementUI" target="_blank">
<img width="150px" src="https://github-production-user-asset-6210df.s3.amazonaws.com/82012629/285874192-0d562df0-2ebc-4bb3-bf8f-8674ac07c38a.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20231127%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231127T131759Z&X-Amz-Expires=300&X-Amz-Signature=532bfe31066712d205616b9a91002be8a187b7111e692a487356943a19c1772e&X-Amz-SignedHeaders=host&actor_id=82012629&key_id=0&repo_id=281319253">
<img width="150px" src="https://github.com/element-plus/element-plus/assets/17680888/6a044d82-c393-48ab-90b8-de0d3aad1624">
</a>
</td>
<td align="center" valign="middle">
<a href="http://github.crmeb.net/u/Element?from=element-plus" target="_blank">
<img width="150px" src="https://github-production-user-asset-6210df.s3.amazonaws.com/82012629/286477993-570c3e32-c32c-43ea-997b-2c5fc8df198a.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20231129%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231129T043748Z&X-Amz-Expires=300&X-Amz-Signature=b4f0d40ae84855c2c9cdab96e90aaf8fcbbba67240bbe2588c32775b41cc1720&X-Amz-SignedHeaders=host&actor_id=0&key_id=0&repo_id=281319253">
<img width="150px" src="https://github.com/element-plus/element-plus/assets/17680888/7abd3c5a-04fb-4eae-9540-0d21c5ed71ed">
</a>
</td>
</tr>
Expand Down
9 changes: 0 additions & 9 deletions docs/.vitepress/config/sponsors.ts
Expand Up @@ -32,15 +32,6 @@ export const rightLogoSmallSponsors = [
]

export const leftCustomImgSponsors = [
{
name: 'JSDesign',
name_cn: '即时设计',
img: '/images/js-design.png',
url: 'https://js.design/?source=element-plus&plan=sy',
slogan: 'Professional online UI design tool',
slogan_cn: '专业在线UI设计工具',
banner_img: '/images/js-design-banner.jpg',
},
{
name: 'VForm',
img: '/images/vform.png',
Expand Down
4 changes: 3 additions & 1 deletion docs/.vitepress/crowdin/en-US/pages/resource.json
Expand Up @@ -12,5 +12,7 @@
"figmaVariables": "Figma Variables",
"figmaVariablesIntro": "Components all use variables to quickly switch between dark and light modes.",
"figma2023": "2023 Figma UI Kit",
"figma2023Intro": "Components designed using Figma's latest variable configuration provide Light/Dark/Dark Alpha theme switching to help you quickly build interface designs."
"figma2023Intro": "Components designed using Figma's latest variable configuration provide Light/Dark/Dark Alpha theme switching to help you quickly build interface designs.",
"masterGo2024": "2024 MasterGo UI Kit",
"masterGo2024Intro": "MasterGo component library with optimized adaptive layouts, more complete component states, and variant switching."
}
9 changes: 9 additions & 0 deletions docs/.vitepress/vitepress/components/globals/resource.vue
Expand Up @@ -10,6 +10,7 @@ import SketchTemplateSvg from './resources/sketch-template-svg.vue'
import FigmaTemplateSvg from './resources/figma-template-svg.vue'
import FigmaVariablesSvg from './resources/figma-variables-svg.vue'
import FigmaUiKitSvg from './resources/figma-ui-kit-svg.vue'
import MasterGoUiKitSvg from './resources/master-go-ui-kit-svg.vue'
const mirrorUrl = 'element-plus.gitee.io'
const isMirrorUrl = () => {
Expand Down Expand Up @@ -60,6 +61,14 @@ const resourceCards = computed(() => [
intro: resourceLang.value.figmaIntro,
url: 'https://www.figma.com/community/file/1021254029764378306',
},
{
key: '2024-master-go-ui-kit',
title: resourceLang.value.masterGo2024,
description: '2024 MasterGo UI Kit',
icon: MasterGoUiKitSvg,
intro: resourceLang.value.masterGo2024Intro,
url: 'https://mastergo.com/community/resource/124855257836266',
},
{
key: 'sketch',
title: resourceLang.value.sketch,
Expand Down

0 comments on commit b0ce448

Please sign in to comment.