diff --git a/packages/opendesign/package.json b/packages/opendesign/package.json
index 0b9263e8c37b978091ff8a2c937386a6366b05f5..c07a70645ef40c6a3f51387a546bf0903c303cfa 100644
--- a/packages/opendesign/package.json
+++ b/packages/opendesign/package.json
@@ -1,6 +1,6 @@
{
"name": "@opensig/opendesign",
- "version": "0.0.6",
+ "version": "0.0.7",
"main": "lib/index.js",
"module": "es/index.mjs",
"types": "es/index.d.ts",
diff --git a/packages/opendesign/src/components/_shared/global.ts b/packages/opendesign/src/components/_shared/global.ts
index c1c457c60e78ff12c76b4b2ebdd29edc5a25ac63..bc88dd0fe7f45df410678d9bf46bd72d8c3865f9 100644
--- a/packages/opendesign/src/components/_shared/global.ts
+++ b/packages/opendesign/src/components/_shared/global.ts
@@ -18,7 +18,7 @@ export function initRound(type: 'pill' | 'normal') {
// 方向
-export type DirectionT = 'horizontal' | 'vertical';
+export type DirectionT = 'h' | 'v';
export type VariantT = 'solid' | 'outline' | 'text';
diff --git a/packages/opendesign/src/components/card/OCard.vue b/packages/opendesign/src/components/card/OCard.vue
index d856473d231e96a8e983655deb9289308fd39558..5013452c0dae992089d6713ee148ec82fff7b36a 100644
--- a/packages/opendesign/src/components/card/OCard.vue
+++ b/packages/opendesign/src/components/card/OCard.vue
@@ -43,19 +43,21 @@ const hasContent = computed(() => {
-
-
-
-
{{ props.title }}
+
+
+
+
+ {{ props.title }}
+
+
+
{{ props.content }}
+
+
-
-
{{ props.content }}
-
+
+
-
-
-
-
+
diff --git a/packages/opendesign/src/components/card/__demo__/CardBasic.vue b/packages/opendesign/src/components/card/__demo__/CardBasic.vue
index 835fbac39ecc7a50ef4f824d3bba8392f6952f3f..26869dc25947a1da1a7d5f57653134cc86ca8320 100644
--- a/packages/opendesign/src/components/card/__demo__/CardBasic.vue
+++ b/packages/opendesign/src/components/card/__demo__/CardBasic.vue
@@ -74,6 +74,17 @@ const card = {
+
+
+
+
+
+
{{ card.title }}
+
{{ card.content }}
+
+
+
+
diff --git a/packages/opendesign/src/components/card/style/index.scss b/packages/opendesign/src/components/card/style/index.scss
index 38bc008701474c52dfbd2a9ba23a95bd0b237fc0..e670142cf1af0ad560e559f085c280a64c235d55 100644
--- a/packages/opendesign/src/components/card/style/index.scss
+++ b/packages/opendesign/src/components/card/style/index.scss
@@ -42,7 +42,7 @@
}
.o-card-main {
- padding: 24px;
+ padding: var(--card-main-padding);
display: flex;
flex-direction: column;
justify-content: space-between;
diff --git a/packages/opendesign/src/components/card/style/var.scss b/packages/opendesign/src/components/card/style/var.scss
index 6b71a6757ac95532827a57e77c3250eefb0f1c09..9475659ed78d94cf479aafe58764f483381ff854 100644
--- a/packages/opendesign/src/components/card/style/var.scss
+++ b/packages/opendesign/src/components/card/style/var.scss
@@ -2,6 +2,7 @@
--card-radius: var(--o-radius-control-l);
--card-title-max-row: 0;
--card-detail-max-row: 0;
+ --card-main-padding: 24px;
}
.o-card-medium {
diff --git a/packages/opendesign/src/components/checkbox-group/types.ts b/packages/opendesign/src/components/checkbox-group/types.ts
index 5bffd3e619e7db252e3d5af90f8cecf6a4c98c68..553533991feab95d039943c474dd09fe16383fb1 100644
--- a/packages/opendesign/src/components/checkbox-group/types.ts
+++ b/packages/opendesign/src/components/checkbox-group/types.ts
@@ -24,11 +24,11 @@ export const checkboxGroupProps = {
},
/**
* 多选框组方向
- * 'horizontal' | 'vertical'
+ * 'h' | 'v'
*/
direction: {
type: String as PropType
,
- default: 'horizontal',
+ default: 'h',
},
/**
* 多选框组支持选中的最小多选框数量
diff --git a/packages/opendesign/src/components/divider/ODivider.vue b/packages/opendesign/src/components/divider/ODivider.vue
index 9e6f852108110913ff5bc7f9be78f3fb6c980f24..99276e1bb174449f226ac7f28e078963afd71727 100644
--- a/packages/opendesign/src/components/divider/ODivider.vue
+++ b/packages/opendesign/src/components/divider/ODivider.vue
@@ -10,7 +10,7 @@ const props = defineProps(dividerProps);
class="o-divider"
:class="[`o-divider-${props.type}`, `o-divider-${props.direction}`, { [`o-divider-content-${props.contentPosition}`]: $slots.default }]"
>
-
+
diff --git a/packages/opendesign/src/components/divider/style/index.scss b/packages/opendesign/src/components/divider/style/index.scss
index cd82a86e1289273443580bc8eb00ee996579f4d6..1a5e334e16fb91759550afddbb8532ceacd7bfdb 100644
--- a/packages/opendesign/src/components/divider/style/index.scss
+++ b/packages/opendesign/src/components/divider/style/index.scss
@@ -7,7 +7,7 @@
font-weight: 500;
}
-.o-divider-horizontal {
+.o-divider-h {
display: flex;
align-items: center;
width: 100%;
diff --git a/packages/opendesign/src/components/divider/style/var.scss b/packages/opendesign/src/components/divider/style/var.scss
index 186ef4f5b4395b0008f8fcbab71c54b8cda00adf..c15c6f690fd25efe21eda507e78b3d4b49349d56 100644
--- a/packages/opendesign/src/components/divider/style/var.scss
+++ b/packages/opendesign/src/components/divider/style/var.scss
@@ -7,7 +7,7 @@
--o-divider-text-height: var(--o-line_height-text1);
}
-.o-divider-horizontal {
+.o-divider-h {
--o-divider-gap: var(--o-gap-3);
}
diff --git a/packages/opendesign/src/components/divider/types.ts b/packages/opendesign/src/components/divider/types.ts
index 7e84fbee615a34865a0615b1684e06e8492b2da8..b2d821a84f7a2f4c1c3e33bcb4359eb269f9fb19 100644
--- a/packages/opendesign/src/components/divider/types.ts
+++ b/packages/opendesign/src/components/divider/types.ts
@@ -15,11 +15,11 @@ export const dividerProps = {
},
/**
* 分割线方向
- * 'horizontal' | 'vertical'
+ * 'h' | 'v'
*/
direction: {
type: String as PropType
,
- default: 'horizontal',
+ default: 'h',
},
/**
* 自定义内容位置
diff --git a/packages/opendesign/src/components/figure/OFigure.vue b/packages/opendesign/src/components/figure/OFigure.vue
index 5abeeb81f87da8d3a44128fc58a3506108e88760..4d563d67220d2ab52c3bdb47a03cb308d600eee7 100644
--- a/packages/opendesign/src/components/figure/OFigure.vue
+++ b/packages/opendesign/src/components/figure/OFigure.vue
@@ -1,5 +1,5 @@
-
+
-
+
diff --git a/packages/opendesign/src/components/index.ts b/packages/opendesign/src/components/index.ts
index a7c36024104e5d9eeb0d423cdb0d3326a50c7e88..ed6a810df01762aaf9fb4b9310cf49c157ba942c 100644
--- a/packages/opendesign/src/components/index.ts
+++ b/packages/opendesign/src/components/index.ts
@@ -29,12 +29,13 @@ export * from './menu';
export * from './breadcrumb';
export * from './progress';
export * from './dropdown';
-// export * from './scrollbar';
export * from './dialog';
export * from './figure';
export * from './card';
export * from './message';
+// export * from './scrollbar';
+
export * from './intersection-observer';
export * from './resize-observer';
export * from './child-only';
diff --git a/packages/opendesign/src/components/radio-group/types.ts b/packages/opendesign/src/components/radio-group/types.ts
index 4ac84ac25694b3506aae4c80bd549ca9f618c395..2ae682f8d858701cf5ea31aaf19b65042e6cebe1 100644
--- a/packages/opendesign/src/components/radio-group/types.ts
+++ b/packages/opendesign/src/components/radio-group/types.ts
@@ -24,11 +24,11 @@ export const radioGroupProps = {
},
/**
* 单选框组方向
- * 'horizontal' | 'vertical'
+ * 'h' | 'v'
*/
direction: {
type: String as PropType,
- default: 'horizontal',
+ default: 'h',
},
};
diff --git a/packages/opendesign/src/components/textarea/OTextarea.vue b/packages/opendesign/src/components/textarea/OTextarea.vue
index 16409d646d8bb380abe11088e13450f925c56234..de7bd065a8d5f2a008c104cf86d5893efa4f5948 100644
--- a/packages/opendesign/src/components/textarea/OTextarea.vue
+++ b/packages/opendesign/src/components/textarea/OTextarea.vue
@@ -4,7 +4,7 @@ import { defaultSize } from '../_shared/global';
import { isFunction } from '../_shared/is';
import { IconClose } from '../_shared/icons';
import { trigger } from '../_shared/event';
-import { toInputString } from './textarea';
+import { getResizeValue, toInputString } from './textarea';
import { OResizeObserver } from '../resize-observer';
import { textareaProps } from './types';
import { getRoundClass } from '../_shared/style-class';
@@ -40,7 +40,7 @@ watch(
);
const resizeValue = computed(() => {
- return props.autoHeight || props.disabled ? 'none' : props.resize;
+ return props.autoHeight || props.disabled ? 'none' : getResizeValue(props.resize);
});
const getValueLength = (val: string) => {
diff --git a/packages/opendesign/src/components/textarea/__demo__/TextareaBasic.vue b/packages/opendesign/src/components/textarea/__demo__/TextareaBasic.vue
index 605910e6b9f158187c96a5a9b95835e93e62991e..72574e31e5b4bd4ab546ff9714186749fa99a8cb 100644
--- a/packages/opendesign/src/components/textarea/__demo__/TextareaBasic.vue
+++ b/packages/opendesign/src/components/textarea/__demo__/TextareaBasic.vue
@@ -80,11 +80,11 @@ const printEvent = (event: string, val?: string | number) => {
none:
diff --git a/packages/opendesign/src/components/textarea/textarea.ts b/packages/opendesign/src/components/textarea/textarea.ts
index 7c05e51f294e2438fa0736281a17ceaaf7a7fbe0..72b9319cd0b45a52c5e331dc8c53a5f66df1741b 100644
--- a/packages/opendesign/src/components/textarea/textarea.ts
+++ b/packages/opendesign/src/components/textarea/textarea.ts
@@ -1,8 +1,18 @@
import { isNull, isUndefined } from '../_shared/is';
+import { ResizeT } from './types';
export function toInputString(val: unknown): string {
if (isUndefined(val) || isNull(val) || (typeof val === 'number' && isNaN(val as number))) {
return '';
}
return String(val);
+}
+
+export function getResizeValue(resize: ResizeT) {
+ if (resize === 'h') {
+ return 'horizontal';
+ } else if (resize ==='v') {
+ return 'vertical';
+ }
+ return resize;
}
\ No newline at end of file
diff --git a/packages/opendesign/src/components/textarea/types.ts b/packages/opendesign/src/components/textarea/types.ts
index e33b314568b18ade42f7fe97d702fd6f1dad8301..7877ba2e00e4156c1376832699a13e33251aabef 100644
--- a/packages/opendesign/src/components/textarea/types.ts
+++ b/packages/opendesign/src/components/textarea/types.ts
@@ -1,6 +1,7 @@
import { ExtractPropTypes, PropType } from 'vue';
import type { SizeT, RoundT, VariantT } from '../_shared/global';
+export type ResizeT = 'both' | 'horizontal'| 'h' | 'vertical' | 'v' | 'none';
export const textareaProps = {
/**
* 下拉框的值
@@ -78,7 +79,7 @@ export const textareaProps = {
* 是否支持调整尺寸
*/
resize: {
- type: String as PropType<'both' | 'horizontal' | 'vertical' | 'none'>,
+ type: String as PropType
,
default: 'vertical'
},
/**