From e7be6b09499b81debcb3db5e5e60ddf9a262e22b Mon Sep 17 00:00:00 2001
From: terwer <youweics@163.com>
Date: Wed, 2 Aug 2023 23:15:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=BB=86=E7=B2=92=E5=BA=A6=E9=85=8D=E7=BD=AE=E7=9A=84=E5=B8=B8?=
 =?UTF-8?q?=E8=A7=84=E5=8F=91=E5=B8=83-=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   4 +-
 pnpm-lock.yaml                                |  32 ++--
 src/components/publish/BatchPublishIndex.vue  |  10 +-
 .../publish/SinglePublishDoPublish.vue        | 142 +++++++++++++++++-
 .../publish/SinglePublishSelectPlatform.vue   |   2 +
 src/composables/usePublish.ts                 |  79 ++++++++--
 src/models/methodEnum.ts                      |  39 +++++
 7 files changed, 271 insertions(+), 37 deletions(-)
 create mode 100644 src/models/methodEnum.ts

diff --git a/package.json b/package.json
index eed4d577..874e24fd 100644
--- a/package.json
+++ b/package.json
@@ -60,13 +60,13 @@
     "vue-i18n": "^9.2.2",
     "vue-router": "^4.2.4",
     "xmlbuilder2": "^3.1.1",
-    "zhi-blog-api": "^1.20.1",
+    "zhi-blog-api": "^1.20.2",
     "zhi-common": "^1.11.6",
     "zhi-device": "^2.3.0",
     "zhi-fetch-middleware": "^0.2.6",
     "zhi-github-middleware": "^0.1.3",
     "zhi-lib-base": "^0.4.2",
-    "zhi-siyuan-api": "^1.29.1",
+    "zhi-siyuan-api": "^1.29.2",
     "zhi-xmlrpc-middleware": "^0.4.1"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e5a8f744..6734d0d5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -51,8 +51,8 @@ dependencies:
     specifier: ^3.1.1
     version: 3.1.1
   zhi-blog-api:
-    specifier: ^1.20.1
-    version: 1.20.1
+    specifier: ^1.20.2
+    version: 1.20.2
   zhi-common:
     specifier: ^1.11.6
     version: 1.11.6
@@ -69,8 +69,8 @@ dependencies:
     specifier: ^0.4.2
     version: 0.4.2
   zhi-siyuan-api:
-    specifier: ^1.29.1
-    version: 1.29.1
+    specifier: ^1.29.2
+    version: 1.29.2
   zhi-xmlrpc-middleware:
     specifier: ^0.4.1
     version: 0.4.1
@@ -5481,8 +5481,8 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /strip-literal@1.0.1:
-    resolution: {integrity: sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==}
+  /strip-literal@1.1.0:
+    resolution: {integrity: sha512-KH41jC/ZiLwhFf3aKkcj6CJZYbRfD/GAb4d05KPwbhjSswohY0wArniCcNIhgAhrudpzzYnXmSu0NLp2b6rsMg==}
     dependencies:
       acorn: 8.10.0
     dev: true
@@ -5821,8 +5821,8 @@ packages:
     resolution: {integrity: sha512-RsPyTbqORDNDxqAdQPQBpgqhWle1VcTSou/FraClYlHf6TZnQcGslpLcAphNR+sQW4q5lLWLbOsRlh9j24baQg==}
     dev: true
 
-  /unimport@3.1.0:
-    resolution: {integrity: sha512-ybK3NVWh30MdiqSyqakrrQOeiXyu5507tDA0tUf7VJHrsq4DM6S43gR7oAsZaFojM32hzX982Lqw02D3yf2aiA==}
+  /unimport@3.1.1:
+    resolution: {integrity: sha512-B7NRqP6imrhT70RWS46QeCB4EdmoO+LgSmdDp7YiylYSmPEbRmampXhSfarp2ZBofnvK/oUnM0c5d8Oy/oF09w==}
     dependencies:
       '@rollup/pluginutils': 5.0.2
       escape-string-regexp: 5.0.0
@@ -5833,7 +5833,7 @@ packages:
       pathe: 1.1.1
       pkg-types: 1.0.3
       scule: 1.0.0
-      strip-literal: 1.0.1
+      strip-literal: 1.1.0
       unplugin: 1.4.0
     transitivePeerDependencies:
       - rollup
@@ -5867,7 +5867,7 @@ packages:
       local-pkg: 0.4.3
       magic-string: 0.30.2
       minimatch: 9.0.3
-      unimport: 3.1.0
+      unimport: 3.1.1
       unplugin: 1.4.0
     transitivePeerDependencies:
       - rollup
@@ -6114,7 +6114,7 @@ packages:
       pathe: 1.1.1
       picocolors: 1.0.0
       std-env: 3.3.3
-      strip-literal: 1.0.1
+      strip-literal: 1.1.0
       tinybench: 2.5.0
       tinypool: 0.7.0
       vite: 4.4.8(@types/node@18.17.1)(stylus@0.59.0)
@@ -6362,8 +6362,8 @@ packages:
     engines: {node: '>=12.20'}
     dev: true
 
-  /zhi-blog-api@1.20.1:
-    resolution: {integrity: sha512-8jjOvnd6Sh3oKqg4tiwx0A2AWbiWTvhYGAN1FZnOo5UaozpNAe4YsGfshkfhG/GAxT0gkoeY/MY9iQQde/YndA==}
+  /zhi-blog-api@1.20.2:
+    resolution: {integrity: sha512-1trKXFeL5NJTrIUG5zuhWyEb//5jG1eSbb72Dq10Z+6xhRXFmEKiVxLTe5jZva3AIaLJe4UuN2yr4K9IqBGWUQ==}
     dependencies:
       zhi-lib-base: 0.4.2
     dev: false
@@ -6399,10 +6399,10 @@ packages:
     resolution: {integrity: sha512-kfKgN4hb5efUf+k5Y9028CVV1p/hsnK0NbRsxI3uwJoTlHfTBjfi6ZfrkhDn+XEnEYeWidO75sx4RdcnT7C3KA==}
     dev: false
 
-  /zhi-siyuan-api@1.29.1:
-    resolution: {integrity: sha512-yfK+KG3YrmZLyp4+jEtVYRKVA0Hx7uF8KVta0YozgH1wRg5+4hgJG/Sjx7dVQ5DXyPybGp3nkPV7pePwZ8XEKw==}
+  /zhi-siyuan-api@1.29.2:
+    resolution: {integrity: sha512-REvz97sdSUB5/K8oNDe3MZsu9uLd4Q0jHRATzWwNtnXoR8K9Hdw4ZKZ3RAJUyZQ9ns9eW8gm1UE93JKyKLh97w==}
     dependencies:
-      zhi-blog-api: 1.20.1
+      zhi-blog-api: 1.20.2
       zhi-common: 1.11.6
       zhi-lib-base: 0.4.2
     dev: false
diff --git a/src/components/publish/BatchPublishIndex.vue b/src/components/publish/BatchPublishIndex.vue
index 9081deba..c3fe0ab9 100644
--- a/src/components/publish/BatchPublishIndex.vue
+++ b/src/components/publish/BatchPublishIndex.vue
@@ -62,7 +62,7 @@ const formData = reactive({
   isDeleteLoading: false,
 
   showProcessResult: false,
-  doc: {} as Post,
+  siyuanPost: {} as Post,
   errCount: 0,
   successBatchResults: <any[]>[],
   failBatchResults: <any[]>[],
@@ -82,7 +82,7 @@ const handlePublish = async () => {
     formData.failBatchResults = []
     formData.successBatchResults = []
     for (const key of formData.dynList) {
-      const batchResult = await doSinglePublish(key, props.id, formData.doc)
+      const batchResult = await doSinglePublish(key, props.id, formData.siyuanPost)
       if (batchResult.status) {
         formData.successBatchResults.push(batchResult)
       } else {
@@ -173,12 +173,12 @@ const handleRefresh = () => {
 onMounted(async () => {
   logger.info("获取到的ID为=>", props.id)
   // 思源笔记原始文章数据
-  formData.doc = await blogApi.getPost(props.id)
+  formData.siyuanPost = await blogApi.getPost(props.id)
 })
 </script>
 
 <template>
-  <div id="publish-index">
+  <div id="batch-publish-index">
     <el-container>
       <el-main>
         <!-- 提示 -->
@@ -212,7 +212,7 @@ onMounted(async () => {
             <!-- 文章标题 -->
             <div class="form-post-title">
               <el-form-item :label="t('main.title')">
-                <el-input v-model="formData.doc.title" />
+                <el-input v-model="formData.siyuanPost.title" />
               </el-form-item>
             </div>
             <el-divider border-style="dashed" />
diff --git a/src/components/publish/SinglePublishDoPublish.vue b/src/components/publish/SinglePublishDoPublish.vue
index ea70f578..41ef75ec 100644
--- a/src/components/publish/SinglePublishDoPublish.vue
+++ b/src/components/publish/SinglePublishDoPublish.vue
@@ -24,23 +24,157 @@
   -->
 
 <script setup lang="ts">
-import { reactive } from "vue"
+import { onMounted, reactive } from "vue"
 import { useRoute } from "vue-router"
 import BackPage from "~/src/components/common/BackPage.vue"
+import { usePublish } from "~/src/composables/usePublish.ts"
+import { MethodEnum } from "~/src/models/methodEnum.ts"
+import { Post } from "zhi-blog-api"
+import { createAppLogger } from "~/src/utils/appLogger.ts"
+import { useVueI18n } from "~/src/composables/useVueI18n.ts"
+import { pre } from "~/src/utils/import/pre.ts"
+import { DynamicConfig } from "~/src/components/set/publish/platform/dynamicConfig.ts"
+import { useSiyuanApi } from "~/src/composables/useSiyuanApi.ts"
+
+const logger = createAppLogger("single-publish-do-publish")
 
 // uses
+const { t } = useVueI18n()
 const route = useRoute()
+const { doInitPage } = usePublish()
+const { query } = useRoute()
+const { kernelApi, blogApi } = useSiyuanApi()
 
 // datas
+const sysKeys = pre.systemCfg.map((item) => {
+  return item.platformKey
+})
 const params = reactive(route.params)
 const key = params.key as string
 const id = params.id as string
+const method = query.method as MethodEnum
+
+const dynList = sysKeys.concat(key)
+const formData = reactive({
+  isInit: false,
+  isPublishLoading: false,
+  isDeleteLoading: false,
+
+  siyuanPost: {} as Post,
+  platformPost: {} as Post,
+  mergedPost: {} as Post,
+
+  singleFormData: {} as any,
+  actionEnable: true,
+})
+
+const handlePublish = async () => {}
+
+const handleDelete = async () => {}
+
+const getTitle = () => {
+  const dynCfg = formData.singleFormData?.dynCfg as DynamicConfig
+  const cfg = formData.singleFormData?.cfg as any
+  const platformName = dynCfg?.platformName || ""
+  const blogName = cfg?.blogName || ""
+
+  let title = "当前操作的平台为 - "
+  title += platformName ? platformName : key
+  if (blogName) {
+    title += " - " + blogName
+  }
+
+  return title
+}
+
+const showChangeTip = (v1: string, v2: string) => {
+  return `系统标题为 [${v1}] ， 已在远程平台被修改为 [${v2}]`
+}
+
+onMounted(async () => {
+  logger.info("获取到的ID为=>", id)
+  try {
+    formData.singleFormData = await doInitPage(key, id, method)
+
+    formData.siyuanPost = formData.singleFormData.siyuanPost
+    formData.platformPost = formData.singleFormData.platformPost
+    formData.mergedPost = formData.singleFormData.mergedPost
+  } catch (e) {
+    const errMsg = t("main.opt.failure") + "=>" + e
+    logger.error(errMsg)
+    await kernelApi.pushErrMsg({
+      msg: errMsg,
+      timeout: 7000,
+    })
+  }
+
+  formData.isInit = true
+})
 </script>
 
 <template>
-  <back-page :title="'常规发布 - ' + key">
-    <div>single publish do publish {{ id }}</div>
+  <back-page title="常规发布">
+    <el-skeleton class="placeholder" v-if="!formData.isInit" :rows="5" animated />
+    <div v-else id="batch-publish-index">
+      <el-alert class="top-tip" :title="getTitle()" type="info" :closable="false" />
+      <el-container>
+        <el-main>
+          <!-- 表单数据 -->
+          <div class="publish-form">
+            <el-form label-width="100px">
+              <!-- 文章标题 -->
+              <div class="form-post-title">
+                <el-form-item :label="t('main.title')">
+                  <el-input v-model="formData.mergedPost.title" />
+                </el-form-item>
+                <el-alert
+                  v-if="method === MethodEnum.METHOD_EDIT && formData.siyuanPost.title !== formData.platformPost.title"
+                  class="top-tip"
+                  :title="showChangeTip(formData.siyuanPost.title, formData.platformPost.title)"
+                  type="error"
+                  :closable="false"
+                />
+              </div>
+              <el-divider border-style="dashed" />
+
+              <!--
+             ----------------------------------------------------------------------
+             -->
+              <!-- 标签 -->
+              <publish-tags />
+
+              <!-- 发布 -->
+              <el-form-item label-width="100px" class="form-action">
+                <el-button
+                  type="primary"
+                  :loading="formData.isPublishLoading"
+                  @click="handlePublish"
+                  :disabled="!formData.actionEnable"
+                >
+                  {{ t("main.publish") }}
+                </el-button>
+                <el-button
+                  type="danger"
+                  :loading="formData.isDeleteLoading"
+                  @click="handleDelete"
+                  :disabled="!formData.actionEnable"
+                  class="btn-rm-action"
+                >
+                  {{ t("main.cancel") }}
+                </el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-main>
+      </el-container>
+    </div>
   </back-page>
 </template>
 
-<style scoped lang="stylus"></style>
+<style scoped lang="stylus">
+.placeholder
+  margin-top 10px
+.top-tip
+  margin-top 10px
+  padding-left 0
+</style>
diff --git a/src/components/publish/SinglePublishSelectPlatform.vue b/src/components/publish/SinglePublishSelectPlatform.vue
index 5ff54607..8a637796 100644
--- a/src/components/publish/SinglePublishSelectPlatform.vue
+++ b/src/components/publish/SinglePublishSelectPlatform.vue
@@ -57,12 +57,14 @@ const formData = reactive({
 
 // methods
 const handleSingleDoPublish = (key: string) => {
+  const method = checkHasPublished(key) ? "edit" : "add"
   const path = `/publish/singlePublish/doPublish/${key}/${props.id}`
   logger.info("will go to =>", path)
   const query = {
     path: path,
     query: {
       showBack: "true",
+      method: method,
     },
   }
   router.push(query)
diff --git a/src/composables/usePublish.ts b/src/composables/usePublish.ts
index 48f4d354..c5321a7b 100644
--- a/src/composables/usePublish.ts
+++ b/src/composables/usePublish.ts
@@ -35,6 +35,9 @@ import { useVueI18n } from "~/src/composables/useVueI18n.ts"
 import { useSettingStore } from "~/src/stores/useSettingStore.ts"
 import { useSiyuanApi } from "~/src/composables/useSiyuanApi.ts"
 import { pre } from "~/src/utils/import/pre.ts"
+import { MethodEnum } from "~/src/models/methodEnum.ts"
+import { DynamicConfig, DynamicJsonCfg, getDynCfgByKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
+import { DYNAMIC_CONFIG_KEY } from "~/src/utils/constants.ts"
 
 /**
  * 通用发布组件
@@ -45,7 +48,7 @@ const usePublish = () => {
   // uses
   const { t } = useVueI18n()
   const { getSetting, updateSetting } = useSettingStore()
-  const { kernelApi } = useSiyuanApi()
+  const { kernelApi, blogApi } = useSiyuanApi()
 
   // datas
   const singleFormData = reactive({
@@ -55,9 +58,15 @@ const usePublish = () => {
 
     setting: {} as typeof SypConfig,
     cfg: {} as any,
+    dynCfg: {} as DynamicConfig,
+
     isAdd: true,
     postid: "",
     previewUrl: "",
+
+    siyuanPost: {} as Post,
+    platformPost: {} as Post,
+    mergedPost: {} as Post,
   })
 
   const doSinglePublish = async (key: string, id: string, doc: Post) => {
@@ -92,11 +101,8 @@ const usePublish = () => {
       singleFormData.isAdd = StrUtil.isEmptyString(singleFormData.postid)
       if (singleFormData.isAdd) {
         logger.info("文章未发布，准备发布")
-        const post = new Post()
-        post.title = doc.title
-        post.description = doc.description
         // result 正常情况下就是 postid
-        const result = await api.newPost(post)
+        const result = await api.newPost(doc)
 
         // 写入postid到配置
         singleFormData.postid = result
@@ -108,11 +114,8 @@ const usePublish = () => {
         logger.info("new post=>", result)
       } else {
         logger.info("文章已发布，准备更新")
-        const post = new Post()
-        post.title = doc.title
-        post.description = doc.description
-        // result 正常情况下就是 postid
-        const result = await api.editPost(singleFormData.postid, post)
+        // result 正常情况下是 true
+        const result = await api.editPost(singleFormData.postid, doc)
         logger.info("edit post=>", result)
       }
       const previewUrl = await api.getPreviewUrl(singleFormData.postid)
@@ -232,11 +235,67 @@ const usePublish = () => {
     }
   }
 
+  const assignValue = (title1: string, title2: string) => (title1.length > title2.length ? title1 : title2)
+
+  const doInitPage = async (key: string, id: string, method: MethodEnum = MethodEnum.METHOD_ADD) => {
+    // 思源笔记原始文章数据
+    singleFormData.siyuanPost = await blogApi.getPost(id)
+
+    // 加载配置
+    singleFormData.setting = await getSetting()
+    // 平台特定配置
+    singleFormData.cfg = JsonUtil.safeParse<any>(singleFormData.setting[key], {} as any)
+
+    // 平台定义配置
+    const dynJsonCfg = JsonUtil.safeParse<DynamicJsonCfg>(
+      singleFormData.setting[DYNAMIC_CONFIG_KEY],
+      {} as DynamicJsonCfg
+    )
+    const dynamicConfigArray = dynJsonCfg?.totalCfg || []
+    singleFormData.dynCfg = getDynCfgByKey(dynamicConfigArray, key)
+
+    // 检测是否发布
+    const posidKey = singleFormData.cfg.posidKey
+    if (StrUtil.isEmptyString(posidKey)) {
+      throw new Error("配置错误，posidKey不能为空，请检查配置")
+    }
+
+    const postMeta = singleFormData.setting[id] ?? {}
+    const postid = postMeta[posidKey] ?? ""
+
+    // 初始化API
+    const appInstance = new AppInstance()
+    const apiAdaptor = await Adaptors.getAdaptor(key)
+    const api = Utils.blogApi(appInstance, apiAdaptor)
+    logger.info("api=>", api)
+
+    if (method === MethodEnum.METHOD_ADD) {
+      logger.info("Add, using siyuan post")
+      singleFormData.mergedPost = new Post()
+      singleFormData.mergedPost.title = singleFormData.siyuanPost.title
+      singleFormData.mergedPost.description = singleFormData.siyuanPost.description
+    } else {
+      logger.info("Reading post from remote platform")
+      if (StrUtil.isEmptyString(postid)) {
+        throw new Error("未找到postid，将无法进行更新")
+      }
+
+      singleFormData.platformPost = await api.getPost(postid)
+
+      singleFormData.mergedPost = new Post()
+      singleFormData.mergedPost.title = assignValue(singleFormData.siyuanPost.title, singleFormData.platformPost.title)
+      // 正文以思源笔记为准
+      singleFormData.mergedPost.description = singleFormData.siyuanPost.description
+    }
+    return singleFormData
+  }
+
   return {
     singleFormData,
     doSinglePublish,
     doSingleDelete,
     doForceSingleDelete,
+    doInitPage,
   }
 }
 
diff --git a/src/models/methodEnum.ts b/src/models/methodEnum.ts
new file mode 100644
index 00000000..24b05b02
--- /dev/null
+++ b/src/models/methodEnum.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023, Terwer . All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Terwer designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Terwer in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Terwer, Shenzhen, Guangdong, China, youweics@163.com
+ * or visit www.terwer.space if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * 方法定义
+ */
+export enum MethodEnum {
+  /**
+   * 新增
+   */
+  METHOD_ADD = "add",
+
+  /**
+   * 编辑
+   */
+  METHOD_EDIT = "edit",
+}