From 52d8f2ea4d44591d396e825446b6a76cd2f619c3 Mon Sep 17 00:00:00 2001 From: zsmj Date: Fri, 5 May 2023 16:23:53 +0800 Subject: [PATCH] =?UTF-8?q?BI-125865=20fix:=20=E3=80=906.0.10=E5=8F=91?= =?UTF-8?q?=E6=95=A3=E3=80=91=E5=B1=95=E5=BC=80=E6=95=B0=E6=8D=AE=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E5=90=8E=EF=BC=8C=E8=B0=83=E6=95=B4=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E7=AA=97=E5=8F=A3=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 代码结构缺陷,core的不能反过来依赖base的. 所以直接把依赖注入 --- packages/fineui/src/base/0.base.js | 2 +- .../src/core/controller/controller.layer.js | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/fineui/src/base/0.base.js b/packages/fineui/src/base/0.base.js index 3cf9b52a3..6e224dbce 100644 --- a/packages/fineui/src/base/0.base.js +++ b/packages/fineui/src/base/0.base.js @@ -11,7 +11,7 @@ import { import { StyleLoaderManager } from '../core/loader/loader.style'; const Resizers = new ResizeController(); -const Layers = new LayerController(); +const Layers = new LayerController(Resizers); const Maskers = new MaskersController(); const Bubbles = new BubblesController(); const Tooltips = new TooltipsController(); diff --git a/packages/fineui/src/core/controller/controller.layer.js b/packages/fineui/src/core/controller/controller.layer.js index 9701a6d60..7b3196ef2 100644 --- a/packages/fineui/src/core/controller/controller.layer.js +++ b/packages/fineui/src/core/controller/controller.layer.js @@ -9,17 +9,17 @@ import { Widget } from "../4.widget"; import { createWidget } from "../5.inject"; import { zIndex_layer } from "../constant"; import { DOM } from "../utils"; -// import { Resizers } from "../../base/0.base"; export class LayerController extends Controller { - constructor() { + constructor(Resizers) { super(); this._constructor(); + this.Resizers = Resizers; } - + props = { render: "body", - } + }; init() { this.layerManager = {}; @@ -28,7 +28,7 @@ export class LayerController extends Controller { } _initResizer() { - // this.resizer = Resizers.add(`layerController${uniqueId()}`, bind(this._resize, this)); + this.resizer = this.Resizers.add(`layerController${uniqueId()}`, bind(this._resize, this)); } _resize() { @@ -47,7 +47,7 @@ export class LayerController extends Controller { context = op; op = container; } - + return this.create(name, null, op, context); } @@ -124,7 +124,7 @@ export class LayerController extends Controller { }); } this.add(name, widget, layout); - + return widget; } @@ -134,7 +134,7 @@ export class LayerController extends Controller { } this._getLayout(name).visible(); this._getLayout(name).element.css("z-index", this.zindex++).show(0, callback).trigger("__resize__"); - + return this; } @@ -144,7 +144,7 @@ export class LayerController extends Controller { } this._getLayout(name).invisible(); this._getLayout(name).element.hide(0, callback); - + return this; } @@ -160,7 +160,7 @@ export class LayerController extends Controller { this.layerManager[name] = layer; this.layouts[name] = layout; layout.element.css("z-index", this.zindex++); - + return this; } @@ -184,7 +184,7 @@ export class LayerController extends Controller { this.layouts[name].destroy(); delete this.layerManager[name]; delete this.layouts[name]; - + return this; } @@ -195,7 +195,7 @@ export class LayerController extends Controller { }); this.layerManager = {}; this.layouts = {}; - + return this; } }