From c8d1e1ed1d5c8d20a9aad8554d51001afb3c6312 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 20 十一月 2024 15:28:27 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TextbookReader
---
src/main.ts | 87 ++++++++++++++++++++++++++++++++-----------
1 files changed, 65 insertions(+), 22 deletions(-)
diff --git a/src/main.ts b/src/main.ts
index 95c79c2..78dfb1f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,39 +8,82 @@
import router from './router'
import * as ElementPlusIconsVue from '@element-plus/icons-vue'
import toolClass from '@/assets/js/toolClass'
-import request from "@/plugin/axios/index.ts"
-import "./child.ts"
+import MG from '@/assets/js/middleGround/WebMiddleGroundApi.js'
+import './child.ts'
+import { loginCtx } from '@/assets/js/config.ts'
+
+// 鍏紡杈撳叆
+import { MathfieldElement } from "mathlive"
+// 鍏紡瑙ｆ瀽
+import VueLatex from 'vatex'
const handleGetToken = () => {
- return localStorage.getItem("token");
+ return localStorage.getItem('token')
}
// 璺敱鎵ц涔嬪墠鐨勪竴浜涙搷浣�
router.beforeEach((to, from, next) => {
- // 濡傛灉鏈塼oken
- if (handleGetToken()) {
- // 鏄惁鏄櫥褰曢〉闈紝鐩存帴鍒伴椤�
- if (to.path === "/login") {
- next({ path: "/transmission" });
- } else {
- // 濡傛灉涓嶆槸鐧诲綍椤甸潰锛岃烦杞埌鐩爣鐨勯〉闈�
- next();
- }
+ const isInternalLink = from.fullPath.includes('/testBookReader')
+ if (isInternalLink) {
+ sessionStorage.removeItem('loginCtx')
} else {
- // 娌℃湁token
- if (!to.meta || !to.meta.auth) {
- // 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
- next();
- } else {
- next(`/login?redirect=${to.fullPath}`); // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
- }
+ sessionStorage.setItem('loginCtx', loginCtx)
}
-});
+
+ next()
+ // if (handleGetToken()) {
+ // // 鏄惁鏄櫥褰曢〉闈紝鐩存帴鍒伴椤�
+ // if (to.path === '/login') {
+ // next({ path: '/home', query: { bookId: localStorage.getItem('bookId') } })
+ // } else {
+ // // 濡傛灉涓嶆槸鐧诲綍椤甸潰锛岃烦杞埌鐩爣鐨勯〉闈�
+ // next()
+ // }
+ // } else {
+ // // 娌℃湁token
+ // if (!to.meta || !to.meta.auth) {
+ // // 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
+ // next()
+ // } else {
+ // next(`/login?redirect=${to.fullPath}`) // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
+ // }
+ // }
+})
+
+// qiankun涓诲簲鐢ㄤ笌寰簲鐢ㄩ�氳
+// import { initGlobalState, type MicroAppStateActions } from 'qiankun'
+// import state from './qiankunState/state'
+
+// state.bb = (data) => {
+// console.log(data);
+// }
+
+// 鍒濆鍖� state
+// const actions: any = initGlobalState(state)
+
+// 鐩戝惉state鍙樺寲
+// actions.onGlobalStateChange((state: any, prev: any) => {
+// // state: 鍙樻洿鍚庣殑鐘舵��; prev 鍙樻洿鍓嶇殑鐘舵��
+// console.log("鐖跺眰change锛�",state, prev)
+// })
+// 璁剧疆state鐨勫��
+// actions.setGlobalState(state)
+
+// console.log(actions,"actions");
+
+// app.provide('qiankunActions', actions)
+// window.qiankunActions = actions
+
+// 绉婚櫎褰撳墠搴旂敤鐨勭姸鎬佺洃鍚紝寰簲鐢� umount 鏃朵細榛樿璋冪敤
+// actions.offGlobalStateChange()
const app = createApp(App)
+
+
app.provide('toolClass', toolClass)
-app.provide('request', request)
+app.provide('MG', MG)
+app.use(VueLatex)
app.use(router)
app.use(ElementPlus)
app.use(pinia)
@@ -48,4 +91,4 @@
app.component(key, component)
}
-app.mount('#app')
+app.mount('#parentApp')
--
Gitblit v1.9.1