diff --git a/packages/fineui/src/base/combination/searcher.js b/packages/fineui/src/base/combination/searcher.js index 6487e2c34..9cf9f17c0 100644 --- a/packages/fineui/src/base/combination/searcher.js +++ b/packages/fineui/src/base/combination/searcher.js @@ -74,14 +74,17 @@ export class Searcher extends Widget { // masker层 offset: {}, }, + + simple: false, }); } render() { - const { el, lgap, rgap, tgap, bgap, vgap, hgap, isDefaultInit } = this.options; + const { el, lgap, rgap, tgap, bgap, vgap, hgap, isDefaultInit, simple } = this.options; this.editor = createWidget(el, { type: SearchEditor.xtype, + simple, }); createWidget({ diff --git a/packages/fineui/src/widget/multiselectlist/multiselectlist.insert.js b/packages/fineui/src/widget/multiselectlist/multiselectlist.insert.js index 1390634c5..e0e4aac3b 100644 --- a/packages/fineui/src/widget/multiselectlist/multiselectlist.insert.js +++ b/packages/fineui/src/widget/multiselectlist/multiselectlist.insert.js @@ -52,6 +52,7 @@ export class MultiSelectInsertList extends Single { valueFormatter: emptyFn, searcherHeight: SIZE_CONSANTS.TRIGGER_HEIGHT, itemHeight: SIZE_CONSANTS.LIST_ITEM_HEIGHT, + simple: false, }); } @@ -118,6 +119,7 @@ export class MultiSelectInsertList extends Single { el: { type: SearchEditor.xtype, watermark: i18nText("BI-Basic_Search_And_Patch_Paste"), + simple: o.simple, }, ref(ref) { self.editor = ref; diff --git a/packages/fineui/src/widget/multiselecttree/multiselecttree.js b/packages/fineui/src/widget/multiselecttree/multiselecttree.js index 8acd50d48..9493f444b 100644 --- a/packages/fineui/src/widget/multiselecttree/multiselecttree.js +++ b/packages/fineui/src/widget/multiselecttree/multiselecttree.js @@ -15,6 +15,7 @@ export class MultiSelectTree extends Single { return extend(super._defaultConfig(...arguments), { baseCls: "bi-multi-select-tree", itemsCreator: emptyFn, + simple: false, }); } @@ -55,6 +56,7 @@ export class MultiSelectTree extends Single { this.searcher = createWidget({ type: Searcher.xtype, + simple: o.simple, isAutoSearch: false, isAutoSync: false, onSearch(op, callback) { diff --git a/packages/fineui/src/widget/singleselect/singleselectlist.insert.js b/packages/fineui/src/widget/singleselect/singleselectlist.insert.js index ca8553d79..63a040103 100644 --- a/packages/fineui/src/widget/singleselect/singleselectlist.insert.js +++ b/packages/fineui/src/widget/singleselect/singleselectlist.insert.js @@ -33,6 +33,7 @@ export class SingleSelectInsertList extends Single { itemWrapper: emptyFn, valueFormatter: emptyFn, searcherHeight: 24, + simple: false, }); } @@ -93,6 +94,7 @@ export class SingleSelectInsertList extends Single { el: { type: SearchEditor.xtype, watermark: i18nText("BI-Basic_Search_And_Patch_Paste"), + simple: o.simple, }, ref(ref) { self.editor = ref; diff --git a/packages/fineui/src/widget/timeinterval/dateinterval.js b/packages/fineui/src/widget/timeinterval/dateinterval.js index c2aee06f1..76a7ff381 100644 --- a/packages/fineui/src/widget/timeinterval/dateinterval.js +++ b/packages/fineui/src/widget/timeinterval/dateinterval.js @@ -8,7 +8,7 @@ import { parseDateTime, checkDateVoid, checkDateLegal, - isNotNull + isNotNull, } from "@/core"; import { Single, Label, Bubbles } from "@/base"; import { DynamicDateCombo } from "../dynamicdate"; @@ -39,6 +39,7 @@ export class DateInterval extends Single { maxDate: "2099-12-31", height: 24, supportDynamic: true, + simple: false, }); } @@ -68,7 +69,7 @@ export class DateInterval extends Single { }, { el: this.right, - } + }, ], }; } @@ -91,7 +92,7 @@ export class DateInterval extends Single { action: () => { this.fireEvent(DateInterval.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW); }, - } + }, ], }); combo.on(DynamicDateCombo.EVENT_ERROR, () => { diff --git a/packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js b/packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js index e5736aa85..d5689f43b 100644 --- a/packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js +++ b/packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js @@ -33,6 +33,7 @@ export class YearMonthInterval extends Single { maxDate: "2099-12-31", supportDynamic: true, height: 24, + simple: false, }; render() { @@ -70,6 +71,7 @@ export class YearMonthInterval extends Single { const o = this.options; const combo = createWidget({ type: DynamicYearMonthCombo.xtype, + simple: o.simple, supportDynamic: o.supportDynamic, height: o.height, minDate: o.minDate,