From c56514b063110c7bc43f5838430af6f79d6646ca Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 28 May 2024 20:33:51 +0800
Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20xpack=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=88=86=E7=A6=BB=E9=83=A8=E7=BD=B2=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/home/RestIndexController.java | 11 ++++
 core/core-frontend/src/api/plugin.ts          |  4 ++
 .../src/components/plugin/src/index.vue       | 66 ++++++++++---------
 .../core-frontend/src/config/axios/service.ts |  2 +
 de-xpack                                      |  2 +-
 .../io/dataease/utils/WhitelistUtils.java     |  1 +
 6 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/home/RestIndexController.java b/core/core-backend/src/main/java/io/dataease/home/RestIndexController.java
index bebb41227d..ce541e1d53 100644
--- a/core/core-backend/src/main/java/io/dataease/home/RestIndexController.java
+++ b/core/core-backend/src/main/java/io/dataease/home/RestIndexController.java
@@ -2,6 +2,7 @@ package io.dataease.home;
 
 import io.dataease.utils.ModelUtils;
 import io.dataease.utils.RsaUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -11,6 +12,9 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping
 public class RestIndexController {
 
+    @Value("${dataease.xpack-front-distributed:false}")
+    private boolean xpackFrontDistributed;
+
     @GetMapping("/dekey")
     @ResponseBody
     public String dekey() {
@@ -23,4 +27,11 @@ public class RestIndexController {
         return ModelUtils.isDesktop();
     }
 
+
+    @GetMapping("/xpackModel")
+    @ResponseBody
+    public boolean xpackModel() {
+        return xpackFrontDistributed;
+    }
+
 }
diff --git a/core/core-frontend/src/api/plugin.ts b/core/core-frontend/src/api/plugin.ts
index 5eef5c9ca1..b708650759 100644
--- a/core/core-frontend/src/api/plugin.ts
+++ b/core/core-frontend/src/api/plugin.ts
@@ -1,3 +1,7 @@
 import request from '@/config/axios'
 
 export const load = (key: string) => request.get({ url: `/xpackComponent/content/${key}` })
+
+export const loadDistributed = () => request.get({ url: '/DEXPack.umd.js' })
+
+export const xpackModelApi = () => request.get({ url: '/xpackModel' })
diff --git a/core/core-frontend/src/components/plugin/src/index.vue b/core/core-frontend/src/components/plugin/src/index.vue
index e2825f2eeb..6197cca108 100644
--- a/core/core-frontend/src/components/plugin/src/index.vue
+++ b/core/core-frontend/src/components/plugin/src/index.vue
@@ -1,10 +1,9 @@
 <script lang="ts" setup>
 import noLic from './nolic.vue'
-import { ref, useAttrs, nextTick, shallowRef, computed, reactive, watch, onMounted } from 'vue'
+import { ref, useAttrs, onMounted } from 'vue'
 import { execute, randomKey, formatArray } from './convert'
-import { load } from '@/api/plugin'
+import { load, loadDistributed, xpackModelApi } from '@/api/plugin'
 import { useCache } from '@/hooks/web/useCache'
-import { useI18n } from '@/hooks/web/useI18n'
 import { i18n } from '@/plugins/vue-i18n'
 import * as Vue from 'vue'
 import axios from 'axios'
@@ -13,32 +12,6 @@ import * as vueI18n from 'vue-i18n'
 import * as vueRouter from 'vue-router'
 import { useEmitt } from '@/hooks/web/useEmitt'
 
-const target = ref()
-
-onMounted(() => {
-  window.Vue = Vue
-  window.Axios = axios
-  window.Pinia = Pinia
-  window.vueI18n = vueI18n
-  window.vueRouter = vueRouter
-  window.MittAll = useEmitt().emitter.all
-  window.I18n = i18n
-  const xhr = new XMLHttpRequest()
-  xhr.onreadystatechange = () => {
-    if (xhr.readyState !== xhr.DONE) return
-    async function getDEXPack() {
-      const xpack = await window.DEXPack.mapping[attrs.jsname]
-      target.value = xpack.default
-    }
-
-    nextTick(() => {
-      getDEXPack()
-    })
-  }
-  xhr.open('get', 'http://192.168.31.47:8000/DEXPack.umd.js')
-  xhr.send()
-})
-
 const { wsCache } = useCache()
 
 const plugin = ref()
@@ -107,11 +80,44 @@ const storeCacheProxy = byteArray => {
   })
   wsCache.set(`de-plugin-proxy`, JSON.stringify(result))
 }
-loadComponent()
 const pluginProxy = ref(null)
 const invokeMethod = param => {
   pluginProxy.value['invokeMethod'](param)
 }
+
+onMounted(async () => {
+  const key = 'xpack-model-distributed'
+  let distributed = false
+  if (wsCache.get(key) === null) {
+    const res = await xpackModelApi()
+    wsCache.set('xpack-model-distributed', res.data)
+    distributed = res.data
+  } else {
+    distributed = wsCache.get(key)
+  }
+  if (distributed) {
+    window['Vue'] = Vue
+    window['Axios'] = axios
+    window['Pinia'] = Pinia
+    window['vueI18n'] = vueI18n
+    window['vueRouter'] = vueRouter
+    window['MittAll'] = useEmitt().emitter.all
+    window['i18n'] = i18n
+    if (window['DEXPack']) {
+      const xpack = await window['DEXPack'].mapping[attrs.jsname]
+      plugin.value = xpack.default
+    } else {
+      loadDistributed().then(async res => {
+        new Function(res.data)()
+        const xpack = await window['DEXPack'].mapping[attrs.jsname]
+        plugin.value = xpack.default
+      })
+    }
+  } else {
+    loadComponent()
+  }
+})
+
 const emits = defineEmits(['loadFail'])
 defineExpose({
   invokeMethod
diff --git a/core/core-frontend/src/config/axios/service.ts b/core/core-frontend/src/config/axios/service.ts
index fc68c6859a..cced05ba8a 100644
--- a/core/core-frontend/src/config/axios/service.ts
+++ b/core/core-frontend/src/config/axios/service.ts
@@ -171,6 +171,8 @@ service.interceptors.response.use(
     } else if (response.config.url.match(/^\/map|geo\/\d{3}\/\d+\.json$/)) {
       //   TODO 处理静态文件
       return response
+    } else if (response.config.url.includes('DEXPack.umd.js')) {
+      return response
     } else {
       if (
         !response?.config?.url.startsWith('/xpackComponent/content') &&
diff --git a/de-xpack b/de-xpack
index 53ef3a55d9..e025afe5eb 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 53ef3a55d9ce36f3227a9851915250e55a32476d
+Subproject commit e025afe5ebce6c2987c6b24b4e48c6a8d583fec6
diff --git a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java
index 528465834d..242f99f81d 100644
--- a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java
+++ b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java
@@ -26,6 +26,7 @@ public class WhitelistUtils {
             "/dekey",
             "/index.html",
             "/model",
+            "/xpackModel",
             "/swagger-resources",
             "/doc.html",
             "/panel.html",