diff --git a/src/workbench/browser/src/app/shared/components/navbar/navbar.component.html b/src/workbench/browser/src/app/shared/components/navbar/navbar.component.html index b5123f08d..25e7d4549 100644 --- a/src/workbench/browser/src/app/shared/components/navbar/navbar.component.html +++ b/src/workbench/browser/src/app/shared/components/navbar/navbar.component.html @@ -94,5 +94,4 @@

{{ dataSourceText }}数据源

- - + diff --git a/src/workbench/browser/src/app/shared/components/setting/setting.component.html b/src/workbench/browser/src/app/shared/components/setting/setting.component.html index 4daf7194c..9969448a0 100644 --- a/src/workbench/browser/src/app/shared/components/setting/setting.component.html +++ b/src/workbench/browser/src/app/shared/components/setting/setting.component.html @@ -17,3 +17,115 @@ --> + + +
+ + + + + {{ node.title }} + + + + + + + + + {{ node.title }} + + + + +
+
+

{{ module.title }}

+ + + + {{ module.properties[field]?.label }} + + + +
+ + + + + + + + + + + + + + + {{ module.properties[field]?.description }} + + + + + + + + + + +
+
+
+ + + 暂无配置项 + + +
+ + + +
+ diff --git a/src/workbench/browser/src/app/shared/components/setting/setting.component.ts b/src/workbench/browser/src/app/shared/components/setting/setting.component.ts index 4489481e0..8d82dc5a4 100644 --- a/src/workbench/browser/src/app/shared/components/setting/setting.component.ts +++ b/src/workbench/browser/src/app/shared/components/setting/setting.component.ts @@ -1,5 +1,5 @@ // @ts-nocheck -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { SelectionModel } from '@angular/cdk/collections'; import { FlatTreeControl } from '@angular/cdk/tree'; @@ -34,6 +34,7 @@ interface FlatNode { styleUrls: ['./setting.component.scss'], }) export class SettingComponent implements OnInit { + @Output() isShowModalChange = new EventEmitter(); objectKeys = Object.keys; /** 是否远程数据源 */ get isRemote() { @@ -68,7 +69,7 @@ export class SettingComponent implements OnInit { /** current configuration */ currentConfiguration = []; - isVisible = false; + // ! isVisible = false; $isShowModal = false; /** all configure */ settings = {}; @@ -86,7 +87,7 @@ export class SettingComponent implements OnInit { return this.$isShowModal; } - set isShowModal(val) { + @Input() set isShowModal(val) { this.$isShowModal = val; if (val) { this.init(); @@ -272,7 +273,7 @@ export class SettingComponent implements OnInit { if (!window.eo && !window.eo?.getFeature) { return; } - this.isVisible = true; + // ! this.isVisible = true; this.settings = {}; this.nestedSettings = {}; // 获取本地设置 @@ -408,6 +409,7 @@ export class SettingComponent implements OnInit { } catch (error) { } finally { this.isShowModal = false; + this.isShowModalChange.emit(false); } } } diff --git a/src/workbench/browser/src/app/shared/components/setting/setting.module.ts b/src/workbench/browser/src/app/shared/components/setting/setting.module.ts index 9353b8826..2eb6c7883 100644 --- a/src/workbench/browser/src/app/shared/components/setting/setting.module.ts +++ b/src/workbench/browser/src/app/shared/components/setting/setting.module.ts @@ -16,10 +16,11 @@ import { NzDropDownModule } from 'ng-zorro-antd/dropdown'; import { NzPopoverModule } from 'ng-zorro-antd/popover'; import { NzEmptyModule } from 'ng-zorro-antd/empty'; import { NzTabsModule } from 'ng-zorro-antd/tabs'; +import { NzRadioModule } from 'ng-zorro-antd/radio'; import { NzTreeViewModule } from 'ng-zorro-antd/tree-view'; import { ElectronService } from '../../../core/services'; -import { SharedModule } from '../../shared.module'; +import { SelectThemeComponent } from 'eo/workbench/browser/src/app/shared/components/toolbar/select-theme/select-theme.component'; const ANTDMODULES = [ NzModalModule, @@ -37,11 +38,12 @@ const ANTDMODULES = [ NzEmptyModule, NzDropDownModule, NzPopoverModule, + NzRadioModule, ]; @NgModule({ - declarations: [SettingComponent], - imports: [FormsModule, ReactiveFormsModule, SharedModule, CommonModule, ...ANTDMODULES], - exports: [SettingComponent], + declarations: [SettingComponent, SelectThemeComponent], + imports: [FormsModule, ReactiveFormsModule, CommonModule, ...ANTDMODULES], + exports: [SettingComponent, SelectThemeComponent], providers: [ElectronService], }) export class SettingModule {} diff --git a/src/workbench/browser/src/app/shared/shared.module.ts b/src/workbench/browser/src/app/shared/shared.module.ts index bdf17943c..7f63577ca 100644 --- a/src/workbench/browser/src/app/shared/shared.module.ts +++ b/src/workbench/browser/src/app/shared/shared.module.ts @@ -2,7 +2,6 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { PageNotFoundComponent, - SelectThemeComponent, ToolbarComponent, SidebarComponent, NavbarComponent, @@ -29,17 +28,12 @@ import { ModalService } from './services/modal.service'; import { PageBlankComponent } from './components/page-blank/page-blank.component'; import { PageFeaturePreviewComponent } from './components/page-feature-preview/page-feature-preview.component'; import { RouterModule } from '@angular/router'; +import { SettingModule } from 'eo/workbench/browser/src/app/shared/components/setting/setting.module'; -const COMPONENTS = [ - ToolbarComponent, - SelectThemeComponent, - SidebarComponent, - NavbarComponent, - PageNotFoundComponent, - AboutComponent, -]; +const COMPONENTS = [ToolbarComponent, SidebarComponent, NavbarComponent, PageNotFoundComponent, AboutComponent]; @NgModule({ imports: [ + SettingModule, CommonModule, FormsModule, RouterModule, @@ -58,7 +52,7 @@ const COMPONENTS = [ ], declarations: [WebviewDirective, ...COMPONENTS, ApiParamsNumPipe, PageBlankComponent, PageFeaturePreviewComponent], providers: [ModalService], - schemas: [CUSTOM_ELEMENTS_SCHEMA], + // schemas: [CUSTOM_ELEMENTS_SCHEMA], exports: [WebviewDirective, ...COMPONENTS, ApiParamsNumPipe], }) export class SharedModule {}