releases 4.8.0

x-extends · Oct 31, 2024 · d0d812c · d0d812c
1 parent 865abd3
commit d0d812c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 32 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.8.0-beta.2",
+  "version": "4.8.0-beta.3",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

diff --git a/packages/table/render/index.ts b/packages/table/render/index.ts
@@ -89,10 +89,10 @@ function isImmediateCell (renderOpts: VxeColumnPropTypes.EditRender, params: any
 }
 
 function getCellLabelVNs (renderOpts: any, params: any, cellLabel: any) {
-  const { name, placeholder } = renderOpts
+  const { placeholder } = renderOpts
   return [
     h('span', {
-      class: ['vxe-cell--label', ['VxeTextarea', 'textarea'].includes(name) ? 'is--textarea' : '']
+      class: 'vxe-cell--label'
     }, placeholder && isEmptyValue(cellLabel)
       ? [
           h('span', {

diff --git a/packages/table/src/body.ts b/packages/table/src/body.ts
@@ -335,7 +335,6 @@ export default defineComponent({
             'col--tree-node': treeNode,
             'col--edit': isEdit,
             'col--ellipsis': hasEllipsis,
-            'col--height': !!rowOpts.height,
             'fixed--hidden': fixedHiddenColumn,
             'col--dirty': isDirty,
             'col--active': editConfig && isEdit && (actived.row === row && (actived.column === column || editOpts.mode === 'row')),

diff --git a/styles/components/table.scss b/styles/components/table.scss
@@ -132,15 +132,8 @@
 }
 .vxe-body--column {
   &.col--vertical-top {
-    &.col--active {
-      & > .vxe-cell {
-        height: 100%;
-      }
-    }
-  }
-  .vxe-cell--label {
-    &.is--textarea {
-      white-space: pre-line;
+    & > .vxe-cell {
+      height: 100%;
     }
   }
 }
@@ -1248,10 +1241,10 @@
           text-overflow: ellipsis;
           white-space: nowrap;
         }
-      }
-      &:not(.col--height) {
-        & > .vxe-cell {
-          max-height: var(--vxe-ui-table-row-height-default);
+        &.col--vertical-top {
+          & > .vxe-cell {
+            white-space: pre-line;
+          }
         }
       }
     }
@@ -1262,11 +1255,6 @@
     .vxe-footer--column {
       &.col--ellipsis {
         @extend %MediumColumnHeight;
-        &:not(.col--height) {
-          & > .vxe-cell {
-            max-height: var(--vxe-ui-table-row-height-medium);
-          }
-        }
       }
     }
     .vxe-cell--checkbox {
@@ -1282,11 +1270,6 @@
     .vxe-footer--column {
       &.col--ellipsis {
         @extend %SmallColumnHeight;
-        &:not(.col--height) {
-          & > .vxe-cell {
-            max-height: var(--vxe-ui-table-row-height-small);
-          }
-        }
       }
     }
     .vxe-cell--checkbox {
@@ -1302,11 +1285,6 @@
     .vxe-footer--column {
       &.col--ellipsis {
         @extend %MiniColumnHeight;
-        &:not(.col--height) {
-          & > .vxe-cell {
-            max-height: var(--vxe-ui-table-row-height-mini);
-          }
-        }
       }
     }
     .vxe-cell--checkbox {