fix: icon load error

Postcatlab · Apr 20, 2022 · cc823d1 · cc823d1
2 parents facde98 + 9df818f
commit cc823d1
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -24,16 +24,16 @@
 
 # 功能
 
+📃 API 文档
+
+- HTTP 协议
+- 各种格式请求体：FormData、XML、JSON、Raw
+
 ⚡ API 测试
 
 - 快速对 API 发起测试
 - 支持本地测试
 
-📃 API 管理
-
-- HTTP 协议
-- 各种格式请求体：FormData、XML、JSON、Raw
-
 📶 可离线使用
 
 🌐 测试环境管理

diff --git a/src/app/browser/index.html b/src/app/browser/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8" />
     <script type="application/javascript" src="./dist/index.js"></script>
   </head>
   <body>

diff --git a/src/app/electron-main/coreView.ts b/src/app/electron-main/coreView.ts
@@ -36,6 +36,7 @@ export class CoreViews {
           ? 'http://localhost:4201'
           : `file://${path.join(__dirname, '../../', 'workbench', 'browser', 'dist', 'index.html')}`,
     }).init(this.win);
+    this.view.webContents.openDevTools();
     this.view.webContents.once('dom-ready', () => {
       require('@electron/remote/main').enable(this.view.webContents);
     });

diff --git a/src/core/api-manager/browser/package.json b/src/core/api-manager/browser/package.json
@@ -8,7 +8,7 @@
   "moduleID": "default",
   "moduleName": "API Manager",
   "moduleType": "app",
-  "logo": "dist/assets/images/icon.png",
+  "logo": "icon-link",
   "main": "dist/index.html",
   "main_node": "../node/unitWorker.js",
   "main_debug": "http://localhost:4200",

diff --git a/src/core/api-manager/browser/src/assets/images/icon.png b/src/core/api-manager/browser/src/assets/images/icon.png
diff --git a/src/core/market/browser/package.json b/src/core/market/browser/package.json
@@ -6,7 +6,7 @@
   "belongs": [
     "default"
   ],
-  "logo": "dist/icon.png",
+  "logo": "icon-apps",
   "main_debug": "http://localhost:8080",
   "moduleID": "market",
   "moduleName": "Market",

diff --git a/src/core/market/browser/public/icon.png b/src/core/market/browser/public/icon.png
diff --git a/src/core/market/browser/public/icon.svg b/src/core/market/browser/public/icon.svg
diff --git a/src/platform/node/extension-manager/lib/core.ts b/src/platform/node/extension-manager/lib/core.ts
@@ -45,7 +45,7 @@ export class CoreHandler {
       if (moduleInfo.main_node && moduleInfo.main_node.length > 0) {
         moduleInfo.main_node = path.join(moduleInfo.baseDir, moduleInfo.main_node);
       }
-      if (moduleInfo.logo && moduleInfo.logo.length > 0 && !moduleInfo.logo.startsWith('http')) {
+      if (moduleInfo.logo && moduleInfo.logo.length > 0 && !moduleInfo.logo.startsWith('http')&&!moduleInfo.logo.includes("icon-")) {
         moduleInfo.logo = 'file://' + path.join(moduleInfo.baseDir, moduleInfo.logo);
       }
       if (!moduleInfo.belongs || !isNotEmpty(moduleInfo.belongs)) {

diff --git a/src/workbench/browser/src/app/shared/components/sidebar/sidebar.component.html b/src/workbench/browser/src/app/shared/components/sidebar/sidebar.component.html
@@ -1,7 +1,8 @@
 <div class="eo_sidebar" [ngClass]="{ eo_sidebar_shrink: isCollapsed }">
   <a (click)="openApp(item.moduleID)" *ngFor="let item of getModules()">
-    <div nz-tooltip (nzTooltipVisibleChange)="tooltipVisibleChange($event)" [nzTooltipTitle]="isCollapsed ? item.moduleName : ''" class="sidebar_item sidebar_item_active">
-      <img [src]="item.logo" />
+    <div nz-tooltip (nzTooltipVisibleChange)="tooltipVisibleChange($event)" [nzTooltipTitle]="isCollapsed ? item.moduleName : ''" class="sidebar_item" [ngClass]="{sidebar_item_active:item.moduleID===this.moduleID}">
+      <span *ngIf="item.logo.includes('icon-')" class="iconfont fs28" [ngClass]="item.logo" ></span>
+      <img *ngIf="!item.logo.includes('icon-')"[src]="item.logo" />
       <span *ngIf="!isCollapsed">{{ item.moduleName }}</span>
     </div>
   </a>

diff --git a/src/workbench/browser/src/app/shared/components/sidebar/sidebar.component.ts b/src/workbench/browser/src/app/shared/components/sidebar/sidebar.component.ts
@@ -12,6 +12,7 @@ export class SidebarComponent implements OnInit, OnDestroy {
   isCollapsed: boolean;
   destroy = false;
   isElectron: boolean = false;
+  moduleID:string='default';
   modules: Map<string, ModuleInfo>;
   constructor(private electron: ElectronService, private sidebar: SidebarService) {
     this.isElectron = this.electron.isElectron;
@@ -41,6 +42,7 @@ export class SidebarComponent implements OnInit, OnDestroy {
   ngOnInit(): void {
     if (this.isElectron) {
       this.modules = window.eo.getSideModuleList();
+      console.log(this.modules)
       this.electron.ipcRenderer.on('moduleUpdate', (event, args) => {
         console.log('get moduleUpdate');
         this.modules = window.eo.getSideModuleList();
@@ -55,6 +57,7 @@ export class SidebarComponent implements OnInit, OnDestroy {
   }
 
   openApp(moduleID: string) {
+    this.moduleID=moduleID;
     window.eo.openApp({ moduleID: moduleID });
   }
 

diff --git a/src/workbench/browser/src/assets/font/iconfont.css b/src/workbench/browser/src/assets/font/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2855448 */
-  src: url('iconfont.woff2?t=1638375349218') format('woff2'),
-       url('iconfont.woff?t=1638375349218') format('woff'),
-       url('iconfont.ttf?t=1638375349218') format('truetype');
+  src: url('iconfont.woff2?t=1650440880888') format('woff2'),
+       url('iconfont.woff?t=1650440880888') format('woff'),
+       url('iconfont.ttf?t=1650440880888') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-wangyuanjing:before {
+  content: "\e6b6";
+}
+
+.icon-apispace:before {
+  content: "\e62c";
+}
+
 .icon-linux:before {
   content: "\e60a";
 }

diff --git a/src/workbench/browser/src/assets/font/iconfont.ttf b/src/workbench/browser/src/assets/font/iconfont.ttf
diff --git a/src/workbench/browser/src/assets/font/iconfont.woff b/src/workbench/browser/src/assets/font/iconfont.woff
diff --git a/src/workbench/browser/src/assets/font/iconfont.woff2 b/src/workbench/browser/src/assets/font/iconfont.woff2
diff --git a/src/workbench/browser/src/assets/images/icon.png b/src/workbench/browser/src/assets/images/icon.png
diff --git a/wiki/README.en.md b/wiki/README.en.md
@@ -22,15 +22,15 @@ English | [简体中文](README.md)
 
 # Featue
 
-⚡ API Test
+📃 API Documentation
+
+- HTTP protocol
+- Various formats of request body: FormData, XML, JSON, Raw
 
+⚡ API Test
 - Quickly test the API
 - Test local API
 
-📃 API management
-
-- HTTP protocol
-- Various formats of request body: FormData, XML, JSON, Raw
 
 🌐 Test environment management