From 244a1e110b26ddf8259c0a5db6dbddfae6cb4664 Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Fri, 14 Nov 2025 19:14:16 +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=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + .../md-advaned-searchform.scss | 46 ++++--------------- .../md-advaned-searchform.tsx | 16 +++---- 3 files changed, 18 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fe1b2983..9c5b534dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,7 @@ ### Change +- 更新高级搜索表单样式 - 更新搜索栏和搜索表单样式 - 更新标题栏样式，更新链接按钮样式，更新搜索栏高级搜索打开时，底部不自动弹出添加抽屉 - 移除搜索表单保存条件UI相关代码 diff --git a/src/common/md-advaned-searchform/md-advaned-searchform.scss b/src/common/md-advaned-searchform/md-advaned-searchform.scss index 7c952eaa9..883a7eaa1 100644 --- a/src/common/md-advaned-searchform/md-advaned-searchform.scss +++ b/src/common/md-advaned-searchform/md-advaned-searchform.scss @@ -10,7 +10,7 @@ $md-advaned-searchform: ( footer-reset-color: getCssVar(color, text), footer-reset-bg-color: transparent, footer-confirm-color: getCssVar(color, default), - footer-confirm-bg-color: getCssVar(color, primary) + footer-confirm-bg-color: getCssVar(color, primary), ); @include b('md-advaned-searchform') { @include set-component-css-var( @@ -25,44 +25,18 @@ $md-advaned-searchform: ( flex: 1; overflow: auto; padding: getCssVar(md-advaned-searchform, content-padding); + + &.#{bem(control-searchform)} { + background-color: getCssVar(control-search-form-bg-color); + } } @include e('footer') { - flex-shrink: 0; + flex: none; + padding: getCssVar(spacing, base); display: flex; - gap: getCssVar(md-advaned-searchform, footer-item-gap); - padding: getCssVar(md-advaned-searchform, footer-padding); - @include m('reset') { - flex: 1; - padding: getCssVar(md-advaned-searchform, footer-item-padding); - box-shadow: getCssVar(md-advaned-searchform, footer-item-shadow); - background-color: getCssVar( - md-advaned-searchform, - footer-reset-bg-color - ); - color: getCssVar(md-advaned-searchform, text-color); - width: 100%; - text-align: center; - border-radius: getCssVar( - md-advaned-searchform, - footer-item-border-radius - ); - } - @include m('confirm') { - flex: 1; - padding: getCssVar(md-advaned-searchform, footer-item-padding); - box-shadow: getCssVar(md-advaned-searchform, footer-item-shadow); - background-color: getCssVar( - md-advaned-searchform, - footer-confirm-bg-color - ); - color: getCssVar(md-advaned-searchform, footer-confirm-color); - width: 100%; - text-align: center; - opacity: 0.9; - border-radius: getCssVar( - md-advaned-searchform, - footer-item-border-radius - ); + justify-content: space-between; + .van-button { + width: 48%; } } } diff --git a/src/common/md-advaned-searchform/md-advaned-searchform.tsx b/src/common/md-advaned-searchform/md-advaned-searchform.tsx index 698f38d32..1aca22103 100644 --- a/src/common/md-advaned-searchform/md-advaned-searchform.tsx +++ b/src/common/md-advaned-searchform/md-advaned-searchform.tsx @@ -73,18 +73,16 @@ export const IBizMdAdvanedSearchfrom = defineComponent({ controller={this.c!} >
-
this.onCancel()} - > + {ibiz.i18n.t('control.form.searchForm.reset')} -
-
this.onConfirm()} + + {ibiz.i18n.t('control.form.searchForm.search')} -
+
); -- Gitee From 814aa768ab1e968da76626c4378bbcb7d4a6ea10 Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Fri, 14 Nov 2025 19:15:32 +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=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + .../form-item/form-item-container/form-item-container.scss | 2 +- src/control/search-bar/search-bar.scss | 2 +- src/panel-component/setting-container/setting-container.scss | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c5b534dc..d7de7f799 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,7 @@ ### Change +- 更新搜索栏样式 - 更新高级搜索表单样式 - 更新搜索栏和搜索表单样式 - 更新标题栏样式，更新链接按钮样式，更新搜索栏高级搜索打开时，底部不自动弹出添加抽屉 diff --git a/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss b/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss index 57fd712eb..e71bf737c 100644 --- a/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss +++ b/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss @@ -2,7 +2,7 @@ $form-item-container: ( // 颜色 require-mark-color: getCssVar(color, danger), - bg-color: getCssVar(color, bg, 1), + bg-color: getCssVar(color, bg, 2), label-text-color: getCssVar(color, text, 0), underline-color: getCssVar(color, border), diff --git a/src/control/search-bar/search-bar.scss b/src/control/search-bar/search-bar.scss index 4ca9fbabd..5465dffa5 100644 --- a/src/control/search-bar/search-bar.scss +++ b/src/control/search-bar/search-bar.scss @@ -121,7 +121,7 @@ $dropdown-popover: ( @include set-component-css-var(dropdown-popover, $dropdown-popover); background-color: getCssVar(dropdown-popover, color-popover-bg); flex-direction: column; - position: absolute; + position: fixed; left: 0; gap: 8px; width: 100vw; diff --git a/src/panel-component/setting-container/setting-container.scss b/src/panel-component/setting-container/setting-container.scss index 7f9a246aa..c1a560243 100644 --- a/src/panel-component/setting-container/setting-container.scss +++ b/src/panel-component/setting-container/setting-container.scss @@ -9,7 +9,7 @@ $setting-container: ( @include b('setting-container') { @include set-component-css-var('setting-container', $setting-container); - + height: 100%; padding: getCssVar('setting-container', 'padding'); background-color: getCssVar('setting-container', 'bg-color'); -- Gitee From a8f86f9089a5d5c619d8945ac12b6b71a0f80552 Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Fri, 14 Nov 2025 19:17: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=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/editor/array/ibiz-array/ibiz-array.scss | 12 +++++- src/editor/array/ibiz-array/ibiz-array.tsx | 42 ++++++++++++--------- 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7de7f799..4706a4a54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,7 @@ ### Change +- 更新数组编辑器的样式 - 更新搜索栏样式 - 更新高级搜索表单样式 - 更新搜索栏和搜索表单样式 diff --git a/src/editor/array/ibiz-array/ibiz-array.scss b/src/editor/array/ibiz-array/ibiz-array.scss index 347173158..a5d1b1eeb 100644 --- a/src/editor/array/ibiz-array/ibiz-array.scss +++ b/src/editor/array/ibiz-array/ibiz-array.scss @@ -16,6 +16,8 @@ $array: ( // 高度 min-height: getCssVar(editor, default, line-height), + spacing-icons-gap: getCssVar(spacing, tight), + spacing-icons-margin-left: getCssVar(spacing,base), ); @include b(array) { @@ -25,7 +27,9 @@ $array: ( font-size: getCssVar(array, font-size); line-height: getCssVar(array, line-height); color: getCssVar(array, color); - text-align: getCssVar(array, text-align); + display: flex; + align-items: end; + flex-direction: column; --van-field-input-text-color: #{getCssVar(array, color)}; --van-cell-text-color: #{getCssVar(array, color)}; @@ -57,6 +61,10 @@ $array: ( } } +@include b('array-item'){ + width: 100%; +} + @include b(array-add-icon) { display: flex; align-items: center; @@ -67,4 +75,6 @@ $array: ( display: flex; align-items: center; min-height: getCssVar(array, min-height); + margin-left: getCssVar(array, spacing-icons-margin-left); + gap: getCssVar(array, spacing-icons-gap); } diff --git a/src/editor/array/ibiz-array/ibiz-array.tsx b/src/editor/array/ibiz-array/ibiz-array.tsx index 07bba54bf..59885850d 100644 --- a/src/editor/array/ibiz-array/ibiz-array.tsx +++ b/src/editor/array/ibiz-array/ibiz-array.tsx @@ -195,23 +195,31 @@ export const IBizArray = defineComponent({ onFocus={this.onFocus} onInput={(): void => this.handleInput()} {...useFilterAttribute(this.$attrs)} - > - {!(this.disabled || this.readonly) && ( -
- {(!this.limit || this.items.length < this.limit) && ( - this.addItem(index + 1)} - /> - )} - this.removeItem(index)} - /> -
- )} + > + {{ + extra: () => { + if (!(this.disabled || this.readonly)) { + return ( +
+ {(!this.limit || + this.items.length < this.limit) && ( + this.addItem(index + 1)} + /> + )} + this.removeItem(index)} + /> +
+ ); + } + }, + }} + ); }) -- Gitee