releases 4.2.2

x-extends · Sep 23, 2024 · d091be9 · d091be9
1 parent 188fd72
commit d091be9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "A vue based PC component library",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

diff --git a/packages/row/src/col.ts b/packages/row/src/col.ts
@@ -117,7 +117,11 @@ export default defineComponent({
           'is--ellipsis': ellipsis
         }],
         style: colStyle
-      }, defaultSlot ? defaultSlot({}) : [])
+      }, [
+        h('div', {
+          class: 'vxe-col--inner'
+        }, defaultSlot ? defaultSlot({}) : [])
+      ])
     }
 
     $xeCol.renderVN = renderVN

diff --git a/styles/components/card.scss b/styles/components/card.scss
@@ -1,4 +1,5 @@
 .vxe-card {
+  position: relative;
   display: inline-flex;
   flex-direction: column;
   font-size: var(--vxe-ui-font-size-default);
@@ -10,8 +11,6 @@
     box-shadow: var(--vxe-ui-base-popup-box-shadow);
   }
   &.is--padding {
-    .vxe-card--header,
-    .vxe-card--footer,
     .vxe-card--body-content,
     .vxe-card--body-left,
     .vxe-card--body-right {
@@ -36,6 +35,10 @@
 .vxe-card--header {
   flex-shrink: 0;
 }
+.vxe-card--header,
+.vxe-card--footer {
+  padding: var(--vxe-ui-card-padding);
+}
 .vxe-card--body {
   overflow: hidden;
   flex-grow: 1;

diff --git a/styles/components/col.scss b/styles/components/col.scss
@@ -30,3 +30,7 @@ $colSpanList: 4.16667%, 8.33333%, 12.5%, 16.66667%, 20.83333%, 25%, 29.16667%, 3
     }
   }
 }
+.vxe-col--inner {
+  display: flex;
+  flex-direction: column;
+}