From 67cfec57aec6464bf1f5a6552c8ba2d612b311a4 Mon Sep 17 00:00:00 2001
From: "Zhenfei.Li" <Zhenfei.Li@fanruan.com>
Date: Wed, 28 Dec 2022 17:56:18 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-13947=20refactor:=20=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=BB=A7=E6=89=BFOB=E5=AF=B9=E8=B1=A1=E7=9A=84=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/controller/controller.drawer.js  |  6 +++++-
 src/core/controller/controller.layer.js   |  5 +++++
 src/core/controller/controller.popover.js | 13 ++++++++-----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/core/controller/controller.drawer.js b/src/core/controller/controller.drawer.js
index 4b2daca9e..b808699c2 100644
--- a/src/core/controller/controller.drawer.js
+++ b/src/core/controller/controller.drawer.js
@@ -6,13 +6,17 @@
  */
 import Controller from "./0.controller";
 export default class DrawerController extends Controller {
+    constructor() {
+        super();
+        this._constructor();
+        this.modal = this.options.modal;
+    }
     props = {
         modal: true, // 模态窗口
         render: "body"
     }
 
     init() {
-        this.modal = this.options.modal;
         this.floatManager = {};
         this.floatLayer = {};
         this.floatContainer = {};
diff --git a/src/core/controller/controller.layer.js b/src/core/controller/controller.layer.js
index a2a6735b7..10092b560 100644
--- a/src/core/controller/controller.layer.js
+++ b/src/core/controller/controller.layer.js
@@ -6,6 +6,11 @@
  */
 import Controller from "./0.controller";
 export default class LayerController extends Controller {
+    constructor() {
+        super();
+        this._constructor();
+    }
+    
     props = {
         render: "body"
     }
diff --git a/src/core/controller/controller.popover.js b/src/core/controller/controller.popover.js
index bcb129f3b..0c48b68ec 100644
--- a/src/core/controller/controller.popover.js
+++ b/src/core/controller/controller.popover.js
@@ -6,13 +6,18 @@
  */
 import Controller from "./0.controller";
 export default class PopoverController extends Controller {
+    constructor() {
+        super();
+        this._constructor();
+        this.modal = this.options.modal;
+    }
+
     props = {
         modal: true, // 模态窗口
         render: "body"
     }
 
     init() {
-        this.modal = this.options.modal;
         this.floatManager = {};
         this.floatLayer = {};
         this.floatContainer = {};
@@ -50,7 +55,7 @@ export default class PopoverController extends Controller {
             const W = BI.Widget._renderEngine.createElement(this.options.render).width(),
                 H = BI.Widget._renderEngine.createElement(this.options.render).height();
             const w = popover.element.width(), h = popover.element.height();
-            const left = (W - w) / 2, top = (H - h) / 2;
+            let left = (W - w) / 2, top = (H - h) / 2;
             if (left < 0) {
                 left = 0;
             }
@@ -110,9 +115,7 @@ export default class PopoverController extends Controller {
             }]
         });
         this.floatManager[name] = popover;
-        (function (key) {
-            popover.on(BI.Popover.EVENT_CLOSE, () => self.close(key));
-        })(name);
+        popover.on(BI.Popover.EVENT_CLOSE, () => this.close(name));
         BI.createWidget({
             type: "bi.absolute",
             element: options.container || this.options.render,