From 8563f11bd5596aa94e2324aa188a00ca501bbdbd Mon Sep 17 00:00:00 2001
From: Guyi <Guyi@fanruan.com>
Date: Thu, 20 Aug 2020 19:57:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8Cpop?=
 =?UTF-8?q?over=E5=BA=95=E9=83=A8=E9=AB=98=E5=BA=A6=E5=8F=AF=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/layer/layer.popover.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/base/layer/layer.popover.js b/src/base/layer/layer.popover.js
index f8a19a6e4..f90f8193b 100644
--- a/src/base/layer/layer.popover.js
+++ b/src/base/layer/layer.popover.js
@@ -25,6 +25,7 @@ BI.Popover = BI.inherit(BI.Widget, {
             headerHeight: 40,
             body: null,
             footer: null,
+            footerHeight: 44,
             closable: true // BI-40839 是否显示右上角的关闭按钮
         });
     },
@@ -122,9 +123,9 @@ BI.Popover = BI.inherit(BI.Widget, {
                         right: 20,
                         bottom: 0
                     }],
-                    height: 44
+                    height: o.footerHeight
                 },
-                height: 44
+                height: o.footerHeight
             });
         }
 
@@ -154,7 +155,7 @@ BI.Popover = BI.inherit(BI.Widget, {
         if (o.logic.dynamic) {
             var size = this._calculateSize();
             var height = this.element.height();
-            var compareHeight = BI.clamp(height, size.height, 600) - (o.footer ? 84 : 44);
+            var compareHeight = BI.clamp(height, size.height, 600) - (o.footer ? o.footerHeight + o.headerHeight : o.headerHeight);
             this.body.element.height(compareHeight);
         }
     },

From c38c43e588fa926c5899db67b5638c476660fa0b Mon Sep 17 00:00:00 2001
From: Guyi <Guyi@fanruan.com>
Date: Fri, 21 Aug 2020 11:11:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9concat=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 typescript/core/base.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/typescript/core/base.ts b/typescript/core/base.ts
index e72decc91..40a216d76 100644
--- a/typescript/core/base.ts
+++ b/typescript/core/base.ts
@@ -85,7 +85,7 @@ export interface _base {
 
     lastObject: (obj: object) => any;
 
-    concat: (obj1: any, obj2: any) => any;
+    concat: (obj1: any, obj2: any, ...args: any[]) => any;
 
     backEach: (obj: any, predicate: Function, context?: any) => boolean;