Browse Source

Pull request #3532: REPORT-80311 fix: 给一下默认值

Merge in VISUAL/fineui from ~JIMMY.CHAI/fineui:es6 to es6

* commit 'f7c2574d4b30aafa07e1c19d09d204096eea4163':
  REPORT-80311 fix: 给一下默认值
es6
Jimmy.Chai-柴嘉明 2 years ago
parent
commit
4bd661e9c7
  1. 5
      packages/fineui/src/base/combination/searcher.js
  2. 2
      packages/fineui/src/widget/multiselectlist/multiselectlist.insert.js
  3. 2
      packages/fineui/src/widget/multiselecttree/multiselecttree.js
  4. 2
      packages/fineui/src/widget/singleselect/singleselectlist.insert.js
  5. 7
      packages/fineui/src/widget/timeinterval/dateinterval.js
  6. 2
      packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js

5
packages/fineui/src/base/combination/searcher.js

@ -74,14 +74,17 @@ export class Searcher extends Widget {
// masker层 // masker层
offset: {}, offset: {},
}, },
simple: false,
}); });
} }
render() { 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, { this.editor = createWidget(el, {
type: SearchEditor.xtype, type: SearchEditor.xtype,
simple,
}); });
createWidget({ createWidget({

2
packages/fineui/src/widget/multiselectlist/multiselectlist.insert.js

@ -52,6 +52,7 @@ export class MultiSelectInsertList extends Single {
valueFormatter: emptyFn, valueFormatter: emptyFn,
searcherHeight: SIZE_CONSANTS.TRIGGER_HEIGHT, searcherHeight: SIZE_CONSANTS.TRIGGER_HEIGHT,
itemHeight: SIZE_CONSANTS.LIST_ITEM_HEIGHT, itemHeight: SIZE_CONSANTS.LIST_ITEM_HEIGHT,
simple: false,
}); });
} }
@ -118,6 +119,7 @@ export class MultiSelectInsertList extends Single {
el: { el: {
type: SearchEditor.xtype, type: SearchEditor.xtype,
watermark: i18nText("BI-Basic_Search_And_Patch_Paste"), watermark: i18nText("BI-Basic_Search_And_Patch_Paste"),
simple: o.simple,
}, },
ref(ref) { ref(ref) {
self.editor = ref; self.editor = ref;

2
packages/fineui/src/widget/multiselecttree/multiselecttree.js

@ -15,6 +15,7 @@ export class MultiSelectTree extends Single {
return extend(super._defaultConfig(...arguments), { return extend(super._defaultConfig(...arguments), {
baseCls: "bi-multi-select-tree", baseCls: "bi-multi-select-tree",
itemsCreator: emptyFn, itemsCreator: emptyFn,
simple: false,
}); });
} }
@ -55,6 +56,7 @@ export class MultiSelectTree extends Single {
this.searcher = createWidget({ this.searcher = createWidget({
type: Searcher.xtype, type: Searcher.xtype,
simple: o.simple,
isAutoSearch: false, isAutoSearch: false,
isAutoSync: false, isAutoSync: false,
onSearch(op, callback) { onSearch(op, callback) {

2
packages/fineui/src/widget/singleselect/singleselectlist.insert.js

@ -33,6 +33,7 @@ export class SingleSelectInsertList extends Single {
itemWrapper: emptyFn, itemWrapper: emptyFn,
valueFormatter: emptyFn, valueFormatter: emptyFn,
searcherHeight: 24, searcherHeight: 24,
simple: false,
}); });
} }
@ -93,6 +94,7 @@ export class SingleSelectInsertList extends Single {
el: { el: {
type: SearchEditor.xtype, type: SearchEditor.xtype,
watermark: i18nText("BI-Basic_Search_And_Patch_Paste"), watermark: i18nText("BI-Basic_Search_And_Patch_Paste"),
simple: o.simple,
}, },
ref(ref) { ref(ref) {
self.editor = ref; self.editor = ref;

7
packages/fineui/src/widget/timeinterval/dateinterval.js

@ -8,7 +8,7 @@ import {
parseDateTime, parseDateTime,
checkDateVoid, checkDateVoid,
checkDateLegal, checkDateLegal,
isNotNull isNotNull,
} from "@/core"; } from "@/core";
import { Single, Label, Bubbles } from "@/base"; import { Single, Label, Bubbles } from "@/base";
import { DynamicDateCombo } from "../dynamicdate"; import { DynamicDateCombo } from "../dynamicdate";
@ -39,6 +39,7 @@ export class DateInterval extends Single {
maxDate: "2099-12-31", maxDate: "2099-12-31",
height: 24, height: 24,
supportDynamic: true, supportDynamic: true,
simple: false,
}); });
} }
@ -68,7 +69,7 @@ export class DateInterval extends Single {
}, },
{ {
el: this.right, el: this.right,
} },
], ],
}; };
} }
@ -91,7 +92,7 @@ export class DateInterval extends Single {
action: () => { action: () => {
this.fireEvent(DateInterval.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW); this.fireEvent(DateInterval.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW);
}, },
} },
], ],
}); });
combo.on(DynamicDateCombo.EVENT_ERROR, () => { combo.on(DynamicDateCombo.EVENT_ERROR, () => {

2
packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js

@ -33,6 +33,7 @@ export class YearMonthInterval extends Single {
maxDate: "2099-12-31", maxDate: "2099-12-31",
supportDynamic: true, supportDynamic: true,
height: 24, height: 24,
simple: false,
}; };
render() { render() {
@ -70,6 +71,7 @@ export class YearMonthInterval extends Single {
const o = this.options; const o = this.options;
const combo = createWidget({ const combo = createWidget({
type: DynamicYearMonthCombo.xtype, type: DynamicYearMonthCombo.xtype,
simple: o.simple,
supportDynamic: o.supportDynamic, supportDynamic: o.supportDynamic,
height: o.height, height: o.height,
minDate: o.minDate, minDate: o.minDate,

Loading…
Cancel
Save