diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java index 91714ddf36..42a790e9a1 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java @@ -30,6 +30,7 @@ import io.dataease.exception.DEException; import io.dataease.i18n.Translator; import io.dataease.result.ResultCode; import io.dataease.system.manage.CorePermissionManage; +import io.dataease.utils.AuthUtils; import io.dataease.utils.BeanUtils; import io.dataease.utils.JsonUtil; import jakarta.annotation.Resource; @@ -85,6 +86,10 @@ public class ChartDataManage { if (ObjectUtils.isEmpty(view)) { DEException.throwException(ResultCode.DATA_IS_WRONG.code(), Translator.get("i18n_chart_delete")); } + if (ObjectUtils.isNotEmpty(AuthUtils.getUser())) { + chartExtRequest.setUser(AuthUtils.getUser().getUserId()); + } + //如果是excel导出 如果是从仪表板获取图表数据,则仪表板的查询模式,查询结果的数量,覆盖图表对应的属性 if (view.getIsExcelExport()) { diff --git a/core/core-frontend/src/config/axios/refresh.ts b/core/core-frontend/src/config/axios/refresh.ts index 9c685e334d..4f668013f0 100644 --- a/core/core-frontend/src/config/axios/refresh.ts +++ b/core/core-frontend/src/config/axios/refresh.ts @@ -1,6 +1,8 @@ import { useCache } from '@/hooks/web/useCache' import { refreshApi } from '@/api/login' import { useUserStoreWithOut } from '@/store/modules/user' + +import { isLink } from '@/utils/utils' const { wsCache } = useCache() const userStore = useUserStoreWithOut() const refreshUrl = '/login/refresh' @@ -39,6 +41,9 @@ export const configHandler = config => { if (desktop) { return config } + if (isLink()) { + return config + } if (wsCache.get('user.token')) { config.headers['X-DE-TOKEN'] = wsCache.get('user.token') const expired = isExpired() diff --git a/core/core-frontend/src/permission.ts b/core/core-frontend/src/permission.ts index af09bd08e9..5b2fbbca88 100644 --- a/core/core-frontend/src/permission.ts +++ b/core/core-frontend/src/permission.ts @@ -50,7 +50,7 @@ router.beforeEach(async (to, from, next) => { } } await appearanceStore.setAppearance() - if (wsCache.get('user.token') || isDesktop) { + if ((wsCache.get('user.token') || isDesktop) && !to.path.startsWith('/de-link/')) { if (!userStore.getUid) { await userStore.setUser() } diff --git a/core/core-frontend/src/utils/utils.ts b/core/core-frontend/src/utils/utils.ts index 09b1534275..581c27f3c4 100644 --- a/core/core-frontend/src/utils/utils.ts +++ b/core/core-frontend/src/utils/utils.ts @@ -147,3 +147,7 @@ export function cutTargetTree(tree: BusiTreeNode[], targetId: string | number) { } }) } + +export const isLink = () => { + return window.location.hash.startsWith('#/de-link/') +}