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/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; } } 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; 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, }, }); 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, + ), ); } 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,