diff --git a/package.json b/package.json index 4bfa2505..fd109317 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "vue-i18n": "^9.5.0", "vue-router": "^4.2.5", "xmlbuilder2": "^3.1.1", - "zhi-blog-api": "^1.44.3", + "zhi-blog-api": "^1.45.0", "zhi-common": "^1.24.0", "zhi-device": "^2.3.1", "zhi-fetch-middleware": "^0.6.5", @@ -83,7 +83,7 @@ "zhi-gitlab-middleware": "^0.6.5", "zhi-lib-base": "^0.5.0", "zhi-notion-markdown": "^0.1.4", - "zhi-siyuan-api": "^2.10.3", + "zhi-siyuan-api": "^2.10.5", "zhi-xmlrpc-middleware": "^0.5.12" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f7a40d73..452683f0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -75,8 +75,8 @@ dependencies: specifier: ^3.1.1 version: 3.1.1 zhi-blog-api: - specifier: ^1.44.3 - version: 1.44.3 + specifier: ^1.45.0 + version: 1.45.0 zhi-common: specifier: ^1.24.0 version: 1.24.0 @@ -99,8 +99,8 @@ dependencies: specifier: ^0.1.4 version: 0.1.4 zhi-siyuan-api: - specifier: ^2.10.3 - version: 2.10.3 + specifier: ^2.10.5 + version: 2.10.5 zhi-xmlrpc-middleware: specifier: ^0.5.12 version: 0.5.12 @@ -6629,7 +6629,7 @@ packages: zhi-device: 2.3.1 zhi-fetch-middleware: 0.2.29 zhi-lib-base: 0.4.4 - zhi-siyuan-api: 2.10.3 + zhi-siyuan-api: 2.10.5 transitivePeerDependencies: - '@vue/composition-api' - typescript @@ -7975,8 +7975,8 @@ packages: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} - /zhi-blog-api@1.44.3: - resolution: {integrity: sha512-eBnHiLjGnobOeaK9TDbROJ1KWkSEcjE39o2nwO28r6ptJUU/kj8kOG25qW8zryNfAmOC6wiYp+N+drJRc9VuyA==} + /zhi-blog-api@1.45.0: + resolution: {integrity: sha512-NCUS/vfUHT+3wtA3gJDkSbUHVX9nKCpRoc+UJI/w6nIutTLNnKTF8MJm1AeJc6+g3AJw3R0abTl+XS5H6MgxqQ==} dependencies: zhi-common: 1.24.0 zhi-lib-base: 0.5.0 @@ -8056,10 +8056,10 @@ packages: - supports-color dev: false - /zhi-siyuan-api@2.10.3: - resolution: {integrity: sha512-IsG0zYXuYxDmJktTZLXhragil8VzL2fQGI8d2HGkUHmPLMfWY5EdsZdmrKTE9okj80AdGRna8VUbfR8a1S2c+Q==} + /zhi-siyuan-api@2.10.5: + resolution: {integrity: sha512-hNggum06YZIHd9+GnWNSEAdoSDeiVOCSKhuQe7tYNFd9fnvKZNkkWAUiHOH88XRRT5aSIB6VKP9PqC6D1PPqrw==} dependencies: - zhi-blog-api: 1.44.3 + zhi-blog-api: 1.45.0 zhi-common: 1.24.0 zhi-lib-base: 0.5.0 dev: false diff --git a/src/composables/usePublish.ts b/src/composables/usePublish.ts index 29abd8de..a8aa3bd3 100644 --- a/src/composables/usePublish.ts +++ b/src/composables/usePublish.ts @@ -513,13 +513,21 @@ const usePublish = () => { const postKeywords = post?.mt_keywords?.split(",") ?? [] const newPostKeywords = newPost?.mt_keywords?.split(",") ?? [] // 合并并去重关键词 - const mergedKeywords = [...new Set([...postKeywords, ...newPostKeywords])].filter((tag) => tag.trim() !== "") + const mergedKeywords = [ + ...new Set([ + ...postKeywords.map((tag) => tag.trim()), + ...newPostKeywords.map((tag) => tag.trim()), + ]), + ].filter((tag) => tag.trim() !== "") mergedPost.mt_keywords = mergedKeywords.join(",") // 合并并去重分类 - const mergedCategories = [...new Set([...(post?.categories ?? []), ...(newPost?.categories ?? [])])].filter( - (cate) => cate.trim() !== "" - ) + const mergedCategories = [ + ...new Set([ + ...(post?.categories ?? []).map((cate) => cate.trim()), + ...(newPost?.categories ?? []).map((cate) => cate.trim()), + ]), + ].filter((cate) => cate.trim() !== "") mergedPost.categories = mergedCategories return mergedPost