From 02464a752533581f6feb59b848965ad22c406c29 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 30 May 2024 19:05:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/dataset/manage/PermissionManage.java |  5 +++--
 .../datasource/provider/CalciteProvider.java      |  6 +++---
 core/core-frontend/src/assets/svg/de-refresh.svg  |  1 -
 .../views/visualized/data/dataset/ExportExcel.vue | 15 +++++++++------
 .../permissions/variable/api/SysVariablesApi.java |  2 +-
 .../variable/dto/SysVariableValueItem.java        |  1 +
 6 files changed, 17 insertions(+), 13 deletions(-)
 delete mode 100644 core/core-frontend/src/assets/svg/de-refresh.svg

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 1cf32a21ed..14201dddc6 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
@@ -220,11 +220,12 @@ public class PermissionManage {
 
     private String handleSysVariable(UserFormVO userEntity, String sysVariable) {
         String value = null;
-        System.out.println(sysVariable);
-        System.out.println(JsonUtil.toJSONString(userEntity));
         if (StringUtils.isNotBlank(sysVariable) && sysVariable.startsWith("${") && sysVariable.endsWith("}")) {
             String variableId = sysVariable.substring(2, sysVariable.length() - 1);
             for (SysVariableValueItem variable : userEntity.getVariables()) {
+                if (!variable.isValid()){
+                    continue;
+                }
                 if (variableId.equalsIgnoreCase(variable.getVariableId().toString())) {
                     if (variable.getSysVariableDto().getType().equalsIgnoreCase("text")) {
                         for (SysVariableValueDto sysVariableValueDto : variable.getValueList()) {
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
index 0964609d9e..980c4b75c9 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
@@ -932,9 +932,9 @@ public class CalciteProvider {
         Properties props = new Properties();
         if (StringUtils.isNotBlank(configuration.getUsername())) {
             props.setProperty("user", configuration.getUsername());
-            if (StringUtils.isNotBlank(configuration.getPassword())) {
-                props.setProperty("password", configuration.getPassword());
-            }
+        }
+        if (StringUtils.isNotBlank(configuration.getPassword())) {
+            props.setProperty("password", configuration.getPassword());
         }
         String driverClassName = configuration.getDriver();
         ExtendedJdbcClassLoader jdbcClassLoader = extendedJdbcClassLoader;
diff --git a/core/core-frontend/src/assets/svg/de-refresh.svg b/core/core-frontend/src/assets/svg/de-refresh.svg
deleted file mode 100644
index 76618ab91c..0000000000
--- a/core/core-frontend/src/assets/svg/de-refresh.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1716540076970" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7068" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M912 480c-17.7 0-32 14.3-32 32 0 25-2.5 50-7.5 74.2-4.8 23.6-12 46.8-21.4 69-9.2 21.8-20.6 42.8-33.9 62.5-13.2 19.5-28.3 37.8-45 54.5s-35 31.8-54.5 45c-19.7 13.3-40.7 24.7-62.5 33.9-22.2 9.4-45.4 16.6-69 21.4-48.5 9.9-99.9 9.9-148.4 0-23.6-4.8-46.8-12-69-21.4-21.8-9.2-42.8-20.6-62.5-33.9-19.5-13.2-37.8-28.3-54.5-45s-31.8-35-45-54.5c-13.3-19.7-24.7-40.7-33.9-62.5-9.4-22.2-16.6-45.4-21.4-69-5-24.2-7.5-49.2-7.5-74.2s2.5-50 7.5-74.2c4.8-23.6 12-46.8 21.4-69 9.2-21.8 20.6-42.8 33.9-62.5 13.2-19.5 28.3-37.8 45-54.5s35-31.8 54.5-45c19.7-13.3 40.7-24.7 62.5-33.9 22.2-9.4 45.4-16.6 69-21.4 48.5-9.9 99.9-9.9 148.4 0 23.6 4.8 46.8 12 69 21.4 21.8 9.2 42.8 20.6 62.5 33.9 19.5 13.2 37.8 28.3 54.5 45 1.4 1.4 2.8 2.8 4.1 4.2H688c-17.7 0-32 14.3-32 32s14.3 32 32 32h160c17.7 0 32-14.3 32-32V128c0-17.7-14.3-32-32-32s-32 14.3-32 32v77.1c-19.2-19-40.1-36.2-62.4-51.3-23.1-15.6-47.8-29-73.4-39.8-26.1-11-53.4-19.5-81.1-25.2-56.9-11.6-117.1-11.6-174.1 0-27.8 5.7-55.1 14.2-81.1 25.2-25.6 10.8-50.3 24.2-73.4 39.8-22.9 15.4-44.4 33.2-63.9 52.7s-37.3 41-52.7 63.9c-15.6 23.1-29 47.8-39.8 73.4-11 26.1-19.5 53.4-25.2 81.1C83 453.4 80 482.7 80 512s3 58.6 8.8 87c5.7 27.8 14.2 55 25.2 81.1 10.8 25.6 24.2 50.3 39.8 73.4 15.4 22.9 33.2 44.4 52.7 63.9s41 37.3 63.9 52.7c23.1 15.6 47.8 29 73.4 39.8 26.1 11 53.4 19.5 81.1 25.2 28.5 5.8 57.7 8.8 87 8.8s58.6-3 87-8.8c27.8-5.7 55-14.2 81.1-25.2 25.6-10.8 50.3-24.2 73.4-39.8 22.9-15.5 44.4-33.2 63.9-52.7s37.3-41 52.7-63.9c15.6-23.1 29-47.8 39.8-73.4 11-26.1 19.5-53.4 25.2-81.1 5.8-28.5 8.8-57.7 8.8-87 0.2-17.7-14.1-32-31.8-32z" fill="#1875F0" p-id="7069"></path></svg>
\ No newline at end of file
diff --git a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
index 2c56677811..eaad3f48bd 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
@@ -354,7 +354,7 @@ defineExpose({
       @click="downLoadAll"
     >
       <template #icon>
-        <Icon name="de-delete"></Icon>
+        <Icon name="dv-preview-download"></Icon>
       </template>
       {{ $t('data_export.download_all') }}
     </el-button>
@@ -426,11 +426,14 @@ defineExpose({
                 </el-icon>
               </div>
             </el-button>
-            <el-button text @click="retry(scope.row)">
-              <template #icon>
-                <Icon name="de-refresh"></Icon>
-              </template>
-            </el-button>
+            <el-tooltip effect="dark" content="重新导出" placement="top">
+              <el-button text @click="retry(scope.row)">
+                <template #icon>
+                  <Icon name="icon_refresh_outlined"></Icon>
+                </template>
+              </el-button>
+            </el-tooltip>
+
             <el-button text @click="deleteField(scope.row)">
               <template #icon>
                 <Icon name="de-delete"></Icon>
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java
index 8f0bbd7796..11be8eae9c 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java
@@ -32,7 +32,7 @@ public interface SysVariablesApi {
 
     @Operation(summary = "删除")
     @GetMapping("/delete/{id}")
-    void delete(@PathVariable String id);
+    void delete(@PathVariable Long id);
 
     @Operation(summary = "详细信息")
     @GetMapping("/detail/{id}")
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueItem.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueItem.java
index b7aaa92670..e0d53a845b 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueItem.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/dto/SysVariableValueItem.java
@@ -18,6 +18,7 @@ public class SysVariableValueItem {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long variableValueId;
     private String variableName;
+    private boolean valid = true;
     private List<SysVariableValueDto> valueList;
     private SysVariableDto sysVariableDto;