fix: 修复未打开浮窗时可能出现的报错问题

terwer · Jun 21, 2023 · f379a9d · f379a9d
1 parent b42f2f3
commit f379a9d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -9,7 +9,7 @@ const generateDynamicV = () => {
 }
 
 const isDev = process.env.NODE_ENV === "development"
-const appBase = "/"
+const appBase = "/plugins/siyuan-blog/"
 const staticV = generateDynamicV()
 
 // https://nuxt.com/docs/api/configuration/nuxt-config
@@ -24,7 +24,14 @@ export default defineNuxtConfig({
   },
 
   // build modules
-  modules: ["@vueuse/nuxt", "@nuxtjs/i18n", "@element-plus/nuxt", "@nuxtjs/color-mode", "@pinia/nuxt", "@nuxt/image"],
+  modules: [
+    "@vueuse/nuxt",
+    "@nuxtjs/i18n-edge",
+    "@element-plus/nuxt",
+    "@nuxtjs/color-mode",
+    "@pinia/nuxt",
+    "@nuxt/image",
+  ],
 
   // vueuse
   vueuse: {
@@ -47,7 +54,7 @@ export default defineNuxtConfig({
     define: {
       "process.env.DEV_MODE": `"${isDev}"`,
       "process.env.APP_BASE": `"${appBase}"`,
-      "process.env.SSR": `"true"`,
+      "process.env.SSR": `"false"`,
     },
     plugins: [],
   },
@@ -58,6 +65,14 @@ export default defineNuxtConfig({
     themes: ["dark"],
   },
 
+  // https://nuxt.com/docs/guide/going-further/custom-routing#hash-mode-spa
+  ssr: false,
+  router: {
+    options: {
+      hashMode: true,
+    },
+  },
+
   css: ["~/assets/siyuan/style.styl", "~/assets/siyuan/index.styl"],
 
   app: {
@@ -94,11 +109,15 @@ export default defineNuxtConfig({
 
   // 环境变量
   runtimeConfig: {
-    siyuanAuthToken: process.env.NUXT_SIYUAN_AUTH_TOKEN,
+    // siyuanAuthToken: process.env.NUXT_SIYUAN_AUTH_TOKEN,
+    siyuanAuthToken: "",
     public: {
-      defaultType: process.env.NUXT_PUBLIC_DEFAULT_TYPE ?? "siyuan",
-      siyuanApiUrl: process.env.NUXT_PUBLIC_SIYUAN_API_URL ?? "http://127.0.0.1:6806",
-      waitTime: process.env.NUXT_PUBLIC_WAIT_TIME,
+      // defaultType: process.env.NUXT_PUBLIC_DEFAULT_TYPE,
+      defaultType: "siyuan",
+      // siyuanApiUrl: process.env.NUXT_PUBLIC_SIYUAN_API_URL,
+      siyuanApiUrl: "",
+      // waitTime: process.env.NUXT_PUBLIC_WAIT_TIME,
+      waitTime: "0",
     },
   },
 })
diff --git a/pages/share.vue b/pages/share.vue
@@ -6,9 +6,10 @@ import { useShareOptionToggle } from "~/composables/useShareOptionToggle"
 import copy from "copy-to-clipboard"
 import { useSiyuanApi } from "~/composables/api/useSiyuanApi"
 import { PostStatusEnum } from "zhi-blog-api"
-import { DateUtil, JsonUtil, StrUtil } from "zhi-common"
+import { JsonUtil } from "zhi-common"
 import { useMethodAsync } from "~/composables/useMethodAsync"
 import { useMethod } from "~/composables/useMethod"
+import { sendMessageToParent } from "~/utils/innerIframeEvent"
 
 const logger = createAppLogger("share-page")
 const { t } = useI18n()
@@ -56,7 +57,7 @@ const { optionState, optionToggle } = useShareOptionToggle(formData.optionEnable
 // }
 
 const goHelp = async () => {
-  window.open("https://blog.terwer.space/docs")
+  window.open("https://blog.terwer.space/s/20230621001422-xsimx5v")
 }
 
 const copyWebLink = () => {

diff --git a/siyuan/iframeEvent.ts b/siyuan/iframeEvent.ts
@@ -74,6 +74,10 @@ export const registerIframeEvent = (pluginInstance: SiyuanBlog) => {
   // 监听 message 事件
   window.addEventListener("message", (event) => {
     const iframe = document.getElementById(popContentIframeId) as HTMLIFrameElement
+    if (!iframe) {
+      logger.debug(`popContent not show, ignore`)
+      return
+    }
 
     // 判断是否是来自指定 iframe 的消息
     if (event.source === iframe.contentWindow) {