diff --git a/.env b/.env index ada25fe7..f0819725 100644 --- a/.env +++ b/.env @@ -2,7 +2,9 @@ VITE_DEV_PORT = '8080' # development path -VITE_DEV_PATH = 'https://demo.mtruning.club' +# VITE_DEV_PATH = 'https://demo.mtruning.club' +VITE_DEV_PATH = 'http://192.168.0.120:3001' # production path -VITE_PRO_PATH = 'https://demo.mtruning.club' \ No newline at end of file +# VITE_PRO_PATH = 'https://demo.mtruning.club' +VITE_PRO_PATH = 'http://192.168.0.120:3001' diff --git a/README.md b/README.md index c664b7c0..e17d8898 100644 --- a/README.md +++ b/README.md @@ -37,61 +37,61 @@ import axiosInstance from './axios' import { RequestHttpEnum, ContentTypeEnum } from '@/enums/httpEnum' export const get = (url: string, params?: object) => { - return axiosInstance({ - url: url, - method: RequestHttpEnum.GET, - params: params, - }) + return axiosInstance({ + url: url, + method: RequestHttpEnum.GET, + params: params, + }) } export const post = (url: string, data?: object, headersType?: string) => { - return axiosInstance({ - url: url, - method: RequestHttpEnum.POST, - data: data, - headers: { - 'Content-Type': headersType || ContentTypeEnum.JSON - } - }) + return axiosInstance({ + url: url, + method: RequestHttpEnum.POST, + data: data, + headers: { + 'Content-Type': headersType || ContentTypeEnum.JSON + } + }) } export const put = (url: string, data?: object, headersType?: string) => { - return axiosInstance({ - url: url, - method: RequestHttpEnum.PUT, - data: data, - headers: { - 'Content-Type': headersType || ContentTypeEnum.JSON - } - }) + return axiosInstance({ + url: url, + method: RequestHttpEnum.PUT, + data: data, + headers: { + 'Content-Type': headersType || ContentTypeEnum.JSON + } + }) } export const del = (url: string, params?: object) => { - return axiosInstance({ - url: url, - method: RequestHttpEnum.DELETE, - params - }) + return axiosInstance({ + url: url, + method: RequestHttpEnum.DELETE, + params + }) } // 获取请求函数，默认get export const http = (type?: RequestHttpEnum) => { - switch (type) { - case RequestHttpEnum.GET: - return get + switch (type) { + case RequestHttpEnum.GET: + return get - case RequestHttpEnum.POST: - return post + case RequestHttpEnum.POST: + return post - case RequestHttpEnum.PUT: - return put + case RequestHttpEnum.PUT: + return put - case RequestHttpEnum.DELETE: - return del + case RequestHttpEnum.DELETE: + return del - default: - return get - } + default: + return get + } } ``` @@ -109,11 +109,3 @@ export const http = (type?: RequestHttpEnum) => { * build: 影响项目构建或依赖修改 * style: 不影响程序逻辑的代码修改 * chore: 不属于以上类型的其他类型(日常事务) - -## 交流 - -QQ 群：1030129384 - -![QQ群](readme/go-view-qq.png) - -![渲染海报](readme/logo-poster.png) diff --git a/src/layout/components/LayoutHeaderPro/index.vue b/src/layout/components/LayoutHeaderPro/index.vue index f89ca7b6..c69c729a 100644 --- a/src/layout/components/LayoutHeaderPro/index.vue +++ b/src/layout/components/LayoutHeaderPro/index.vue @@ -10,7 +10,7 @@ diff --git a/src/router/index.ts b/src/router/index.ts index c8977dda..8b633e99 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -28,7 +28,7 @@ const RootRoute: Array = [ ] -export const constantRouter: any[] = [LoginRoute, ...RootRoute, ReloadRoute]; +export const constantRouter: any[] = [...RootRoute, ReloadRoute]; const router = createRouter({ history: createWebHashHistory(''), diff --git a/src/router/router-guards.ts b/src/router/router-guards.ts index 5c81c514..9dd54ad1 100644 --- a/src/router/router-guards.ts +++ b/src/router/router-guards.ts @@ -28,9 +28,9 @@ export function createRouterGuards(router: Router) { } // @ts-ignore - if (!routerAllowList.includes(to.name) && !loginCheck()) { - next({ name: PageEnum.BASE_LOGIN_NAME }) - } + // if (!routerAllowList.includes(to.name) && !loginCheck()) { + // next({ name: PageEnum.BASE_LOGIN_NAME }) + // } next() }) @@ -44,4 +44,4 @@ export function createRouterGuards(router: Router) { router.onError((error) => { console.log(error, '路由错误'); }); -} \ No newline at end of file +} diff --git a/src/utils/router.ts b/src/utils/router.ts index 006b2f76..53ab7fc2 100644 --- a/src/utils/router.ts +++ b/src/utils/router.ts @@ -59,15 +59,30 @@ export const fetchPathByName = (pageName: string, p?: string) => { * @param windowOpen */ export const routerTurnByPath = ( - path: string, - query?: Array, - isReplace?: boolean, - windowOpen?: boolean + path: string, + query?: Array, + isReplace?: boolean, + windowOpen?: boolean, + isCallByParent?: boolean ) => { let fullPath = '' if (query?.length) { fullPath = `${path}/${query.join('/')}` } + if (isCallByParent) { + // 获取父页面的 window 对象 + var parentWindow = window.parent; + const message = { + // 属于哪个页面 + page: 'customLargeScreen', + // 属于什么类型 + type: 'changeRouter', + url: fullPath, + openNew: windowOpen ? 1 : 0 + } + parentWindow.postMessage(JSON.stringify(message), '*'); + return + } if (windowOpen) { return openNewWindow(fullPath) } @@ -204,11 +219,11 @@ export const loginCheck = () => { /** * * 预览地址 - * @returns + * @returns */ - export const previewPath = (id?: string | number) => { +export const previewPath = (id?: string | number) => { const { origin, pathname } = document.location const path = fetchPathByName(PreviewEnum.CHART_PREVIEW_NAME, 'href') const previewPath = `${origin}${pathname}${path}/${id || fetchRouteParamsLocation()}` return previewPath -} \ No newline at end of file +} diff --git a/src/views/chart/ContentEdit/components/EditTools/index.vue b/src/views/chart/ContentEdit/components/EditTools/index.vue index 3f7ada41..74ec86cc 100644 --- a/src/views/chart/ContentEdit/components/EditTools/index.vue +++ b/src/views/chart/ContentEdit/components/EditTools/index.vue @@ -152,7 +152,7 @@ const editHandle = () => { if (!path) return const id = fetchRouteParamsLocation() updateToSession(id) - routerTurnByPath(path, [id], undefined, true) + routerTurnByPath(path, [id], undefined, true, true) }, 2000) } diff --git a/src/views/chart/ContentHeader/headerRightBtn/index.vue b/src/views/chart/ContentHeader/headerRightBtn/index.vue index fea220c4..f9874142 100644 --- a/src/views/chart/ContentHeader/headerRightBtn/index.vue +++ b/src/views/chart/ContentHeader/headerRightBtn/index.vue @@ -117,7 +117,7 @@ const previewHandle = () => { setSessionStorage(StorageEnum.GO_CHART_STORAGE_LIST, [{ id: previewId, ...storageInfo }]) } // 跳转 - routerTurnByPath(path, [previewId], undefined, true) + routerTurnByPath(path, [previewId], undefined, true, true) } // 模态弹窗 diff --git a/src/views/edit/index.vue b/src/views/edit/index.vue index 4cba7ae4..31d4b5a3 100644 --- a/src/views/edit/index.vue +++ b/src/views/edit/index.vue @@ -102,7 +102,7 @@ function importJSON() { } // 同步数据编辑页 -window.opener.addEventListener(SavePageEnum.CHART, (e: any) => { +window?.opener?.addEventListener(SavePageEnum.CHART, (e: any) => { window['$message'].success('正在进行更新...') setSessionStorage(StorageEnum.GO_CHART_STORAGE_LIST, [e.detail]) content.value = JSONStringify(e.detail) diff --git a/src/views/project/index.vue b/src/views/project/index.vue index 22d179f9..01ed20b3 100644 --- a/src/views/project/index.vue +++ b/src/views/project/index.vue @@ -27,16 +27,16 @@ import { ProjectLayoutSider } from './layout/components/ProjectLayoutSider' import { LayoutHeaderPro } from '@/layout/components/LayoutHeaderPro' import { LayoutTransitionMain } from '@/layout/components/LayoutTransitionMain/index' -import { goDialog } from '@/utils' +// import { goDialog } from '@/utils' -// 提示 -goDialog({ - message: '不要在官方后端上发布任何私密数据，任何人都看得到并进行删除！！！！', - isMaskClosable: true, - closeNegativeText: true, - transformOrigin: 'center', - onPositiveCallback: () => {} -}) +// // 提示 +// goDialog({ +// message: '不要在官方后端上发布任何私密数据，任何人都看得到并进行删除！！！！', +// isMaskClosable: true, +// closeNegativeText: true, +// transformOrigin: 'center', +// onPositiveCallback: () => {} +// })