Merge pull request #10147 from dataease/dev-v2

merge fix

core/core-frontend/src/components/plugin/src/index.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import noLic from './nolic.vue'
-import { ref, useAttrs, onMounted, watch } from 'vue'
+import { ref, useAttrs, onMounted } from 'vue'
 import { execute, randomKey, formatArray } from './convert'
 import { load, loadDistributed, xpackModelApi } from '@/api/plugin'
 import { useCache } from '@/hooks/web/useCache'
@@ -81,7 +81,11 @@ const storeCacheProxy = byteArray => {
 }
 const pluginProxy = ref(null)
 const invokeMethod = param => {
-  pluginProxy.value['invokeMethod'](param)
+  if (pluginProxy.value['invokeMethod']) {
+    pluginProxy.value['invokeMethod'](param)
+  } else {
+    pluginProxy.value[param.methodName](param.args)
+  }
 }
 
 onMounted(async () => {

core/core-frontend/src/views/login/index.vue

@@ -117,8 +117,12 @@ const handleLogin = () => {
           if (!xpackLoadFail.value && xpackInvalidPwd.value?.invokeMethod) {
             const param = {
               methodName: 'init',
-              args: () => {
-                duringLogin.value = false
+              args: r => {
+                duringLogin.value = !!r
+                if (r) {
+                  const queryRedirectPath = getCurLocation()
+                  router.push({ path: queryRedirectPath })
+                }
               }
             }
             xpackInvalidPwd?.value.invokeMethod(param)

de-xpack

@@ -1 +1 @@
-Subproject commit e55d5ef12d98a142487a29b62343332f4884a3a2
+Subproject commit a12eea394d8d5edf2941988819b08676e512a11e