Browse Source

REPORT-44591 fix: 重新设计单选下拉树的valueFormatter,存在o.valueFormatter时优先使用

es6
iapyang 4 years ago
parent
commit
2aef70b448
  1. 13
      src/widget/multilayerselecttree/multilayerselecttree.trigger.js
  2. 14
      src/widget/multilayersingletree/multilayersingletree.trigger.js

13
src/widget/multilayerselecttree/multilayerselecttree.trigger.js

@ -7,9 +7,6 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
return {
extraCls: "bi-multi-layer-select-tree-trigger bi-border bi-focus-shadow bi-border-radius",
height: 24,
valueFormatter: function (v) {
return v;
},
itemsCreator: BI.emptyFn,
watermark: BI.i18nText("BI-Basic_Search"),
allowSearchValue: false,
@ -202,13 +199,19 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
_digest: function (v) {
var o = this.options;
if(o.itemsCreator === BI.emptyFn) {
if (BI.isFunction(o.valueFormatter)) {
return o.valueFormatter(v);
}
if (o.itemsCreator === BI.emptyFn) {
var result = BI.find(o.items, function (i, item) {
return item.value === v;
});
return BI.isNotNull(result) ? result.text : o.text;
}
return o.valueFormatter(v);
return v;
},
_getShowText: function () {

14
src/widget/multilayersingletree/multilayersingletree.trigger.js

@ -7,9 +7,6 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
return {
extraCls: "bi-multi-layer-single-tree-trigger bi-border bi-focus-shadow bi-border-radius",
height: 24,
valueFormatter: function (v) {
return v;
},
itemsCreator: BI.emptyFn,
watermark: BI.i18nText("BI-Basic_Search"),
allowSearchValue: false,
@ -202,13 +199,20 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
_digest: function (v) {
var o = this.options;
if(o.itemsCreator === BI.emptyFn) {
if (BI.isFunction(o.valueFormatter)) {
return o.valueFormatter(v);
}
if (o.itemsCreator === BI.emptyFn) {
var result = BI.find(o.items, function (i, item) {
return item.value === v;
});
return BI.isNotNull(result) ? result.text : o.text;
}
return o.valueFormatter(v);
return v;
},

Loading…
Cancel
Save