From b49fc3e2e179a165483ea12de83539829e063c58 Mon Sep 17 00:00:00 2001
From: terwer <youweics@163.com>
Date: Fri, 29 Jul 2022 11:29:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:#13=20=E5=8F=91=E5=B8=83=E5=88=B0Vuepress-?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E9=98=B6=E6=AE=B5=E6=A8=A1=E6=8B=9FID?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E5=BE=97=E6=95=B4=E4=B8=AA=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=9B=B4=E5=8A=A0=E9=80=9A=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                     |  5 +-
 src/components/main/VuepressMain.vue |  8 +--
 src/lib/siyuan/siyuanUtil.ts         | 89 ++++++++++++++++++----------
 3 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/.env.development b/.env.development
index 923bad24..b98e6b23 100644
--- a/.env.development
+++ b/.env.development
@@ -3,4 +3,7 @@
 # VITE_LOG_INFO_ENABLED=
 
 # 思源笔记授权token，部分api调用需要
-# VITE_SIYUAN_CONFIG_TOKEN=
\ No newline at end of file
+# VITE_SIYUAN_CONFIG_TOKEN=
+
+# 开发阶段模拟的页面ID，仅限调试使用，生产环境无需此配置
+# VITE_SIYUAN_DEV_PAGE_ID=
\ No newline at end of file
diff --git a/src/components/main/VuepressMain.vue b/src/components/main/VuepressMain.vue
index 6edfe28a..32b9fc9c 100644
--- a/src/components/main/VuepressMain.vue
+++ b/src/components/main/VuepressMain.vue
@@ -107,7 +107,7 @@
 
 <script lang="ts" setup>
 import {onBeforeMount} from "vue";
-import {getSiyuanPage} from "../../lib/siyuan/siyuanUtil";
+import {getPageId} from "../../lib/siyuan/siyuanUtil";
 import log from "../../lib/logUtil"
 
 const isPublished = false
@@ -196,9 +196,9 @@ const publishPage = () => {
 }
 
 onBeforeMount(async () => {
-  const page = await getSiyuanPage()
-  log.logInfo("page=>", page)
-  if(!page){
+  const pageId = await getPageId(true)
+  log.logInfo("VuepressMain pageId=>", pageId)
+  if (!pageId || pageId == "") {
     return
   }
 })
diff --git a/src/lib/siyuan/siyuanUtil.ts b/src/lib/siyuan/siyuanUtil.ts
index 5c7fea7c..d4c1b56a 100644
--- a/src/lib/siyuan/siyuanUtil.ts
+++ b/src/lib/siyuan/siyuanUtil.ts
@@ -5,10 +5,13 @@
 import {getJSONConf, setJSONConf} from "../config";
 import {getBlockByID} from "./siYuanApi.js";
 import log from "../logUtil";
+import {getEnv} from "../envUtil";
 
-export async function getWidgetId() {
+async function getWidgetId() {
     // @ts-ignore
-    if (!window.frameElement) {
+    if (!window.frameElement
+        || !window.frameElement.parentElement
+        || !window.frameElement.parentElement.parentElement) {
         log.logWarn("正在已非挂件模式运行，部分功能将不可用，请知悉")
         return {
             isInSiyuan: false,
@@ -16,15 +19,7 @@ export async function getWidgetId() {
         }
     }
 
-    if (!window.frameElement.parentElement) {
-        log.logWarn("正在已非挂件模式运行，部分功能将不可用，请知悉")
-        return {
-            isInSiyuan: false,
-            widgetId: ""
-        }
-    }
-
-    const self = window.frameElement.parentElement.parentElement;
+    let self = window.frameElement.parentElement.parentElement;
     if (!self) {
         log.logWarn("正在已非挂件模式运行，部分功能将不可用，请知悉")
         return {
@@ -49,30 +44,12 @@ export async function getWidgetId() {
     }
 }
 
-/**
- * 获取本地缓存的思源笔记页面ID
- * @param force
- * true 强制调用查询不获取缓存
- * false 优先读取本地缓存，缓存不存在再去查询
- * @returns {Promise<*|string>}
- */
-export async function getSiyuanPageId(force: boolean) {
-    const page = await getSiyuanPage(force);
-    if (!page) {
-        return
-    }
-
-    const pageId = page.root_id || ""
-    log.logInfo("获取思源笔记页面ID=>", pageId)
-    return pageId
-}
-
 /**
  * 获取本地缓存的思源笔记页面信息（不是实时的）
  * @param force true代表强制调用查询不获取缓存
  * @returns {Promise<any>}
  */
-export async function getSiyuanPage(force?: boolean) {
+async function getWidgetPage(force?: boolean) {
     const widgetResult = await getWidgetId()
     if (!widgetResult.isInSiyuan) {
         return
@@ -94,4 +71,56 @@ export async function getSiyuanPage(force?: boolean) {
         log.logInfo("调用API设置查询思源页面信息并更新本地缓存", page)
     }
     return page;
+}
+
+/**
+ * 获取本地缓存的思源笔记页面ID
+ * @param force
+ * true 强制调用查询不获取缓存
+ * false 优先读取本地缓存，缓存不存在再去查询
+ * @returns {Promise<*|string>}
+ */
+async function getSiyuanPageId(force?: boolean) {
+    const page = await getWidgetPage(force);
+    if (!page) {
+        return
+    }
+
+    const pageId = page.root_id
+    log.logInfo("获取思源笔记页面ID=>", pageId)
+    return pageId
+}
+
+/**
+ * 获取页面ID，如果不是挂件模式，可以自己提供一个页面ID
+ * @param force 是否强制刷新
+ * @param pageId 页面ID，可选的（挂件模式无需传递，开发阶段或者非挂件模式可以传递ID模拟运行）
+ */
+export async function getPageId(force?: boolean, pageId?: string) {
+    // 默认尝试读取挂件的ID
+    let syPageId = await getSiyuanPageId(force)
+    // log.logWarn("syPageId=>", syPageId)
+    if (!syPageId) {
+        //如果其他地方想使用，也可以显式的传入一个页面ID
+        // log.logWarn("pageId=>", pageId)
+        if (pageId) {
+            syPageId = pageId
+        }
+        //  开发模式模拟传递一个ID
+        if (!pageId && import.meta.env.DEV) {
+            // log.logWarn("env=>", getEnv("VITE_SIYUAN_DEV_PAGE_ID"))
+            syPageId = getEnv("VITE_SIYUAN_DEV_PAGE_ID")
+        }
+    }
+
+    log.logWarn("当前页面ID是=>", syPageId)
+    return syPageId;
+}
+
+/**
+ * 获取页面
+ * @param pageId 页面ID
+ */
+export async function getPage(pageId: string) {
+    return await getBlockByID(pageId)
 }
\ No newline at end of file