From 0ecad28450bfe0df5f196e5059547783b918bdeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E5=BE=97=E8=AE=A9=E4=BA=BA=E5=8F=91=E6=AF=9B?=
<2328204591@qq.com>
Date: Wed, 10 Sep 2025 15:41:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84ODropdown?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84size=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/opendesign/src/dropdown/ODropdown.vue | 4 ++--
.../opendesign/src/dropdown/style/index.scss | 1 +
.../opendesign/src/dropdown/style/media.scss | 18 ++++++++++++++++++
.../opendesign/src/dropdown/style/var.scss | 11 ++++++++++-
packages/opendesign/src/dropdown/types.ts | 2 ++
5 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 packages/opendesign/src/dropdown/style/media.scss
diff --git a/packages/opendesign/src/dropdown/ODropdown.vue b/packages/opendesign/src/dropdown/ODropdown.vue
index f3152c9f..55067ade 100644
--- a/packages/opendesign/src/dropdown/ODropdown.vue
+++ b/packages/opendesign/src/dropdown/ODropdown.vue
@@ -23,7 +23,7 @@ watch(
if (!isUndefined(val)) {
isVisible.value = val;
}
- }
+ },
);
const updateVisible = (val: boolean) => {
@@ -54,7 +54,7 @@ provide(dropdownInjectKey, { updateVisible });
:adjust-min-width="props.optionWidthMode === 'min-width'"
:adjust-width="props.optionWidthMode === 'width'"
>
-
+
diff --git a/packages/opendesign/src/dropdown/style/index.scss b/packages/opendesign/src/dropdown/style/index.scss
index 408201ef..5491c019 100644
--- a/packages/opendesign/src/dropdown/style/index.scss
+++ b/packages/opendesign/src/dropdown/style/index.scss
@@ -1,2 +1,3 @@
@use './style.scss' as *;
@use './var.scss' as *;
+@use './media.scss' as *;
\ No newline at end of file
diff --git a/packages/opendesign/src/dropdown/style/media.scss b/packages/opendesign/src/dropdown/style/media.scss
new file mode 100644
index 00000000..29e7c890
--- /dev/null
+++ b/packages/opendesign/src/dropdown/style/media.scss
@@ -0,0 +1,18 @@
+@use '../../_styles/mixin.scss' as *;
+
+@include respond-to('pad_v-pc_s') {
+ .o-dropdown-list-large {
+ .o-dropdown-item {
+ --dropdown-item-text-size: var(--o-font_size-tip1);
+ --dropdown-item-text-height: var(--o-line_height-tip1);
+
+ --dropdown-item-padding: 6px 12px;
+ }
+ }
+
+ .o-dropdown-list-medium {
+ .o-dropdown-item {
+ --dropdown-item-padding: 2px 12px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/opendesign/src/dropdown/style/var.scss b/packages/opendesign/src/dropdown/style/var.scss
index 069b182b..835db601 100644
--- a/packages/opendesign/src/dropdown/style/var.scss
+++ b/packages/opendesign/src/dropdown/style/var.scss
@@ -20,7 +20,16 @@
--dropdown-item-justify: center;
- --dropdown-item-padding: 7px 0px;
+ --dropdown-item-padding: 7px 12px;
--dropdown-item-gap: 2px;
--dropdown-item-radius: var(--o-radius_control-s);
}
+
+.o-dropdown-list-medium {
+ .o-dropdown-item {
+ --dropdown-item-text-size: var(--o-font_size-tip1);
+ --dropdown-item-text-height: var(--o-line_height-tip1);
+
+ --dropdown-item-padding: 4px 12px;
+ }
+}
\ No newline at end of file
diff --git a/packages/opendesign/src/dropdown/types.ts b/packages/opendesign/src/dropdown/types.ts
index e745a345..7277f9c6 100644
--- a/packages/opendesign/src/dropdown/types.ts
+++ b/packages/opendesign/src/dropdown/types.ts
@@ -22,9 +22,11 @@ export const dropdownProps = {
/**
* @zh-CN 大小
* @en-US Size
+ * @default 'large'
*/
size: {
type: String as PropType,
+ default: 'large',
},
/**
* @zh-CN 圆角值
--
Gitee
From 404a28eb1b20f464fab2c5e91fc5fedd8b5a6e2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E5=BE=97=E8=AE=A9=E4=BA=BA=E5=8F=91=E6=AF=9B?=
<2328204591@qq.com>
Date: Wed, 10 Sep 2025 15:43:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(doc):=20=E8=A1=A5=E5=85=85ODropdown?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6size=E5=B1=9E=E6=80=A7=E7=9A=84=E7=A4=BA?=
=?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/dropdown/__docs__/__case__/DropdownAsTheme.vue | 6 +++---
.../src/dropdown/__docs__/__case__/DropdownNormal.vue | 6 +++---
.../src/dropdown/__docs__/__case__/DropdownPrimary.vue | 6 +++---
.../src/dropdown/__docs__/__case__/DropdownText.vue | 6 +++---
.../src/dropdown/__docs__/__case__/DropdownUsage.vue | 1 +
.../opendesign/src/dropdown/style/theme-kunpeng.scss | 10 +++++++++-
.../opendesign/src/dropdown/style/theme-openeuler.scss | 10 +++++++++-
7 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/packages/opendesign/src/dropdown/__docs__/__case__/DropdownAsTheme.vue b/packages/opendesign/src/dropdown/__docs__/__case__/DropdownAsTheme.vue
index 7202e3a7..bed288e0 100644
--- a/packages/opendesign/src/dropdown/__docs__/__case__/DropdownAsTheme.vue
+++ b/packages/opendesign/src/dropdown/__docs__/__case__/DropdownAsTheme.vue
@@ -27,14 +27,14 @@ const list = reactive>([
btnClass: 'c-btn-activity',
visible: false,
forbid: false,
- trigger: 'click',
+ trigger: 'click-outclick',
},
{
size: 'medium',
btnClass: 'c-btn-ascend',
visible: false,
forbid: false,
- trigger: 'click',
+ trigger: 'click-outclick',
},
{
size: 'medium',
@@ -53,7 +53,7 @@ const options = [
-
+
下拉按钮
diff --git a/packages/opendesign/src/dropdown/__docs__/__case__/DropdownNormal.vue b/packages/opendesign/src/dropdown/__docs__/__case__/DropdownNormal.vue
index aa28c829..06a61adf 100644
--- a/packages/opendesign/src/dropdown/__docs__/__case__/DropdownNormal.vue
+++ b/packages/opendesign/src/dropdown/__docs__/__case__/DropdownNormal.vue
@@ -27,13 +27,13 @@ const list = reactive>([
size: 'large',
visible: false,
forbid: false,
- trigger: 'click',
+ trigger: 'click-outclick',
},
{
size: 'medium',
visible: false,
forbid: false,
- trigger: 'click',
+ trigger: 'click-outclick',
},
{
size: 'medium',
@@ -51,7 +51,7 @@ const options = [
-
+
下拉按钮
diff --git a/packages/opendesign/src/dropdown/__docs__/__case__/DropdownPrimary.vue b/packages/opendesign/src/dropdown/__docs__/__case__/DropdownPrimary.vue
index 09c9e29d..bb6b8a7c 100644
--- a/packages/opendesign/src/dropdown/__docs__/__case__/DropdownPrimary.vue
+++ b/packages/opendesign/src/dropdown/__docs__/__case__/DropdownPrimary.vue
@@ -28,13 +28,13 @@ const list = reactive>([
size: 'large',
visible: false,
forbid: false,
- trigger: 'click',
+ trigger: 'click-outclick',
},
{
size: 'medium',
visible: false,
forbid: false,
- trigger: 'click',
+ trigger: 'click-outclick',
},
{
size: 'medium',
@@ -52,7 +52,7 @@ const options = [
-
+
下拉按钮
diff --git a/packages/opendesign/src/dropdown/__docs__/__case__/DropdownText.vue b/packages/opendesign/src/dropdown/__docs__/__case__/DropdownText.vue
index df447803..5bfdcce6 100644
--- a/packages/opendesign/src/dropdown/__docs__/__case__/DropdownText.vue
+++ b/packages/opendesign/src/dropdown/__docs__/__case__/DropdownText.vue
@@ -28,13 +28,13 @@ const list = reactive>([
size: 'large',
visible: false,
forbid: false,
- trigger: 'click',
+ trigger: 'click-outclick',
},
{
size: 'medium',
visible: false,
forbid: false,
- trigger: 'click',
+ trigger: 'click-outclick',
},
{
size: 'medium',
@@ -52,7 +52,7 @@ const options = [
-
+
下拉按钮
diff --git a/packages/opendesign/src/dropdown/__docs__/__case__/DropdownUsage.vue b/packages/opendesign/src/dropdown/__docs__/__case__/DropdownUsage.vue
index 7e478f16..b5a1d8ce 100644
--- a/packages/opendesign/src/dropdown/__docs__/__case__/DropdownUsage.vue
+++ b/packages/opendesign/src/dropdown/__docs__/__case__/DropdownUsage.vue
@@ -20,6 +20,7 @@ import { propsToAttrStr } from '../../../_demo/utils';
import { DocDemoSchema, DocDemoTemplate } from '../../../_demo/types';
const _schema = {
+ size: { type: 'list', list: ['large', 'medium'] },
trigger: {
type: 'list',
list: ['none', 'click', 'click-outclick', 'hover', 'hover-outclick', 'focus', 'contextmenu'],
diff --git a/packages/opendesign/src/dropdown/style/theme-kunpeng.scss b/packages/opendesign/src/dropdown/style/theme-kunpeng.scss
index a84bc073..c156eb02 100644
--- a/packages/opendesign/src/dropdown/style/theme-kunpeng.scss
+++ b/packages/opendesign/src/dropdown/style/theme-kunpeng.scss
@@ -1 +1,9 @@
-@use "./common.scss" as *;
\ No newline at end of file
+@use "./common.scss" as *;
+
+.o-dropdown-list {
+ --dropdown-list-radius: var(--o-radius_control-xs);
+}
+
+.o-dropdown-item {
+ --dropdown-item-radius: var(--o-radius_control-xs);
+}
\ No newline at end of file
diff --git a/packages/opendesign/src/dropdown/style/theme-openeuler.scss b/packages/opendesign/src/dropdown/style/theme-openeuler.scss
index a84bc073..c156eb02 100644
--- a/packages/opendesign/src/dropdown/style/theme-openeuler.scss
+++ b/packages/opendesign/src/dropdown/style/theme-openeuler.scss
@@ -1 +1,9 @@
-@use "./common.scss" as *;
\ No newline at end of file
+@use "./common.scss" as *;
+
+.o-dropdown-list {
+ --dropdown-list-radius: var(--o-radius_control-xs);
+}
+
+.o-dropdown-item {
+ --dropdown-item-radius: var(--o-radius_control-xs);
+}
\ No newline at end of file
--
Gitee