gi-component 0.0.41 → 0.0.43

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gi-component",
   "type": "module",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "description": "Vue3中基于Element Plus二次封装基础组件库",
   "author": "lin",
   "license": "MIT",

package/packages/components/card/src/card.vue

@@ -51,10 +51,10 @@ const getCardClass = computed(() => {
   if (props.bordered) {
     arr.push(b('card--bordered'))
   }
+  arr.push(b(`card--${props.size}`))
   if (props.inner) {
     arr.push(b('card--inner'))
   }
-  arr.push(b(`card--${props.size}`))
   return arr.join(' ')
 })
 
@@ -132,24 +132,6 @@ const getHeaderClass = computed(() => {
   box-sizing: border-box;
 }
 
-.#{a.$prefix}-card--full {
-  .#{a.$prefix}-card-body {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-  }
-}
-
-.#{a.$prefix}-card--inner {
-
-  .#{a.$prefix}-card-header,
-  .#{a.$prefix}-card-body,
-  .#{a.$prefix}-card-footer {
-    padding-left: 0;
-    padding-right: 0;
-  }
-}
-
 .#{a.$prefix}-card--small {
   .#{a.$prefix}-card-header {
     height: 36px;
@@ -168,4 +150,22 @@ const getHeaderClass = computed(() => {
     padding: var(--card-padding-y-small) var(--card-padding-x-small);
   }
 }
+
+.#{a.$prefix}-card--full {
+  .#{a.$prefix}-card-body {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.#{a.$prefix}-card--inner {
+
+  .#{a.$prefix}-card-header,
+  .#{a.$prefix}-card-body,
+  .#{a.$prefix}-card-footer {
+    padding-left: 0;
+    padding-right: 0;
+  }
+}
 </style>

package/packages/components/flex/src/flex.vue

@@ -24,8 +24,8 @@ const classNames = computed(() => [b('flex')])
 
 const gapMap: Record<string, string> = {
   small: '8px',
-  middle: '16px',
-  large: '24px'
+  middle: '12px',
+  large: '16px'
 }
 
 const resolvedGap = computed(() => {
@@ -50,7 +50,7 @@ const resolvedWrap = computed(() => {
 const style = computed<CSSProperties>(() => {
   const obj: CSSProperties = {
     display: 'flex',
-    flexDirection: props.vertical ? 'column' : 'row',
+    flexDirection: props.column || props.vertical ? 'column' : 'row',
     flexWrap: resolvedWrap.value,
     justifyContent: props.justify,
     alignItems: props.align

package/packages/components/flex/src/type.ts

@@ -1,12 +1,14 @@
 export interface FlexProps {
   /** Flex 主轴的方向是否垂直，使用 flex-direction: column */
+  column?: boolean
+  /** 与 column 同义，保留用于兼容旧版 API */
   vertical?: boolean
   /** 设置元素单行显示还是多行显示，参考 flex-wrap；支持布尔值，true 为 wrap，false 为 nowrap */
   wrap?: 'nowrap' | 'wrap' | 'wrap-reverse' | boolean | ''
   /** 设置元素在主轴方向上的对齐方式，参考 justify-content */
-  justify?: 'normal' | 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around' | 'space-evenly'
+  justify?: 'normal' | 'start' | 'end' | 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around' | 'space-evenly'
   /** 设置元素在交叉轴方向上的对齐方式，参考 align-items */
-  align?: 'normal' | 'flex-start' | 'flex-end' | 'center' | 'stretch' | 'baseline'
+  align?: 'normal' | 'start' | 'end' | 'flex-start' | 'flex-end' | 'center' | 'stretch' | 'baseline'
   /** flex CSS 简写属性 */
   flex?: string
   /** 设置网格之间的间隙，可选预设 small / middle / large 或 string / number */

package/packages/components.d.ts

@@ -1,33 +1,33 @@
-/* eslint-disable */
-// @ts-nocheck
-// Generated by unplugin-vue-components
-// Read more: https://github.com/vuejs/core/pull/3399
-// biome-ignore lint: disable
-export {}
-
-/* prettier-ignore */
-declare module 'vue' {
-  export interface GlobalComponents {
-    GiButton: typeof import('./components/button/src/button.vue')['default']
-    GiCard: typeof import('./components/card/src/card.vue')['default']
-    GiDescriptions: typeof import('./components/descriptions/src/descriptions.vue')['default']
-    GiDialog: typeof import('./components/dialog/src/dialog.vue')['default']
-    GiDialogContent: typeof import('./components/dialog/src/dialog-content.vue')['default']
-    GiDot: typeof import('./components/dot/src/dot.vue')['default']
-    GiDrawer: typeof import('./components/drawer/src/drawer.vue')['default']
-    GiEditTable: typeof import('./components/edit-table/src/edit-table.vue')['default']
-    GiFlex: typeof import('./components/flex/src/flex.vue')['default']
-    GiForm: typeof import('./components/form/src/form.vue')['default']
-    GiGrid: typeof import('./components/grid/src/grid.vue')['default']
-    GiGridItem: typeof import('./components/grid/src/grid-item.vue')['default']
-    GiInputGroup: typeof import('./components/input-group/src/input-group.vue')['default']
-    GiInputSearch: typeof import('./components/input-search/src/input-search.vue')['default']
-    GiPageLayout: typeof import('./components/page-layout/src/page-layout.vue')['default']
-    GiSplitButton: typeof import('./components/page-layout/src/split-button.vue')['default']
-    GiTable: typeof import('./components/table/src/table.vue')['default']
-    GiTableColumn: typeof import('./components/table/src/TableColumn.vue')['default']
-    GiTabs: typeof import('./components/tabs/src/tabs.vue')['default']
-    GiTag: typeof import('./components/tag/src/tag.vue')['default']
-    GiTreeTransfer: typeof import('./components/tree-transfer/src/tree-transfer.vue')['default']
-  }
-}
+/* eslint-disable */
+// @ts-nocheck
+// Generated by unplugin-vue-components
+// Read more: https://github.com/vuejs/core/pull/3399
+// biome-ignore lint: disable
+export {}
+
+/* prettier-ignore */
+declare module 'vue' {
+  export interface GlobalComponents {
+    GiButton: typeof import('./components/button/src/button.vue')['default']
+    GiCard: typeof import('./components/card/src/card.vue')['default']
+    GiDescriptions: typeof import('./components/descriptions/src/descriptions.vue')['default']
+    GiDialog: typeof import('./components/dialog/src/dialog.vue')['default']
+    GiDialogContent: typeof import('./components/dialog/src/dialog-content.vue')['default']
+    GiDot: typeof import('./components/dot/src/dot.vue')['default']
+    GiDrawer: typeof import('./components/drawer/src/drawer.vue')['default']
+    GiEditTable: typeof import('./components/edit-table/src/edit-table.vue')['default']
+    GiFlex: typeof import('./components/flex/src/flex.vue')['default']
+    GiForm: typeof import('./components/form/src/form.vue')['default']
+    GiGrid: typeof import('./components/grid/src/grid.vue')['default']
+    GiGridItem: typeof import('./components/grid/src/grid-item.vue')['default']
+    GiInputGroup: typeof import('./components/input-group/src/input-group.vue')['default']
+    GiInputSearch: typeof import('./components/input-search/src/input-search.vue')['default']
+    GiPageLayout: typeof import('./components/page-layout/src/page-layout.vue')['default']
+    GiSplitButton: typeof import('./components/page-layout/src/split-button.vue')['default']
+    GiTable: typeof import('./components/table/src/table.vue')['default']
+    GiTableColumn: typeof import('./components/table/src/TableColumn.vue')['default']
+    GiTabs: typeof import('./components/tabs/src/tabs.vue')['default']
+    GiTag: typeof import('./components/tag/src/tag.vue')['default']
+    GiTreeTransfer: typeof import('./components/tree-transfer/src/tree-transfer.vue')['default']
+  }
+}