From 1353c440aa74ea3684759b7a6c6cd6bbbbd11d97 Mon Sep 17 00:00:00 2001 From: muwoo <2424880409@qq.com> Date: Mon, 6 Dec 2021 18:23:34 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20=E4=BB=A3=E7=A0=81=E9=87=8D?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/public/{plugin.json => package.json} | 0 feature/public/preload.js | 14 +- feature/src/App.vue | 4 + feature/src/store/index.ts | 6 +- feature/src/views/installed/index.vue | 2 +- .../src/views/market/components/finder.vue | 20 +- .../views/market/components/plugin-list.vue | 4 +- public/preload.js | 49 +- runner/.gitignore | 23 - runner/README.md | 24 - runner/babel.config.js | 3 - runner/package-lock.json | 13200 ---------------- runner/package.json | 56 - runner/public/favicon.ico | Bin 4286 -> 0 bytes runner/public/index.html | 17 - runner/src/App.vue | 41 - runner/src/assets/logo.png | Bin 6849 -> 0 bytes runner/src/main.ts | 4 - runner/src/shims-vue.d.ts | 8 - runner/tsconfig.json | 39 - runner/vue.config.js | 6 - src/main/browsers/runner.ts | 15 +- src/main/common/api.ts | 21 +- src/renderer/App.vue | 13 +- src/renderer/components/result.vue | 3 +- src/renderer/components/search.vue | 16 +- src/renderer/plugins-manager/index.ts | 149 +- src/renderer/plugins-manager/options.ts | 100 + src/renderer/plugins-manager/search.ts | 20 + 29 files changed, 295 insertions(+), 13562 deletions(-) rename feature/public/{plugin.json => package.json} (100%) delete mode 100644 runner/.gitignore delete mode 100644 runner/README.md delete mode 100644 runner/babel.config.js delete mode 100644 runner/package-lock.json delete mode 100644 runner/package.json delete mode 100644 runner/public/favicon.ico delete mode 100644 runner/public/index.html delete mode 100644 runner/src/App.vue delete mode 100644 runner/src/assets/logo.png delete mode 100644 runner/src/main.ts delete mode 100644 runner/src/shims-vue.d.ts delete mode 100644 runner/tsconfig.json delete mode 100644 runner/vue.config.js create mode 100644 src/renderer/plugins-manager/options.ts create mode 100644 src/renderer/plugins-manager/search.ts diff --git a/feature/public/plugin.json b/feature/public/package.json similarity index 100% rename from feature/public/plugin.json rename to feature/public/package.json diff --git a/feature/public/preload.js b/feature/public/preload.js index 702f428..3449509 100644 --- a/feature/public/preload.js +++ b/feature/public/preload.js @@ -1 +1,13 @@ -console.log("hello"); +const {remote} = require("electron"); + +window.market = { + getLocalPlugins() { + return remote.getGlobal("LOCAL_PLUGINS").getLocalPlugins(); + }, + downloadPlugin(plugin) { + return remote.getGlobal("LOCAL_PLUGINS").downloadPlugin(plugin); + }, + deletePlugin(plugin) { + return remote.getGlobal("LOCAL_PLUGINS").deletePlugin(plugin); + }, +} diff --git a/feature/src/App.vue b/feature/src/App.vue index 4131427..d6c184b 100644 --- a/feature/src/App.vue +++ b/feature/src/App.vue @@ -51,6 +51,10 @@ const changeMenu = (key: any) => { const store = useStore(); const init = () => store.dispatch("init"); init(); + +(window as any).rubick.onPluginEnter((res) => { + console.log(res); +}) diff --git a/runner/src/assets/logo.png b/runner/src/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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 - export default component -} - -declare const __static: string diff --git a/runner/tsconfig.json b/runner/tsconfig.json deleted file mode 100644 index e621cbc..0000000 --- a/runner/tsconfig.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "compilerOptions": { - "target": "esnext", - "module": "esnext", - "strict": true, - "jsx": "preserve", - "importHelpers": true, - "moduleResolution": "node", - "skipLibCheck": true, - "esModuleInterop": true, - "allowSyntheticDefaultImports": true, - "sourceMap": true, - "baseUrl": ".", - "types": [ - "webpack-env" - ], - "paths": { - "@/*": [ - "src/*" - ] - }, - "lib": [ - "esnext", - "dom", - "dom.iterable", - "scripthost" - ] - }, - "include": [ - "src/**/*.ts", - "src/**/*.tsx", - "src/**/*.vue", - "tests/**/*.ts", - "tests/**/*.tsx" - ], - "exclude": [ - "node_modules" - ] -} diff --git a/runner/vue.config.js b/runner/vue.config.js deleted file mode 100644 index aa14f82..0000000 --- a/runner/vue.config.js +++ /dev/null @@ -1,6 +0,0 @@ -const path = require("path"); - -module.exports = { - outputDir: path.join(__dirname, "../public/runner"), - publicPath: process.env.NODE_ENV === "production" ? "" : "/", -}; diff --git a/src/main/browsers/runner.ts b/src/main/browsers/runner.ts index 744eeec..f635178 100644 --- a/src/main/browsers/runner.ts +++ b/src/main/browsers/runner.ts @@ -13,7 +13,7 @@ export default () => { const createView = (plugin, window: BrowserWindow) => { const preload = commonConst.dev() - ? `http://localhost:8080/preload.js` + ? path.resolve(__static, `../feature/public/preload.js`) : path.resolve(plugin.indexPath, `../`, plugin.preload); const ses = session.fromPartition("<" + plugin.name + ">"); @@ -38,6 +38,8 @@ export default () => { view.setAutoResize({ width: true }); window.setSize(800, 660); view.webContents.openDevTools(); + executeHooks(plugin.ext, "PluginEnter"); + executeHooks(plugin.ext, "PluginReady"); }); }; @@ -45,11 +47,22 @@ export default () => { if (!view) return; window.removeBrowserView(view); window.setSize(800, 60); + executeHooks("PluginOut", null); view = undefined; }; const getView = () => view; + const executeHooks = (hook, data) => { + const evalJs = `if(window.rubick && window.rubick.hooks && typeof window.rubick.hooks.on${hook} === 'function' ) { + try { + window.rubick.hooks.on${hook}(${data ? JSON.stringify(data) : ""}); + } catch(e) {} + } + `; + view.webContents.executeJavaScript(evalJs); + }; + return { init, getView, diff --git a/src/main/common/api.ts b/src/main/common/api.ts index 58df774..dbb4713 100644 --- a/src/main/common/api.ts +++ b/src/main/common/api.ts @@ -1,12 +1,9 @@ -import { BrowserWindow, ipcMain } from "electron"; +import { BrowserWindow, ipcMain, dialog } from "electron"; import { runner } from "../browsers"; const runnerInstance = runner(); const API: any = { - setExpendHeight({ height }: { height: number }, win: BrowserWindow): void { - win.setSize(800, height || 60); - }, openPlugin({ plugin }, window) { runnerInstance.removeView(window); runnerInstance.init(plugin, window); @@ -14,6 +11,22 @@ const API: any = { removePlugin(e, window) { runnerInstance.removeView(window); }, + hideMainWindow(arg, window) { + window.hide(); + }, + showMainWindow(arg, window) { + window.show(); + }, + showOpenDialog({ data }, window) { + dialog.showOpenDialogSync(window, data); + }, + setExpendHeight({ data: height }, window: BrowserWindow) { + const targetHeight = height; + window.setSize(window.getSize()[0], targetHeight); + }, + setSubInput() { + + }, }; export default (mainWindow: BrowserWindow) => { diff --git a/src/renderer/App.vue b/src/renderer/App.vue index ad98221..a7d6b30 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -7,9 +7,15 @@ @onSearch="onSearch" @openMenu="openMenu" @changeSelect="changeSelect" + :searchValue="searchValue" /> - + @@ -40,7 +46,7 @@ const menuPluginInfo = ref({}); getPluginInfo({ pluginName: "feature", // eslint-disable-next-line no-undef - pluginPath: `${__static}/feature/plugin.json`, + pluginPath: `${__static}/feature/package.json`, }).then((res) => { menuPluginInfo.value = res; }); @@ -50,7 +56,7 @@ watch([searchValue], () => { nextTick(() => { ipcRenderer.sendSync("msg-trigger", { type: "setExpendHeight", - height: getWindowHeight(searchValue.value ? options.value : []), + data: getWindowHeight(searchValue.value ? options.value : []), }); }); }); @@ -68,6 +74,7 @@ const changeIndex = (index) => { const openMenu = () => { openPlugin({ ...toRaw(menuPluginInfo.value), + feature: menuPluginInfo.value.features[0], cmd: "插件市场", }); }; diff --git a/src/renderer/components/result.vue b/src/renderer/components/result.vue index c81a18a..8bd1624 100644 --- a/src/renderer/components/result.vue +++ b/src/renderer/components/result.vue @@ -1,5 +1,5 @@