From d4ef792d98b7cb242bd39201c5db5532a1dec63c Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Fri, 14 Nov 2025 22:06:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting-container.controller.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/panel-component/setting-container/setting-container.controller.ts b/src/panel-component/setting-container/setting-container.controller.ts index f38fb3a39..48e09011e 100644 --- a/src/panel-component/setting-container/setting-container.controller.ts +++ b/src/panel-component/setting-container/setting-container.controller.ts @@ -4,7 +4,7 @@ import { ISearchFormController, PanelContainerController, } from '@ibiz-template/runtime'; -import { IPanelContainer } from '@ibiz/model-core'; +import { IAppDEMultiDataView, IPanelContainer } from '@ibiz/model-core'; /** * @description 设置容器控制器 @@ -57,7 +57,11 @@ export class SettingContainerController extends PanelContainerController Date: Fri, 14 Nov 2025 22:07:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A0=8F=E5=92=8C=E6=90=9C=E7=B4=A2=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/form/search-form/search-form.scss | 17 +++++++++++++---- src/control/search-bar/search-bar.tsx | 3 +++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/control/form/search-form/search-form.scss b/src/control/form/search-form/search-form.scss index df1d72067..da744e5c7 100644 --- a/src/control/form/search-form/search-form.scss +++ b/src/control/form/search-form/search-form.scss @@ -1,15 +1,20 @@ $control-search-form: ( 'bg-color': transparent, 'padding': getCssVar(spacing, tight) getCssVar(spacing, base), - 'right-gap': getCssVar(spacing, base), + 'right-gap': 0, + 'color-searchform-bottom': getCssVar(color, border), + 'spacing-right-buttons-padding': getCssVar(spacing, tight) + getCssVar(spacing, base) getCssVar(spacing, tight) 0, 'btn-margin': 0 0 0 getCssVar(spacing, tight), + 'spacing-right-form-padding': getCssVar(spacing, base) 0, 'form-page-item-padding-top': calc(getCssVar('padding') / 2), 'form-item-container-padding-bottom': calc(getCssVar('padding', 'right') / 2), ); @include b(control-searchform) { @include set-component-css-var('control-search-form', $control-search-form); - + border-bottom: 1px solid + getCssVar('control-search-form', 'color-searchform-bottom'); background-color: getCssVar('control-search-form', 'bg-color'); .#{bem(form-page-item)} { @@ -39,11 +44,15 @@ $control-search-form: ( @include e('right') { @include flex(row, flex-start, center); - + padding: getCssVar('control-search-form', 'spacing-right-form-padding'); gap: getCssVar('control-search-form', 'right-gap'); .#{bem(control-searchform,buttons)} { - flex-shrink: 0; + flex-shrink: 0; + padding: getCssVar( + 'control-search-form', + 'spacing-right-buttons-padding' + ); } } } diff --git a/src/control/search-bar/search-bar.tsx b/src/control/search-bar/search-bar.tsx index 4566f4add..2a434da40 100644 --- a/src/control/search-bar/search-bar.tsx +++ b/src/control/search-bar/search-bar.tsx @@ -15,6 +15,7 @@ import { import { ISearchBar, ISearchBarGroup } from '@ibiz/model-core'; import { debounce } from 'lodash-es'; import { + getOriginFilterNodes, IControlProvider, IOverlayPopoverContainer, SearchBarController, @@ -337,6 +338,8 @@ export const SearchBarControl = defineComponent({ // 分组点击 const onGroupClick = (item: ISearchBarGroup) => { + c.state.filterNodes = getOriginFilterNodes(); + c.state.customCond = ''; if (c.state.selectedGroupItem?.id !== item?.id) { c.state.selectedGroupItem = item; c.evt.emit('onTabChange', { data: [item] }); -- Gitee From ff198fd1f619bf0d64a88ba6225bd2c6793a49e7 Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Fri, 14 Nov 2025 22:08:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=95=B0?= =?UTF-8?q?=E7=BB=84=E7=BC=96=E8=BE=91=E5=99=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/array/ibiz-array/ibiz-array.scss | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/editor/array/ibiz-array/ibiz-array.scss b/src/editor/array/ibiz-array/ibiz-array.scss index 09b3c75d6..49950bbe8 100644 --- a/src/editor/array/ibiz-array/ibiz-array.scss +++ b/src/editor/array/ibiz-array/ibiz-array.scss @@ -4,20 +4,17 @@ $array: ( placeholder-color: getCssVar(editor, default, placeholder-color), disabled-color: getCssVar(editor, disabled, text-color), readonly-color: getCssVar(editor, readonly, text-color), - + color-array-item-border: getCssVar(color, border), // 字体大小 font-size: getCssVar(editor, default, font-size), - // 行高 line-height: getCssVar(editor, default, line-height), - // 文本对齐 text-align: getCssVar(editor, default, text-align), - // 高度 min-height: getCssVar(editor, default, line-height), spacing-icons-gap: getCssVar(spacing, tight), - spacing-icons-margin-left: getCssVar(spacing,base), + spacing-icons-margin-left: getCssVar(spacing, base) ); @include b(array) { @@ -28,7 +25,7 @@ $array: ( line-height: getCssVar(array, line-height); color: getCssVar(array, color); display: flex; - align-items: end; + align-items: end; flex-direction: column; --van-field-input-text-color: #{getCssVar(array, color)}; @@ -61,8 +58,9 @@ $array: ( } } -@include b('array-item'){ +@include b('array-item') { width: 100%; + border-bottom: 1px solid getCssVar(array, color-array-item-border); } @include b(array-add-icon) { -- Gitee