fix: 修复 AI 标签无法打开的问题

terwer · Oct 27, 2023 · 9689c55 · 9689c55
1 parent f3dc8f9
commit 9689c55
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/esbuild.config.cjs b/esbuild.config.cjs
@@ -39,7 +39,10 @@ if (isWatch || isServe) {
   baseDir = "/Users/zhangyue/Documents/terwer/SiyuanWorkspace/test/data/plugins/siyuan-plugin-publisher"
   // baseDir = "/Users/terwer/Documents/mydocs/SiYuanWorkspace/public/data/plugins/siyuan-plugin-publisher"
   if (isWindows) {
-    baseDir = "C:\\Users\\terwer\\Documents\\mydocs\\SiyuanWorkspace\\test\\data\\plugins\\siyuan-plugin-publisher"
+    // Home
+    // baseDir = "C:\\Users\\terwer\\Documents\\mydocs\\SiyuanWorkspace\\test\\data\\plugins\\siyuan-plugin-publisher"
+    // Bootcamp
+    baseDir = "C:\\Users\\Terwer\\Documents\\mydocs\\SiyuanWorkspace\\test\\data\\plugins\\siyuan-plugin-publisher"
   }
 } else {
   baseDir = "./"

diff --git a/siyuan/invoke/widgetInvoke.ts b/siyuan/invoke/widgetInvoke.ts
@@ -137,27 +137,24 @@ export class WidgetInvoke {
     }
   }
 
-  private showTab(pageUrl: string, noscroll?: boolean) {
+  private async showTab(pageUrl: string, noscroll?: boolean) {
     // 自定义tab
     this.pluginInstance.tabInstance = openTab({
       app: this.pluginInstance.app,
       custom: {
         id: "publisher-ai-tab",
         icon: "iconAccount",
         title: this.pluginInstance.i18n.aiChatTab,
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-expect-error
         fn: this.pluginInstance.customTabObject,
       },
     })
+    if (this.pluginInstance.tabInstance instanceof Promise) {
+      this.pluginInstance.tabInstance = await this.pluginInstance.tabInstance
+    }
     const url = `/plugins/siyuan-plugin-publisher/#${pageUrl}`
     this.logger.info("will show webview page =>", url)
-    // 有高度问题，参考下面的
-    // this.pluginInstance.tabInstance.panelElement.innerHTML = `
-    //   <div class="plugin-publisher__custom-tab">
-    //       <style>iframe { width: 100%; border: none; }</style>
-    //       <iframe src="${url}" width="100%" scrolling="${noscroll ? "no" : "yes"}">
-    //       </iframe>
-    //   </div>`
 
     // 参考 https://github.com/zuoez02/siyuan-plugin-webview-flomo/blob/main/index.js#L380C20-L382C29
     this.pluginInstance.tabInstance.panelElement.innerHTML = `

diff --git a/vite.config.ts b/vite.config.ts
@@ -66,8 +66,10 @@ const isWindows = process.platform === "win32"
 let devDistDir = "/Users/zhangyue/Documents/terwer/SiyuanWorkspace/test/data/plugins/siyuan-plugin-publisher"
 // let devDistDir = "/Users/terwer/Documents/mydocs/SiYuanWorkspace/public/data/plugins/siyuan-plugin-publisher"
 if (isWindows) {
-  devDistDir = "C:\\Users\\terwer\\Documents\\mydocs\\SiyuanWorkspace\\test\\data\\plugins\\siyuan-plugin-publisher"
-  // devDistDir = "C:\\Users\\terwer\\Documents\\mydocs\\SiyuanWorkspace\\public\plugins\siyuan-plugin-publisher"
+  // Home
+  // devDistDir = "C:\\Users\\terwer\\Documents\\mydocs\\SiyuanWorkspace\\test\\data\\plugins\\siyuan-plugin-publisher"
+  // Bootcamp
+  devDistDir = "C:\\Users\\Terwer\\Documents\\mydocs\\SiyuanWorkspace\\test\\data\\plugins\\\\siyuan-plugin-publisher"
 }
 const isSiyuanBuild = process.env.BUILD_TYPE === "siyuan"
 const isWidgetBuild = process.env.BUILD_TYPE === "widget"
@@ -176,7 +178,7 @@ export default defineConfig({
         // can also be 'build', 'dev', or false
         Buffer: true,
         global: true,
-        process: true
+        process: true,
       },
       protocolImports: true,
     }),