From 41179de20faf0c13878b28ca13b8824472608bf4 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 26 Jul 2018 19:01:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20container?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/colorchooser/colorchooser.js | 1 + src/case/colorchooser/colorchooser.simple.js | 1 + src/case/combo/bubblecombo/combo.bubble.js | 1 + src/case/combo/icontextvaluecombo/combo.icontextvalue.js | 1 + src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js | 1 + src/case/combo/staticcombo/combo.static.js | 1 + src/case/richeditor/niceditor/niceditor.js | 2 +- src/widget/multiselect/multiselect.combo.js | 1 + src/widget/multiselect/multiselect.insert.combo.js | 1 + src/widget/multiselect/multiselect.insert.combo.nobar.js | 1 + .../searchmultitextvaluecombo/multitextvalue.combo.search.js | 1 + 11 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js index 5eaeb7718..ddda99782 100644 --- a/src/case/colorchooser/colorchooser.js +++ b/src/case/colorchooser/colorchooser.js @@ -21,6 +21,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, { this.combo = BI.createWidget({ type: "bi.combo", element: this, + container: o.container, adjustLength: 1, isNeedAdjustWidth: false, isNeedAdjustHeight: false, diff --git a/src/case/colorchooser/colorchooser.simple.js b/src/case/colorchooser/colorchooser.simple.js index 75244d174..2753b2e3c 100644 --- a/src/case/colorchooser/colorchooser.simple.js +++ b/src/case/colorchooser/colorchooser.simple.js @@ -21,6 +21,7 @@ BI.SimpleColorChooser = BI.inherit(BI.Widget, { this.combo = BI.createWidget({ type: "bi.color_chooser", element: this, + container: o.container, value: o.value, popup: { type: "bi.simple_color_chooser_popup" diff --git a/src/case/combo/bubblecombo/combo.bubble.js b/src/case/combo/bubblecombo/combo.bubble.js index c6368d5ad..6146a03f4 100644 --- a/src/case/combo/bubblecombo/combo.bubble.js +++ b/src/case/combo/bubblecombo/combo.bubble.js @@ -36,6 +36,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { element: this, trigger: o.trigger, toggle: o.toggle, + container: o.container, direction: o.direction, isDefaultInit: o.isDefaultInit, destroyWhenHide: o.destroyWhenHide, diff --git a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js index 068d3394f..26414187a 100644 --- a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js +++ b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js @@ -44,6 +44,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { this.textIconCombo = BI.createWidget({ type: "bi.combo", element: this, + container: o.container, adjustLength: 2, el: this.trigger, popup: { diff --git a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js index cada57d89..403d93f5b 100644 --- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js +++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js @@ -19,6 +19,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { items: [{ el: { type: "bi.combo", + container: o.container, adjustLength: 2, toggle: false, ref: function () { diff --git a/src/case/combo/staticcombo/combo.static.js b/src/case/combo/staticcombo/combo.static.js index c8d90773b..4aa61377d 100644 --- a/src/case/combo/staticcombo/combo.static.js +++ b/src/case/combo/staticcombo/combo.static.js @@ -45,6 +45,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, { type: "bi.combo", element: this, adjustLength: 2, + container: o.container, el: this.trigger, popup: { el: this.popup diff --git a/src/case/richeditor/niceditor/niceditor.js b/src/case/richeditor/niceditor/niceditor.js index 441eec3b3..4f755cdd6 100644 --- a/src/case/richeditor/niceditor/niceditor.js +++ b/src/case/richeditor/niceditor/niceditor.js @@ -68,7 +68,7 @@ var self = this; var found = false; do { - if (t.nodeName !== "svg" && t.className && t.className.indexOf(prefix) != -1) { + if (t.nodeName !== "svg" && t.className && t.className.indexOf && t.className.indexOf(prefix) != -1) { return; // return false; } diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index cb2cba8ae..dafaa3a1e 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/src/widget/multiselect/multiselect.combo.js @@ -119,6 +119,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", toggle: false, + container: o.container, el: this.trigger, adjustLength: 1, popup: { diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js index e824477b2..3200c287b 100644 --- a/src/widget/multiselect/multiselect.insert.combo.js +++ b/src/widget/multiselect/multiselect.insert.combo.js @@ -114,6 +114,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { toggle: false, el: this.trigger, adjustLength: 1, + container: o.container, popup: { type: "bi.multi_select_popup_view", ref: function () { diff --git a/src/widget/multiselect/multiselect.insert.combo.nobar.js b/src/widget/multiselect/multiselect.insert.combo.nobar.js index b3a4382d7..9f99f9769 100644 --- a/src/widget/multiselect/multiselect.insert.combo.nobar.js +++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js @@ -121,6 +121,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", toggle: false, + container: o.container, el: this.trigger, adjustLength: 1, popup: { diff --git a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js index f44c6701d..31c8b15e9 100644 --- a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js +++ b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js @@ -124,6 +124,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", toggle: false, + container: o.container, el: this.trigger, adjustLength: 1, popup: {