diff --git a/core/core-frontend/src/config/axios/service.ts b/core/core-frontend/src/config/axios/service.ts index 008aa3397e..affc34a0e9 100644 --- a/core/core-frontend/src/config/axios/service.ts +++ b/core/core-frontend/src/config/axios/service.ts @@ -14,6 +14,7 @@ import { useEmbedded } from '@/store/modules/embedded' import { useLinkStoreWithOut } from '@/store/modules/link' import { config } from './config' import { configHandler } from './refresh' +import { isMobile } from '@/utils/utils' type AxiosErrorWidthLoading = T & { config: { @@ -108,6 +109,9 @@ service.interceptors.request.use( config.baseURL = PATH_URL } + if (isMobile()) { + ;(config.headers as AxiosRequestHeaders)['X-DE-MOBILE'] = true + } if (linkStore.getLinkToken) { ;(config.headers as AxiosRequestHeaders)['X-DE-LINK-TOKEN'] = linkStore.getLinkToken } else if (embeddedStore.token) { diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index ac1cc7fe22..661d2763d0 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -83,7 +83,9 @@ export default { confirm_export: '确定导出日志吗', export_success: '导出成功', excel_file_name: 'DataEase操作日志', - relevant_content_found: '没有找到相关内容' + relevant_content_found: '没有找到相关内容', + mobile: '移动端', + client: '客户端' }, template_manage: { name_already_exists_type: '分类名称已存在', diff --git a/de-xpack b/de-xpack index 9d120aec82..b7b7a604fa 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 9d120aec82118de0493e3c22dc2acc200f74f05a +Subproject commit b7b7a604fa8a35ca9e48e6fcbdde2aea9f88c390 diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java index 6c62ec7d50..4da8b51a35 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java @@ -20,4 +20,6 @@ public class LogGridRequest extends KeywordRequest implements Serializable { private List time; private Boolean timeDesc = true; + + private List client; }