From daabe3b60a2bd311cfb9f3cfb09f1a1bab2737dd Mon Sep 17 00:00:00 2001 From: fay Date: Fri, 27 Jul 2018 17:47:33 +0800 Subject: [PATCH] update --- dist/bundle.js | 10 +++++++++- dist/case.js | 10 +++++++++- dist/fineui.js | 10 +++++++++- .../richeditor/plugins/combo.backgroundcolorchooser.js | 1 + src/case/richeditor/plugins/combo.colorchooser.js | 1 + src/case/richeditor/richeditor.js | 8 +++++++- 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index 4e612b20f3..3646283970 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -84331,6 +84331,7 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, { var self = this, o = this.options; this.colorchooser = BI.createWidget({ type: "bi.color_chooser", + container: null, element: this, width: o.width, height: o.height, @@ -84377,6 +84378,7 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, { var self = this, o = this.options; this.colorchooser = BI.createWidget({ type: "bi.color_chooser", + container: null, element: this, width: o.width, height: o.height, @@ -84716,7 +84718,10 @@ BI.RichEditor = BI.inherit(BI.Widget, { popup: { el: BI.extend({ type: "bi.rich_editor_text_toolbar", - editor: this.editor + editor: this.editor, + ref: function (_ref) { + self.toolbar = _ref; + } }, o.toolbar), height: 34, stopPropagation: true, @@ -84736,6 +84741,9 @@ BI.RichEditor = BI.inherit(BI.Widget, { if(BI.isNull(o.value)) { this.editor.setValue(o.value); } + if(o.toolbar) { + this.editor.bindToolbar(this.toolbar); + } }, focus: function () { diff --git a/dist/case.js b/dist/case.js index 688dcf2df8..e1947cf2e3 100644 --- a/dist/case.js +++ b/dist/case.js @@ -11648,6 +11648,7 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, { var self = this, o = this.options; this.colorchooser = BI.createWidget({ type: "bi.color_chooser", + container: null, element: this, width: o.width, height: o.height, @@ -11694,6 +11695,7 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, { var self = this, o = this.options; this.colorchooser = BI.createWidget({ type: "bi.color_chooser", + container: null, element: this, width: o.width, height: o.height, @@ -12033,7 +12035,10 @@ BI.RichEditor = BI.inherit(BI.Widget, { popup: { el: BI.extend({ type: "bi.rich_editor_text_toolbar", - editor: this.editor + editor: this.editor, + ref: function (_ref) { + self.toolbar = _ref; + } }, o.toolbar), height: 34, stopPropagation: true, @@ -12053,6 +12058,9 @@ BI.RichEditor = BI.inherit(BI.Widget, { if(BI.isNull(o.value)) { this.editor.setValue(o.value); } + if(o.toolbar) { + this.editor.bindToolbar(this.toolbar); + } }, focus: function () { diff --git a/dist/fineui.js b/dist/fineui.js index b15ad98b1d..b67886e444 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -84580,6 +84580,7 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, { var self = this, o = this.options; this.colorchooser = BI.createWidget({ type: "bi.color_chooser", + container: null, element: this, width: o.width, height: o.height, @@ -84626,6 +84627,7 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, { var self = this, o = this.options; this.colorchooser = BI.createWidget({ type: "bi.color_chooser", + container: null, element: this, width: o.width, height: o.height, @@ -84965,7 +84967,10 @@ BI.RichEditor = BI.inherit(BI.Widget, { popup: { el: BI.extend({ type: "bi.rich_editor_text_toolbar", - editor: this.editor + editor: this.editor, + ref: function (_ref) { + self.toolbar = _ref; + } }, o.toolbar), height: 34, stopPropagation: true, @@ -84985,6 +84990,9 @@ BI.RichEditor = BI.inherit(BI.Widget, { if(BI.isNull(o.value)) { this.editor.setValue(o.value); } + if(o.toolbar) { + this.editor.bindToolbar(this.toolbar); + } }, focus: function () { diff --git a/src/case/richeditor/plugins/combo.backgroundcolorchooser.js b/src/case/richeditor/plugins/combo.backgroundcolorchooser.js index b089bd75c1..6a4607b892 100644 --- a/src/case/richeditor/plugins/combo.backgroundcolorchooser.js +++ b/src/case/richeditor/plugins/combo.backgroundcolorchooser.js @@ -18,6 +18,7 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, { var self = this, o = this.options; this.colorchooser = BI.createWidget({ type: "bi.color_chooser", + container: null, element: this, width: o.width, height: o.height, diff --git a/src/case/richeditor/plugins/combo.colorchooser.js b/src/case/richeditor/plugins/combo.colorchooser.js index e7ca5409b7..9477e6e0db 100644 --- a/src/case/richeditor/plugins/combo.colorchooser.js +++ b/src/case/richeditor/plugins/combo.colorchooser.js @@ -20,6 +20,7 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, { var self = this, o = this.options; this.colorchooser = BI.createWidget({ type: "bi.color_chooser", + container: null, element: this, width: o.width, height: o.height, diff --git a/src/case/richeditor/richeditor.js b/src/case/richeditor/richeditor.js index e0963f2307..b46fb1b278 100644 --- a/src/case/richeditor/richeditor.js +++ b/src/case/richeditor/richeditor.js @@ -68,7 +68,10 @@ BI.RichEditor = BI.inherit(BI.Widget, { popup: { el: BI.extend({ type: "bi.rich_editor_text_toolbar", - editor: this.editor + editor: this.editor, + ref: function (_ref) { + self.toolbar = _ref; + } }, o.toolbar), height: 34, stopPropagation: true, @@ -88,6 +91,9 @@ BI.RichEditor = BI.inherit(BI.Widget, { if(BI.isNull(o.value)) { this.editor.setValue(o.value); } + if(o.toolbar) { + this.editor.bindToolbar(this.toolbar); + } }, focus: function () {