From 4b936e062e90c1b5c98c8de671f729cb8d9e92a8 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Fri, 1 Jun 2018 09:13:29 +0800
Subject: [PATCH] BI-20435

---
 dist/base.js                                             | 2 +-
 dist/bundle.js                                           | 7 +++++--
 dist/case.js                                             | 5 ++++-
 dist/fineui.js                                           | 7 +++++--
 src/base/single/tip/tip.toast.js                         | 2 +-
 src/case/combo/icontextvaluecombo/popup.icontextvalue.js | 5 ++++-
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/dist/base.js b/dist/base.js
index 1d51b4dd4c..f941da6ed3 100644
--- a/dist/base.js
+++ b/dist/base.js
@@ -20605,7 +20605,7 @@ BI.Toast = BI.inherit(BI.Tip, {
         });
     },
     _init: function () {
-        BI.Toast.superclass._init.apply(this, arguments);
+        BI.Toast.superclass._init.apply(this, arguments);BI
         var self = this, o = this.options;
         this.element.css({
             minWidth: this._const.minWidth + "px"
diff --git a/dist/bundle.js b/dist/bundle.js
index 5459134409..12dad297d8 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -56371,7 +56371,7 @@ BI.Toast = BI.inherit(BI.Tip, {
         });
     },
     _init: function () {
-        BI.Toast.superclass._init.apply(this, arguments);
+        BI.Toast.superclass._init.apply(this, arguments);BI
         var self = this, o = this.options;
         this.element.css({
             minWidth: this._const.minWidth + "px"
@@ -78463,9 +78463,12 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
 
     populate: function (items) {
         BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
+        var o = this.options;
         items = BI.createItems(items, {
             type: "bi.single_select_icon_text_item",
-            height: 30
+            height: 30,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
         });
         this.popup.populate(items);
     },
diff --git a/dist/case.js b/dist/case.js
index 0169887d04..0a3cff9f97 100644
--- a/dist/case.js
+++ b/dist/case.js
@@ -5984,9 +5984,12 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
 
     populate: function (items) {
         BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
+        var o = this.options;
         items = BI.createItems(items, {
             type: "bi.single_select_icon_text_item",
-            height: 30
+            height: 30,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
         });
         this.popup.populate(items);
     },
diff --git a/dist/fineui.js b/dist/fineui.js
index cd864bb18d..d5fe2b4e70 100644
--- a/dist/fineui.js
+++ b/dist/fineui.js
@@ -56614,7 +56614,7 @@ BI.Toast = BI.inherit(BI.Tip, {
         });
     },
     _init: function () {
-        BI.Toast.superclass._init.apply(this, arguments);
+        BI.Toast.superclass._init.apply(this, arguments);BI
         var self = this, o = this.options;
         this.element.css({
             minWidth: this._const.minWidth + "px"
@@ -78706,9 +78706,12 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
 
     populate: function (items) {
         BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
+        var o = this.options;
         items = BI.createItems(items, {
             type: "bi.single_select_icon_text_item",
-            height: 30
+            height: 30,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
         });
         this.popup.populate(items);
     },
diff --git a/src/base/single/tip/tip.toast.js b/src/base/single/tip/tip.toast.js
index a2150b60eb..897788b3d8 100644
--- a/src/base/single/tip/tip.toast.js
+++ b/src/base/single/tip/tip.toast.js
@@ -19,7 +19,7 @@ BI.Toast = BI.inherit(BI.Tip, {
         });
     },
     _init: function () {
-        BI.Toast.superclass._init.apply(this, arguments);
+        BI.Toast.superclass._init.apply(this, arguments);BI
         var self = this, o = this.options;
         this.element.css({
             minWidth: this._const.minWidth + "px"
diff --git a/src/case/combo/icontextvaluecombo/popup.icontextvalue.js b/src/case/combo/icontextvaluecombo/popup.icontextvalue.js
index 4ddf8ab83f..0753ff6c1b 100644
--- a/src/case/combo/icontextvaluecombo/popup.icontextvalue.js
+++ b/src/case/combo/icontextvaluecombo/popup.icontextvalue.js
@@ -42,9 +42,12 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
 
     populate: function (items) {
         BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
+        var o = this.options;
         items = BI.createItems(items, {
             type: "bi.single_select_icon_text_item",
-            height: 30
+            height: 30,
+            iconHeight: o.iconHeight,
+            iconWidth: o.iconWidth
         });
         this.popup.populate(items);
     },