npmrun 2 months ago
parent
commit
ab0017d9e5
  1. 14
      src/main/_ioc.ts
  2. 2
      src/main/commands/BasicCommand.ts
  3. 8
      src/main/commands/TabsCommand.ts
  4. 4
      src/renderer/src/pages/_ui/Browser.vue

14
src/main/_ioc.ts

@ -11,16 +11,10 @@ async function destroyAll() {
await destroyAllCommand(_ioc) await destroyAllCommand(_ioc)
} }
const _modulesIOC = new Container() const _ioc = new Container()
_modulesIOC.load(iocModules) _ioc.load(iocModules)
_ioc.load(iocCommand)
const _commandIOC = _modulesIOC.createChild() _ioc.load(iocController)
_commandIOC.load(iocCommand)
const _controllerIOC = _commandIOC.createChild()
_controllerIOC.load(iocController)
const _ioc = _controllerIOC.createChild()
_ioc.bind(IOC).toSelf().inSingletonScope() _ioc.bind(IOC).toSelf().inSingletonScope()
_ioc.bind(App).toSelf().inSingletonScope() _ioc.bind(App).toSelf().inSingletonScope()

2
src/main/commands/BasicCommand.ts

@ -6,7 +6,7 @@ import WindowManager from "main/modules/window-manager"
export default class BasicCommand { export default class BasicCommand {
constructor( constructor(
@inject(WindowManager) private _WindowManager: WindowManager, @inject(WindowManager) private _WindowManager: WindowManager,
@inject(Tabs) private _Tabs: Tabs @inject(Tabs) private _Tabs: Tabs,
) { ) {
// //
} }

8
src/main/commands/TabsCommand.ts

@ -12,6 +12,10 @@ class TabsCommand {
this._Tabs.events.on("update", this.listenerTabActive) this._Tabs.events.on("update", this.listenerTabActive)
} }
listenerTabActive() {
broadcast("main:TabsCommand.update", this.getAllTabs())
}
bindElement(rect) { bindElement(rect) {
this._Tabs.updateRect(rect) this._Tabs.updateRect(rect)
} }
@ -27,10 +31,6 @@ class TabsCommand {
} }
} }
listenerTabActive() {
broadcast("TabsCommand.update", this.getAllTabs())
}
add(url) { add(url) {
this._Tabs.add(url, true, this._WindowManager.getMainWindow()!) this._Tabs.add(url, true, this._WindowManager.getMainWindow()!)
} }

4
src/renderer/src/pages/_ui/Browser.vue

@ -45,9 +45,9 @@ const listener = (_, v) => {
} }
} }
if (import.meta.hot) { if (import.meta.hot) {
api.off("TabsCommand.update", listener) api.off("main:TabsCommand.update", listener)
} }
api.on("TabsCommand.update", listener) api.on("main:TabsCommand.update", listener)
onMounted(() => { onMounted(() => {
api.call("TabsCommand.sync") api.call("TabsCommand.sync")
}) })

Loading…
Cancel
Save