From 70398dc69359fc5fa36c2fa8107f223dff230db6 Mon Sep 17 00:00:00 2001 From: chenzeyu Date: Mon, 14 Oct 2024 14:16:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?BI-157020=20fix:=20=E6=B7=B1=E8=89=B2?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8Bclear=E7=9A=84=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=B8=A6=E6=9C=89=E8=83=8C=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/less/base/single/button/button.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/fineui/src/less/base/single/button/button.less b/packages/fineui/src/less/base/single/button/button.less index e352d4c3c..a25690732 100644 --- a/packages/fineui/src/less/base/single/button/button.less +++ b/packages/fineui/src/less/base/single/button/button.less @@ -580,6 +580,10 @@ body .bi-button, #body .bi-button { .bi-button { background-color: @color-bi-background-button-theme-dark; + &.clear { + background-color: transparent; + } + &.button-ignore { background-color: @color-bi-background-ignore-button-theme-dark; From af8f11c8b4806909f63872d81424d93cf61dbd39 Mon Sep 17 00:00:00 2001 From: "Jimmy.Chai" Date: Wed, 16 Oct 2024 18:08:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?BI-148470=20refactor:=20=E5=A2=9E=E5=8A=A0p?= =?UTF-8?q?opup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/widget/multilayerdownlist/combo.downlist.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/fineui/src/widget/multilayerdownlist/combo.downlist.js b/packages/fineui/src/widget/multilayerdownlist/combo.downlist.js index 56bf41107..e5a1e464d 100644 --- a/packages/fineui/src/widget/multilayerdownlist/combo.downlist.js +++ b/packages/fineui/src/widget/multilayerdownlist/combo.downlist.js @@ -23,6 +23,7 @@ export class MultiLayerDownListCombo extends Widget { container: null, stopPropagation: false, el: {}, + popup: {}, }); } @@ -65,6 +66,7 @@ export class MultiLayerDownListCombo extends Widget { el: this.popupview, stopPropagation: o.stopPropagation, maxHeight: 1000, + ...o.popup, }, }); From 0664def54e151515b4da5e57e3675338a2544272 Mon Sep 17 00:00:00 2001 From: "Oliver.Ke" Date: Tue, 22 Oct 2024 20:37:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?BI-155367=20fix:=20=E5=85=9C=E5=BA=95?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=80=E4=B8=8B=EF=BC=8C=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=BA=8B=E4=BB=B6=E5=9B=9E=E8=B0=83=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E5=90=8C=E6=AD=A5=E7=A7=BB=E9=99=A4=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=90=8E=E7=BB=AD=E9=81=8D?= =?UTF-8?q?=E5=8E=86=E6=89=A7=E8=A1=8C=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/core/controller/controller.broadcast.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/fineui/src/core/controller/controller.broadcast.js b/packages/fineui/src/core/controller/controller.broadcast.js index 3f1eb3035..0ce6406b6 100644 --- a/packages/fineui/src/core/controller/controller.broadcast.js +++ b/packages/fineui/src/core/controller/controller.broadcast.js @@ -16,13 +16,13 @@ export class BroadcastController extends Controller { this._broadcasts[name] = []; } this._broadcasts[name].push(fn); - + return () => this.remove(name, fn); } send(name) { const args = [].slice.call(arguments, 1); - each(this._broadcasts[name], (i, fn) => fn(...args)); + each(this._broadcasts[name]?.slice?.(), (i, fn) => fn(...args)); } remove(name, fn) { @@ -34,7 +34,7 @@ export class BroadcastController extends Controller { } else { delete this._broadcasts[name]; } - + return this; } } From 403e0f10cf97ca04711c98ec9ba27a8db7396a89 Mon Sep 17 00:00:00 2001 From: "Oliver.Ke" Date: Fri, 1 Nov 2024 11:08:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?BI-158367=20fix:=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=8BSingleSelectSearchLoader=E9=87=8C=EF=BC=8CSingleSelect?= =?UTF-8?q?RadioItem=E7=9A=84=E6=96=87=E6=9C=AC=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../singleselect/search/singleselect.search.loader.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/fineui/src/widget/singleselect/search/singleselect.search.loader.js b/packages/fineui/src/widget/singleselect/search/singleselect.search.loader.js index 0eb7009a5..7b67b59df 100644 --- a/packages/fineui/src/widget/singleselect/search/singleselect.search.loader.js +++ b/packages/fineui/src/widget/singleselect/search/singleselect.search.loader.js @@ -12,7 +12,7 @@ import { isArray, isKey, Func, - SIZE_CONSANTS + SIZE_CONSANTS, } from "@/core"; import { ButtonGroup, Loader } from "@/base"; import { SingleSelectList } from "../singleselect.list"; @@ -71,7 +71,7 @@ export class SingleSelectSearchLoader extends Widget { layouts: [ { type: VerticalLayout.xtype, - } + }, ], }, }, @@ -122,11 +122,11 @@ export class SingleSelectSearchLoader extends Widget { height: SIZE_CONSANTS.LIST_ITEM_HEIGHT, selected: false, iconWrapperWidth: 26, - hgap: o.allowNoSelect ? 10 : 0, + textHgap: o.allowNoSelect ? 10 : 0, title: item.title || item.text, }, - item - ) + item, + ), ); } From 2eda6cd069e497bb4b4d1a87a5f2ee915f544600 Mon Sep 17 00:00:00 2001 From: "stan.yang" Date: Thu, 7 Nov 2024 09:55:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?report-136587=20feat:=20=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=8C=BA=E9=97=B4=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0=E6=A0=BC?= =?UTF-8?q?=E5=BC=8Foptions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/widget/yearmonthinterval/demo.year_month_interval.js | 1 + packages/fineui/src/widget/timeinterval/dateinterval.js | 2 ++ packages/fineui/src/widget/timeinterval/timeinterval.js | 2 ++ 3 files changed, 5 insertions(+) diff --git a/packages/demo/src/demo/widget/yearmonthinterval/demo.year_month_interval.js b/packages/demo/src/demo/widget/yearmonthinterval/demo.year_month_interval.js index 014c80565..a3ea66721 100644 --- a/packages/demo/src/demo/widget/yearmonthinterval/demo.year_month_interval.js +++ b/packages/demo/src/demo/widget/yearmonthinterval/demo.year_month_interval.js @@ -20,6 +20,7 @@ export class YearMonthIntervalDemo extends Widget { ref(_ref) { self.interval = _ref; }, + format: "%Y/%X", value: { start: { type: 2, diff --git a/packages/fineui/src/widget/timeinterval/dateinterval.js b/packages/fineui/src/widget/timeinterval/dateinterval.js index d98510c7b..180785b39 100644 --- a/packages/fineui/src/widget/timeinterval/dateinterval.js +++ b/packages/fineui/src/widget/timeinterval/dateinterval.js @@ -41,6 +41,7 @@ export class DateInterval extends Single { minDate: "1900-01-01", maxDate: "2099-12-31", height: 24, + format: "", supportDynamic: true, simple: false, }); @@ -96,6 +97,7 @@ export class DateInterval extends Single { maxDate: o.maxDate, simple: o.simple, behaviors: o.behaviors, + format: o.format, watermark, value: v, height: o.height, diff --git a/packages/fineui/src/widget/timeinterval/timeinterval.js b/packages/fineui/src/widget/timeinterval/timeinterval.js index 4ae530169..f84971e69 100644 --- a/packages/fineui/src/widget/timeinterval/timeinterval.js +++ b/packages/fineui/src/widget/timeinterval/timeinterval.js @@ -40,6 +40,7 @@ export class TimeInterval extends Single { minDate: "1900-01-01", maxDate: "2099-12-31", height: 24, + format: "", supportDynamic: true, }); } @@ -94,6 +95,7 @@ export class TimeInterval extends Single { supportDynamic: o.supportDynamic, minDate: o.minDate, maxDate: o.maxDate, + format: o.format, behaviors: o.behaviors, watermark, value: v,