Merge pull request #305 in FUI/fineui from ~WINDY/fui:master to master

* commit '228200cd16473d77224b4af0a2df183b84345699':
  filter_expander的问题

dist/base.js

@@ -3615,9 +3615,7 @@ BI.Expander = BI.inherit(BI.Widget, {
     },
 
     _initExpander: function () {
-        this.expander = BI.createWidget(this.options.el, {
+        this.expander = BI.createWidget(this.options.el);
-            value: this.options.value
-        });
     },
 
     _assertPopupView: function () {

dist/bundle.js

@@ -38876,9 +38876,7 @@ BI.Expander = BI.inherit(BI.Widget, {
     },
 
     _initExpander: function () {
-        this.expander = BI.createWidget(this.options.el, {
+        this.expander = BI.createWidget(this.options.el);
-            value: this.options.value
-        });
     },
 
     _assertPopupView: function () {
@@ -83072,6 +83070,9 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             }, {
                 eventName: BI.NicEditor.EVENT_FOCUS,
                 action: function () {
+                    if(!self.combo.isViewVisible()) {
+                        self.combo.showView();
+                    }
                     self.fireEvent(BI.RichEditor.EVENT_FOCUS);
                 }
             }]
@@ -92794,7 +92795,7 @@ BI.extend(BI.AbstractFilterItem, {
 
         render: function () {
             var self = this, o = this.options;
-            var value = o.value, text = "";
+            var value = o.el.value, text = "";
             if (value === BI.Filter.FILTER_TYPE.AND) {
                 text = BI.i18nText("BI-Basic_And");
             } else {

dist/case.js

@@ -11130,6 +11130,9 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             }, {
                 eventName: BI.NicEditor.EVENT_FOCUS,
                 action: function () {
+                    if(!self.combo.isViewVisible()) {
+                        self.combo.showView();
+                    }
                     self.fireEvent(BI.RichEditor.EVENT_FOCUS);
                 }
             }]

dist/widget.js

@@ -6284,7 +6284,7 @@ BI.extend(BI.AbstractFilterItem, {
 
         render: function () {
             var self = this, o = this.options;
-            var value = o.value, text = "";
+            var value = o.el.value, text = "";
             if (value === BI.Filter.FILTER_TYPE.AND) {
                 text = BI.i18nText("BI-Basic_And");
             } else {

src/base/combination/expander.js

@@ -129,9 +129,7 @@ BI.Expander = BI.inherit(BI.Widget, {
     },
 
     _initExpander: function () {
-        this.expander = BI.createWidget(this.options.el, {
+        this.expander = BI.createWidget(this.options.el);
-            value: this.options.value
-        });
     },
 
     _assertPopupView: function () {

src/case/richeditor/richeditor.js

@@ -28,6 +28,9 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             }, {
                 eventName: BI.NicEditor.EVENT_FOCUS,
                 action: function () {
+                    if(!self.combo.isViewVisible()) {
+                        self.combo.showView();
+                    }
                     self.fireEvent(BI.RichEditor.EVENT_FOCUS);
                 }
             }]

src/widget/filter/expander/filter.expander.js

@@ -17,7 +17,7 @@
 
         render: function () {
             var self = this, o = this.options;
-            var value = o.value, text = "";
+            var value = o.el.value, text = "";
             if (value === BI.Filter.FILTER_TYPE.AND) {
                 text = BI.i18nText("BI-Basic_And");
             } else {