From 28d60ac8a01fbcc7ff419e314c9594024892576f Mon Sep 17 00:00:00 2001 From: zsmj Date: Thu, 24 Mar 2022 11:01:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=20combo=20popup=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/combination/bubble.js | 2 +- src/base/combination/combo.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/base/combination/bubble.js b/src/base/combination/bubble.js index e35fa38ca..ca0c9ef60 100644 --- a/src/base/combination/bubble.js +++ b/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 diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index bdb488e4c..202e31c3d 100644 --- a/src/base/combination/combo.js +++ b/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