diff --git a/dist/bundle.js b/dist/bundle.js index d3cd568ee..79f02bf01 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -83515,7 +83515,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/** setValue: function (v) { v = v || ( isIE11Below() ? "" : "
"); - v = ($(v)[0] && $(v)[0].nodeName === "P") ? v : "

" + v + "

"; + v = v.startWith("" + v + "

"; this.instance.setContent(v); }, @@ -104630,7 +104630,8 @@ BI.extend(BI.SearchMultiTextValueCombo, { BI.SearchMultiTextValueCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; -BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo);BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, { +BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo); +BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, { constants: { height: 14, @@ -112625,12 +112626,14 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult render: function () { var self = this, o = this.options; + var value = this._digestValue(o.value); return { type: "bi.search_multi_text_value_combo", text: o.text, height: o.height, items: o.items, - value: o.value, + value: value, + numOfPage: 100, valueFormatter: o.valueFormatter, listeners: [{ eventName: BI.SearchMultiTextValueCombo.EVENT_CONFIRM, @@ -112645,10 +112648,8 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult }, setValue: function (v) { - this.combo.setValue({ - type: BI.Selection.Multi, - value: v || [] - }); + var value = this._digestValue(v); + this.combo.setValue(value); }, getValue: function () { @@ -112667,10 +112668,18 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult populate: function (items) { this.options.items = items; this.combo.populate.apply(this, arguments); + }, + + _digestValue: function (v) { + return { + type: BI.Selection.Multi, + value: v || [] + }; } }); BI.AllValueMultiTextValueCombo.EVENT_CONFIRM = "AllValueMultiTextValueCombo.EVENT_CONFIRM"; -BI.shortcut("bi.all_value_multi_text_value_combo", BI.AllValueMultiTextValueCombo);BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { +BI.shortcut("bi.all_value_multi_text_value_combo", BI.AllValueMultiTextValueCombo); +BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { _const: { perPage: 100 diff --git a/dist/case.js b/dist/case.js index c1e4fbb51..a217d9db3 100644 --- a/dist/case.js +++ b/dist/case.js @@ -10835,7 +10835,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/** setValue: function (v) { v = v || ( isIE11Below() ? "" : "
"); - v = ($(v)[0] && $(v)[0].nodeName === "P") ? v : "

" + v + "

"; + v = v.startWith("" + v + "

"; this.instance.setContent(v); }, diff --git a/dist/fineui.js b/dist/fineui.js index 3d9e82e24..2aa889acb 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -83764,7 +83764,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/** setValue: function (v) { v = v || ( isIE11Below() ? "" : "
"); - v = ($(v)[0] && $(v)[0].nodeName === "P") ? v : "

" + v + "

"; + v = v.startWith("" + v + "

"; this.instance.setContent(v); }, @@ -104879,7 +104879,8 @@ BI.extend(BI.SearchMultiTextValueCombo, { BI.SearchMultiTextValueCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; -BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo);BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, { +BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo); +BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, { constants: { height: 14, @@ -112874,12 +112875,14 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult render: function () { var self = this, o = this.options; + var value = this._digestValue(o.value); return { type: "bi.search_multi_text_value_combo", text: o.text, height: o.height, items: o.items, - value: o.value, + value: value, + numOfPage: 100, valueFormatter: o.valueFormatter, listeners: [{ eventName: BI.SearchMultiTextValueCombo.EVENT_CONFIRM, @@ -112894,10 +112897,8 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult }, setValue: function (v) { - this.combo.setValue({ - type: BI.Selection.Multi, - value: v || [] - }); + var value = this._digestValue(v); + this.combo.setValue(value); }, getValue: function () { @@ -112916,10 +112917,18 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult populate: function (items) { this.options.items = items; this.combo.populate.apply(this, arguments); + }, + + _digestValue: function (v) { + return { + type: BI.Selection.Multi, + value: v || [] + }; } }); BI.AllValueMultiTextValueCombo.EVENT_CONFIRM = "AllValueMultiTextValueCombo.EVENT_CONFIRM"; -BI.shortcut("bi.all_value_multi_text_value_combo", BI.AllValueMultiTextValueCombo);BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { +BI.shortcut("bi.all_value_multi_text_value_combo", BI.AllValueMultiTextValueCombo); +BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { _const: { perPage: 100 diff --git a/dist/widget.js b/dist/widget.js index deb6d7b48..c05f2fe07 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -16602,7 +16602,8 @@ BI.extend(BI.SearchMultiTextValueCombo, { BI.SearchMultiTextValueCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; -BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo);BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, { +BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo); +BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, { constants: { height: 14, @@ -24597,12 +24598,14 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult render: function () { var self = this, o = this.options; + var value = this._digestValue(o.value); return { type: "bi.search_multi_text_value_combo", text: o.text, height: o.height, items: o.items, - value: o.value, + value: value, + numOfPage: 100, valueFormatter: o.valueFormatter, listeners: [{ eventName: BI.SearchMultiTextValueCombo.EVENT_CONFIRM, @@ -24617,10 +24620,8 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult }, setValue: function (v) { - this.combo.setValue({ - type: BI.Selection.Multi, - value: v || [] - }); + var value = this._digestValue(v); + this.combo.setValue(value); }, getValue: function () { @@ -24639,10 +24640,18 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult populate: function (items) { this.options.items = items; this.combo.populate.apply(this, arguments); + }, + + _digestValue: function (v) { + return { + type: BI.Selection.Multi, + value: v || [] + }; } }); BI.AllValueMultiTextValueCombo.EVENT_CONFIRM = "AllValueMultiTextValueCombo.EVENT_CONFIRM"; -BI.shortcut("bi.all_value_multi_text_value_combo", BI.AllValueMultiTextValueCombo);BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { +BI.shortcut("bi.all_value_multi_text_value_combo", BI.AllValueMultiTextValueCombo); +BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { _const: { perPage: 100 diff --git a/src/case/richeditor/niceditor/niceditor.js b/src/case/richeditor/niceditor/niceditor.js index 3a33a2aa1..441eec3b3 100644 --- a/src/case/richeditor/niceditor/niceditor.js +++ b/src/case/richeditor/niceditor/niceditor.js @@ -97,7 +97,7 @@ setValue: function (v) { v = v || ( isIE11Below() ? "" : "
"); - v = ($(v)[0] && $(v)[0].nodeName === "P") ? v : "

" + v + "

"; + v = v.startWith("" + v + "

"; this.instance.setContent(v); }, diff --git a/src/component/allvaluemultitextvaluecombo/allvalue.multitextvalue.combo.js b/src/component/allvaluemultitextvaluecombo/allvalue.multitextvalue.combo.js index 5a75805cb..3f85550ca 100644 --- a/src/component/allvaluemultitextvaluecombo/allvalue.multitextvalue.combo.js +++ b/src/component/allvaluemultitextvaluecombo/allvalue.multitextvalue.combo.js @@ -9,12 +9,14 @@ BI.AllValueMultiTextValueCombo = BI.inherit(BI.Widget, { render: function () { var self = this, o = this.options; + var value = this._digestValue(o.value); return { type: "bi.search_multi_text_value_combo", text: o.text, height: o.height, items: o.items, - value: o.value, + value: value, + numOfPage: 100, valueFormatter: o.valueFormatter, listeners: [{ eventName: BI.SearchMultiTextValueCombo.EVENT_CONFIRM, @@ -29,10 +31,8 @@ BI.AllValueMultiTextValueCombo = BI.inherit(BI.Widget, { }, setValue: function (v) { - this.combo.setValue({ - type: BI.Selection.Multi, - value: v || [] - }); + var value = this._digestValue(v); + this.combo.setValue(value); }, getValue: function () { @@ -51,7 +51,14 @@ BI.AllValueMultiTextValueCombo = BI.inherit(BI.Widget, { populate: function (items) { this.options.items = items; this.combo.populate.apply(this, arguments); + }, + + _digestValue: function (v) { + return { + type: BI.Selection.Multi, + value: v || [] + }; } }); BI.AllValueMultiTextValueCombo.EVENT_CONFIRM = "AllValueMultiTextValueCombo.EVENT_CONFIRM"; -BI.shortcut("bi.all_value_multi_text_value_combo", BI.AllValueMultiTextValueCombo); \ No newline at end of file +BI.shortcut("bi.all_value_multi_text_value_combo", BI.AllValueMultiTextValueCombo); diff --git a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js index 9628c2982..f44c6701d 100644 --- a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js +++ b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js @@ -471,4 +471,4 @@ BI.extend(BI.SearchMultiTextValueCombo, { BI.SearchMultiTextValueCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; -BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo); \ No newline at end of file +BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo);