chore: release v1.11.2

aooiuu · Sep 28, 2024 · 656d4c2 · 656d4c2
1 parent c4fd9fb
commit 656d4c2
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 41 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "docs",
   "type": "module",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "private": true,
   "scripts": {
     "docs:dev": "vitepress dev",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "any-reader",
   "type": "module",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "private": true,
   "packageManager": "pnpm@9.4.0",
   "description": "",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@any-reader/cli",
   "type": "commonjs",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "",
   "author": "aooiuu <aooiu@qq.com>",
   "license": "GPL3",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@any-reader/core",
   "type": "module",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "",
   "author": "aooiuu <aooiu@qq.com>",
   "license": "GPL3",

diff --git a/packages/epub/package.json b/packages/epub/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@any-reader/epub",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "",
   "scripts": {
     "build": "unbuild",

diff --git a/packages/legado/package.json b/packages/legado/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@any-reader/legado",
   "type": "module",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "private": true,
   "description": "",
   "author": "aooiuu <aooiu@qq.com>",

diff --git a/packages/rubick/package.json b/packages/rubick/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@any-reader/rubick",
   "type": "commonjs",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "private": true,
   "description": "",
   "author": "aooiuu <aooiu@qq.com>",

diff --git a/packages/rule-utils/package.json b/packages/rule-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@any-reader/rule-utils",
   "type": "module",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "",
   "author": "aooiuu <aooiu@qq.com>",
   "license": "GPL3",

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@any-reader/server",
   "type": "module",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "",
   "author": "aooiuu <aooiu@qq.com>",
   "license": "GPL3",

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@any-reader/shared",
   "type": "module",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "",
   "author": "aooiuu <aooiu@qq.com>",
   "license": "GPL3",

diff --git a/packages/utools/package.json b/packages/utools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@any-reader/utools",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "private": true,
   "description": "",
   "author": "aooiuu <aooiu@qq.com>",

diff --git a/packages/vscode/package.json b/packages/vscode/package.json
@@ -3,7 +3,7 @@
   "displayName": "any-reader",
   "description": "摸鱼,自定义规则多站点聚合搜索阅读小说、漫画。包含JS规则解析库和VSCode插件。支持本地小说 TXT、EPUB",
   "icon": "resources/icon.png",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "publisher": "aooiu",
   "private": true,
   "qna": "https://github.com/aooiuu/any-reader/issues",

diff --git a/packages/web/package.json b/packages/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@any-reader/web",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "",
   "author": "aooiuu <aooiu@qq.com>",
   "license": "GPL3",

diff --git a/packages/web/src/components/Search/index.vue b/packages/web/src/components/Search/index.vue
@@ -7,7 +7,14 @@
       boxShadow: '0px 0px 5px 5px rgba(0, 0, 0, 0.2)'
     }"
   >
-    <a-input-search ref="inputRef" v-model:value="searchText" placeholder="输入关键词，回车键搜索" class="w-full" @keyup.enter="onSearch" />
+    <a-input-search
+      ref="inputRef"
+      v-model:value="searchText"
+      placeholder="输入关键词，回车键搜索"
+      class="w-full"
+      allow-clear
+      @keyup.enter="onSearch"
+    />
   </div>
 </template>
 

diff --git a/packages/web/src/components/Setting/components/KeyboardShortcuts/KeyRow.vue b/packages/web/src/components/Setting/components/KeyboardShortcuts/KeyRow.vue
@@ -1,6 +1,6 @@
 <template>
   <SettingRow :title="props.title">
-    <a-input v-model:value="modelValue" class="!w-200px" @keydown="keydown" @keyup="keyup" />
+    <a-input v-model:value="modelValue" readonly class="!w-200px" @keydown="keydown" @keyup="keyup" />
   </SettingRow>
 </template>
 

diff --git a/packages/web/src/components/Setting/components/KeyboardShortcuts/index.vue b/packages/web/src/components/Setting/components/KeyboardShortcuts/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div ref="rootRef">
     <KeyRow v-model="settingStore.data.keyboardShortcuts.prevChapter" title="上一章" :key-text="keyText" />
     <KeyRow v-model="settingStore.data.keyboardShortcuts.nextChapter" title="下一章" :key-text="keyText" />
     <KeyRow v-model="settingStore.data.keyboardShortcuts.pageUp" title="上一屏" :key-text="keyText" />
@@ -13,10 +13,12 @@ import { useMagicKeys } from '@/hooks/useMagicKeys';
 import { useSettingStore } from '@/stores/setting';
 import KeyRow from './KeyRow.vue';
 
+const rootRef = ref();
+
 const { keyText } = useMagicKeys({
-  passive: false,
+  target: rootRef,
   onEventFired(e) {
-    e.preventDefault();
+    e.stopImmediatePropagation();
   }
 });
 

diff --git a/packages/web/src/pages/common/content.ts b/packages/web/src/pages/common/content.ts
@@ -240,6 +240,7 @@ export function useContent(contentRef: Ref<HTMLElement>) {
   useKeyboardShortcuts(
     {
       passive: false,
+      target: contentRef,
       onEventFired: (e) => {
         e.preventDefault();
       }

diff --git a/packages/web/src/pages/pc/category/index.vue b/packages/web/src/pages/pc/category/index.vue
@@ -5,7 +5,7 @@
       <a-select v-if="typeof route.params.contentType === 'undefined'" v-model:value="contentType" class="mb-10">
         <a-select-option v-for="o in CONTENT_TYPES" :key="o.value" :value="o.value">{{ o.label }}</a-select-option>
       </a-select>
-      <a-input v-model:value="searchText" class="mb-10" placeholder="过滤" />
+      <a-input v-model:value="searchText" class="mb-10" placeholder="过滤" allow-clear />
 
       <!-- 分类 -->
       <ARTabs v-model="ruleId" :options="ruleListDisplay" value-key="id" label-key="name" @update:model-value="changeRule">

diff --git a/packages/web/src/pages/pc/content/index.vue b/packages/web/src/pages/pc/content/index.vue
@@ -11,7 +11,7 @@
       <!-- 加载 -->
       <a-spin v-if="loading" :spinning="loading" class="h-full w-full items-center justify-center !flex" />
       <!-- 阅读区域 -->
-      <div ref="contentRef" class="relative h-full flex flex-1 flex-col overflow-y-auto indent-2em sm:mx-60">
+      <div ref="contentRef" tabindex="0" class="relative h-full flex flex-1 flex-col overflow-y-auto indent-2em outline-none sm:px-60">
         <!-- 漫画 -->
         <template v-if="contentType === ContentType.MANGA">
           <img v-for="(row, idx) in content" :key="idx" :src="row" />

diff --git a/packages/web/src/pages/pc/rules/index.vue b/packages/web/src/pages/pc/rules/index.vue
@@ -10,7 +10,7 @@
 
     <div class="mb-10 flex gap-10">
       <div class="flex flex-1 items-center gap-10">
-        <a-input-search v-model:value="searchText" placeholder="搜索" class="!w-140px" />
+        <a-input-search v-model:value="searchText" placeholder="搜索" class="!w-140px" allow-clear />
         <a-checkbox-group v-model:value="contentTypes" :options="CONTENT_TYPES"> </a-checkbox-group>
       </div>
     </div>
@@ -248,16 +248,6 @@ const tableColumns = ref<ColumnsType<any>>([
     title: '置顶',
     width: 120,
     align: 'center',
-    filters: [
-      {
-        text: '启用',
-        value: true
-      },
-      {
-        text: '禁用',
-        value: false
-      }
-    ],
     customRender: ({ record }) => <a-switch checked={rulesStore.pindStore.includes(record.id)} onUpdate:checked={() => rulesStore.pindRule(record)} />
   },
   {
@@ -336,12 +326,8 @@ const tableColumns = ref<ColumnsType<any>>([
     fixed: 'right',
     customRender: ({ record }) => (
       <div class="flex gap-5 text-12">
-        <a-button size="small" type="text" onClick={() => editRule(record)}>
-          编辑
-        </a-button>
-        <a-button size="small" type="text" danger onClick={() => delRule(record.id)}>
-          删除
-        </a-button>
+        <a-button type="primary" shape="circle" onClick={() => editRule(record)} icon={<EditOutlined />}></a-button>
+        <a-button type="primary" shape="circle" danger onClick={() => delRule(record.id)} icon={<DeleteOutlined />}></a-button>
       </div>
     )
   }

diff --git a/packages/web/src/pages/pc/search/index.vue b/packages/web/src/pages/pc/search/index.vue
@@ -7,7 +7,7 @@
           <a-select v-model:value="contentType">
             <a-select-option v-for="item in CONTENT_TYPES" :key="item.value" :value="item.value">{{ item.label }}</a-select-option>
           </a-select>
-          <a-input v-model:value="searchText" placeholder="输入关键词，回车键搜索" :disabled="loading" @keyup.enter="onSearch()" />
+          <a-input v-model:value="searchText" placeholder="输入关键词，回车键搜索" :disabled="loading" allow-clear @keyup.enter="onSearch()" />
         </a-input-group>
       </div>
     </div>

diff --git a/packages/web/src/pages/vscode/content/index.vue b/packages/web/src/pages/vscode/content/index.vue
@@ -6,7 +6,8 @@
     <div
       id="text-container"
       ref="contentRef"
-      class="flex-1 overflow-y-auto whitespace-pre-wrap break-words p-10 indent-2em lh-1.5em"
+      tabindex="0"
+      class="flex-1 overflow-y-auto whitespace-pre-wrap break-words p-10 indent-2em lh-1.5em outline-none"
       :style="{
         fontSize: settingStore.data.readStyle.fontSize + 'px',
         letterSpacing: settingStore.data.readStyle.letterSpacing + 'px'

diff --git a/packages/web/src/pages/vscode/settings/KeyboardShortcuts/index.vue b/packages/web/src/pages/vscode/settings/KeyboardShortcuts/index.vue
@@ -17,9 +17,8 @@ const contentRef = ref();
 
 const { keyText } = useMagicKeys({
   target: contentRef,
-  passive: false,
   onEventFired(e) {
-    e.preventDefault();
+    e.stopImmediatePropagation();
   }
 });