From 828d7cb1ec9b2730d2c718f882748060978e06a9 Mon Sep 17 00:00:00 2001 From: sakurayinfei <970412446@qq.com> Date: Thu, 4 Sep 2025 20:06:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=9A=AE=E8=82=A4?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=87=8D=E6=9E=84=E5=90=8E=E6=9C=AA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AF=BC=E5=85=A5=E8=B7=AF=E5=BE=84=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/docs/src/assets/style/index.ts | 2 +- packages/portal/src/main.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/docs/src/assets/style/index.ts b/packages/docs/src/assets/style/index.ts index 13a67601..ea24668d 100644 --- a/packages/docs/src/assets/style/index.ts +++ b/packages/docs/src/assets/style/index.ts @@ -1,4 +1,4 @@ -import '@opensig/opendesign/theme/common.scss'; +import '@opensig/opendesign/theme/grid.scss'; import './font-family.scss'; import './var-map.scss'; import './style.scss'; diff --git a/packages/portal/src/main.ts b/packages/portal/src/main.ts index 2e202e70..f5a2c3c7 100644 --- a/packages/portal/src/main.ts +++ b/packages/portal/src/main.ts @@ -2,12 +2,12 @@ import { createApp } from 'vue'; import './assets/style/style.scss'; import 'normalize.css'; -import '@opendesign-src/theme/opendesign/light.token.css'; -import '@opendesign-src/theme/opendesign/dark.token.css'; -import '@opendesign-src/theme/ascend/a.dark.token.css'; -import '@opendesign-src/theme/ascend/a.light.token.css'; -import '@opendesign-src/theme/kunpeng/k.dark.token.css'; -import '@opendesign-src/theme/kunpeng/k.light.token.css'; +import '@opendesign-src/theme/opendesign/common/light.token.css'; +import '@opendesign-src/theme/opendesign/common/dark.token.css'; +import '@opendesign-src/theme/ascend/common/a.dark.token.css'; +import '@opendesign-src/theme/ascend/common/a.light.token.css'; +import '@opendesign-src/theme/kunpeng/common/k.dark.token.css'; +import '@opendesign-src/theme/kunpeng/common/k.light.token.css'; import './assets/style/media.token.scss'; import { router } from '@/router'; -- Gitee From 3b68ab0acadc4186db29958f9a198a4984154a4a Mon Sep 17 00:00:00 2001 From: sakurayinfei <970412446@qq.com> Date: Thu, 4 Sep 2025 20:08:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0cascader=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendesign/src/cascader/style/index.scss | 2 +- .../opendesign/src/cascader/style/media.scss | 17 ++++++++--------- packages/opendesign/src/cascader/style/var.scss | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/opendesign/src/cascader/style/index.scss b/packages/opendesign/src/cascader/style/index.scss index e6b6f59b..8bb47c58 100644 --- a/packages/opendesign/src/cascader/style/index.scss +++ b/packages/opendesign/src/cascader/style/index.scss @@ -1,3 +1,3 @@ @use './style.scss' as *; -@use './media.scss' as *; @use './var.scss' as *; +@use './media.scss' as *; diff --git a/packages/opendesign/src/cascader/style/media.scss b/packages/opendesign/src/cascader/style/media.scss index 17937e85..790ed32e 100644 --- a/packages/opendesign/src/cascader/style/media.scss +++ b/packages/opendesign/src/cascader/style/media.scss @@ -1,11 +1,10 @@ @use '../../_styles/mixin.scss' as *; -// @include respond-to('laptop') { -// .o-cascader { -// } -// } - -// @include respond-to('<=pad') { -// .o-cascader { -// } -// } +@include respond-to('<=pc_s') { + .o-cascader-option { + --cascader-option-text-size: var(--o-font_size-tip1); + --cascader-option-text-height: var(--o-line_height-tip1); + --cascader-option-padding: 6px 12px; + --cascader-option-icon-size: var(--o-icon_size-s); + } +} diff --git a/packages/opendesign/src/cascader/style/var.scss b/packages/opendesign/src/cascader/style/var.scss index c4eabe54..ccd27f17 100644 --- a/packages/opendesign/src/cascader/style/var.scss +++ b/packages/opendesign/src/cascader/style/var.scss @@ -22,7 +22,7 @@ --cascader-option-bg-color-hover: var(--o-color-control2-light); --cascader-option-bg-color-selected: var(--o-color-control3-light); - --cascader-option-icon-size: var(--o-icon_size_control-xs); + --cascader-option-icon-size: var(--o-icon_size-m); --cascader-option-gap: 2px; } -- Gitee From 95dc1d36d4a91b44903504c3593a09693cac8020 Mon Sep 17 00:00:00 2001 From: sakurayinfei <970412446@qq.com> Date: Thu, 4 Sep 2025 20:09:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D--cascader-options?= =?UTF-8?q?-bd-clor=E5=8D=95=E8=AF=8D=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/opendesign/src/cascader/style/style.scss | 2 +- packages/opendesign/src/cascader/style/var.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/opendesign/src/cascader/style/style.scss b/packages/opendesign/src/cascader/style/style.scss index e74c2f95..e40f98a5 100644 --- a/packages/opendesign/src/cascader/style/style.scss +++ b/packages/opendesign/src/cascader/style/style.scss @@ -20,7 +20,7 @@ overflow-y: auto; & + .o-cascader-options { - border-left: 1px solid var(--cascader-options-bd-clor); + border-left: 1px solid var(--cascader-options-bd-color); } &:first-child { diff --git a/packages/opendesign/src/cascader/style/var.scss b/packages/opendesign/src/cascader/style/var.scss index ccd27f17..ef17968a 100644 --- a/packages/opendesign/src/cascader/style/var.scss +++ b/packages/opendesign/src/cascader/style/var.scss @@ -3,7 +3,7 @@ } .o-cascader-options { - --cascader-options-bd-clor: var(--o-color-control1-light); + --cascader-options-bd-color: var(--o-color-control1-light); --cascader-options-gap: 8px; } -- Gitee From 19adab8f3b163c1167511bf2eac8d8f7606f63e3 Mon Sep 17 00:00:00 2001 From: sakurayinfei <970412446@qq.com> Date: Mon, 8 Sep 2025 11:33:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96vScrollbar?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E7=9A=84=E7=B1=BB=E5=9E=8B=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/opendesign/src/scrollbar/vScrollbar.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/opendesign/src/scrollbar/vScrollbar.ts b/packages/opendesign/src/scrollbar/vScrollbar.ts index 50364320..52f443a7 100644 --- a/packages/opendesign/src/scrollbar/vScrollbar.ts +++ b/packages/opendesign/src/scrollbar/vScrollbar.ts @@ -1,11 +1,11 @@ -import { DirectiveBinding, ObjectDirective } from 'vue'; +import { ObjectDirective } from 'vue'; import { useScrollbar } from './use-scrollebar'; import { BaseScrollerPropsT } from './types'; const scrollbarMap = new WeakMap(); -const vScrollbar: ObjectDirective = { - mounted(el: HTMLElement, binding: DirectiveBinding | undefined>) { +const vScrollbar: ObjectDirective | undefined> = { + mounted(el: HTMLElement, binding) { const value = binding.value; if (value === false) { -- Gitee