[fix] fix some bug

WindLX · Dec 10, 2023 · 6d1eb9d · 6d1eb9d
1 parent b40a1cb
commit 6d1eb9d
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 18 deletions.
diff --git a/data/config.toml b/data/config.toml
@@ -6,7 +6,7 @@ backend_port = 13956
 
 [basic]
 title = "Pap"
-log_level = "WARNING"
+log_level = "INFO"
 
 [path]
 note_dir = "./data/note/"

diff --git a/index.html b/index.html
@@ -10,10 +10,10 @@
 <body>
   <div id="app"></div>
   <script>
-    //window.host = "{{ host }}"
-    //window.port = {{ port }}
-    window.host = "127.0.0.1"
-    window.port = 13956
+    window.host = "{{ host }}"
+    window.port = {{ port }}
+    //window.host = "127.0.0.1"
+    //window.port = 13956
   </script>
   <script type="module" src="/src/main.ts"></script>
 </body>

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pap",
   "private": true,
-  "version": "0.2.4",
+  "version": "0.2.5",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/scripts/pap.sh b/scripts/pap.sh
@@ -54,9 +54,6 @@ if [ "$Update" = true ]; then
     mv ./PapPack/libmd_net.so ./libmd_net.so
     mv ./PapPack/requirements_release.txt ./requirements_release.txt
 
-    rm PapPack -r
-    rm PapPack.tar.gz
-
     if [ -d ".venv" ]; then
         rm .venv -r
     fi

diff --git a/src/api/note.ts b/src/api/note.ts
@@ -44,6 +44,7 @@ export class NoteApi extends BaseApi {
     public static async getNoteByTags(tagsId: TagSetSchema): Promise<Array<NoteRelationshipSchema>> {
         return new Promise(function (resolve, reject) {
             pFetch(`/note/get_note_by_tags`, {
+                method: 'POST',
                 body: JSON.stringify(tagsId),
             }).then(async res => {
                 const notes = await res.json() as Array<NoteRelationshipSchema>;

diff --git a/src/components/Markdown/MdTip.vue b/src/components/Markdown/MdTip.vue
diff --git a/src/components/Middlebar/Note.vue b/src/components/Middlebar/Note.vue
@@ -23,18 +23,19 @@ tagStore.$onAction(
         name: name,
         after: after,
     }) => {
-        after((result) => {
+        after(async (result) => {
             switch (name) {
                 case "onUpdate":
                     filterTags.value = []
-                    getNoteAsync()
+                    await getNoteAsync()
                     break;
                 case "onChoose":
                     const e = result as TagEvent
                     if (e.filterId === -1) {
                         filterTags.value = filterTags.value.filter((t) => t.id !== e.tag.id)
                         filterTags.value.push(e.tag)
                     }
+                    await getNoteByTagsAsync()
                     break;
             }
         })
@@ -52,6 +53,12 @@ async function getNoteAsync() {
     noteSet.value = newData
 }
 
+async function getNoteByTagsAsync() {
+    const tagSet = { tags_id: filterTags.value.map((t) => t.id) }
+    const newData = await NoteApi.getNoteByTags(tagSet)
+    noteSet.value = newData
+}
+
 // callback function
 function handleShowTag() {
     tagStore.setShow()

diff --git a/src/components/Tag/TagDrawer.vue b/src/components/Tag/TagDrawer.vue
@@ -54,6 +54,12 @@ let filterTags: ComputedRef<Array<TagRelationshipSchema>> = computed(() => {
 })
 let targetTag: ReactiveVariable<TagSchema> = reactive(tagDefault())
 let inputValue: Ref<string> = ref("")
+let dialogWidth = computed(() => {
+    const w = window.screen.width
+    if (w < 540) return '90%'
+    else if (w < 900) return '50%'
+    else return '30%'
+})
 
 // callback function
 async function handleUpdateConfirmAsync() {
@@ -192,7 +198,7 @@ onMounted(() => {
             </el-collapse>
         </template>
     </el-drawer>
-    <el-dialog v-model="inputVisible" title="修改标签" width="30%">
+    <el-dialog v-model="inputVisible" title="修改标签" :width="dialogWidth">
         <el-form class="tag-new" :form="targetTag">
             <el-form-item label="名称">
                 <el-input v-model="targetTag.name">
@@ -219,7 +225,7 @@ onMounted(() => {
             </span>
         </template>
     </el-dialog>
-    <el-dialog v-model="chooseVisible" title="提示" width="30%">
+    <el-dialog v-model="chooseVisible" title="提示" :width="dialogWidth">
         <div style="display: flex; align-items: center; flex-direction: column;">
             <tag :color="targetTag?.color" :closable="false" :disable="false">
                 {{ targetTag?.name }}

diff --git a/src/store/state.ts b/src/store/state.ts
@@ -19,6 +19,7 @@ export enum ContentIndex {
 }
 
 const sideIndexes = [SidebarIndex.Note, SidebarIndex.Net, SidebarIndex.Resource, SidebarIndex.Setting]
+const contentIndexes = [ContentIndex.Note, ContentIndex.Net, ContentIndex.Resource]
 
 export const useStateStore = defineStore('states', {
     state: () => {
@@ -39,6 +40,9 @@ export const useStateStore = defineStore('states', {
         },
         select(index: number) {
             this.sidebarIndex = sideIndexes[index]
+            if (index != 3) {
+                this.contentIndex = contentIndexes[index]
+            }
         },
         ownMiddlebar(): boolean {
             let a = this.sidebarIndex != SidebarIndex.Net