diff --git a/feature/src/languages/langs/en-US.ts b/feature/src/languages/langs/en-US.ts index a6be872..07246b8 100644 --- 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 index 6822d53..0abc51e 100644 --- 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 index 3c57fad..abd5f02 100644 --- 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 index d24b206..9cdfda3 100644 --- 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')" > +
+
+ {{ $t('feature.settings.basic.history') }} +
+ +
{{ $t('feature.settings.basic.theme') }}
diff --git a/package.json b/package.json index a69712f..aef4a38 100644 --- 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 index d258ec8..2e030c7 100644 Binary files a/public/icons/256x256.png and b/public/icons/256x256.png differ diff --git a/public/icons/icon.ico b/public/icons/icon.ico index 2c9c434..bf1efa0 100644 Binary files a/public/icons/icon.ico and b/public/icons/icon.ico differ diff --git a/public/logo.png b/public/logo.png index d258ec8..2e030c7 100644 Binary files a/public/logo.png and b/public/logo.png differ diff --git a/src/common/constans/defaultConfig.ts b/src/common/constans/defaultConfig.ts index 1acaa1a..8f5e195 100644 --- 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 index be72932..dbdfe73 100644 --- 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 index 6d2bdd2..a9fc213 100644 --- a/src/renderer/components/result.vue +++ b/src/renderer/components/result.vue @@ -1,5 +1,5 @@