From 0b90b3baf013841eb6767292fc9f68674726990d Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Tue, 26 Jul 2022 16:37:00 +0800
Subject: [PATCH] =?UTF-8?q?DESIGN-5=20style:=20=E3=80=902022=E3=80=91?=
 =?UTF-8?q?=E6=B0=94=E6=B3=A1=E7=9A=84=E8=BE=B9=E8=B7=9D=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/case/combo/bubblecombo/popup.bubble.js | 30 ++++++++++------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/case/combo/bubblecombo/popup.bubble.js b/src/case/combo/bubblecombo/popup.bubble.js
index 7bc1f500c..6826a99f5 100644
--- a/src/case/combo/bubblecombo/popup.bubble.js
+++ b/src/case/combo/bubblecombo/popup.bubble.js
@@ -36,7 +36,9 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
             }, {
                 text: BI.i18nText(BI.i18nText("BI-Basic_OK")),
                 value: true
-            }]
+            }],
+            innerVgap: 16,
+            innerHgap: 16,
         });
     },
 
@@ -48,8 +50,7 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
             if (BI.isWidget(buttonOpt)) {
                 items.push({
                     el: buttonOpt,
-                    lgap: i === 0 ? 15 : 10,
-                    rgap: i === o.buttons.length - 1 ? 15 : 0
+                    lgap: 12,
                 });
             } else {
                 items.push({
@@ -60,14 +61,14 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
                             self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, v);
                         }
                     }, buttonOpt),
-                    lgap: i === 0 ? 15 : 10,
-                    rgap: i === o.buttons.length - 1 ? 15 : 0
+                    lgap: 12,
                 });
             }
         });
         return BI.createWidget({
             type: "bi.right_vertical_adapt",
-            height: 44,
+            innerVgap: o.innerVgap,
+            innerHgap: o.innerHgap,
             items: items
         });
     },
@@ -79,20 +80,17 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
     _createView: function () {
         var o = this.options;
 
-        var button = BI.createWidget({
-            type: "bi.button_group",
+        var view = BI.createWidget({
+            type: "bi.vertical",
             items: [this._createContent()],
-            layouts: [{
-                type: "bi.vertical",
-                cls: "bar-popup-container",
-                hgap: BI.SIZE_CONSANTS.H_GAP_SIZE,
-                tgap: BI.SIZE_CONSANTS.V_GAP_SIZE
-            }]
+            cls: "bar-popup-container",
+            hgap: o.innerHgap,
+            tgap: o.innerVgap,
         });
 
-        button.element.css("min-height", o.minHeight - 44);
+        view.element.css("min-height", o.minHeight);
 
-        return button;
+        return view;
     }
 });
 BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON = "EVENT_CLICK_TOOLBAR_BUTTON";