diff --git a/README.md b/README.md index 9e5b19ba..4c54a7f4 100644 --- a/README.md +++ b/README.md @@ -69,12 +69,12 @@ Names not listed in order - [X] **Platform switch**: All platforms support enabling and disabling, the blog garden is enabled by default, and can be disabled at any time - [X] **Dynamic Newly Added**: Support custom adding platform -- [ ] **Smart Classification**: Support smart tags, smart slug aliases, smart summaries, and continue to improve +- [X] **Smart Classification**: Support smart tags, smart slug aliases, smart summaries, and continue to improve - [X] **Article Binding**: Support linking existing platform articles to siyuan-note to facilitate follow-up management, support Siyuan->platform one-way synchronization - [X] **Adapt to Theme**: Automatically adapt to dark mode and light mode - [X] **Language support**: multi-language support, support Chinese version and English version -- [ ] **Release view**: Support multiple release views, simple mode, detailed mode and source code mode +- [X] **Release view**: Support multiple release views, simple mode, detailed mode and source code mode - [X] **Multiple deployments**: support Siyuan notes pluginHighly recommended, Chrome browser extension, self-deployment This plugin promises that the basic functions will be free forever, and the follow-up related to intelligent AI may be charged, and the closed beta stage is completely free. If you want to support developers, please [feel free to support](https://github.com/terwer/siyuan-plugin-publisher/blob/main/README_zh_CN.md#Donate) here. diff --git a/README_zh_CN.md b/README_zh_CN.md index 124684ce..1f06176e 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -66,11 +66,11 @@ - [X] **支持扩展**：基于统一的博客 API 规范，内置 metaweblogAPI 、 WordPress 、Wechatsync 和 Github 支持，并提供了统一的适配器，理论上可支持扩展到任何平台 - [X] **平台开关**：所有平台均支持启用禁用，默认开启博客园，可随时禁用 - [X] **动态新增**：支持自定义添加平台 -- [ ] **智能分类**：支持智能标签、智能 slug 别名、智能摘要，并持续完善中 +- [X] **智能分类**：支持智能标签、智能 slug 别名、智能摘要，并持续完善中 - [X] **文章绑定**：支持关联已有的平台文章到思源笔记，方便后续管理，支持思源-> 平台单向同步 - [X] **适应主题**：自动适配暗黑模式与浅色模式 - [X] **语言支持**：多语言支持，支持中文版和英文版 -- [ ] **发布视图**：支持多种发布视图，简单模式、详细模式和源码模式 +- [X] **发布视图**：支持多种发布视图，简单模式、详细模式和源码模式 - [X] **多种部署**：支持思源笔记插件强烈推荐、Chrome 浏览器扩展、自部署 本插件承诺，基础功能永久免费，智能AI相关的后续可能会收费，内测阶段完全免费。如果您想支持开发者，请在这里 [随意打赏](https://github.com/terwer/siyuan-plugin-publisher/blob/main/README_zh_CN.md#捐赠)。 diff --git a/src/components/publish/BatchPublishIndex.vue b/src/components/publish/BatchPublishIndex.vue index c761d68d..f2348d72 100644 --- a/src/components/publish/BatchPublishIndex.vue +++ b/src/components/publish/BatchPublishIndex.vue @@ -27,7 +27,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import PublishTips from "~/src/components/publish/form/PublishTips.vue" import PublishPlatform from "~/src/components/publish/form/PublishPlatform.vue" -import { markRaw, onMounted, reactive } from "vue" +import { markRaw, onMounted, reactive, toRaw } from "vue" import { usePublish } from "~/src/composables/usePublish.ts" import { useSiyuanApi } from "~/src/composables/useSiyuanApi.ts" import { useVueI18n } from "~/src/composables/useVueI18n.ts" @@ -91,7 +91,7 @@ const formData = reactive({ dynList: [], // 页面模式 - editType: isDev ? PageEditMode.EditMode_complex : PageEditMode.EditMode_simple, + editType: PageEditMode.EditMode_simple, // ========================= // sync attrs end // ========================= @@ -242,6 +242,8 @@ onMounted(async () => { // 思源笔记原始文章数据 const siyuanPost = await blogApi.getPost(id) formData.siyuanPost = siyuanPost + formData.editType = isDev ? PageEditMode.EditMode_complex : PageEditMode.EditMode_simple + logger.debug("batch inited siyuanPost =>", toRaw(formData.siyuanPost)) }) @@ -282,7 +284,7 @@ onMounted(async () => {
- + - + { -
- + @@ -353,7 +342,7 @@ onMounted(async () => { - +
diff --git a/src/components/publish/form/EditModeSelect.vue b/src/components/publish/form/EditModeSelect.vue index 212a96be..f70cdc5c 100644 --- a/src/components/publish/form/EditModeSelect.vue +++ b/src/components/publish/form/EditModeSelect.vue @@ -25,21 +25,34 @@ @@ -50,17 +63,17 @@ const onEditModeChange = (val: PageEditMode) => { {{ t("main.publish.editmode.simple") }} {{ t("main.publish.editmode.complex") }} {{ t("main.publish.editmode.source") }} diff --git a/src/components/publish/form/PublishDescription.vue b/src/components/publish/form/PublishDescription.vue index 1b3066fa..4823713a 100644 --- a/src/components/publish/form/PublishDescription.vue +++ b/src/components/publish/form/PublishDescription.vue @@ -79,6 +79,10 @@ const handleMakeDesc = async () => { try { if (formData.useAi) { ElMessage.warning("使用人工智能提取摘要") + if (StrUtil.isEmptyString(formData.html)) { + throw new Error("正文为空，无法生成摘要") + } + logger.debug("使用人工智能提取摘要", { q: formData.html }) const result = await SmartUtil.autoSummary(formData.html) logger.debug("auto summary reault =>", result) if (!StrUtil.isEmptyString(result.errMsg)) { diff --git a/src/composables/usePublish.ts b/src/composables/usePublish.ts index e16e4da3..75d100cb 100644 --- a/src/composables/usePublish.ts +++ b/src/composables/usePublish.ts @@ -38,8 +38,6 @@ import { CommonBlogConfig } from "~/src/adaptors/api/base/commonBlogConfig.ts" import { IPublishCfg } from "~/src/types/IPublishCfg.ts" import { usePublishConfig } from "~/src/composables/usePublishConfig.ts" import { ElMessage } from "element-plus" -import { usePicgoBridge } from "~/src/composables/usePicgoBridge.ts" -import {PageEditMode} from "~/src/models/pageEditMode.ts"; /** * 通用发布组件 @@ -339,7 +337,7 @@ const usePublish = () => { } const initPublishMethods = { - doInitPage : async ( + doInitPage: async ( key: string, id: string, method: MethodEnum = MethodEnum.METHOD_ADD, @@ -366,8 +364,8 @@ const usePublish = () => { // 思源笔记原始文章数据 const siyuanPost = await blogApi.getPost(id) - let platformPost = new Post() - let mergedPost = new Post() + let platformPost = {} as Post + let mergedPost = siyuanPost logger.debug("doInitPage start init siyuanPost =>", toRaw(siyuanPost)) if (method === MethodEnum.METHOD_ADD) { @@ -381,9 +379,7 @@ const usePublish = () => { // 查询平台文章 platformPost = await api.getPost(postid) - - // 暂时不合并 - mergedPost = siyuanPost + // 更新属性 // 更新预览链接 postPreviewUrl = await getPostPreviewUrl(api, postid, cfg) @@ -401,7 +397,7 @@ const usePublish = () => { mergedPost, postPreviewUrl, } - } + }, } return {