Merge branch 'ElemeFE:dev' into dev

ElemeFE · Oct 2, 2021 · 2ce398d · 2ce398d
2 parents f16cc75 + 492ab00
commit 2ce398d
Show file tree

Hide file tree

Showing 20 changed files with 168 additions and 50 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -1,9 +1,34 @@
 ## Changelog
 
+### 2.15.6
+
+*2021-09-02*
+
+#### Bug fixes
+
+- Cascader
+  - fix a bug that makes the browser jitter in zoom mode (#21207 by @cs1707)
+  - optimize performance (#21231 by @cs1707)
+- Select
+  - fix long text overflow in multiple mode (#21237 by @cs1707)
+- Dropdown
+  - add disabled property (#21235 by @mshioda)
+- Radio
+  - fix checked state when browser go back (#21250 by @cs1707)
+- Descriptions
+  - fix type declaration (#21265 by @adaex)
+  - avoid table style conflict (#21254 by @adaex)
+- Drawer
+  - fix append to body (#21264 by @cs1707)
+- Local
+  - fix italian mistake (#21012 by @ricardotondello)
+
 ### 2.15.5
 
 *2021-08-04*
 
+#### Bug fixes
+
 - Select
   - fix resetInputHeight (#21201 by @cs1707)
 

diff --git a/CHANGELOG.es.md b/CHANGELOG.es.md
@@ -1,9 +1,34 @@
 ## Changelog
 
+### 2.15.6
+
+*2021-09-02*
+
+#### Bug fixes
+
+- Cascader
+  - fix a bug that makes the browser jitter in zoom mode (#21207 by @cs1707)
+  - optimize performance (#21231 by @cs1707)
+- Select
+  - fix long text overflow in multiple mode (#21237 by @cs1707)
+- Dropdown
+  - add disabled property (#21235 by @mshioda)
+- Radio
+  - fix checked state when browser go back (#21250 by @cs1707)
+- Descriptions
+  - fix type declaration (#21265 by @adaex)
+  - avoid table style conflict (#21254 by @adaex)
+- Drawer
+  - fix append to body (#21264 by @cs1707)
+- Local
+  - fix italian mistake (#21012 by @ricardotondello)
+
 ### 2.15.5
 
 *2021-08-04*
 
+#### Bug fixes
+
 - Select
   - fix resetInputHeight (#21201 by @cs1707)
 

diff --git a/CHANGELOG.fr-FR.md b/CHANGELOG.fr-FR.md
@@ -1,9 +1,34 @@
 ## Changelog
 
+### 2.15.6
+
+*2021-09-02*
+
+#### Bug fixes
+
+- Cascader
+  - fix a bug that makes the browser jitter in zoom mode (#21207 by @cs1707)
+  - optimize performance (#21231 by @cs1707)
+- Select
+  - fix long text overflow in multiple mode (#21237 by @cs1707)
+- Dropdown
+  - add disabled property (#21235 by @mshioda)
+- Radio
+  - fix checked state when browser go back (#21250 by @cs1707)
+- Descriptions
+  - fix type declaration (#21265 by @adaex)
+  - avoid table style conflict (#21254 by @adaex)
+- Drawer
+  - fix append to body (#21264 by @cs1707)
+- Local
+  - fix italian mistake (#21012 by @ricardotondello)
+
 ### 2.15.5
 
 *2021-08-04*
 
+#### Bug fixes
+
 - Select
   - fix resetInputHeight (#21201 by @cs1707)
 

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -1,5 +1,28 @@
 ## 更新日志
 
+### 2.15.6
+
+*2021-09-02*
+
+#### Bug 修复
+
+- Cascader
+  - 修复浏览器缩放模式下抖动的 bug (#21207 by @cs1707)
+  - 优化性能 (#21231 by @cs1707)
+- Select
+  - 修复多选模式下文字溢出的 bug (#21237 by @cs1707)
+- Dropdown
+  - 增加 disabled 属性 (#21235 by @mshioda)
+- Radio
+  - 修复浏览器返回后保留状态的 bug (#21250 by @cs1707)
+- Descriptions
+  - 修复类型定义 (#21265 by @adaex)
+  - 修复与表格组件混用样式冲突的问题 (#21254 by @adaex)
+- Drawer
+  - 修复 append-to-body (#21264 by @cs1707)
+- Local
+  - 修复 italian 翻译错误 (#21012 by @ricardotondello)
+
 ### 2.15.5
 
 *2021-08-04*

diff --git a/examples/versions.json b/examples/versions.json
@@ -1 +1 @@
-{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.4.11":"2.4","2.5.4":"2.5","2.6.3":"2.6","2.7.2":"2.7","2.8.2":"2.8","2.9.2":"2.9","2.10.1":"2.10","2.11.1":"2.11","2.12.0":"2.12","2.13.2":"2.13","2.14.1":"2.14","2.15.5":"2.15"}
+{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.4.11":"2.4","2.5.4":"2.5","2.6.3":"2.6","2.7.2":"2.7","2.8.2":"2.8","2.9.2":"2.9","2.10.1":"2.10","2.11.1":"2.11","2.12.0":"2.12","2.13.2":"2.13","2.14.1":"2.14","2.15.6":"2.15"}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-ui",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "description": "A Component Library for Vue.js.",
   "main": "lib/element-ui.common.js",
   "files": [

diff --git a/packages/badge/src/main.vue b/packages/badge/src/main.vue
@@ -7,7 +7,7 @@
         v-text="content"
         class="el-badge__content"
         :class="[
-          'el-badge__content--' + type,
+          type ? 'el-badge__content--' + type : null,
           {
             'is-fixed': $slots.default,
             'is-dot': isDot

diff --git a/packages/descriptions/src/descriptions-row.js b/packages/descriptions/src/descriptions-row.js
@@ -27,6 +27,7 @@ export default {
                 return (
                   <th
                     class={{
+                      'el-descriptions-item__cell': true,
                       'el-descriptions-item__label': true,
                       'has-colon': elDescriptions.border ? false : elDescriptions.colon,
                       'is-bordered-label': elDescriptions.border,
@@ -44,8 +45,7 @@ export default {
               row.map(item =>{
                 return (
                   <td
-                    class="el-descriptions-item__content"
-                    class={['el-descriptions-item__content', item.contentClassName]}
+                    class={['el-descriptions-item__cell', 'el-descriptions-item__content', item.contentClassName]}
                     style={item.contentStyle}
                     colSpan={item.props.span}
                   >{item.slots.default}</td>
@@ -65,6 +65,7 @@ export default {
                 return ([
                   <th
                     class={{
+                      'el-descriptions-item__cell': true,
                       'el-descriptions-item__label': true,
                       'is-bordered-label': elDescriptions.border,
                       [item.labelClassName]: true
@@ -73,7 +74,7 @@ export default {
                     colSpan="1"
                   >{item.label}</th>,
                   <td
-                    class={['el-descriptions-item__content', item.contentClassName]}
+                    class={['el-descriptions-item__cell', 'el-descriptions-item__content', item.contentClassName]}
                     style={item.contentStyle}
                     colSpan={item.props.span * 2 - 1}
                   >{item.slots.default}</td>
@@ -90,7 +91,7 @@ export default {
           {
             row.map(item=> {
               return (
-                <td class="el-descriptions-item" colSpan={item.props.span}>
+                <td class="el-descriptions-item el-descriptions-item__cell" colSpan={item.props.span}>
                   <div class="el-descriptions-item__container">
                     <span
                       class={{

diff --git a/packages/descriptions/src/index.js b/packages/descriptions/src/index.js
@@ -168,7 +168,7 @@ export default {
         }
 
         <div class="el-descriptions__body">
-          <table class={[{'is-bordered': border}, descriptionsSize ? `el-descriptions--${descriptionsSize}` : '']}>
+          <table class={['el-descriptions__table', {'is-bordered': border}, descriptionsSize ? `el-descriptions--${descriptionsSize}` : '']}>
             {rows.map(row => (
               <DescriptionsRow row={row}></DescriptionsRow>
             ))}

diff --git a/packages/drawer/src/main.vue b/packages/drawer/src/main.vue
@@ -190,6 +190,9 @@ export default {
     if (this.visible) {
       this.rendered = true;
       this.open();
+      if (this.appendToBody) {
+        document.body.appendChild(this.$el);
+      }
     }
   },
   destroyed() {

diff --git a/packages/select/src/select.vue b/packages/select/src/select.vue
@@ -565,10 +565,10 @@
       handleFocus(event) {
         if (!this.softFocus) {
           if (this.automaticDropdown || this.filterable) {
-            this.visible = true;
-            if (this.filterable) {
+            if (this.filterable && !this.visible) {
               this.menuVisibleOnFocus = true;
             }
+            this.visible = true;
           }
           this.$emit('focus', event);
         } else {

diff --git a/packages/table/src/table-body.js b/packages/table/src/table-body.js
@@ -219,6 +219,8 @@ export default {
         }));
       }
 
+      classes.push('el-table__cell');
+
       return classes.join(' ');
     },
 
@@ -404,7 +406,7 @@ export default {
         return [[
           tr,
           <tr key={'expanded-row__' + tr.key}>
-            <td colspan={ this.columnsCount } class="el-table__expanded-cell">
+            <td colspan={ this.columnsCount } class="el-table__cell el-table__expanded-cell">
               { renderExpanded(this.$createElement, { row, $index, store: this.store }) }
             </td>
           </tr>]];

diff --git a/packages/table/src/table-footer.js b/packages/table/src/table-footer.js
@@ -63,7 +63,7 @@ export default {
                 key={cellIndex}
                 colspan={ column.colSpan }
                 rowspan={ column.rowSpan }
-                class={ this.getRowClasses(column, cellIndex) }>
+                class={ [...this.getRowClasses(column, cellIndex), 'el-table__cell'] }>
                 <div class={ ['cell', column.labelClassName] }>
                   {
                     sums[cellIndex]
@@ -72,7 +72,7 @@ export default {
               </td>)
             }
             {
-              this.hasGutter ? <th class="gutter"></th> : ''
+              this.hasGutter ? <th class="el-table__cell gutter"></th> : ''
             }
           </tr>
         </tbody>

diff --git a/packages/table/src/table-header.js b/packages/table/src/table-header.js
@@ -136,7 +136,7 @@ export default {
                   </th>))
                 }
                 {
-                  this.hasGutter ? <th class="gutter"></th> : ''
+                  this.hasGutter ? <th class="el-table__cell gutter"></th> : ''
                 }
               </tr>
             )
@@ -286,6 +286,8 @@ export default {
         }));
       }
 
+      classes.push('el-table__cell');
+
       return classes.join(' ');
     },
 

diff --git a/packages/theme-chalk/package.json b/packages/theme-chalk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-theme-chalk",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "description": "Element component chalk theme.",
   "main": "lib/index.css",
   "style": "lib/index.css",

diff --git a/packages/theme-chalk/src/descriptions.scss b/packages/theme-chalk/src/descriptions.scss
@@ -23,12 +23,12 @@
     color: $--color-text-regular;
     background-color: $--color-white;
 
-    table {
+    .el-descriptions__table {
       border-collapse: collapse;
       width: 100%;
       table-layout: fixed;
 
-      th, td {
+      .el-descriptions-item__cell {
         box-sizing: border-box;
         text-align: left;
         font-weight: normal;
@@ -51,27 +51,27 @@
 
   .is-bordered {
     table-layout: auto;
-    th, td {
+    .el-descriptions-item__cell {
       border: $--descriptions-table-border;
       padding: 12px 10px;
     }
   }
 
   :not(.is-bordered) {
-    th, td {
+    .el-descriptions-item__cell {
       padding-bottom: 12px;
     }
   }
 
   @include m(medium) {
     &.is-bordered {
-      th, td {
+      .el-descriptions-item__cell {
         padding: 10px;
       }
     }
 
     &:not(.is-bordered) {
-      th, td {
+      .el-descriptions-item__cell {
         padding-bottom: 10px;
       }
     }
@@ -81,13 +81,13 @@
     font-size: 12px;
 
     &.is-bordered {
-      th, td {
+      .el-descriptions-item__cell {
         padding: 8px 10px;
       }
     }
 
     &:not(.is-bordered) {
-      th, td {
+      .el-descriptions-item__cell {
         padding-bottom: 8px;
       }
     }
@@ -97,13 +97,13 @@
     font-size: 12px;
 
     &.is-bordered {
-      th, td {
+      .el-descriptions-item__cell {
         padding: 6px 10px;
       }
     }
 
     &:not(.is-bordered) {
-      th, td {
+      .el-descriptions-item__cell {
         padding-bottom: 6px;
       }
     }