diff --git a/changelog.md b/changelog.md index a064e127d..207d4db1c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,10 @@ # 更新日志 +2.0(2019-08) +- 可编辑的combo新增水印配置 +- 单选下拉树同步状态下内置搜索 + 2.0(2019-07) +- 修改了下拉框控件默认值的配色 - input及其派生编辑控件在PAUSE事件之前会触发CHANGE事件 2.0(2019-06) diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index b43547d4b..dad41abbc 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -68679,6 +68679,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, height: o.height - 2, text: o.text, value: o.value, @@ -69017,7 +69018,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -69046,7 +69048,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -69687,6 +69689,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { ref: function (_ref) { self.trigger = _ref; }, + watermark: o.watermark, items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, @@ -70027,7 +70030,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -70056,7 +70060,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -71507,6 +71511,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { allowEdit: o.allowEdit, height: o.height, text: o.text, + watermark: o.watermark, // adapter: this.popup, masker: { offset: { @@ -72307,6 +72312,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -73033,6 +73039,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -73631,7 +73638,8 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-multi-select-editor", - el: {} + el: {}, + watermark: BI.i18nText("BI-Basic_Search") }); }, @@ -73642,7 +73650,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { type: "bi.state_editor", element: this, height: o.height, - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, allowBlank: true, value: o.value, defaultText: o.text, @@ -73739,6 +73747,7 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget(o.el, { type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, text: o.text, listeners: [{ @@ -75903,6 +75912,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", @@ -77009,7 +77019,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { popup: {}, adapter: null, - masker: {} + masker: {}, }); }, @@ -77018,6 +77028,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget({ type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, el: { type: "bi.simple_state_editor", diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index c123ad0ad..433db499f 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -69083,6 +69083,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, height: o.height - 2, text: o.text, value: o.value, @@ -69421,7 +69422,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -69450,7 +69452,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -70091,6 +70093,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { ref: function (_ref) { self.trigger = _ref; }, + watermark: o.watermark, items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, @@ -70431,7 +70434,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -70460,7 +70464,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -71911,6 +71915,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { allowEdit: o.allowEdit, height: o.height, text: o.text, + watermark: o.watermark, // adapter: this.popup, masker: { offset: { @@ -72711,6 +72716,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -73437,6 +73443,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -74035,7 +74042,8 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-multi-select-editor", - el: {} + el: {}, + watermark: BI.i18nText("BI-Basic_Search") }); }, @@ -74046,7 +74054,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { type: "bi.state_editor", element: this, height: o.height, - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, allowBlank: true, value: o.value, defaultText: o.text, @@ -74143,6 +74151,7 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget(o.el, { type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, text: o.text, listeners: [{ @@ -76307,6 +76316,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", @@ -77413,7 +77423,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { popup: {}, adapter: null, - masker: {} + masker: {}, }); }, @@ -77422,6 +77432,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget({ type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, el: { type: "bi.simple_state_editor", diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index b43547d4b..dad41abbc 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -68679,6 +68679,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, height: o.height - 2, text: o.text, value: o.value, @@ -69017,7 +69018,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -69046,7 +69048,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -69687,6 +69689,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { ref: function (_ref) { self.trigger = _ref; }, + watermark: o.watermark, items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, @@ -70027,7 +70030,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -70056,7 +70060,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -71507,6 +71511,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { allowEdit: o.allowEdit, height: o.height, text: o.text, + watermark: o.watermark, // adapter: this.popup, masker: { offset: { @@ -72307,6 +72312,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -73033,6 +73039,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -73631,7 +73638,8 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-multi-select-editor", - el: {} + el: {}, + watermark: BI.i18nText("BI-Basic_Search") }); }, @@ -73642,7 +73650,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { type: "bi.state_editor", element: this, height: o.height, - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, allowBlank: true, value: o.value, defaultText: o.text, @@ -73739,6 +73747,7 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget(o.el, { type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, text: o.text, listeners: [{ @@ -75903,6 +75912,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", @@ -77009,7 +77019,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { popup: {}, adapter: null, - masker: {} + masker: {}, }); }, @@ -77018,6 +77028,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget({ type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, el: { type: "bi.simple_state_editor", diff --git a/dist/bundle.js b/dist/bundle.js index c123ad0ad..433db499f 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -69083,6 +69083,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, height: o.height - 2, text: o.text, value: o.value, @@ -69421,7 +69422,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -69450,7 +69452,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -70091,6 +70093,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { ref: function (_ref) { self.trigger = _ref; }, + watermark: o.watermark, items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, @@ -70431,7 +70434,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -70460,7 +70464,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -71911,6 +71915,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { allowEdit: o.allowEdit, height: o.height, text: o.text, + watermark: o.watermark, // adapter: this.popup, masker: { offset: { @@ -72711,6 +72716,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -73437,6 +73443,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -74035,7 +74042,8 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-multi-select-editor", - el: {} + el: {}, + watermark: BI.i18nText("BI-Basic_Search") }); }, @@ -74046,7 +74054,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { type: "bi.state_editor", element: this, height: o.height, - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, allowBlank: true, value: o.value, defaultText: o.text, @@ -74143,6 +74151,7 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget(o.el, { type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, text: o.text, listeners: [{ @@ -76307,6 +76316,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", @@ -77413,7 +77423,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { popup: {}, adapter: null, - masker: {} + masker: {}, }); }, @@ -77422,6 +77432,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget({ type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, el: { type: "bi.simple_state_editor", diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index da64189a7..70e1fe99b 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -68924,6 +68924,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, height: o.height - 2, text: o.text, value: o.value, @@ -69262,7 +69263,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -69291,7 +69293,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -69932,6 +69934,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { ref: function (_ref) { self.trigger = _ref; }, + watermark: o.watermark, items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, @@ -70272,7 +70275,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -70301,7 +70305,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -71752,6 +71756,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { allowEdit: o.allowEdit, height: o.height, text: o.text, + watermark: o.watermark, // adapter: this.popup, masker: { offset: { @@ -72552,6 +72557,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -73278,6 +73284,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -73876,7 +73883,8 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-multi-select-editor", - el: {} + el: {}, + watermark: BI.i18nText("BI-Basic_Search") }); }, @@ -73887,7 +73895,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { type: "bi.state_editor", element: this, height: o.height, - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, allowBlank: true, value: o.value, defaultText: o.text, @@ -73984,6 +73992,7 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget(o.el, { type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, text: o.text, listeners: [{ @@ -76148,6 +76157,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", @@ -77254,7 +77264,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { popup: {}, adapter: null, - masker: {} + masker: {}, }); }, @@ -77263,6 +77273,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget({ type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, el: { type: "bi.simple_state_editor", diff --git a/dist/fineui.js b/dist/fineui.js index 99c49579e..3f1aef139 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -69328,6 +69328,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, height: o.height - 2, text: o.text, value: o.value, @@ -69666,7 +69667,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -69695,7 +69697,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -70336,6 +70338,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { ref: function (_ref) { self.trigger = _ref; }, + watermark: o.watermark, items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, @@ -70676,7 +70679,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -70705,7 +70709,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -72156,6 +72160,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { allowEdit: o.allowEdit, height: o.height, text: o.text, + watermark: o.watermark, // adapter: this.popup, masker: { offset: { @@ -72956,6 +72961,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -73682,6 +73688,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -74280,7 +74287,8 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-multi-select-editor", - el: {} + el: {}, + watermark: BI.i18nText("BI-Basic_Search") }); }, @@ -74291,7 +74299,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { type: "bi.state_editor", element: this, height: o.height, - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, allowBlank: true, value: o.value, defaultText: o.text, @@ -74388,6 +74396,7 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget(o.el, { type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, text: o.text, listeners: [{ @@ -76552,6 +76561,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", @@ -77658,7 +77668,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { popup: {}, adapter: null, - masker: {} + masker: {}, }); }, @@ -77667,6 +77677,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget({ type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, el: { type: "bi.simple_state_editor", diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 7699b5d6a..e6871210e 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -51934,6 +51934,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, height: o.height - 2, text: o.text, value: o.value, @@ -52272,7 +52273,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -52301,7 +52303,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -52942,6 +52944,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { ref: function (_ref) { self.trigger = _ref; }, + watermark: o.watermark, items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, @@ -53282,7 +53285,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -53311,7 +53315,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -54762,6 +54766,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { allowEdit: o.allowEdit, height: o.height, text: o.text, + watermark: o.watermark, // adapter: this.popup, masker: { offset: { @@ -55562,6 +55567,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -56288,6 +56294,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -56886,7 +56893,8 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-multi-select-editor", - el: {} + el: {}, + watermark: BI.i18nText("BI-Basic_Search") }); }, @@ -56897,7 +56905,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { type: "bi.state_editor", element: this, height: o.height, - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, allowBlank: true, value: o.value, defaultText: o.text, @@ -56994,6 +57002,7 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget(o.el, { type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, text: o.text, listeners: [{ @@ -59158,6 +59167,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", @@ -60264,7 +60274,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { popup: {}, adapter: null, - masker: {} + masker: {}, }); }, @@ -60273,6 +60283,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget({ type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, el: { type: "bi.simple_state_editor", diff --git a/dist/widget.js b/dist/widget.js index f9ea6f49c..774d349e2 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -6741,6 +6741,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, height: o.height - 2, text: o.text, value: o.value, @@ -7079,7 +7080,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -7108,7 +7110,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -7749,6 +7751,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { ref: function (_ref) { self.trigger = _ref; }, + watermark: o.watermark, items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, @@ -8089,7 +8092,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -8118,7 +8122,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { @@ -9569,6 +9573,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { allowEdit: o.allowEdit, height: o.height, text: o.text, + watermark: o.watermark, // adapter: this.popup, masker: { offset: { @@ -10369,6 +10374,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -11095,6 +11101,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, @@ -11693,7 +11700,8 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-multi-select-editor", - el: {} + el: {}, + watermark: BI.i18nText("BI-Basic_Search") }); }, @@ -11704,7 +11712,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { type: "bi.state_editor", element: this, height: o.height, - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, allowBlank: true, value: o.value, defaultText: o.text, @@ -11801,6 +11809,7 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget(o.el, { type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, text: o.text, listeners: [{ @@ -13965,6 +13974,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", @@ -15071,7 +15081,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { popup: {}, adapter: null, - masker: {} + masker: {}, }); }, @@ -15080,6 +15090,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget({ type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, el: { type: "bi.simple_state_editor", diff --git a/src/widget/multilayerselecttree/multilayerselecttree.combo.js b/src/widget/multilayerselecttree/multilayerselecttree.combo.js index bd12b25cf..c583070b5 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.combo.js @@ -104,6 +104,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, height: o.height - 2, text: o.text, value: o.value, diff --git a/src/widget/multilayerselecttree/multilayerselecttree.trigger.js b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js index e91a6b413..b0c7f37a9 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.trigger.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js @@ -9,7 +9,8 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -38,7 +39,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js index 4745c85a8..3bac26da8 100644 --- a/src/widget/multilayersingletree/multilayersingletree.combo.js +++ b/src/widget/multilayersingletree/multilayersingletree.combo.js @@ -104,6 +104,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { ref: function (_ref) { self.trigger = _ref; }, + watermark: o.watermark, items: o.items, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, diff --git a/src/widget/multilayersingletree/multilayersingletree.trigger.js b/src/widget/multilayersingletree/multilayersingletree.trigger.js index 08e855204..bf143e7e3 100644 --- a/src/widget/multilayersingletree/multilayersingletree.trigger.js +++ b/src/widget/multilayersingletree/multilayersingletree.trigger.js @@ -9,7 +9,8 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { valueFormatter: function (v) { return v; }, - itemsCreator: BI.emptyFn + itemsCreator: BI.emptyFn, + watermark: BI.i18nText("BI-Basic_Search") }, render: function () { @@ -38,7 +39,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { value: o.value, height: o.height, tipText: "", - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, listeners: [{ eventName: BI.StateEditor.EVENT_FOCUS, action: function () { diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js index 291e3935a..d40af8813 100644 --- a/src/widget/multiselect/multiselect.insert.combo.js +++ b/src/widget/multiselect/multiselect.insert.combo.js @@ -36,6 +36,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { allowEdit: o.allowEdit, height: o.height, text: o.text, + watermark: o.watermark, // adapter: this.popup, masker: { offset: { diff --git a/src/widget/multiselect/multiselect.insert.trigger.js b/src/widget/multiselect/multiselect.insert.trigger.js index a2f60828d..154a1dda9 100644 --- a/src/widget/multiselect/multiselect.insert.trigger.js +++ b/src/widget/multiselect/multiselect.insert.trigger.js @@ -41,6 +41,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, diff --git a/src/widget/multiselect/multiselect.trigger.js b/src/widget/multiselect/multiselect.trigger.js index 12e802859..e30b23e3b 100644 --- a/src/widget/multiselect/multiselect.trigger.js +++ b/src/widget/multiselect/multiselect.trigger.js @@ -41,6 +41,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { text: o.text, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, + watermark: o.watermark, popup: {}, adapter: o.adapter, masker: o.masker, diff --git a/src/widget/multiselect/trigger/editor.multiselect.js b/src/widget/multiselect/trigger/editor.multiselect.js index 376070f95..78b38a73f 100644 --- a/src/widget/multiselect/trigger/editor.multiselect.js +++ b/src/widget/multiselect/trigger/editor.multiselect.js @@ -9,7 +9,8 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-multi-select-editor", - el: {} + el: {}, + watermark: BI.i18nText("BI-Basic_Search") }); }, @@ -20,7 +21,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { type: "bi.state_editor", element: this, height: o.height, - watermark: BI.i18nText("BI-Basic_Search"), + watermark: o.watermark, allowBlank: true, value: o.value, defaultText: o.text, diff --git a/src/widget/multiselect/trigger/searcher.multiselect.insert.js b/src/widget/multiselect/trigger/searcher.multiselect.insert.js index 4c5a67a11..e5014bf8b 100644 --- a/src/widget/multiselect/trigger/searcher.multiselect.insert.js +++ b/src/widget/multiselect/trigger/searcher.multiselect.insert.js @@ -24,6 +24,7 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget(o.el, { type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, text: o.text, listeners: [{ diff --git a/src/widget/multitree/multi.tree.insert.combo.js b/src/widget/multitree/multi.tree.insert.combo.js index 92af70e1b..d73716923 100644 --- a/src/widget/multitree/multi.tree.insert.combo.js +++ b/src/widget/multitree/multi.tree.insert.combo.js @@ -47,6 +47,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", diff --git a/src/widget/multitree/trigger/searcher.multi.tree.js b/src/widget/multitree/trigger/searcher.multi.tree.js index ffc57300b..e7f27d1e3 100644 --- a/src/widget/multitree/trigger/searcher.multi.tree.js +++ b/src/widget/multitree/trigger/searcher.multi.tree.js @@ -16,7 +16,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { popup: {}, adapter: null, - masker: {} + masker: {}, }); }, @@ -25,6 +25,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { var self = this, o = this.options; this.editor = BI.createWidget({ type: "bi.multi_select_editor", + watermark: o.watermark, height: o.height, el: { type: "bi.simple_state_editor",