✨ release new version

Fix regex match error

.npmrc

@@ -1 +1 @@
-electron_mirror=https://npm.taobao.org/mirrors/electron/
+electron_mirror=https://npmmirror.com/mirrors/electron/

README.md

@@ -109,6 +109,8 @@ Those who are interested in this project or want to exchange and learn can scan
 
 ![image](https://user-images.githubusercontent.com/21073039/127327603-9796f246-ee4b-4950-a69d-ce3205ec9569.png)
 
+<a href="https://hellogithub.com/repository/0a3e2484b44e481e9dcf1850e45193cd" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=0a3e2484b44e481e9dcf1850e45193cd&claim_uid=vXGwjpmYNsBex0C" alt="Featured｜HelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+
 ## Contribute
 This project exists thanks to all the people who contribute. [[Contribute](https://github.com/rubickCenter/rubick/graphs/contributors)]. <a href="https://github.com/rubickCenter/rubick/graphs/contributors"><img src="https://opencollective.com/rubick/contributors.svg?width=890&button=false" /></a>
 

feature/src/App.vue

@@ -8,37 +8,37 @@
       >
         <a-menu-item key="finder">
           <template #icon>
-            <StarOutlined style="font-size: 18px;" />
+            <StarOutlined style="font-size: 16px" />
           </template>
           {{ $t('feature.market.explore') }}
         </a-menu-item>
         <a-menu-item key="worker">
           <template #icon>
-            <SendOutlined style="transform: rotate(-45deg); font-size: 18px;" />
+            <SendOutlined style="transform: rotate(-45deg); font-size: 16px" />
           </template>
           {{ $t('feature.market.efficiency') }}
         </a-menu-item>
         <a-menu-item key="tools">
           <template #icon>
-            <SearchOutlined style="font-size: 18px;" />
+            <SearchOutlined style="font-size: 16px" />
           </template>
           {{ $t('feature.market.searchTool') }}
         </a-menu-item>
         <a-menu-item key="image">
           <template #icon>
-            <FileImageOutlined style="font-size: 18px;" />
+            <FileImageOutlined style="font-size: 16px" />
           </template>
           {{ $t('feature.market.imageTool') }}
         </a-menu-item>
         <a-menu-item key="devPlugin">
           <template #icon>
-            <CodeOutlined style="font-size: 18px;" />
+            <CodeOutlined style="font-size: 16px" />
           </template>
           {{ $t('feature.market.developTool') }}
         </a-menu-item>
         <a-menu-item key="system">
           <template #icon>
-            <DatabaseOutlined style="font-size: 18px;" />
+            <DatabaseOutlined style="font-size: 16px" />
           </template>
           {{ $t('feature.market.systemTool') }}
         </a-menu-item>
@@ -72,7 +72,21 @@
         </a-sub-menu>
       </a-menu>
     </div>
-    <div :class="['finder', 'result', 'devPlugin', 'image', 'tools', 'worker', 'system'].includes(active[0]) ? 'container' : 'more'">
+    <div
+      :class="
+        [
+          'finder',
+          'result',
+          'devPlugin',
+          'image',
+          'tools',
+          'worker',
+          'system',
+        ].includes(active[0])
+          ? 'container'
+          : 'more'
+      "
+    >
       <keep-alive>
         <router-view />
       </keep-alive>
@@ -103,14 +117,14 @@ const active = computed(() => store.state.active);
 const { perf } = localConfig.getConfig();
 
 const changeMenu = (key: any) => {
-  store.commit('commonUpdate', {active: [key]})
+  store.commit('commonUpdate', { active: [key] });
   router.push(key);
 };
 
 window.rubick.onPluginEnter(({ code }: { code: string }) => {
   code = code === '已安装插件' ? 'installed' : code;
   changeMenu(code);
-  store.commit('commonUpdate', {active: [code]})
+  store.commit('commonUpdate', { active: [code] });
 });
 
 window.rubick.setSubInput((e: any) => {
@@ -129,7 +143,7 @@ window.rubick.setSubInput((e: any) => {
       store.commit('setSearchValue', e.text);
       router.push('result');
     } else {
-      store.commit('commonUpdate', {active: ['finder']})
+      store.commit('commonUpdate', { active: ['finder'] });
       router.push('finder');
     }
   }
@@ -144,13 +158,16 @@ init();
     background: var(--color-body-bg2) !important;
     height: 100%;
     border-right: none;
-    .ant-menu-item, .ant-menu-submenu, .ant-menu-submenu-arrow {
+    .ant-menu-item,
+    .ant-menu-submenu,
+    .ant-menu-submenu-arrow {
       color: var(--color-text-content);
       &:active {
         background: none;
       }
     }
-    .ant-menu-item-selected, .ant-menu-submenu-selected {
+    .ant-menu-item-selected,
+    .ant-menu-submenu-selected {
       background-color: var(--color-list-hover);
       color: var(--ant-primary-color);
       .ant-menu-submenu-arrow {
@@ -203,9 +220,12 @@ init();
     background: var(--color-body-bg2);
   }
   .left-menu {
-    padding: 24px 16px;
+    padding: 16px;
     position: relative;
     height: 100vh;
+    :deep(.ant-menu) {
+      width: 100%;
+    }
     :deep(.ant-menu-item) {
       padding-left: 12px !important;
       display: flex;
@@ -219,7 +239,14 @@ init();
     }
     :deep(.user-info) {
       position: absolute;
-      bottom: 32px;
+      bottom: 16px;
+      width: calc(100% - 32px);
+      .ant-menu-submenu-title {
+        padding: 0 32px 0 8px;
+        .ant-menu-title-content {
+          margin-left: 8px;
+        }
+      }
     }
     :deep(.ant-avatar) {
       background: transparent;

feature/src/languages/langs/en-US.ts

@@ -67,6 +67,7 @@ export default {
           changeLang: 'Change Language',
           cn: '简体中文',
           en: 'English',
+          history: 'keywords search history',
         },
         global: {
           title: 'Global Shortcut Key',

feature/src/languages/langs/zh-CN.ts

@@ -65,6 +65,7 @@ export default {
           changeLang: '切换语言',
           cn: '简体中文',
           en: 'English',
+          history: '关键词搜索记录',
         },
         global: {
           title: '全局快捷键',

feature/src/views/market/components/result.vue

@@ -31,9 +31,9 @@ const searchValue = computed(() => store.state.searchValue);
 
 const result = computed(() => {
   if (searchValue.value.trim().length > 0) {
-    const pattern = new RegExp(searchValue.value);
+    const pattern = new RegExp(searchValue.value.toLowerCase());
     return totalPlugins.value.filter((plugin) => {
-      if (plugin.pluginName.match(pattern)) {
+      if (plugin.pluginName.toLowerCase().match(pattern)) {
         return true;
       } else {
         return false;

feature/src/views/settings/index.vue

@@ -119,6 +119,16 @@
                 :un-checked-children="$t('feature.settings.basic.off')"
               ></a-switch>
             </div>
+            <div class="settings-item-li">
+              <div class="label">
+                {{ $t('feature.settings.basic.history') }}
+              </div>
+              <a-switch
+                v-model:checked="common.history"
+                :checked-children="$t('feature.settings.basic.on')"
+                :un-checked-children="$t('feature.settings.basic.off')"
+              ></a-switch>
+            </div>
           </div>
           <div class="setting-item">
             <div class="title">{{ $t('feature.settings.basic.theme') }}</div>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubick",
-  "version": "4.2.1",
+  "version": "4.2.5",
   "author": "muwoo <2424880409@qq.com>",
   "private": true,
   "scripts": {

src/common/constans/defaultConfig.ts

@@ -1,5 +1,5 @@
 export default {
-  version: 6,
+  version: 7,
   perf: {
     custom: {
       theme: 'SPRING',
@@ -25,6 +25,7 @@ export default {
       autoPast: false,
       darkMode: false,
       guide: false,
+      history: true,
       lang: 'zh-CN',
     },
     local: {

src/main/browsers/main.ts

@@ -25,7 +25,7 @@ export default () => {
       height: WINDOW_HEIGHT,
       minHeight: WINDOW_MIN_HEIGHT,
       useContentSize: true,
-      resizable: true,
+      resizable: false,
       width: WINDOW_WIDTH,
       frame: false,
       title: '拉比克',

src/main/browsers/runner.ts

@@ -175,22 +175,21 @@ export default () => {
 
   const removeView = (window: BrowserWindow) => {
     if (!view) return;
+    executeHooks('PluginOut', null);
+    setTimeout(() => {
       window.removeBrowserView(view);
       if (!view.inDetach) {
         window.setBrowserView(null);
         view.webContents?.destroy();
       }
-
-    // window.setSize(800, 60);
-    executeHooks('PluginOut', null);
       window.webContents?.executeJavaScript(`window.initRubick()`);
       view = undefined;
+    }, 0);
   };
 
   const getView = () => view;
 
   const executeHooks = (hook, data) => {
-    setTimeout(() => {
     if (!view) return;
     const evalJs = `if(window.rubick && window.rubick.hooks && typeof window.rubick.hooks.on${hook} === 'function' ) {
           try {
@@ -199,7 +198,6 @@ export default () => {
         }
       `;
     view.webContents?.executeJavaScript(evalJs);
-    }, 300);
   };
 
   return {

src/main/common/api.ts

@@ -128,8 +128,8 @@ class API extends DBInstance {
   }
 
   public removePlugin(e, window) {
-    this.currentPlugin = null;
     runnerInstance.removeView(window);
+    this.currentPlugin = null;
   }
 
   public openPluginDevTools() {
@@ -211,11 +211,10 @@ class API extends DBInstance {
     if (!Notification.isSupported()) return;
     'string' != typeof body && (body = String(body));
     const plugin = this.currentPlugin;
-    if (!plugin) return;
     const notify = new Notification({
-      title: plugin.pluginName,
+      title: plugin ? plugin.pluginName : null,
       body,
-      icon: plugin.logo,
+      icon: plugin ? plugin.logo : null,
     });
     notify.show();
   }

src/renderer/App.vue

@@ -1,8 +1,5 @@
 <template>
-  <div
+  <div id="components-layout" @mousedown="onMouseDown">
-    id="components-layout"
-    @mousedown="onMouseDown"
-  >
     <Search
       :currentPlugin="currentPlugin"
       @changeCurrent="changeIndex"
@@ -44,6 +41,7 @@ import useDrag from '../common/utils/dragWindow';
 import { getGlobal } from '@electron/remote';
 import { PLUGIN_HISTORY } from '@/common/constans/renderer';
 import { message } from 'ant-design-vue';
+import localConfig from './confOp';
 
 const { onMouseDown } = useDrag();
 const remote = window.require('@electron/remote');
@@ -74,6 +72,8 @@ initPlugins();
 const currentSelect = ref(0);
 const menuPluginInfo: any = ref({});
 
+const config: any = ref(localConfig.getConfig());
+
 getPluginInfo({
   pluginName: 'feature',
   // eslint-disable-next-line no-undef
@@ -91,7 +91,9 @@ watch(
     window.rubick.setExpendHeight(
       getWindowHeight(
         options.value,
-        pluginLoading.value ? [] : pluginHistory.value
+        pluginLoading.value || !config.value.perf.common.history
+          ? []
+          : pluginHistory.value
       )
     );
   },
@@ -101,26 +103,15 @@ watch(
 );
 
 const changeIndex = (index) => {
-  if (!options.value.length) {
+  const len = options.value.length || pluginHistory.value.length;
-    if (!pluginHistory.value.length) return;
+  if (!len) return;
-    if (
+  if (currentSelect.value + index > len - 1) {
-      currentSelect.value + index > pluginHistory.value.length - 1 ||
-      currentSelect.value + index < 0
-    ) {
     currentSelect.value = 0;
-      return;
+  } else if (currentSelect.value + index < 0) {
-    }
+    currentSelect.value = len - 1;
+  } else {
     currentSelect.value = currentSelect.value + index;
-    return;
   }
-  if (
-    currentSelect.value + index > options.value.length - 1 ||
-    currentSelect.value + index < 0
-  ) {
-    currentSelect.value = 0;
-    return;
-  }
-  currentSelect.value = currentSelect.value + index;
 };
 
 const openMenu = (ext) => {
@@ -158,7 +149,9 @@ const choosePlugin = (plugin) => {
     });
     if (hasRemove) {
       const result = window.rubick.db.get(PLUGIN_HISTORY) || {};
-      const history = result.data.filter(item => item.originName !== currentChoose.originName);
+      const history = result.data.filter(
+        (item) => item.originName !== currentChoose.originName
+      );
       setPluginHistory(history);
       return message.warning('插件已被卸载！');
     }

src/renderer/components/result.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-show="!currentPlugin.name" class="options">
+  <div v-show="!currentPlugin.name && config.perf.common.history" class="options">
     <div
       class="history-plugins"
       v-if="!options.length || !(searchValue || !!clipboardFile.length)"
@@ -44,12 +44,16 @@
 </template>
 
 <script lang="ts" setup>
-import {defineEmits, defineProps, reactive, toRaw, watch} from 'vue';
+import { defineEmits, defineProps, reactive, ref, toRaw, watch } from 'vue';
+import localConfig from '../confOp';
+
 const path = window.require('path');
 const remote = window.require('@electron/remote');
 
 declare const __static: string;
 
+const config: any = ref(localConfig.getConfig());
+
 const props: any = defineProps({
   searchValue: {
     type: [String, Number],

src/renderer/components/search.vue

@@ -25,6 +25,8 @@
       ref="mainInput"
       class="main-input"
       @input="(e) => changeValue(e)"
+      @keydown.left="(e) => keydownEvent(e, 'left')"
+      @keydown.right="(e) => keydownEvent(e, 'right')"
       @keydown.down="(e) => keydownEvent(e, 'down')"
       @keydown.tab="(e) => keydownEvent(e, 'down')"
       @keydown.up="(e) => keydownEvent(e, 'up')"
@@ -41,10 +43,7 @@
     >
       <template #suffix>
         <div class="suffix-tool">
-          <MoreOutlined
+          <MoreOutlined @click="showSeparate()" class="icon-more" />
-            @click="showSeparate()"
-            class="icon-more"
-          />
         </div>
       </template>
     </a-input>
@@ -96,6 +95,7 @@ const emit = defineEmits([
 ]);
 
 const keydownEvent = (e, key: string) => {
+  key !== 'space' && e.preventDefault();
   const { ctrlKey, shiftKey, altKey, metaKey } = e;
   const modifiers: Array<string> = [];
   ctrlKey && modifiers.push('control');
@@ -119,12 +119,19 @@ const keydownEvent = (e, key: string) => {
     case 'down':
       emit('changeCurrent', 1);
       break;
+    case 'left':
+      emit('changeCurrent', -1);
+      break;
+    case 'right':
+      emit('changeCurrent', 1);
+      break;
     case 'enter':
       if (runPluginDisable) return;
       emit('choosePlugin');
       break;
     case 'space':
       if (runPluginDisable || !config.value.perf.common.space) return;
+      e.preventDefault();
       emit('choosePlugin');
       break;
     default:

src/renderer/plugins-manager/index.ts

@@ -77,6 +77,10 @@ const createPluginManager = (): any => {
   };
 
   const openPlugin = async (plugin, option) => {
+    ipcRenderer.send('msg-trigger', {
+      type: 'removePlugin',
+    });
+    window.initRubick();
     if (plugin.pluginType === 'ui' || plugin.pluginType === 'system') {
       if (state.currentPlugin && state.currentPlugin.name === plugin.name) {
         window.rubick.showMainWindow();
@@ -103,7 +107,6 @@ const createPluginManager = (): any => {
         message.error('启动应用出错，请确保启动应用存在！');
       }
     }
-    window.initRubick();
     changePluginHistory({
       ...plugin,
       ...option,

src/renderer/plugins-manager/options.ts

@@ -8,7 +8,7 @@ import useFocus from './clipboardWatch';
 
 function formatReg(regStr) {
   const flags = regStr.replace(/.*\/([gimy]*)$/, '$1');
-  const pattern = flags.replace(new RegExp('^/(.*?)/' + flags + '$'), '$1');
+  const pattern = regStr.replace(new RegExp('^/(.*?)/' + flags + '$'), '$1');
   return new RegExp(pattern, flags);
 }