From 42894556494a736b53cf695cc1fc9e07b0123927 Mon Sep 17 00:00:00 2001 From: Cano1997 <1978141412@qq.com> Date: Wed, 22 Oct 2025 20:12:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?style:=20=E8=A7=86=E5=9B=BE=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/common/view-message/view-message.scss | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d38c027..085fb160 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ - 优化重复器表单和多数据部件表单的操作行为样式 - 多数据部件自定义排序设置采用布局实现 - 用户消息无数据提示样式与部件一致 +- 视图消息组件样式变量抽取 ### Fixed diff --git a/src/common/view-message/view-message.scss b/src/common/view-message/view-message.scss index 9427a5ec..8605fe98 100644 --- a/src/common/view-message/view-message.scss +++ b/src/common/view-message/view-message.scss @@ -1,17 +1,24 @@ $view-message: ( + info-bg: getCssVar(color, info, light, default), + info-color: getCssVar(color, info), + warn-bg: getCssVar(color, warning, light, default), + warn-color: getCssVar(color, warning), + error-bg: getCssVar(color, danger, light, default), + error-color: getCssVar(color, danger), ); @include b(view-message) { + @include set-component-css-var('view-message', $view-message); @include m(info) { - background-color: getCssVar(color, info, light, default); - color: getCssVar(color, info); + background-color: getCssVar(view-message, info-bg); + color: getCssVar(view-message, info-color); } @include m(warn) { - background-color: getCssVar(color, warning, light, default); - color: getCssVar(color, warning); + background-color: getCssVar(view-message, warn-bg); + color: getCssVar(view-message, warn-color); } @include m(error) { - background-color: getCssVar(color, danger, light, default); - color: getCssVar(color, danger); + background-color: getCssVar(view-message, error-bg); + color: getCssVar(view-message, error-color); } } \ No newline at end of file -- Gitee From 0e469d2b3cf4551cc4945d6c7bb1ac77e2b480e6 Mon Sep 17 00:00:00 2001 From: Cano1997 <1978141412@qq.com> Date: Wed, 22 Oct 2025 20:13:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?style:=20=E5=8D=A1=E7=89=87=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F=E5=8F=98=E9=87=8F=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/control/data-view/data-view.scss | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 085fb160..85212c50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ - 多数据部件自定义排序设置采用布局实现 - 用户消息无数据提示样式与部件一致 - 视图消息组件样式变量抽取 +- 卡片部件样式变量抽取 ### Fixed diff --git a/src/control/data-view/data-view.scss b/src/control/data-view/data-view.scss index 32b0d7b3..e11c5c64 100644 --- a/src/control/data-view/data-view.scss +++ b/src/control/data-view/data-view.scss @@ -5,6 +5,10 @@ $control-dataview: ( item-gap: getCssVar(spacing, base, tight), pagination-height: var(--van-pagination-height), item-bg-color: transparent, + group-height: getCssVar(height, control, large), + group-padding: 0 getCssVar(spacing, base), + more-color: getCssVar(color, link), + item-shadow: getCssVar(shadow, elevated), ); @include b(control-dataview) { @@ -35,9 +39,9 @@ $control-dataview: ( @include e(collapse-item) { .van-collapse-item__title { - height: getCssVar(height, control, large); + height: getCssVar(control-dataview, group-height); align-items: center; - padding: 0 getCssVar(spacing, base); + padding: getCssVar(control-dataview, group-padding); } } @@ -51,13 +55,13 @@ $control-dataview: ( @include flex(row, center, center); height: getCssVar(control-dataview, pagination-height); cursor: pointer; - color: getCssVar(color, link); + color: getCssVar(control-dataview, more-color); } } @include b(control-dataview-item) { padding: getCssVar(control-dataview, item-padding); - box-shadow: getCssVar(shadow, elevated); + box-shadow: getCssVar(control-dataview, item-shadow); background-color: getCssVar(control-dataview, item-bg-color); color: getCssVar(control-dataview, text-color); width: 100%; -- Gitee From 249cb5073c0435d44a991374cee46ab57906fcfd Mon Sep 17 00:00:00 2001 From: Cano1997 <1978141412@qq.com> Date: Wed, 22 Oct 2025 20:14:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?style:=20=E5=88=86=E9=A1=B5=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E9=9D=A2=E6=9D=BF=E6=A0=B7=E5=BC=8F=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/control/tab-exp-panel/tab-exp-panel.scss | 29 ++++++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85212c50..58fcd38e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ - 用户消息无数据提示样式与部件一致 - 视图消息组件样式变量抽取 - 卡片部件样式变量抽取 +- 分页导航面板样式变量抽取 ### Fixed diff --git a/src/control/tab-exp-panel/tab-exp-panel.scss b/src/control/tab-exp-panel/tab-exp-panel.scss index 56c31607..e223643f 100644 --- a/src/control/tab-exp-panel/tab-exp-panel.scss +++ b/src/control/tab-exp-panel/tab-exp-panel.scss @@ -1,30 +1,35 @@ $control-tabexppanel: ( - 'active-color': getCssVar('color', 'primary'), + 'side-padding': getCssVar(spacing, base), +); + +$control-tabexppanel-flow: ( + 'header-padding': getCssVar(spacing, tight) getCssVar(spacing, base), + 'font-size': getCssVar(font-size, regular), + 'line-height': getCssVar(height-control, small), + 'header-color': getCssVar(color, text, 2), + 'header-bg': getCssVar(color, bg, 0), ); @include b(control-tabexppanel-tab-item-header) { - padding: rem(8px) rem(16px); + @include set-component-css-var('control-tabexppanel-flow', $control-tabexppanel-flow); + padding: getCssVar(control-tabexppanel-flow, header-padding); + font-size: getCssVar(control-tabexppanel-flow, font-size); + line-height: getCssVar(control-tabexppanel-flow, line-height); + color: getCssVar(control-tabexppanel-flow, header-color); overflow: hidden; - font-size: getCssVar(font-size, regular); - line-height: var(--van-cell-line-height); - color: getCssVar(color, text, 2); text-overflow: ellipsis; white-space: nowrap; - background: getCssVar(color, bg, 0); + background: getCssVar(control-tabexppanel-flow, header-bg); } @include b(control-tabexppanel) { @include set-component-css-var('control-tabexppanel', $control-tabexppanel); @include e(sidebar) { - --van-sidebar-selected-border-color: #{getCssVar(control-tabexppanel, active-color)}; @include m(left) { - margin-left: getCssVar(spacing, base); + margin-left: getCssVar(control-tabexppanel, side-padding); } @include m(right) { - margin-right: getCssVar(spacing, base); - } - .van-sidebar-item--select { - color: getCssVar(control-tabexppanel, active-color); + margin-right: getCssVar(control-tabexppanel, side-padding); } } } -- Gitee From 21e68819ff401882c3f4459acb555e8c437b382f Mon Sep 17 00:00:00 2001 From: Cano1997 <1978141412@qq.com> Date: Wed, 22 Oct 2025 20:14:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?style:=20=E5=90=91=E5=AF=BC=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E6=A0=B7=E5=BC=8F=E5=8F=98=E9=87=8F=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/control/wizard-panel/wizard-panel.scss | 38 +++++----------------- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58fcd38e..79ecb075 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ - 视图消息组件样式变量抽取 - 卡片部件样式变量抽取 - 分页导航面板样式变量抽取 +- 向导面板样式变量抽取 ### Fixed diff --git a/src/control/wizard-panel/wizard-panel.scss b/src/control/wizard-panel/wizard-panel.scss index 7c6b8b00..af962a35 100644 --- a/src/control/wizard-panel/wizard-panel.scss +++ b/src/control/wizard-panel/wizard-panel.scss @@ -1,15 +1,8 @@ -/* 向导 start */ - $control-wizard-panel: ( - 'header-height': 60px, - 'footer-height': 40px, - margin: getCssVar('spacing', 'loose') getCssVar('spacing', 'tight'), - gap:getCssVar('spacing', 'tight'), - 'form-padding': getCssVar('spacing', 'loose'), + 'footer-margin': getCssVar('spacing', 'loose') getCssVar('spacing', 'tight'), + 'footer-gap': getCssVar('spacing', 'tight'), ); - -/* 向导 end */ @include b(control-wizardpanel) { @include set-component-css-var('control-wizard-panel', $control-wizard-panel); @@ -17,39 +10,24 @@ $control-wizard-panel: ( flex-direction: column; height: 100%; + .van-steps { + flex: none; + } + @include e(form) { flex-grow: 1; overflow: auto; - padding: getCssVar('control-wizard-panel', 'form-padding'); } - - @include when(header) { - @include e(form) { - height: calc(100% - getCssVar('control-wizard-panel', 'footer-height') - getCssVar('control-wizard-panel', 'header-height')); - } - } -} - -@include b(control-wizardpanel-header) { - height: getCssVar('control-wizard-panel', 'header-height'); } @include b(control-wizardpanel-footer) { @include flex(row, flex-end, center); - gap: getCssVar('control-wizard-panel', 'gap'); - height: getCssVar('control-wizard-panel', 'footer-height'); - margin: getCssVar('control-wizard-panel', 'margin'); - - - @include e(form) { - flex-grow: 1; - overflow: auto; - } + gap: getCssVar('control-wizard-panel', 'footer-gap'); + margin: getCssVar('control-wizard-panel', 'footer-margin'); button { flex-grow: 1; - height: 100%; } } \ No newline at end of file -- Gitee From 482f4aea47dcd6e414ccd84d891c80359a246368 Mon Sep 17 00:00:00 2001 From: Cano1997 <1978141412@qq.com> Date: Wed, 22 Oct 2025 20:15:46 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E6=97=A5=E5=8E=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=94=AF=E6=8C=81=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E5=A4=A9=E4=B8=8E=E6=9C=88=E5=BA=A6=E6=97=A5=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/control/calendar/calendar.tsx | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79ecb075..633c4feb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - 新增移动端编辑表单取消变更功能 - 卡片部件支持项样式表配置 - 向导面板支持步骤样式表 +- 日历新增支持默认选中天与月度日历 ### Change diff --git a/src/control/calendar/calendar.tsx b/src/control/calendar/calendar.tsx index 52455477..162e7cee 100644 --- a/src/control/calendar/calendar.tsx +++ b/src/control/calendar/calendar.tsx @@ -384,7 +384,8 @@ export const CalendarControl = defineComponent({
{ this.dateChange(date); -- Gitee