From 830a5b146495ea7970dc4ceb4793c919320c95fa Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 8 Jul 2024 15:27:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=A1=8C=E6=9D=83=E9=99=90=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=8F=98=E9=87=8F=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/dataset/manage/PermissionManage.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java index 0477ea743e..78a7019ece 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java @@ -195,15 +195,22 @@ public class PermissionManage { DatasetRowPermissionsTreeObj tree = JsonUtil.parseObject(record.getExpressionTree(), DatasetRowPermissionsTreeObj.class); List items = new ArrayList<>(); for (DatasetRowPermissionsTreeItem datasetRowPermissionsTreeItem : tree.getItems()) { - if (StringUtils.isNotEmpty(userEntity.getAccount()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("\\$\\{sysParams\\.userId}")) { + if (StringUtils.isNotEmpty(userEntity.getAccount()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("${sysParams.userId}")) { datasetRowPermissionsTreeItem.setValue(userEntity.getAccount()); + items.add(datasetRowPermissionsTreeItem); + continue; } - if (StringUtils.isNotEmpty(userEntity.getEmail()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("\\$\\{sysParams\\.userEmail}")) { + if (StringUtils.isNotEmpty(userEntity.getEmail()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("${sysParams.userEmail}")) { datasetRowPermissionsTreeItem.setValue(userEntity.getEmail()); + items.add(datasetRowPermissionsTreeItem); + continue; } - if (StringUtils.isNotEmpty(userEntity.getName()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("\\$\\{sysParams\\.userName}")) { + if (StringUtils.isNotEmpty(userEntity.getName()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("${sysParams.userName}")) { datasetRowPermissionsTreeItem.setValue(userEntity.getName()); + items.add(datasetRowPermissionsTreeItem); + continue; } + String value = handleSysVariable(userEntity, datasetRowPermissionsTreeItem.getValue()); if (value == null) { continue; From ef2d3e4f3cc53c0bdd95cef8aec353f08bf550d3 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 8 Jul 2024 15:51:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=20=E5=B5=8C=E5=85=A5=E5=BC=8F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA=EF=BC=8C=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=87=B3=E6=9C=AC=E5=9C=B0=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E8=B5=B0=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/views/chart/components/js/util.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/views/chart/components/js/util.ts b/core/core-frontend/src/views/chart/components/js/util.ts index 281397d5ac..222d2eba12 100644 --- a/core/core-frontend/src/views/chart/components/js/util.ts +++ b/core/core-frontend/src/views/chart/components/js/util.ts @@ -4,7 +4,7 @@ import { equalsAny, includesAny } from '../editor/util/StringUtils' import { FeatureCollection } from '@antv/l7plot/dist/esm/plots/choropleth/types' import { useMapStoreWithOut } from '@/store/modules/map' import { getGeoJson } from '@/api/map' -import { toRaw } from 'vue' +import { computed, toRaw } from 'vue' import { Options } from '@antv/g2plot/esm' import { PickOptions } from '@antv/g2plot/esm/core/plot' import { innerExportDetails } from '@/api/chart' @@ -12,6 +12,8 @@ import { ElMessage } from 'element-plus-secondary' import { useI18n } from '@/hooks/web/useI18n' import { useLinkStoreWithOut } from '@/store/modules/link' +const isDataEaseBi = computed(() => appStore.getIsDataEaseBi) + const { t } = useI18n() // 同时支持将hex和rgb，转换成rgba export function hexColorToRGBA(hex, alpha) { @@ -511,7 +513,7 @@ export const exportExcelDownload = (chart, callBack?) => { innerExportDetails(request) .then(res => { - if (linkStore.getLinkToken) { + if (linkStore.getLinkToken || isDataEaseBi.value) { const blob = new Blob([res.data], { type: 'application/vnd.ms-excel' }) const link = document.createElement('a') link.style.display = 'none'