From baece7065041ae0cc2fdb6ca4caae90eb4e8fedc Mon Sep 17 00:00:00 2001 From: buqiyuan <1743369777@qq.com> Date: Tue, 17 May 2022 19:06:45 +0800 Subject: [PATCH] feat: add selectTheme --- .../app/core/services/theme/theme.model.ts | 92 +++++++++---------- .../eoapi-settings/common-settings.json | 2 +- .../setting/eoapi-settings/index.ts | 3 + .../eoapi-settings/theme-settings.json | 21 +++++ .../components/setting/setting.component.html | 5 + .../components/setting/setting.component.scss | 7 +- .../components/setting/setting.component.ts | 1 + .../components/setting/setting.module.ts | 3 +- .../select-theme/select-theme.component.html | 56 +++++------ .../components/toolbar/toolbar.component.html | 5 +- .../browser/src/assets/theme/antd.less | 15 +-- src/workbench/browser/src/styles.scss | 4 +- 12 files changed, 122 insertions(+), 92 deletions(-) create mode 100644 src/workbench/browser/src/app/shared/components/setting/eoapi-settings/theme-settings.json diff --git a/src/workbench/browser/src/app/core/services/theme/theme.model.ts b/src/workbench/browser/src/app/core/services/theme/theme.model.ts index 0a533ec04..406310a56 100644 --- a/src/workbench/browser/src/app/core/services/theme/theme.model.ts +++ b/src/workbench/browser/src/app/core/services/theme/theme.model.ts @@ -6,52 +6,52 @@ export const THEMES = [ key: '森林', value: 'classic_forest', }, - { - key: '日出', - value: 'classic_sunrise', - }, - { - key: '玩具', - value: 'classic_toy', - }, - ], - }, - { - title: '简洁', - lists: [ - { - key: '森林', - value: 'clean_forest', - }, - { - key: '日出', - value: 'clean_sunrise', - }, - { - key: '云', - value: 'clean_cloud', - }, - ], - }, - { - title: '深色', - lists: [ - { - key: '夜晚', - value: 'night_black', - }, - { - key: '森林', - value: 'night_forest', - }, - { - key: '命令行', - value: 'night_cmd', - }, - { - key: '日落', - value: 'night_dusk', - }, + // { + // key: '日出', + // value: 'classic_sunrise', + // }, + // { + // key: '玩具', + // value: 'classic_toy', + // }, ], }, + // { + // title: '简洁', + // lists: [ + // { + // key: '森林', + // value: 'clean_forest', + // }, + // { + // key: '日出', + // value: 'clean_sunrise', + // }, + // { + // key: '云', + // value: 'clean_cloud', + // }, + // ], + // }, + // { + // title: '深色', + // lists: [ + // { + // key: '夜晚', + // value: 'night_black', + // }, + // { + // key: '森林', + // value: 'night_forest', + // }, + // { + // key: '命令行', + // value: 'night_cmd', + // }, + // { + // key: '日落', + // value: 'night_dusk', + // }, + // ], + // }, ]; diff --git a/src/workbench/browser/src/app/shared/components/setting/eoapi-settings/common-settings.json b/src/workbench/browser/src/app/shared/components/setting/eoapi-settings/common-settings.json index 6ed8e6b61..7292d342b 100644 --- a/src/workbench/browser/src/app/shared/components/setting/eoapi-settings/common-settings.json +++ b/src/workbench/browser/src/app/shared/components/setting/eoapi-settings/common-settings.json @@ -10,7 +10,7 @@ "configuration": { "type": "object", "title": "通用", - "order": 2, + "order": 1, "properties": { "common.app.autoUpdate": { "type": "boolean", diff --git a/src/workbench/browser/src/app/shared/components/setting/eoapi-settings/index.ts b/src/workbench/browser/src/app/shared/components/setting/eoapi-settings/index.ts index 9b3abcbb4..f1b1bd93b 100644 --- a/src/workbench/browser/src/app/shared/components/setting/eoapi-settings/index.ts +++ b/src/workbench/browser/src/app/shared/components/setting/eoapi-settings/index.ts @@ -1,6 +1,7 @@ import commonSettings from './common-settings.json'; import extensitonSettings from './extensiton-settings.json'; import featureSettings from './feature-settings.json'; +import themeSettings from './theme-settings.json'; export type eoapiSettingsKey = keyof typeof eoapiSettings; @@ -11,6 +12,8 @@ export const eoapiSettings = { 'Eoapi-Extensions': extensitonSettings, /** 扩展配置 */ 'Eoapi-Features': featureSettings, + /** 主题配置 */ + 'Eoapi-theme': themeSettings, } as const; export default eoapiSettings; diff --git a/src/workbench/browser/src/app/shared/components/setting/eoapi-settings/theme-settings.json b/src/workbench/browser/src/app/shared/components/setting/eoapi-settings/theme-settings.json new file mode 100644 index 000000000..0641fc568 --- /dev/null +++ b/src/workbench/browser/src/app/shared/components/setting/eoapi-settings/theme-settings.json @@ -0,0 +1,21 @@ +{ + "private": true, + "name": "Eoapi-theme", + "version": "0.0.1", + "moduleName": "主题", + "moduleID": "eoapi-theme", + "author": "eoapi", + "publisher": "eoapi", + "contributes": { + "configuration": { + "type": "object", + "order": 1, + "properties": { + "select.theme": { + "type": "component", + "default": "eo-select-theme" + } + } + } + } +} 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 7b45c92b6..8e70f6c9d 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 @@ -57,6 +57,11 @@

{{ module.title }}

{{module.properties[field]?.description}} + + + + + diff --git a/src/workbench/browser/src/app/shared/components/setting/setting.component.scss b/src/workbench/browser/src/app/shared/components/setting/setting.component.scss index 21ce3bb4b..fa19df115 100644 --- a/src/workbench/browser/src/app/shared/components/setting/setting.component.scss +++ b/src/workbench/browser/src/app/shared/components/setting/setting.component.scss @@ -2,7 +2,7 @@ font-size: 20px; position: absolute; padding: 15px; - bottom: 0; + bottom: var(--FOOTER_HEIGHT, 0); } .container { @@ -17,11 +17,6 @@ .tree-view, .form { overflow: auto; } -::ng-deep { - .tree-view .ant-tree-switcher { - width: 20px; - } -} .form { padding-right: 10px; } 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 e10368847..d761b16c9 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 @@ -168,6 +168,7 @@ export class SettingComponent implements OnInit { // 所有设置 const allSettings = cloneDeep([ eoapiSettings['Eoapi-Common'], + eoapiSettings['Eoapi-theme'], eoapiSettings['Eoapi-Extensions'], // eoapiSettings['Eoapi-Features'], ]); 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 ba05f52ba..9846a0066 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 @@ -17,6 +17,7 @@ import { NzTabsModule } from 'ng-zorro-antd/tabs'; import { NzTreeViewModule } from 'ng-zorro-antd/tree-view'; import { ElectronService } from '../../../core/services'; +import { SharedModule } from '../../shared.module'; const ANTDMODULES = [ NzModalModule, @@ -35,7 +36,7 @@ const ANTDMODULES = [ ]; @NgModule({ declarations: [SettingComponent], - imports: [FormsModule, ReactiveFormsModule, CommonModule, ...ANTDMODULES], + imports: [FormsModule, ReactiveFormsModule, SharedModule, CommonModule, ...ANTDMODULES], exports: [SettingComponent], providers: [ElectronService], }) diff --git a/src/workbench/browser/src/app/shared/components/toolbar/select-theme/select-theme.component.html b/src/workbench/browser/src/app/shared/components/toolbar/select-theme/select-theme.component.html index 861458525..8b6c3448f 100644 --- a/src/workbench/browser/src/app/shared/components/toolbar/select-theme/select-theme.component.html +++ b/src/workbench/browser/src/app/shared/components/toolbar/select-theme/select-theme.component.html @@ -1,4 +1,4 @@ - - - -
-
{{ group.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ theme.key }} -
+ --> + +
+
{{ group.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ theme.key }} +
+
- - - +
+
+ + diff --git a/src/workbench/browser/src/app/shared/components/toolbar/toolbar.component.html b/src/workbench/browser/src/app/shared/components/toolbar/toolbar.component.html index 608d4a8d1..314e76752 100644 --- a/src/workbench/browser/src/app/shared/components/toolbar/toolbar.component.html +++ b/src/workbench/browser/src/app/shared/components/toolbar/toolbar.component.html @@ -1,5 +1,6 @@
- +
- + diff --git a/src/workbench/browser/src/assets/theme/antd.less b/src/workbench/browser/src/assets/theme/antd.less index 44865e890..e55e18df1 100644 --- a/src/workbench/browser/src/assets/theme/antd.less +++ b/src/workbench/browser/src/assets/theme/antd.less @@ -5,10 +5,10 @@ // Override less variables to here // View all variables: https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/components/style/themes/default.less @theme-color: #00785a; -@border-radius-base:3px; +@border-radius-base: 3px; @primary-color: @theme-color; @success-color: @theme-color; -@link-color:rgba(0, 0, 0, 0.8); +@link-color:rgba (0, 0, 0, 0.8); @processing-color: @theme-color; @tree-title-height: 30px; body { @@ -68,13 +68,16 @@ body { p { margin-bottom: 0; } -.ant-btn.ant-dropdown-trigger{ +.ant-btn.ant-dropdown-trigger { width: 20px; } -.ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected{ +.ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected { background-color: @theme-color; color: #fff; } -.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn{ +.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn { text-shadow: none; -} \ No newline at end of file +} +.ant-tree-switcher { + width: 20px; +} diff --git a/src/workbench/browser/src/styles.scss b/src/workbench/browser/src/styles.scss index bc8079c77..8eea89b9b 100644 --- a/src/workbench/browser/src/styles.scss +++ b/src/workbench/browser/src/styles.scss @@ -8,8 +8,8 @@ body { } :root { --NAVBAR_HEIGHT: 50px; - --FOOTER_HEIGHT: 0px; - // --FOOTER_HEIGHT: 30px; + // --FOOTER_HEIGHT: 0px; + --FOOTER_HEIGHT: 30px; } .api_test_history_list { .method_label {