update

Author: frankie-zeng

package-lock.json

@@ -128,6 +128,7 @@
     "vxe-table": "^4.16.11",
     "winston": "^3.17.0",
     "workerpool": "github:frankie-zeng/workerpool#465f31",
+    "wujie-polyfill": "^1.1.3",
     "wujie-vue3": "^1.0.29",
     "xterm": "^5.3.0"
   },

package.json

@@ -30,8 +30,5 @@ export function emitEvent(name: string, data: any) {
 }
 
 export function getPluginPath(): string {
-  if (isMainThread) {
-    return __dirname
-  }
   return workerData?.pluginPath || ''
 }

src/main/plugin-sdk/index.ts

@@ -54,7 +54,7 @@ dataParseWorker.onmessage = (event) => {
 }
 
 window.serviceDetail = window.electron?.ipcRenderer.sendSync('ipc-service-detail')
-window.electron.ipcRenderer.on('ipc-log', (event, data) => {
+window.electron?.ipcRenderer.on('ipc-log', (event, data) => {
   const groups: { method: string; data: any[] }[] = [] // 存储所有分组，每个元素是 {method, data} 对象
   let currentGroup: { method: string; data: any[] } | null = null
 

src/renderer/src/main.ts

@@ -5,7 +5,7 @@
       :name="editIndex"
       :url="entry"
       :fetch="isDev ? undefined : customFetch"
-      :plugins="isDev ? undefined : plugins"
+      :plugins="plugins"
       :props="{ ...props, modelValue: data }"
       :load-error="loadError"
     ></WujieVue>
@@ -20,6 +20,7 @@ import { usePluginStore } from '@r/stores/plugin'
 import { ElMessageBox } from 'element-plus'
 import { destroyApp } from 'wujie'
 import { cloneDeep } from 'lodash'
+import { InstanceofPlugin } from 'wujie-polyfill'
 const dataStore = useDataStore()
 const props = defineProps<{
   editIndex: string
@@ -70,6 +71,15 @@ const plugins = [
         }
       }
     ],
+    jsLoader: (code) => {
+      // 替换popper.js内计算偏左侧偏移量
+      const codes = code.replace(
+        'left: elementRect.left - parentRect.left',
+        'left: fixed ? elementRect.left : elementRect.left - parentRect.left'
+      )
+      // 替换popper.js内右侧偏移量
+      return codes.replace('popper.right > data.boundaries.right', 'false')
+    },
 
     htmlLoader: (code) => {
       const reHref = /href="\.\/([^"]*)"/g
@@ -80,8 +90,13 @@ const plugins = [
       return code
     },
 
-    cssExcludes: [/element-plus/]
-  }
+    cssExcludes: [/element-plus/],
+    cssBeforeLoaders: [
+      // 强制使子应用body定位是relative
+      { content: 'body{position: relative !important}' }
+    ]
+  },
+  InstanceofPlugin()
 ]
 const customFetch = (url: string, options?: RequestInit) => {
   url = url.replace('file:///', 'local-resource:///' + basePath + '/')