From a90656b1ab4abe8314b7cb86076b6e582af8a2e2 Mon Sep 17 00:00:00 2001 From: lijisanxiong <1518062161@qq.com> Date: Thu, 4 Sep 2025 22:17:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E5=8F=82=E6=95=B0batchtoolbarmode=E3=80=81=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E5=8F=82=E6=95=B0batchToolbarMode=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E8=AE=BE=E7=BD=AE=E6=89=B9=E6=93=8D=E4=BD=9C=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E6=98=BE=E7=A4=BA=E6=A8=A1=E5=BC=8F=EF=BC=88?= =?UTF-8?q?default=20=E9=80=89=E6=95=B0=E6=8D=AE=E5=8D=B3=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=8Cmultiple=20=E9=9C=80=E9=80=89=202=20=E6=9D=A1?= =?UTF-8?q?=E4=BB=A5=E4=B8=8A=EF=BC=89=EF=BC=8C=E4=BB=85=E9=99=90=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E3=80=81=E5=88=97=E8=A1=A8=E3=80=81=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E3=80=81=E6=A0=91=E8=A1=A8=E6=A0=BC=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 ++ src/control/data-view/data-view.scss | 4 ++++ src/control/data-view/data-view.tsx | 2 +- src/control/grid/grid/grid.tsx | 7 +------ src/control/list/list.scss | 14 ++++++++++---- src/control/list/list.tsx | 2 +- src/control/tree-grid/tree-grid.tsx | 7 +------ 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e64dfa65..55cf41fdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ ## [Unreleased] +- 新增部件参数batchtoolbarmode、全局参数batchToolbarMode，用于设置批操作工具栏显示模式（default 选数据即显示，multiple 需选 2 条以上），仅限卡片、列表、表格、树表格使用 + ## [0.7.41-alpha.24] - 2025-09-04 ### Added diff --git a/src/control/data-view/data-view.scss b/src/control/data-view/data-view.scss index 243c33ae8..8ffa0722f 100644 --- a/src/control/data-view/data-view.scss +++ b/src/control/data-view/data-view.scss @@ -107,8 +107,12 @@ $control-dataview-group-item-content: ( } @include e(batchtoolbar) { + display: none; padding: 0 getCssVar(spacing, base); margin: getCssVar(spacing, tight) getCssVar(spacing, super, tight); + @include when('show') { + display: block; + } } @include e(quicktoolbar) { diff --git a/src/control/data-view/data-view.tsx b/src/control/data-view/data-view.tsx index 71a166454..c73a2a9a5 100644 --- a/src/control/data-view/data-view.tsx +++ b/src/control/data-view/data-view.tsx @@ -631,7 +631,7 @@ export const DataViewControl = defineComponent({ }); if (!ctrlModel) return; return ( -
+
0), - ]} - > +
{ibiz.i18n.t('control.common.itemsSelected', { diff --git a/src/control/list/list.scss b/src/control/list/list.scss index 72dea6653..9324d85fb 100644 --- a/src/control/list/list.scss +++ b/src/control/list/list.scss @@ -116,13 +116,19 @@ $control-list-group-style2: ( justify-content: center; width: 100%; } - - @include b(control-list-content) { - flex-grow: 1; - } + @include e(batchtoolbar) { + display: none; margin: getCssVar(spacing, tight) 0; + + @include when('show') { + display: block; + } + } + + @include b(control-list-content) { + flex-grow: 1; } } diff --git a/src/control/list/list.tsx b/src/control/list/list.tsx index be5b6ffd1..bb163293a 100644 --- a/src/control/list/list.tsx +++ b/src/control/list/list.tsx @@ -624,7 +624,7 @@ export const ListControl = defineComponent({ }); if (!ctrlModel) return; return ( -
+
0), - ]} - > +
{ibiz.i18n.t('control.common.itemsSelected', { -- Gitee From 237658d631ee215ea87ce7bc678d7d2eef082b72 Mon Sep 17 00:00:00 2001 From: lijisanxiong <1518062161@qq.com> Date: Thu, 4 Sep 2025 22:19:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat=EF=BC=9A=E6=9B=B4=E6=96=B0CHANGELOG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55cf41fdf..4ec1da81f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ ## [Unreleased] +### Added + - 新增部件参数batchtoolbarmode、全局参数batchToolbarMode，用于设置批操作工具栏显示模式（default 选数据即显示，multiple 需选 2 条以上），仅限卡片、列表、表格、树表格使用 ## [0.7.41-alpha.24] - 2025-09-04 -- Gitee