[feature] keymap

README.md

@@ -34,15 +34,10 @@ Pap 需要 Python 3.11.4 的运行环境. 所有脚本均可通过 `Get-Help scr
 - [x] Note Tag
 - [x] Rightbar
 - [x] Private Lock
-- [ ] Keymap
-- [ ] Style
+- [x] Keymap
 - [x] Title List
 - [x] Markdown Ref net
 - [x] Resource
 - [x] Pdf viewer
-- [x] Music viewer
-- [ ] Video viewer
 - [x] Data Export
-- [ ] Table
-- [ ] Database
-- [ ] OCR
+- [ ] Table

package.json

@@ -1,7 +1,7 @@
 {
   "name": "pap",
   "private": true,
-  "version": "0.1.7",
+  "version": "0.1.8",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-python/router/resource.py

@@ -7,7 +7,7 @@
 from service.logger import logger
 from service.config import path_config
 
-from fastapi import status, APIRouter, HTTPException, UploadFile
+from fastapi import status, APIRouter, HTTPException, UploadFile, WebSocket
 from fastapi.responses import FileResponse, StreamingResponse
 
 router = APIRouter(prefix="/resource")
@@ -100,11 +100,3 @@ async def remove_zip():
     zip_path = "./data.zip"
     if path.exists(zip_path):
         remove(zip_path)
-
-
-@router.get("/get_stream", status_code=status.HTTP_200_OK, include_in_schema=True)
-async def get_stream(url: str):
-    if not path.exists(url):
-        raise HTTPException(status_code=404, detail="Video file not found")
-
-    return StreamingResponse(open(url, "rb"))

src/api/resource.ts

@@ -14,18 +14,6 @@ export class ResourceApi extends BaseApi {
         })
     }
 
-    public static async getStreamUrl(url: string): Promise<string> {
-        return new Promise(function (resolve, reject) {
-            pFetch(`/resource/get_stream?url=${url}`)
-                .then(async res => {
-                    const blob = await res.blob()
-                    const objectURL = URL.createObjectURL(blob);
-                    resolve(objectURL)
-                })
-                .catch(e => reject(e))
-        })
-    }
-
     public static async getBlobUrl(url: string): Promise<string> {
         return new Promise(function (resolve, reject) {
             pFetch(`/${url}`)

src/components/Content/Content.vue

@@ -1,28 +1,22 @@
 <script setup lang="ts">
 import { computed } from 'vue';
-import { useStateStore, SidebarIndex } from '@/store/state'
+import { useStateStore, ContentIndex } from '@/store/state'
 import Notespace from './Notespace.vue';
 import Resourcespace from './Resourcespace.vue';
-import Databasespace from './Databasespace.vue';
-import Settingspace from './Settingspace.vue';
 import Netspace from './Netspace.vue';
 
 // state
 const store = useStateStore();
 
 // content
 const currentComponent = computed(() => {
-    switch (store.sidebarIndex) {
-        case SidebarIndex.Note:
+    switch (store.contentIndex) {
+        case ContentIndex.Note:
             return Notespace
-        case SidebarIndex.Net:
+        case ContentIndex.Net:
             return Netspace
-        case SidebarIndex.Resource:
+        case ContentIndex.Resource:
             return Resourcespace
-        case SidebarIndex.Database:
-            return Databasespace
-        case SidebarIndex.Setting:
-            return Settingspace
         default:
             return Notespace
     }

src/components/Markdown/Editor.vue

@@ -12,6 +12,11 @@ const props = defineProps<{
 const emits = defineEmits<{
     (e: 'update:mdData', value: string): void,
     (e: 'onEdit'): void,
+    (e: 'tag'): void,
+    (e: 'lock'): void,
+    (e: 'export'): void,
+    (e: 'pdf'): void,
+    (e: 'outline'): void,
 }>();
 
 defineExpose({
@@ -31,10 +36,31 @@ const blocks = ref<Array<InstanceType<typeof MdBlock>>>([]);
 let rawDataSet = ref<Array<string>>([""])
 
 function handleKeyDown(event: KeyboardEvent) {
-    if (event.ctrlKey && event.key === 's') {
+    if (event.ctrlKey) {
         event.preventDefault();
-        const newData = saveData();
-        emits('update:mdData', newData);
+        switch (event.key) {
+            case '1':
+                emits('tag')
+                break;
+            case '2':
+                emits('lock')
+                break;
+            case '3':
+                const newData = saveData();
+                emits('update:mdData', newData);
+                break;
+            case '4':
+                emits('export')
+                break;
+            case '5':
+                emits('pdf')
+                break;
+            case '6':
+                emits('outline')
+                break;
+            default:
+                break;
+        }
     }
 }
 

src/components/Markdown/Markdown.vue

@@ -118,6 +118,11 @@ function handleShowOutline() {
     isTagListShow.value = false
 }
 
+function handleLock() {
+    lockState.value = !lockState.value;
+    emits('lock', lockState.value)
+}
+
 onMounted(async () => {
     await loadContentAsync()
     window.onbeforeprint = () => {
@@ -132,7 +137,7 @@ onMounted(async () => {
             <font-awesome-icon :icon="['fas', 'tags']" class="icon" :class="isTagListShow ? 'active' : ''"
                 @mousedown="handleShowTagList()" />
             <font-awesome-icon :icon="['fas', lockState ? 'lock' : 'lock-open']" class="icon"
-                :class="lockState ? 'active' : ''" @mousedown="lockState = !lockState; emits('lock', lockState)" />
+                :class="lockState ? 'active' : ''" @mousedown="handleLock()" />
             <font-awesome-icon :icon="['fas', 'floppy-disk']" class="icon" style="font-size: 22px;"
                 @mousedown="editor?.saveData()" />
             <font-awesome-icon :icon="['fas', 'file-export']" class="icon" @mousedown="downloadMdData()" />
@@ -147,7 +152,8 @@ onMounted(async () => {
             <MdOutline :md-data="mdData" :name="name" v-show="isRightbarShow" :key="updateStatus" />
         </Transition>
         <Editor :md-data="mdData" :lock="lockState" @update:md-data="updateMdData" @on-edit="emits('save', false)"
-            ref="editor" />
+            @tag="handleShowTagList()" @lock="handleLock()" @export="downloadMdData()" @pdf="exportPdf()"
+            @outline="handleShowOutline()" ref="editor" />
     </div>
     <el-skeleton v-else :rows="10" class="md-block-skeleton" animated />
 </template>

src/components/Markdown/MdLinkExtend.vue

@@ -1,9 +1,8 @@
 <script setup lang="ts">
 import { Link } from '@/md/mdexpr';
-import { watch, ref, onMounted, onActivated, computed } from 'vue';
+import { watch, ref, onMounted, onActivated } from 'vue';
+import { ElEmpty } from 'element-plus';
 import PDFViewer from '../MdExtend/PDFViewer.vue';
-import VideoViewer from '../MdExtend/VideoViewer.vue';
-import AudioViewer from '../MdExtend/AudioViewer.vue';
 
 const props = defineProps<{
     link: Link
@@ -12,16 +11,6 @@ const props = defineProps<{
 const url = ref('')
 const config = ref<string | null>(null)
 
-const currentComponent = computed(() => {
-    if (isPDF(url.value)) {
-        return PDFViewer
-    } else if (isVideo(url.value)) {
-        return VideoViewer
-    } else if (isAudio(url.value)) {
-        return AudioViewer
-    }
-});
-
 function extractGroups(url: string): [string, string | null] {
     const reg = /(.*) (\{.*\})/gm;
     const match = reg.exec(url);
@@ -45,14 +34,6 @@ function isPDF(url: string): boolean {
     return (url.endsWith('.pdf') || url.endsWith('.PDF'))
 }
 
-function isVideo(url: string): boolean {
-    return (url.endsWith('.mp4') || url.endsWith('.webm') || url.endsWith('.flv') || url.endsWith('.mkv'))
-}
-
-function isAudio(url: string): boolean {
-    return (url.endsWith('.mp3') || url.endsWith('.wav'))
-}
-
 watch(props, () => {
     generateURL()
 })
@@ -68,7 +49,8 @@ onActivated(() => {
 
 <template>
     <div class="link-extend">
-        <component :is="currentComponent" :name="props.link.content" :url="url.slice(6)" :config="config" />
+        <PDFViewer v-if="isPDF(url)" :name="props.link.content" :url="url.slice(6)" :config="config" />
+        <el-empty v-else description="无法加载的文件类型" />
     </div>
 </template>