From dd64fccef8b2e5f12996ee2742bfca3d80354d73 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Mon, 28 Feb 2022 14:23:26 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-9882=20popover=E7=9A=84gap=20&&=20toast?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bi.lessconfig.json              |  1 +
 src/base/layer/layer.popover.js | 11 +++++------
 src/less/resource/font.less     |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bi.lessconfig.json b/bi.lessconfig.json
index e1e853591..1a367603b 100644
--- a/bi.lessconfig.json
+++ b/bi.lessconfig.json
@@ -18,6 +18,7 @@
   "@color-bi-background-disabled-active-checkbox-content": "#D0D4DA",
   "@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479",
   "@color-bi-background-tooltip-success": "#2E3A4D",
+  "@color-bi-text-header-background": "f2f4f7",
   "@color-bi-border-tooltip-success": "#2E3A4D",
   "@color-bi-background-toast-success": "#FFFFFF",
   "@color-bi-background-toast-warning": "#FFFFFF",
diff --git a/src/base/layer/layer.popover.js b/src/base/layer/layer.popover.js
index 9109a9a4e..bce738ef3 100644
--- a/src/base/layer/layer.popover.js
+++ b/src/base/layer/layer.popover.js
@@ -27,7 +27,7 @@ BI.Popover = BI.inherit(BI.Widget, {
             footerHeight: 44,
             closable: true, // BI-40839 是否显示右上角的关闭按钮
             bodyHgap: BI.SIZE_CONSANTS.H_GAP_SIZE,
-            bodyTgap: 10
+            bodyTgap: BI.SIZE_CONSANTS.V_GAP_SIZE
         };
     },
 
@@ -109,10 +109,10 @@ BI.Popover = BI.inherit(BI.Widget, {
                 },
                 items: [{
                     el: o.body
-                }]
-            },
-            hgap: o.bodyHgap,
-            tgap: o.bodyTgap
+                }],
+                hgap: o.bodyHgap,
+                tgap: o.bodyTgap
+            }
         } : {
             el: {
                 type: "bi.absolute",
@@ -143,7 +143,6 @@ BI.Popover = BI.inherit(BI.Widget, {
         }
 
         return BI.extend({
-            type: o.logic.dynamic ? "bi.vertical" : "bi.vtape",
             items: items,
             width: this._getSuitableWidth(size.width)
         }, o.logic.dynamic ? {
diff --git a/src/less/resource/font.less b/src/less/resource/font.less
index 6c7b3994d..7e7e4e91c 100644
--- a/src/less/resource/font.less
+++ b/src/less/resource/font.less
@@ -83,7 +83,7 @@
 
 //toast
 .font(toast-error-font, @font-tip-error, @color-bi-color-toast-error);
-.font(toast-success-font, @font-tip-success, @color-bi-color-toast-error);
+.font(toast-success-font, @font-tip-success, @color-bi-color-toast-success);
 .font(toast-warning-font, @font-tip-warning, @color-bi-color-toast-warning);
 .font(toast-message-font, @font-tip-message, @color-bi-color-toast-normal);