center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #11050 from dataease/pr@dev-v2@fixDS

Browse Source 
Pr@dev v2@fix ds
This commit is contained in:
taojinlong 2024-07-19 17:25:11 +08:00 committed by GitHub
commit 47f0cadd34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
View File

@ -89,7 +89,7 @@ public class ChartDataServer implements ChartDataApi {
public void innerExportDetails(ChartExcelRequest request, HttpServletResponse response) throws Exception { public void innerExportDetails(ChartExcelRequest request, HttpServletResponse response) throws Exception {
HttpServletRequest httpServletRequest = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest httpServletRequest = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String linkToken = httpServletRequest.getHeader(AuthConstant.LINK_TOKEN_KEY); String linkToken = httpServletRequest.getHeader(AuthConstant.LINK_TOKEN_KEY);
if (StringUtils.isEmpty(linkToken)) { if (StringUtils.isEmpty(linkToken) || !request.isDataEaseBi()) {
exportCenterManage.addTask(request.getViewId(), "chart", request); exportCenterManage.addTask(request.getViewId(), "chart", request);
return; return;
} }

3
core/core-frontend/src/views/chart/components/js/util.ts
View File

@ -517,6 +517,9 @@ export const exportExcelDownload = (chart, callBack?) => {
const linkStore = useLinkStoreWithOut() const linkStore = useLinkStoreWithOut()
if (isDataEaseBi.value || appStore.getIsIframe) {
request.isDataEaseBi = true
}
innerExportDetails(request) innerExportDetails(request)
.then(res => { .then(res => {
if (linkStore.getLinkToken || isDataEaseBi.value || appStore.getIsIframe) { if (linkStore.getLinkToken || isDataEaseBi.value || appStore.getIsIframe) {

7
core/core-frontend/src/views/visualized/data/datasource/form/ApiKeyValue.vue
View File

@ -46,6 +46,11 @@ onBeforeMount(() => {
if (!items.value.length || items.value[items.value.length - 1].name) { if (!items.value.length || items.value[items.value.length - 1].name) {
items.value.push(new KeyValue({ enable: true, name: '', value: '' })) items.value.push(new KeyValue({ enable: true, name: '', value: '' }))
} }
for (let i = 0; i < items.value.length; i++) {
if (!items.value[i].hasOwnProperty('nameType')) {
items.value[i].nameType = 'fixed'
}
}
}) })
const activeName = inject('api-active-name') const activeName = inject('api-active-name')
@ -56,7 +61,7 @@ const remove = (index: number) => {
items.value.splice(index, 1) items.value.splice(index, 1)
} }
const change = () => { const change = () => {
items.value.push(new KeyValue({ enable: true })) items.value.push(new KeyValue({ enable: true, nameType: 'fixed' }))
} }
const isDisable = () => { const isDisable = () => {
return items.value.length === 1 return items.value.length === 1

2
sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExcelRequest.java
View File

@ -22,4 +22,6 @@ public class ChartExcelRequest extends ChartExcelRequestInner {
private List<ChartExcelRequestInner> multiInfo; private List<ChartExcelRequestInner> multiInfo;
private boolean isDataEaseBi = false;
} }