更新 package.json

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.9.10",
+  "version": "1.9.13",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {

src/ace-config.ts

@@ -10,6 +10,8 @@ import modeYamlUrl from 'ace-builds/src-noconflict/mode-yaml?url'
 
 import modeCssUrl from 'ace-builds/src-noconflict/mode-css?url'
 
+import modePythonUrl from 'ace-builds/src-noconflict/mode-python?url'
+
 import themeGithubUrl from 'ace-builds/src-noconflict/theme-github?url'
 
 import themeChromeUrl from 'ace-builds/src-noconflict/theme-chrome?url'
@@ -38,6 +40,8 @@ import snippetsJsonUrl from 'ace-builds/src-noconflict/snippets/json?url'
 
 import snippertsCssUrl from 'ace-builds/src-noconflict/snippets/css?url'
 
+import snippetsPythonUrl from 'ace-builds/src-noconflict/snippets/python?url'
+
 import 'ace-builds/src-noconflict/ext-language_tools'
 
 ace.config.setModuleUrl('ace/mode/json', modeJsonUrl)
@@ -45,6 +49,7 @@ ace.config.setModuleUrl('ace/mode/javascript', modeJavascriptUrl)
 ace.config.setModuleUrl('ace/mode/html', modeHtmlUrl)
 ace.config.setModuleUrl('ace/mode/yaml', modeYamlUrl)
 ace.config.setModuleUrl('ace/mode/css', modeCssUrl)
+ace.config.setModuleUrl('ace/mode/python', modePythonUrl)
 ace.config.setModuleUrl('ace/theme/github', themeGithubUrl)
 ace.config.setModuleUrl('ace/theme/chrome', themeChromeUrl)
 ace.config.setModuleUrl('ace/theme/monokai', themeMonokaiUrl)
@@ -59,5 +64,6 @@ ace.config.setModuleUrl('ace/snippets/javascript', snippetsJsUrl)
 ace.config.setModuleUrl('ace/snippets/javascript', snippetsYamlUrl)
 ace.config.setModuleUrl('ace/snippets/json', snippetsJsonUrl)
 ace.config.setModuleUrl('ace/snippets/css', snippertsCssUrl)
+ace.config.setModuleUrl('ace/snippets/python', snippetsPythonUrl)
 
 ace.require('ace/ext/language_tools')

src/components/cards/FilterRuleCard.vue

@@ -21,6 +21,14 @@ function filtersChanged(value: string[]) {
   emit('changed', props.pri, value)
 }
 
+// 清洗规则中的换行符和多余空格，并在前后添加空格
+const cleanedRules = computed(() => {
+  return props.rules.map(rule => {
+    rule = rule ?? ''
+    return ` ${rule.replace(/[\r\n]/g, '').replace(/\s+/g, '')} `
+  })
+})
+
 // 过滤规则下拉框
 const selectFilterOptions = ref<{ [key: string]: string }[]>([
   { title: '特效字幕', value: ' SPECSUB ' },
@@ -77,7 +85,7 @@ const selectFilterOptions = ref<{ [key: string]: string }[]>([
       <VRow>
         <VCol>
           <VSelect
-            v-model="props.rules"
+            v-model="cleanedRules"
             variant="underlined"
             :items="selectFilterOptions"
             chips

src/layouts/components/SearchBar.vue

@@ -2,6 +2,7 @@
 import * as Mousetrap from 'mousetrap'
 import SearchBarView from '@/views/system/SearchBarView.vue'
 import { useDisplay } from 'vuetify'
+import { ref, computed } from 'vue'
 
 const display = useDisplay()
 
@@ -15,6 +16,14 @@ function openSearchDialog() {
   searchDialog.value = true
   return false
 }
+
+// 检测操作系统是否是Mac
+function isMac() {
+  return navigator.platform.toUpperCase().indexOf('MAC') >= 0
+}
+
+// 计算属性：根据操作系统显示不同的按键提示
+const metaKey = computed(() => (isMac() ? '⌘+K' : 'Ctrl+K'))
 </script>
 
 <template>
@@ -25,12 +34,13 @@ function openSearchDialog() {
     </IconBtn>
     <span v-if="display.lgAndUp.value" class="flex align-center text-disabled ms-2" @click="openSearchDialog">
       <span class="me-3">搜索</span>
-      <span class="meta-key">⌘K</span>
+      <span class="meta-key">{{ metaKey }}</span>
     </span>
   </div>
   <!-- 搜索弹窗 -->
   <SearchBarView v-model="searchDialog" v-if="searchDialog" @close="searchDialog = false" />
 </template>
+
 <style type="scss" scoped>
 .meta-key {
   border: thin solid rgba(var(--v-border-color), var(--v-border-opacity));
@@ -39,4 +49,4 @@ function openSearchDialog() {
   padding-block: 0.1rem;
   padding-inline: 0.25rem;
 }
-</style>
+</style>

src/views/dashboard/AnalyticsWeeklyOverview.vue

@@ -80,7 +80,13 @@ const options = controlledComputed(
             fontSize: '12px',
           },
 
-          formatter: (value: number) => (value > 999 ? (value / 1000).toFixed(0) : value),
+          formatter: (value: number) => {
+            if (value > 999) {
+              return (value / 1000).toFixed(1) + 'k'
+            } else {
+              return value.toString()
+            }
+          },
         },
       },
     }

src/views/reorganize/TransferHistoryView.vue

@@ -148,12 +148,19 @@ const totalPage = computed(() => {
 
 // 切换页签和搜索词
 watch(
-  [() => currentPage.value, () => itemsPerPage.value, () => search.value],
+  [() => currentPage.value, () => itemsPerPage.value],
   debounce(async () => {
     reloadPage()
   }, 1000),
 )
 
+watch(
+  [() => search.value],
+  debounce(async () => {
+    reloadPage(true)
+  }, 1000),
+)
+
 // 获取订阅列表数据
 async function fetchData(page = currentPage.value, count = itemsPerPage.value) {
   loading.value = true
@@ -335,7 +342,7 @@ function addUrlQuery(url: string, name: string, value: any) {
 }
 
 // 重载页面
-function reloadPage() {
+function reloadPage(resetPage = false) {
   let url = '/history'
   if (search.value) {
     url = addUrlQuery(url, 'search', search.value)
@@ -344,7 +351,7 @@ function reloadPage() {
     url = addUrlQuery(url, 'itemsPerPage', itemsPerPage.value)
   }
   if (currentPage.value) {
-    url = addUrlQuery(url, 'currentPage', currentPage.value)
+    url = addUrlQuery(url, 'currentPage', resetPage ? 1 : currentPage.value)
   }
   router.push(url)
 }