🐛 修复 #338, #345, #340

rubickCenter · Feb 20, 2024 · 70ce3dd · 70ce3dd
1 parent a0644c0
commit 70ce3dd
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 7 deletions.
diff --git a/feature/src/languages/langs/en-US.ts b/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',

diff --git a/feature/src/languages/langs/zh-CN.ts b/feature/src/languages/langs/zh-CN.ts
@@ -65,6 +65,7 @@ export default {
           changeLang: '切换语言',
           cn: '简体中文',
           en: 'English',
+          history: '关键词搜索记录',
         },
         global: {
           title: '全局快捷键',

diff --git a/feature/src/views/market/components/result.vue b/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;

diff --git a/feature/src/views/settings/index.vue b/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>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rubick",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "author": "muwoo <2424880409@qq.com>",
   "private": true,
   "scripts": {

diff --git a/public/icons/256x256.png b/public/icons/256x256.png
diff --git a/public/icons/icon.ico b/public/icons/icon.ico
diff --git a/public/logo.png b/public/logo.png
diff --git a/src/common/constans/defaultConfig.ts b/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: {

diff --git a/src/renderer/App.vue b/src/renderer/App.vue
@@ -44,6 +44,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 +75,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 +94,7 @@ watch(
     window.rubick.setExpendHeight(
       getWindowHeight(
         options.value,
-        pluginLoading.value ? [] : pluginHistory.value
+        (pluginLoading.value || !config.value.perf.common.history) ? [] : pluginHistory.value
       )
     );
   },

diff --git a/src/renderer/components/result.vue b/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],

diff --git a/src/renderer/components/search.vue b/src/renderer/components/search.vue
@@ -96,6 +96,7 @@ const emit = defineEmits([
 ]);
 
 const keydownEvent = (e, key: string) => {
+  e.preventDefault();
   const { ctrlKey, shiftKey, altKey, metaKey } = e;
   const modifiers: Array<string> = [];
   ctrlKey && modifiers.push('control');