Browse Source

KERNEL-11286 feat: 下拉框value,text,defaultText属性规则统一

es6
zsmj 2 years ago
parent
commit
10acbec4dc
  1. 2
      src/widget/multiselect/multiselect.combo.js
  2. 2
      src/widget/multiselect/multiselect.combo.nobar.js
  3. 2
      src/widget/multiselect/trigger/editor/editor.patch.js
  4. 2
      src/widget/multiselect/trigger/searcher.multiselect.js
  5. 1
      src/widget/multitree/multi.tree.combo.js
  6. 7
      src/widget/multitree/multi.tree.insert.combo.js
  7. 1
      src/widget/multitree/multi.tree.list.combo.js

2
src/widget/multiselect/multiselect.combo.js

@ -47,7 +47,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
allowEdit: o.allowEdit,
height: o.height - (o.simple ? 1 : 2),
text: o.text,
// adapter: this.popup,
defaultText: o.defaultText,
masker: {
offset: {
left: 0,

2
src/widget/multiselect/multiselect.combo.nobar.js

@ -43,7 +43,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
type: "bi.multi_select_trigger",
height: o.height - (o.simple ? 1 : 2),
text: o.text,
// adapter: this.popup,
defaultText: o.defaultText,
masker: {
offset: {
left: 0,

2
src/widget/multiselect/trigger/editor/editor.patch.js

@ -30,7 +30,7 @@ BI.SelectPatchEditor = BI.inherit(BI.Widget, {
watermark: o.watermark,
allowBlank: true,
value: o.value,
defaultText: o.text,
defaultText: o.defaultText,
text: o.text,
tipType: o.tipType,
warningTitle: o.warningTitle,

2
src/widget/multiselect/trigger/searcher.multiselect.js

@ -15,7 +15,7 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
valueFormatter: BI.emptyFn,
adapter: null,
masker: {},
text: BI.i18nText("BI-Basic_Please_Select"),
defaultText: BI.i18nText("BI-Basic_Please_Select"),
itemHeight: 24
});
},

1
src/widget/multitree/multi.tree.combo.js

@ -32,7 +32,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
text: o.text,
defaultText: o.defaultText,
watermark: o.watermark,
// adapter: this.popup,
masker: {
offset: {
left: 0,

7
src/widget/multitree/multi.tree.insert.combo.js

@ -30,7 +30,9 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
allowEdit: o.allowEdit,
height: o.height - (o.simple ? 1 : 2),
valueFormatter: o.valueFormatter,
// adapter: this.popup,
text: o.text,
defaultText: o.defaultText,
watermark: o.watermark,
masker: {
offset: {
left: 0,
@ -41,8 +43,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
},
searcher: {
type: "bi.multi_tree_searcher",
text: o.text,
watermark: o.watermark,
itemsCreator: o.itemsCreator,
popup: {
type: "bi.multi_tree_search_insert_pane",

1
src/widget/multitree/multi.tree.list.combo.js

@ -35,7 +35,6 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
watermark: o.watermark,
height: o.height - (o.simple ? 1 : 2),
valueFormatter: o.valueFormatter,
// adapter: this.popup,
masker: {
offset: {
left: 0,

Loading…
Cancel
Save