Merge pull request #17118 from element-plus/dev

D2M

CHANGELOG.en-US.md

@@ -1,5 +1,19 @@
 ## Changelog
 
+### 2.7.5
+
+_2024-06-07_
+
+#### Features
+
+- Components [input] add `is-focus` class name when textarea focus (#17049 by @btea)
+
+#### Refactors
+
+- Components [watermark] change textBaseline default value to `hanging` (#17036 by @warmthsea)
+- Style(components): [table] th text can be selected (#17039 by @warmthsea)
+- Style(docs): fix fill color of badge in dark mode (#17078 by @tyj-321)
+
 ### 2.7.4
 
 _2024-05-31_

README.md

@@ -101,8 +101,8 @@ You can also try Element Plus out with the components built-in playground.
         </a>
       </td>
       <td align="center" valign="middle">
-        <a href="https://fantastic-admin.github.io/" target="_blank">
-          <img width="130px" src="https://github.com/element-plus/element-plus/assets/82012629/fdff8d8f-83e8-4986-9949-c5b4e0d30217">
+        <a href="http://www.i-renderer.love/home/index" target="_blank">
+          <img width="130px" src="https://github.com/element-plus/element-plus/assets/82012629/0004917d-71ad-48f9-b3ce-9299f0ff78c6">
         </a>
       </td>
       <td align="center" valign="middle">

docs/.vitepress/config/sponsors.ts

@@ -18,16 +18,16 @@ export const rightLogoSmallSponsors = [
     img: '/images/sponsors/buildadmin.png',
     imgL: '/images/sponsors/buildadmin-l.png',
     url: 'https://doc.buildadmin.com/?from=element-plus',
-    slogan: 'Vue3 opensource admin system',
+    slogan: 'Vue3 open source admin system',
     slogan_cn: 'Vue3企业级开源后台管理系统',
   },
   {
-    name: 'Fantastic-admin',
-    img: '/images/sponsors/fantastic-admin.png',
-    imgL: '/images/sponsors/fantastic-admin-l.png',
-    url: 'https://fantastic-admin.github.io/',
-    slogan: 'Out-of-the-box Vue3 management system framework',
-    slogan_cn: '一款开箱即用的 Vue3 中后台管理系统框架',
+    name: '百搭云',
+    img: '/images/sponsors/baidayun-logo.png',
+    imgL: '/images/sponsors/baidayun.png',
+    url: 'http://www.i-renderer.love/home/index',
+    slogan: 'Fast and elegant low-code dev platform',
+    slogan_cn: '快速且优雅的低代码平台',
   },
   {
     name: 'bit',

docs/.vitepress/vitepress/components/overview-icons/ov-badge.vue

@@ -12,7 +12,7 @@
         fill-rule="evenodd"
         clip-rule="evenodd"
         d="M150.036 81.6713C151.08 82.0326 152 82.8954 152 84V98C152 99.1046 151.105 100 150 100H114C112.895 100 112 99.1046 112 98V78C112 76.8954 112.895 76 114 76H144C145.105 76 145.967 76.92 146.329 77.9638C146.929 79.6978 148.302 81.0709 150.036 81.6713Z"
-        fill="var(--el-fill-color-blank)"
+        fill="var(--el-bg-color-overlay)"
       />
     </g>
     <rect

docs/en-US/component/image.md

@@ -85,7 +85,7 @@ image/image-preview
 | Name   | Description                                                                                       | Type                                 |
 | ------ | ------------------------------------------------------------------------------------------------- | ------------------------------------ |
 | load   | same as native load.                                                                              | ^[Function]`(e: Event) => void`      |
-| error  | same as native error.                                                                             | ^[Function]`(e: Error) => void`      |
+| error  | same as native error.                                                                             | ^[Function]`(e: Event) => void`      |
 | switch | trigger when switching images.                                                                    | ^[Function]`(index: number) => void` |
 | close  | trigger when clicking on close button or when `hide-on-click-modal` enabled clicking on backdrop. | ^[Function]`() => void`              |
 | show   | trigger when the viewer displays                                                                  | ^[Function]`() => void`              |

docs/en-US/component/watermark.md

@@ -73,7 +73,7 @@ watermark/custom
 | fontFamily   | font family   | ^[string]                                                                            | sans-serif      |
 | fontStyle    | font style    | ^[enum]`'none' \| 'normal' \| 'italic' \| 'oblique'`                                 | normal          |
 | textAlign    | text align    | ^[enum]`'left' \| 'right' \| 'center'\| 'start' \| 'end' `                           | center          |
-| textBaseline | text baseline | ^[enum]`'top' \| 'hanging' \| 'middle' \| 'alphabetic' \| 'ideographic' \| 'bottom'` | top             |
+| textBaseline | text baseline | ^[enum]`'top' \| 'hanging' \| 'middle' \| 'alphabetic' \| 'ideographic' \| 'bottom'` | hanging             |
 
 ### Slots
 

docs/en-US/guide/installation.md

@@ -96,7 +96,7 @@ the method to lock the version.
 With CDN, we can easily use Element Plus to
 write a Hello World page. [Online Demo](https://codepen.io/iamkun/pen/YzWMaVr)
 
-<iframe height="469" style="width: 100%;" scrolling="no" title="YzWMaVr" src="https://codepen.io/iamkun/embed/YzWMaVr?height=469&theme-id=light&default -tab=html,result" frameborder="no" loading="lazy" allowtransparency="true" allowfullscreen="true">
+<iframe height="469" style="width: 100%;" scrolling="no" title="YzWMaVr" src="https://codepen.io/iamkun/embed/YzWMaVr?height=469&theme-id=light&default-tab=html,result" frameborder="no" loading="lazy" allowtransparency="true" allowfullscreen="true">
   See the Pen <a href='https://codepen.io/iamkun/pen/YzWMaVr'>YzWMaVr</a> by iamkun
   (<a href='https://codepen.io/iamkun'>@iamkun</a>) on <a href='https://codepen.io'>CodePen</a>.
 </iframe>

docs/en-US/guide/quickstart.md

@@ -219,10 +219,10 @@ export default defineComponent({
 
 ## Using Nuxt.js
 
-We can also use [Nuxt.js](https://v3.nuxtjs.org/)：
+We can also use [Nuxt.js](https://nuxt.com):
 
 <div class="glitch-embed-wrap" style="height: 420px; width: 100%;">
-  <iframe src="https://glitch.com/edit/#!/nuxt-element-plus?path=components%2FExamples.vue%3A1%3A0" alt="nuxt-element-plus on glitch" style="height: 100%; width: 100%; border: 0;"></iframe>
+  <iframe src="https://glitch.com/edit/#!/element-plus-nuxt-starter?path=components%2FExamples.vue%3A1%3A0" alt="nuxt-element-plus on glitch" style="height: 100%; width: 100%; border: 0;"></iframe>
 </div>
 
 ## Let's Get Started

packages/components/input/src/input.vue

@@ -108,7 +108,7 @@
       <textarea
         :id="inputId"
         ref="textarea"
-        :class="nsTextarea.e('inner')"
+        :class="[nsTextarea.e('inner'), nsInput.is('focus', isFocused)]"
         v-bind="attrs"
         :minlength="minlength"
         :maxlength="maxlength"

packages/components/watermark/src/watermark.vue

@@ -35,7 +35,7 @@ const fontWeight = computed(() => props.font?.fontWeight ?? 'normal')
 const fontStyle = computed(() => props.font?.fontStyle ?? 'normal')
 const fontFamily = computed(() => props.font?.fontFamily ?? 'sans-serif')
 const textAlign = computed(() => props.font?.textAlign ?? 'center')
-const textBaseline = computed(() => props.font?.textBaseline ?? 'top')
+const textBaseline = computed(() => props.font?.textBaseline ?? 'hanging')
 
 const gapX = computed(() => props.gap[0])
 const gapY = computed(() => props.gap[1])

packages/theme-chalk/src/table.scss

@@ -217,7 +217,6 @@
   }
 
   th.#{$namespace}-table__cell {
-    user-select: none;
     background-color: getCssVar('table-header-bg-color');
 
     > .cell.highlight {