Merge pull request #11 from BUPTlhuanyu/restructure

fix(menu & search empty): menu & search empty

Author: BUPTlhuanyu

packages/views/src/pages/editor/components/sider/index.scss

@@ -61,6 +61,14 @@
             display: flex;
             flex-direction: column;
             justify-content: space-between;
+            &-empty {
+                display: flex;
+                flex: 1;
+                height: 100%;
+                justify-content: center;
+                align-items: center;
+                color: #7a7a7a;
+            }
             &-header {
                 line-height: 30px;
                 height: 30px;

packages/views/src/pages/editor/components/sider/index.tsx

@@ -569,14 +569,15 @@ export default React.forwardRef(function Sider(props: ISiderProps, ref: any) {
                                 }
                             />
                         </div>
-                        {searchResult.length > 0 && (
+                        {searchResult.length > 0 ?
                             <SearchList
                                 data={searchResult}
                                 className="sider-panel-content"
                                 onSelect={onSearchSelect}
                                 onLineSelect={onLineSelect}
                             />
-                        )}
+                            : <div className="sider-panel-empty">没有匹配结果</div>
+                        }
                     </div>
                 )}
                 {showToc && (

packages/views/src/pages/home/container/content/index.scss

@@ -68,7 +68,8 @@
             padding: 10px;
             box-sizing: border-box;
             &:hover {
-                box-shadow: 2px 2px 6px #ffffff;
+                box-shadow: rgba(243, 240, 239, 0.7) 0px 8px 24px;
+                transform: rotate(1deg);
             }
             &-img {
                 width: 200px;

packages/views/src/pages/home/container/footer/index.tsx

@@ -7,7 +7,6 @@ import * as React from 'react';
 function Footer() {
     return (
         <div className="pandora-home-footer">
-            点击跳转
         </div>
     );
 }

packages/workbench-electron/main/editor/editorMain.ts

@@ -19,7 +19,8 @@ import {ICommandService, CommandService} from 'services/command';
 import 'services/search/electron-browser/searchServices';
 
 const MODE = process.env.NODE_ENV === 'production';
-function createWindow() {
+// TODO：封装成类，提供 close 等事件注册
+function createWindow(dispose: Function) {
     const html = MODE
         ? `file://${path.resolve(app.getAppPath(), './dist/index.html')}`
         : `http://localhost:${DEVELOP_PORT}/index.html`;
@@ -55,19 +56,29 @@ function createWindow() {
         IPC_CHANNEL.forEach((item: string) => {
             ipcMain.removeHandler(item);
         });
-        Menu.setApplicationMenu(new Menu());
+        dispose();
     });
 }
 
 export class CodeMain {
+    private oldMenus: Menu | null;
     constructor() {
         this.initServices();
+        const oldMenu = Menu.getApplicationMenu();
+        this.oldMenus = null;
+		if (oldMenu) {
+			this.oldMenus = oldMenu;
+		}
     }
     async startUp(): Promise<void> {
-        createWindow();
+        createWindow(this.resetMenu.bind(this));
         registerContextMenuListener();
     }
 
+    private resetMenu () {
+        this.oldMenus && Menu.setApplicationMenu(this.oldMenus);
+    }
+
     private initServices() {
         const injector = new Injector();
 

packages/workbench-electron/main/main.ts

@@ -51,7 +51,6 @@ function createHome() {
 
 class Home {
     constructor () {
-        Menu.setApplicationMenu(new Menu());
         this.registerListeners();
     }
     private registerListeners () {

packages/workbench-electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workbench-electron",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Pandora Workbench",
   "productName": "Pandora Workbench",
   "private": true,