Browse Source

Merge pull request #142462 in DEC/fineui from master to feature/x

* commit '1e566cc22930e6268f51d566a522af44e9cb6c98':
  REPORT-77978 fix: 下拉树水印表现异常问题
  KERNEL-11286 feat: 下拉框value,text,defaultText属性规则统一
  KERNEL-11286 feat: 下拉框value,text,defaultText属性规则统一
master
superman 2 years ago
parent
commit
ebf8ac7e1d
  1. 4
      src/case/editor/editor.state.js
  2. 3
      src/case/editor/editor.state.simple.js
  3. 11
      src/case/trigger/trigger.text.select.js
  4. 1
      src/widget/multilayersingletree/multilayersingletree.combo.js
  5. 2
      src/widget/multiselect/multiselect.combo.js
  6. 2
      src/widget/multiselect/multiselect.combo.nobar.js
  7. 3
      src/widget/multiselect/multiselect.insert.combo.js
  8. 3
      src/widget/multiselect/multiselect.insert.trigger.js
  9. 2
      src/widget/multiselect/trigger/editor/editor.patch.js
  10. 2
      src/widget/multiselect/trigger/searcher.multiselect.insert.js
  11. 2
      src/widget/multiselect/trigger/searcher.multiselect.js
  12. 1
      src/widget/multitree/multi.tree.combo.js
  13. 33
      src/widget/multitree/multi.tree.insert.combo.js
  14. 7
      src/widget/multitree/multi.tree.list.combo.js
  15. 2
      src/widget/multitree/trigger/searcher.list.multi.tree.js

4
src/case/editor/editor.state.js

@ -21,8 +21,8 @@ BI.StateEditor = BI.inherit(BI.Widget, {
watermark: "", watermark: "",
errorText: "", errorText: "",
height: 24, height: 24,
defaultText: "", // 默认显示值,默认显示值与显示值的区别是默认显示值标记灰色 defaultText: BI.i18nText("BI-Basic_Unrestricted"), // 默认显示值,默认显示值与显示值的区别是默认显示值标记灰色
text: BI.i18nText("BI-Basic_Unrestricted"), // 显示值 text: "", // 显示值
el: {} el: {}
}); });
}, },

3
src/case/editor/editor.state.simple.js

@ -22,7 +22,8 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
watermark: "", watermark: "",
errorText: "", errorText: "",
height: 24, height: 24,
text: BI.i18nText("BI-Basic_Unrestricted") text: "",
defaultText: BI.i18nText("BI-Basic_Unrestricted"),
}); });
}, },

11
src/case/trigger/trigger.text.select.js

@ -53,7 +53,16 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
_digest: function (val, items) { _digest: function (val, items) {
var o = this.options; var o = this.options;
val = BI.isArray(val) ? val[0] : val; val = BI.isArray(val) ? val[0] : val;
// 提升valueFormatter的优先级
if (o.valueFormatter !== BI.emptyFn && BI.isFunction(o.valueFormatter)) {
return {
text: o.valueFormatter(val),
};
}
var result = []; var result = [];
var formatItems = BI.Tree.transformToArrayFormat(items); var formatItems = BI.Tree.transformToArrayFormat(items);
BI.each(formatItems, function (i, item) { BI.each(formatItems, function (i, item) {
if (val === item.value && !BI.contains(result, item.text || item.value)) { if (val === item.value && !BI.contains(result, item.text || item.value)) {
@ -64,7 +73,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
if (result.length > 0) { if (result.length > 0) {
return { return {
textCls: "", textCls: "",
text: o.valueFormatter(val) || result.join(","), text: result.join(","),
}; };
} else { } else {
var text = BI.isFunction(o.text) ? o.text() : o.text; var text = BI.isFunction(o.text) ? o.text() : o.text;

1
src/widget/multilayersingletree/multilayersingletree.combo.js

@ -200,6 +200,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
self.textTrigger = _ref; self.textTrigger = _ref;
}, },
text: o.text, text: o.text,
defaultText: o.defaultText,
height: o.height, height: o.height,
items: o.items, items: o.items,
value: o.value, value: o.value,

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

@ -47,7 +47,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
height: o.height - (o.simple ? 1 : 2), height: o.height - (o.simple ? 1 : 2),
text: o.text, text: o.text,
// adapter: this.popup, defaultText: o.defaultText,
masker: { masker: {
offset: { offset: {
left: 0, 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", type: "bi.multi_select_trigger",
height: o.height - (o.simple ? 1 : 2), height: o.height - (o.simple ? 1 : 2),
text: o.text, text: o.text,
// adapter: this.popup, defaultText: o.defaultText,
masker: { masker: {
offset: { offset: {
left: 0, left: 0,

3
src/widget/multiselect/multiselect.insert.combo.js

@ -43,6 +43,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
height: o.height - (o.simple ? 1 : 2), height: o.height - (o.simple ? 1 : 2),
text: o.text, text: o.text,
watermark: o.watermark, watermark: o.watermark,
defaultText: o.defaultText,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
@ -55,7 +56,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
itemsCreator: BI.bind(this._itemsCreator4Trigger, this), itemsCreator: BI.bind(this._itemsCreator4Trigger, this),
itemHeight: o.itemHeight, itemHeight: o.itemHeight,
value: o.value value: this.storeValue,
}); });
this.trigger.on(BI.MultiSelectInsertTrigger.EVENT_FOCUS, function () { this.trigger.on(BI.MultiSelectInsertTrigger.EVENT_FOCUS, function () {

3
src/widget/multiselect/multiselect.insert.trigger.js

@ -37,6 +37,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
type: "bi.multi_select_insert_searcher", type: "bi.multi_select_insert_searcher",
height: o.height, height: o.height,
text: o.text, text: o.text,
defaultText: o.defaultText,
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
itemHeight: o.itemHeight, itemHeight: o.itemHeight,
@ -109,7 +110,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
/** /**
* 重新调整numberCounter的空白占位符 * 重新调整numberCounter的空白占位符
*/ */
refreshPlaceHolderWidth: function(width) { refreshPlaceHolderWidth: function (width) {
this.wrapper.attr("items")[1].width = width; this.wrapper.attr("items")[1].width = width;
this.wrapper.resize(); this.wrapper.resize();
}, },

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

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

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

@ -16,7 +16,6 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, {
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
adapter: null, adapter: null,
masker: {}, masker: {},
text: BI.i18nText("BI-Basic_Please_Select"),
watermark: BI.i18nText("BI-Basic_Search_And_Patch_Paste"), watermark: BI.i18nText("BI-Basic_Search_And_Patch_Paste"),
}); });
}, },
@ -29,6 +28,7 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, {
watermark: o.watermark, watermark: o.watermark,
height: o.height, height: o.height,
text: o.text, text: o.text,
defaultText: o.defaultText,
listeners: [{ listeners: [{
eventName: BI.MultiSelectEditor.EVENT_FOCUS, eventName: BI.MultiSelectEditor.EVENT_FOCUS,
action: function () { action: function () {

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

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

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

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

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

@ -23,14 +23,16 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
var isInit = false; var isInit = false;
var want2showCounter = false; var want2showCounter = false;
this.storeValue = {value: o.value || {}}; this.storeValue = { value: o.value || {} };
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
height: o.height - (o.simple ? 1 : 2), height: o.height - (o.simple ? 1 : 2),
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup, text: o.text,
defaultText: o.defaultText,
watermark: o.watermark,
masker: { masker: {
offset: { offset: {
left: 0, left: 0,
@ -41,8 +43,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
}, },
searcher: { searcher: {
type: "bi.multi_tree_searcher", type: "bi.multi_tree_searcher",
text: o.text,
watermark: o.watermark,
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
popup: { popup: {
type: "bi.multi_tree_search_insert_pane", type: "bi.multi_tree_search_insert_pane",
@ -59,7 +60,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
}] }]
} }
}, },
value: {value: o.value || {}} value: { value: o.value || {} }
}); });
@ -121,7 +122,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
maxWidth: o.isNeedAdjustWidth ? "auto" : 500, maxWidth: o.isNeedAdjustWidth ? "auto" : 500,
}, },
isNeedAdjustWidth: o.isNeedAdjustWidth, isNeedAdjustWidth: o.isNeedAdjustWidth,
value: {value: o.value || {}}, value: { value: o.value || {} },
hideChecker: function (e) { hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0 && return triggerBtn.element.find(e.target).length === 0 &&
self.numberCounter.element.find(e.target).length === 0; self.numberCounter.element.find(e.target).length === 0;
@ -147,12 +148,12 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
}); });
this.trigger.on(BI.MultiSelectTrigger.EVENT_START, function () { this.trigger.on(BI.MultiSelectTrigger.EVENT_START, function () {
self.storeValue = {value: self.combo.getValue()}; self.storeValue = { value: self.combo.getValue() };
this.setValue(self.storeValue); this.setValue(self.storeValue);
self.numberCounter.setValue(self.storeValue); self.numberCounter.setValue(self.storeValue);
}); });
this.trigger.on(BI.MultiSelectTrigger.EVENT_STOP, function () { this.trigger.on(BI.MultiSelectTrigger.EVENT_STOP, function () {
self.storeValue = {value: this.getValue()}; self.storeValue = { value: this.getValue() };
self.combo.setValue(self.storeValue); self.combo.setValue(self.storeValue);
self.numberCounter.setValue(self.storeValue); self.numberCounter.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
@ -167,11 +168,11 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
self.fireEvent(BI.MultiTreeInsertCombo.EVENT_SEARCHING); self.fireEvent(BI.MultiTreeInsertCombo.EVENT_SEARCHING);
}); });
function showCounter () { function showCounter() {
if (isSearching()) { if (isSearching()) {
self.storeValue = {value: self.trigger.getValue()}; self.storeValue = { value: self.trigger.getValue() };
} else if (isPopupView()) { } else if (isPopupView()) {
self.storeValue = {value: self.combo.getValue()}; self.storeValue = { value: self.combo.getValue() };
} }
self.trigger.setValue(self.storeValue); self.trigger.setValue(self.storeValue);
self.numberCounter.setValue(self.storeValue); self.numberCounter.setValue(self.storeValue);
@ -185,7 +186,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
var checked = this.getSearcher().hasChecked(); var checked = this.getSearcher().hasChecked();
var val = { var val = {
type: BI.Selection.Multi, type: BI.Selection.Multi,
value: checked ? {1: 1} : {} value: checked ? { 1: 1 } : {}
}; };
this.getSearcher().setState(checked ? BI.Selection.Multi : BI.Selection.None); this.getSearcher().setState(checked ? BI.Selection.Multi : BI.Selection.None);
self.numberCounter.setButtonChecked(val); self.numberCounter.setButtonChecked(val);
@ -197,7 +198,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
return; return;
} }
if (change === true) { if (change === true) {
self.storeValue = {value: self.combo.getValue()}; self.storeValue = { value: self.combo.getValue() };
change = false; change = false;
} }
self.combo.setValue(self.storeValue); self.combo.setValue(self.storeValue);
@ -212,9 +213,9 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
} else { } else {
if (isPopupView()) { if (isPopupView()) {
self._stopEditing(); self._stopEditing();
self.storeValue = {value: self.combo.getValue()}; self.storeValue = { value: self.combo.getValue() };
if (clear === true) { if (clear === true) {
self.storeValue = {value: {}}; self.storeValue = { value: {} };
} }
self.fireEvent(BI.MultiTreeInsertCombo.EVENT_CONFIRM); self.fireEvent(BI.MultiTreeInsertCombo.EVENT_CONFIRM);
} }
@ -322,7 +323,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
this.numberCounter.setButtonChecked(this.storeValue); this.numberCounter.setButtonChecked(this.storeValue);
}, },
_stopEditing: function() { _stopEditing: function () {
this.trigger.stopEditing(); this.trigger.stopEditing();
this.numberCounter.hideView(); this.numberCounter.hideView();
}, },

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

@ -15,7 +15,6 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
allowInsertValue: true, allowInsertValue: true,
isNeedAdjustWidth: true, isNeedAdjustWidth: true,
text: "", text: "",
defaultText: "",
}); });
}, },
@ -35,7 +34,6 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
watermark: o.watermark, watermark: o.watermark,
height: o.height - (o.simple ? 1 : 2), height: o.height - (o.simple ? 1 : 2),
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
// adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 0, left: 0,
@ -77,8 +75,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
itemsCreator: o.itemsCreator itemsCreator: o.itemsCreator
} }
}, },
value: { value: o.value || {} } value: this.storeValue
}); });
this.combo = BI.createWidget({ this.combo = BI.createWidget({
@ -142,7 +139,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
maxWidth: o.isNeedAdjustWidth ? "auto" : 500, maxWidth: o.isNeedAdjustWidth ? "auto" : 500,
}, },
isNeedAdjustWidth: o.isNeedAdjustWidth, isNeedAdjustWidth: o.isNeedAdjustWidth,
value: { value: o.value || {} }, value: this.storeValue,
hideChecker: function (e) { hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0 && return triggerBtn.element.find(e.target).length === 0 &&
self.numberCounter.element.find(e.target).length === 0; self.numberCounter.element.find(e.target).length === 0;

2
src/widget/multitree/trigger/searcher.list.multi.tree.js

@ -8,7 +8,7 @@ BI.MultiListTreeSearcher = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiListTreeSearcher.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiListTreeSearcher.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-searcher", baseCls: "bi-multi-list-tree-searcher",
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
valueFormatter: function (v) { valueFormatter: function (v) {
return v; return v;

Loading…
Cancel
Save