Pull request #2602: 无JIRA combo popup支持函数

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit 'f7b96bf8622f22bed505031528f84b3ac12e050c':
  无JIRA combo popup支持函数
  无JIRA combo popup支持函数
  无JIRA combo popup支持函数
  无JIRA combo popup支持函数

src/base/combination/bubble.js

@@ -228,7 +228,7 @@
         _assertPopupView: function () {
             var self = this, o = this.options;
             if (this.popupView == null) {
-                this.popupView = BI.createWidget(this.options.popup, {
+                this.popupView = BI.createWidget(BI.isFunction(this.options.popup) ? this.options.popup() : this.options.popup, {
                     type: "bi.bubble_popup_view",
                     showArrow: o.showArrow,
                     value: o.value

src/base/combination/combo.js

@@ -103,7 +103,7 @@
         _assertPopupView: function () {
             var self = this, o = this.options;
             if (this.popupView == null) {
-                this.popupView = BI.createWidget(this.options.popup, {
+                this.popupView = BI.createWidget(BI.isFunction(this.options.popup) ? this.options.popup() : this.options.popup, {
                     type: "bi.popup_view",
                     showArrow: o.showArrow,
                     value: o.value

src/case/combo/bubblecombo/combo.bubble.js

@@ -53,12 +53,12 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
             offsetStyle: o.offsetStyle,
             showArrow: true,
             el: o.el,
-            popup: BI.extend({
+            popup: () => BI.extend({
                 type: "bi.bubble_popup_view",
                 animation: "bi-zoom-big",
                 animationDuring: 200,
                 primary: o.primary
-            }, o.popup)
+            }, BI.isFunction(this.options.popup) ? this.options.popup() : this.options.popup)
         });
         this.combo.on(BI.Combo.EVENT_TRIGGER_CHANGE, function () {
             self.fireEvent(BI.BubbleCombo.EVENT_TRIGGER_CHANGE, arguments);