From bebb152ff6af67ddfa0254d3498b73bd0d28479a Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Thu, 27 Nov 2025 15:18:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/plugin/src/index.vue       | 113 +++++++++---------
 de-xpack                                      |   2 +-
 2 files changed, 55 insertions(+), 60 deletions(-)

diff --git a/core/core-frontend/src/components/plugin/src/index.vue b/core/core-frontend/src/components/plugin/src/index.vue
index 3cb9ed839e..652e7dd5b4 100644
--- a/core/core-frontend/src/components/plugin/src/index.vue
+++ b/core/core-frontend/src/components/plugin/src/index.vue
@@ -41,7 +41,7 @@ const importProxy = (bytesArray: any[]) => {
     `../../../../../../${formatArray(bytesArray[6])}/${formatArray(bytesArray[7])}/${formatArray(
       bytesArray[8]
     )}/${formatArray(bytesArray[9])}/${formatArray(bytesArray[10])}.vue`
-  )
+    )
   promise
     .then((res: any) => {
       plugin.value = res.default
@@ -65,7 +65,6 @@ useEmitt({
 })
 
 const loadComponent = () => {
-  console.log('load-component...1')
   loading.value = true
   const byteArray = wsCache.get(`de-plugin-proxy`)
   if (byteArray) {
@@ -98,65 +97,61 @@ const storeCacheProxy = byteArray => {
 }
 const pluginProxy = ref(null)
 const invokeMethod = param => {
-  if (pluginProxy.value && pluginProxy.value['invokeMethod']) {
-    pluginProxy.value['invokeMethod'](param)
-  } else if (param.methodName && pluginProxy.value[param.methodName]) {
-    pluginProxy.value[param.methodName](param.args)
-  }
-}
-const emits = defineEmits(['loadFail'])
-defineExpose({
-  invokeMethod
-})
-onMounted(async () => {
-  console.log('plugin index onmounted...')
-  const key = 'xpack-model-distributed'
-  let distributed = false
-  if (wsCache.get(key) === null) {
-    const res = await xpackModelApi()
-    const resData = isNull(res.data) ? 'null' : res.data
-    wsCache.set('xpack-model-distributed', resData)
-    distributed = res.data
-  } else {
-    distributed = wsCache.get(key)
-  }
-  if (isNull(distributed)) {
-    setTimeout(() => {
-      emits('loadFail')
-      loading.value = false
-    }, 1000)
-    return
-  }
-  if (distributed) {
-    if (window['DEXPack']) {
-      const xpack = await window['DEXPack'].mapping[attrs.jsname]
-      console.log('dexpack...', attrs.jsname)
-      if (!xpack) {
-        loadComponent()
-        return
-      }
-      plugin.value = xpack.default
-    } else if (!window._de_xpack_not_loaded) {
-      window._de_xpack_not_loaded = true
-      window['VueDe'] = Vue
-      window['AxiosDe'] = axios
-      window['PiniaDe'] = Pinia
-      window['vueRouterDe'] = router
-      window['MittAllDe'] = useEmitt().emitter.all
-      window['I18nDe'] = i18n
-      window['EchartsDE'] = echarts
-      if (!window.tinymce) {
-        window.tinymce = tinymce
-      }
-      loadDistributed()?.then(async res => {
-        new Function(res.data)()
-        useEmitt().emitter.emit('load-xpack')
-      })
+  if (pluginProxy.value['invokeMethod']) {
+    if (pluginProxy.value && pluginProxy.value['invokeMethod']) {
+      pluginProxy.value['invokeMethod'](param)
+    } else if (param.methodName && pluginProxy.value[param.methodName]) {
+      pluginProxy.value[param.methodName](param.args)
     }
-  } else {
-    loadComponent()
   }
-})
+  const emits = defineEmits(['loadFail'])
+  defineExpose({
+    invokeMethod
+  })
+  onMounted(async () => {
+    const key = 'xpack-model-distributed'
+    let distributed = false
+    if (wsCache.get(key) === null) {
+      const res = await xpackModelApi()
+      const resData = isNull(res.data) ? 'null' : res.data
+      wsCache.set('xpack-model-distributed', resData)
+      distributed = res.data
+    } else {
+      distributed = wsCache.get(key)
+    }
+    if (isNull(distributed)) {
+      setTimeout(() => {
+        emits('loadFail')
+        loading.value = false
+      }, 1000)
+      return
+    }
+    if (distributed) {
+      if (window['DEXPack']) {
+        const xpack = await window['DEXPack'].mapping[attrs.jsname]
+        plugin.value = xpack.default
+      } else if (!window._de_xpack_not_loaded) {
+        window._de_xpack_not_loaded = true
+        window['VueDe'] = Vue
+        window['AxiosDe'] = axios
+        window['PiniaDe'] = Pinia
+        window['vueRouterDe'] = router
+        window['MittAllDe'] = useEmitt().emitter.all
+        window['I18nDe'] = i18n
+        window['EchartsDE'] = echarts
+        if (!window.tinymce) {
+          window.tinymce = tinymce
+        }
+        debugger
+        loadDistributed().then(async res => {
+          new Function(res.data)()
+          useEmitt().emitter.emit('load-xpack')
+        })
+      }
+    } else {
+      loadComponent()
+    }
+  })
 </script>
 
 <template>
diff --git a/de-xpack b/de-xpack
index e0132981a1..b092832c19 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit e0132981a18e2efb717c33f7fe4caa29f0010ed3
+Subproject commit b092832c19643c5b72c59b23ea56e06a88726db7