From b8ae6a36f725721d8b18c6e601fbdee29a121ac5 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 6 Jul 2021 16:22:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/chart/ChartViewService.java       | 22 ++++++++++++-------
 frontend/src/views/system/datasource/form.vue | 10 ++++-----
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index b3583a2ebd..6b4d57cd37 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -240,17 +240,23 @@ public class ChartViewService {
             else {
                 data = (List<String[]>) cache;
             }*/
-            try{
-                data = cacheViewData(datasourceProvider, datasourceRequest, id);
-            }catch (Exception e) {
-                LogUtil.error(e);
-            }finally {
-                // 如果当前对象被锁 且 当前线程冲入次数 > 0 则释放锁
-                if (lock.isLocked() && lock.getHoldCount() > 0) {
-                    lock.unlock();
+            // 仪表板有参数不实用缓存
+            if (CollectionUtils.isNotEmpty(requestList.getFilter())) {
+                data = datasourceProvider.getData(datasourceRequest);
+            }else {
+                try{
+                    data = cacheViewData(datasourceProvider, datasourceRequest, id);
+                }catch (Exception e) {
+                    LogUtil.error(e);
+                }finally {
+                    // 如果当前对象被锁 且 当前线程冲入次数 > 0 则释放锁
+                    if (lock.isLocked() && lock.getHoldCount() > 0) {
+                        lock.unlock();
+                    }
                 }
             }
 
+
         }
         if (StringUtils.containsIgnoreCase(view.getType(), "pie") && data.size() > 1000) {
             data = data.subList(0, 1000);
diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue
index 6e3865bb76..d2f97bb8ee 100644
--- a/frontend/src/views/system/datasource/form.vue
+++ b/frontend/src/views/system/datasource/form.vue
@@ -52,8 +52,8 @@
           </el-button>
         </el-form-item>
 
-        <el-form-item :label="$t('datasource.schema')"  v-if="form.type=='oracle'">
-          <el-select v-model="form.configuration.schema" :placeholder="$t('datasource.please_choose_schema')" class="select-width" :disabled="formType=='modify'" >
+        <el-form-item v-if="form.type=='oracle'" :label="$t('datasource.schema')">
+          <el-select v-model="form.configuration.schema" :placeholder="$t('datasource.please_choose_schema')" class="select-width" :disabled="formType=='modify'">
             <el-option
               v-for="item in schemas"
               :key="item"
@@ -78,7 +78,7 @@
 
 <script>
 import LayoutContent from '@/components/business/LayoutContent'
-import {addDs, editDs, getSchema, validateDs} from '@/api/system/datasource'
+import { addDs, editDs, getSchema, validateDs } from '@/api/system/datasource'
 export default {
   name: 'DsForm',
   components: { LayoutContent },
@@ -148,7 +148,7 @@ export default {
       this.$refs.dsForm.resetFields()
     },
     save() {
-      if(!this.form.configuration.schema){
+      if (!this.form.configuration.schema) {
         this.$message.error(this.$t('datasource.please_choose_schema'))
         return
       }
@@ -167,7 +167,7 @@ export default {
         }
       })
     },
-    getSchema(){
+    getSchema() {
       this.$refs.dsForm.validate(valid => {
         if (valid) {
           const data = JSON.parse(JSON.stringify(this.form))