From 1ee379b288687aeb5bf25dcf24ca16f8ff2befad Mon Sep 17 00:00:00 2001
From: muwoo <2424880409@qq.com>
Date: Thu, 9 Dec 2021 20:36:33 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E9=80=82=E9=85=8D=E8=B6=85?=
 =?UTF-8?q?=E7=BA=A7=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/src/views/dev/index.vue                    |  2 ++
 feature/src/views/installed/index.vue              |  5 +++--
 feature/src/views/market/components/finder.vue     |  6 ++++--
 .../src/views/market/components/plugin-list.vue    |  2 ++
 src/common/utils/localPlugin.ts                    |  2 --
 src/main/browsers/runner.ts                        | 14 ++++++++++++--
 src/main/common/api.ts                             |  5 +++++
 src/renderer/App.vue                               |  1 -
 src/renderer/plugins-manager/index.ts              |  6 ++++++
 src/renderer/shims-vue.d.ts                        |  1 +
 10 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/feature/src/views/dev/index.vue b/feature/src/views/dev/index.vue
index d68c10f..fbfbcf0 100644
--- a/feature/src/views/dev/index.vue
+++ b/feature/src/views/dev/index.vue
@@ -21,6 +21,7 @@
 
 <script setup>
 import { reactive, ref } from "vue";
+import { message } from "ant-design-vue";
 
 const formRef = ref();
 const formState = reactive({
@@ -45,6 +46,7 @@ const downloadPlugin = async (pluginName) => {
     name: pluginName,
     isDev: true,
   });
+  message.success(`${pluginName}安装成功！`);
   loading.value = false;
 };
 
diff --git a/feature/src/views/installed/index.vue b/feature/src/views/installed/index.vue
index 170cb72..80d91e4 100644
--- a/feature/src/views/installed/index.vue
+++ b/feature/src/views/installed/index.vue
@@ -6,8 +6,9 @@
     <div class="container" v-else>
       <div class="installed-list">
         <div
-          :class="currentSelect === index ? 'item active' : 'item'"
+          :class="currentSelect[0] === index ? 'item active' : 'item'"
           :key="index"
+          @click="currentSelect = [index]"
           v-for="(plugin, index) in localPlugins"
         >
           <img :src="plugin.logo" />
@@ -101,7 +102,7 @@ const localPlugins = computed(() =>
 );
 const updateLocalPlugin = () => store.dispatch("updateLocalPlugin");
 
-const currentSelect = ref(0);
+const currentSelect = ref([0]);
 
 const pluginDetail = computed(() => {
   return localPlugins.value[currentSelect.value] || {};
diff --git a/feature/src/views/market/components/finder.vue b/feature/src/views/market/components/finder.vue
index 06cab15..db5f7de 100644
--- a/feature/src/views/market/components/finder.vue
+++ b/feature/src/views/market/components/finder.vue
@@ -81,10 +81,12 @@ const newList = computed(() => {
 <style lang="less">
 .finder {
   width: 100%;
-  height: 100vh;
+  height: 100%;
   overflow-x: hidden;
   box-sizing: border-box;
-
+  &::-webkit-scrollbar {
+    width: 0;
+  }
   .ant-carousel .slick-slide {
     text-align: center;
     height: 235px;
diff --git a/feature/src/views/market/components/plugin-list.vue b/feature/src/views/market/components/plugin-list.vue
index 268ac32..71e793f 100644
--- a/feature/src/views/market/components/plugin-list.vue
+++ b/feature/src/views/market/components/plugin-list.vue
@@ -78,6 +78,7 @@ import {
 
 import { defineProps, ref } from "vue";
 import { useStore } from "vuex";
+import { message } from "ant-design-vue";
 
 const store = useStore();
 
@@ -95,6 +96,7 @@ defineProps({
 const downloadPlugin = async (plugin) => {
   startDownload(plugin.name);
   await window.market.downloadPlugin(plugin);
+  message.success(`${plugin.name}安装成功！`);
   successDownload(plugin.name);
 };
 
diff --git a/src/common/utils/localPlugin.ts b/src/common/utils/localPlugin.ts
index fd9b8de..e6ed91e 100644
--- a/src/common/utils/localPlugin.ts
+++ b/src/common/utils/localPlugin.ts
@@ -13,7 +13,6 @@ const pluginInstance = new PluginHandler({
 global.LOCAL_PLUGINS = {
   PLUGINS: [],
   async downloadPlugin(plugin) {
-    console.log(plugin);
     await pluginInstance.install([plugin.name], { isDev: plugin.isDev });
     if (plugin.isDev) {
       // 获取 dev 插件信息
@@ -30,7 +29,6 @@ global.LOCAL_PLUGINS = {
         ...pluginInfo,
       };
     }
-    console.log(plugin);
     global.LOCAL_PLUGINS.addPlugin(plugin);
     return global.LOCAL_PLUGINS.PLUGINS;
   },
diff --git a/src/main/browsers/runner.ts b/src/main/browsers/runner.ts
index 7763b13..d8049dc 100644
--- a/src/main/browsers/runner.ts
+++ b/src/main/browsers/runner.ts
@@ -1,6 +1,7 @@
 import { BrowserView, BrowserWindow, session } from "electron";
 import path from "path";
 import commonConst from "../../common/utils/commonConst";
+import { PLUGIN_INSTALL_DIR as baseDir } from "@/common/constans/main";
 
 export default () => {
   let view;
@@ -12,10 +13,19 @@ export default () => {
   };
 
   const createView = (plugin, window: BrowserWindow) => {
+    let pluginIndexPath = plugin.indexPath;
+    if (!pluginIndexPath) {
+      const pluginPath = path.resolve(baseDir, "node_modules", plugin.name);
+      pluginIndexPath = `file://${path.join(pluginPath, "./", plugin.main)}`;
+    }
     const preload =
       commonConst.dev() && plugin.name === "rubick-system-feature"
         ? path.resolve(__static, `../feature/public/preload.js`)
-        : path.resolve(plugin.indexPath.replace("file:", ""), `../`, plugin.preload);
+        : path.resolve(
+            pluginIndexPath.replace("file:", ""),
+            `../`,
+            plugin.preload
+          );
 
     const ses = session.fromPartition("<" + plugin.name + ">");
     ses.setPreloads([`${__static}/preload.js`]);
@@ -33,7 +43,7 @@ export default () => {
       },
     });
     window.setBrowserView(view);
-    view.webContents.loadURL(plugin.indexPath);
+    view.webContents.loadURL(pluginIndexPath);
     window.once("ready-to-show", () => {
       view.setBounds({ x: 0, y: 60, width: 800, height: 600 });
       view.setAutoResize({ width: true });
diff --git a/src/main/common/api.ts b/src/main/common/api.ts
index 1856ccf..f4c992d 100644
--- a/src/main/common/api.ts
+++ b/src/main/common/api.ts
@@ -26,6 +26,11 @@ const API: any = {
     runnerInstance.removeView(window);
     runnerInstance.init(plugin, window);
     API.currentPlugin = plugin;
+    window.webContents.executeJavaScript(
+      `window.setCurrentPlugin(${JSON.stringify({
+        currentPlugin: API.currentPlugin,
+      })})`
+    );
   },
   removePlugin(e, window) {
     API.currentPlugin = null;
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index d361057..3cd12d2 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -86,7 +86,6 @@ const openMenu = () => {
 
 const choosePlugin = () => {
   const currentChoose = options.value[currentSelect.value];
-  console.log(currentChoose);
   currentChoose.click();
 };
 </script>
diff --git a/src/renderer/plugins-manager/index.ts b/src/renderer/plugins-manager/index.ts
index d3f556a..3cc832f 100644
--- a/src/renderer/plugins-manager/index.ts
+++ b/src/renderer/plugins-manager/index.ts
@@ -83,6 +83,12 @@ const createPluginManager = (): any => {
     remote.getGlobal("LOCAL_PLUGINS").updatePlugin(currentPlugin);
   };
 
+  window.setCurrentPlugin = ({ currentPlugin }) => {
+    console.log(currentPlugin);
+    state.currentPlugin = currentPlugin;
+    setSearchValue("");
+  };
+
   window.initRubick = () => {
     state.currentPlugin = {};
     setSearchValue("");
diff --git a/src/renderer/shims-vue.d.ts b/src/renderer/shims-vue.d.ts
index d1bccc7..e962f9f 100644
--- a/src/renderer/shims-vue.d.ts
+++ b/src/renderer/shims-vue.d.ts
@@ -19,4 +19,5 @@ interface Window {
   removeSubInput: () => void;
   updatePlugin: (plugin: any) => void;
   initRubick: () => void;
+  setCurrentPlugin: (plugin: any) => void;
 }