-
Notifications
You must be signed in to change notification settings - Fork 742
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #23 from eolinker/feature/iframe
Use Iframe to replace browserView ( fixed #6)
- Loading branch information
Showing
20 changed files
with
140 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 6 additions & 3 deletions
9
src/workbench/browser/src/app/pages/api/overview/api-overview.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,11 @@ | ||
| .overview_container{ | ||
| width: 50%; | ||
| width: 70%; | ||
| margin: 0 auto; | ||
| padding: 20px 0; | ||
| } | ||
| nz-card{ | ||
| min-width: 220px; | ||
| .card_container{ | ||
| display: grid; | ||
| grid-template-columns: repeat(auto-fill, 250px); | ||
| grid-column-gap: 20px; | ||
| grid-row-gap: 20px; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,36 @@ | ||
| import { Component, OnInit } from '@angular/core'; | ||
| import { ChangeDetectorRef, Component, OnInit } from '@angular/core'; | ||
| import { SidebarService } from '../shared/components/sidebar/sidebar.service'; | ||
|
|
||
| @Component({ | ||
| selector: 'eo-pages', | ||
| templateUrl: './pages.component.html', | ||
| styleUrls: ['./pages.component.scss'] | ||
| styleUrls: ['./pages.component.scss'], | ||
| }) | ||
| export class PagesComponent implements OnInit { | ||
|
|
||
| constructor() { } | ||
|
|
||
| loadedIframe = false; | ||
| constructor(private cdRef: ChangeDetectorRef, public sidebar: SidebarService) {} | ||
| ngOnInit(): void { | ||
| this.watchSidebarItemChange(); | ||
| } | ||
| private watchSidebarItemChange() { | ||
| this.sidebar.appChanged$.pipe().subscribe(() => { | ||
| this.loadedIframe = false; | ||
| if (!this.sidebar.currentModule.isOffical) { | ||
| //add loading | ||
| setTimeout(() => { | ||
| let iframe = document.getElementById('app_iframe') as HTMLIFrameElement; | ||
| //add auto script | ||
| let iframeDocument = iframe.contentWindow.document; | ||
| var el = iframeDocument.createElement('script'); | ||
| el.text = `window.eo=window.parent.eo;\n`; | ||
| iframeDocument.body.appendChild(el); | ||
| //loading finish | ||
| iframe.onload = () => { | ||
| this.loadedIframe = true; | ||
| this.cdRef.detectChanges(); // solution | ||
| }; | ||
| }, 0); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,13 @@ | ||
| import { NgModule } from '@angular/core'; | ||
| import { FormsModule } from '@angular/forms'; | ||
|
|
||
| import { CommonModule } from '@angular/common'; | ||
| import { PagesRoutingModule } from './pages-routing.module'; | ||
| import { SettingModule } from './setting/setting.module' | ||
| import { PagesComponent } from './pages.component'; | ||
| import { SharedModule } from '../shared/shared.module'; | ||
|
|
||
| @NgModule({ | ||
| declarations: [PagesComponent], | ||
| imports: [PagesRoutingModule, FormsModule, SharedModule, SettingModule], | ||
| exports: [] | ||
| imports: [PagesRoutingModule, CommonModule, SharedModule], | ||
| exports: [], | ||
| }) | ||
| export class PagesModule {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 2 additions & 4 deletions
6
src/workbench/browser/src/app/shared/components/sidebar/sidebar.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.