github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat(仪表板): 分享-分享错误提示

Browse Source
This commit is contained in:
fit2cloud-chenyw 2024-12-20 14:19:16 +08:00 committed by xuwei-fit2cloud
parent 050a1f1a4d
commit 3467a91b6f
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java
View File

@ -239,6 +239,7 @@ public class XpackShareManage {
if (!peRequireValid(sharedBase, xpackShare)) { if (!peRequireValid(sharedBase, xpackShare)) {
XpackShareProxyVO vo = new XpackShareProxyVO(); XpackShareProxyVO vo = new XpackShareProxyVO();
vo.setPeRequireValid(false); vo.setPeRequireValid(false);
vo.setInIframeError(false);
return vo; return vo;
} }
String linkToken = LinkTokenUtil.generate(xpackShare.getCreator(), xpackShare.getResourceId(), xpackShare.getExp(), xpackShare.getPwd(), xpackShare.getOid()); String linkToken = LinkTokenUtil.generate(xpackShare.getCreator(), xpackShare.getResourceId(), xpackShare.getExp(), xpackShare.getPwd(), xpackShare.getOid());

11
core/core-frontend/src/views/share/link/index.vue
View File

@ -3,13 +3,12 @@
class="link-container" class="link-container"
v-loading="loading || requestStore.loadingMap[permissionStore.currentPath]" v-loading="loading || requestStore.loadingMap[permissionStore.currentPath]"
> >
<ErrorTemplate <ErrorTemplate v-if="!loading && disableError" msg="已禁用分享功能，请联系管理员！" />
v-if="!loading && (disableError || peRequireError)"
:msg="
disableError ? '已禁用分享功能，请联系管理员！' : '已设置有效期密码必填，当前链接无效！'
"
/>
<IframeError v-else-if="!loading && iframeError" /> <IframeError v-else-if="!loading && iframeError" />
<ErrorTemplate
v-else-if="!loading && peRequireError"
msg="已设置有效期密码必填，当前链接无效！"
/>
<LinkError v-else-if="!loading && !linkExist" /> <LinkError v-else-if="!loading && !linkExist" />
<Exp v-else-if="!loading && linkExp" /> <Exp v-else-if="!loading && linkExp" />
<PwdTips v-else-if="!loading && !pwdValid" /> <PwdTips v-else-if="!loading && !pwdValid" />

18
core/core-frontend/src/views/share/link/mobile.vue
View File

@ -1,12 +1,12 @@
<template> <template>
<div class="mobile-link-container" v-loading="loading"> <div class="mobile-link-container" v-loading="loading">
<ErrorTemplate v-if="!loading && disableError" msg="已禁用分享功能，请联系管理员！" />
<IframeError v-else-if="!loading && iframeError" />
<ErrorTemplate <ErrorTemplate
v-if="!loading && (disableError || peRequireError)" v-else-if="!loading && peRequireError"
:msg=" msg="已设置有效期密码必填，当前链接无效！"
disableError ? '已禁用分享功能，请联系管理员！' : '已设置有效期密码必填，当前链接无效！'
"
/> />
<LinkError v-if="!loading && !linkExist" /> <LinkError v-else-if="!loading && !linkExist" />
<Exp v-else-if="!loading && linkExp" /> <Exp v-else-if="!loading && linkExp" />
<PwdTips v-else-if="!loading && !pwdValid" /> <PwdTips v-else-if="!loading && !pwdValid" />
<TicketError <TicketError
@ -29,6 +29,7 @@ import TicketError from './TicketError.vue'
import { ProxyInfo, shareProxy } from './ShareProxy' import { ProxyInfo, shareProxy } from './ShareProxy'
import Exp from './exp.vue' import Exp from './exp.vue'
import LinkError from './error.vue' import LinkError from './error.vue'
import IframeError from './IframeError.vue'
import PwdTips from './pwd.vue' import PwdTips from './pwd.vue'
import ErrorTemplate from './ErrorTemplate.vue' import ErrorTemplate from './ErrorTemplate.vue'
const disableError = ref(true) const disableError = ref(true)
@ -36,6 +37,7 @@ const peRequireError = ref(true)
const linkExist = ref(false) const linkExist = ref(false)
const loading = ref(true) const loading = ref(true)
const linkExp = ref(false) const linkExp = ref(false)
const iframeError = ref(true)
const pwdValid = ref(false) const pwdValid = ref(false)
const dvMainStore = dvMainStoreWithOut() const dvMainStore = dvMainStoreWithOut()
const pcanvas = ref(null) const pcanvas = ref(null)
@ -58,6 +60,12 @@ onMounted(async () => {
return return
} }
disableError.value = false disableError.value = false
if (proxyInfo?.inIframeError) {
loading.value = false
iframeError.value = true
return
}
iframeError.value = false
if (proxyInfo && !proxyInfo.peRequireValid) { if (proxyInfo && !proxyInfo.peRequireValid) {
loading.value = false loading.value = false
peRequireError.value = true peRequireError.value = true