提交 b8ae6a36 authored 作者: fit2cloud-chenyw's avatar fit2cloud-chenyw

fix:修复组件查询条件无效

上级 f64e8cab
...@@ -240,6 +240,10 @@ public class ChartViewService { ...@@ -240,6 +240,10 @@ public class ChartViewService {
else { else {
data = (List<String[]>) cache; data = (List<String[]>) cache;
}*/ }*/
// 仪表板有参数不实用缓存
if (CollectionUtils.isNotEmpty(requestList.getFilter())) {
data = datasourceProvider.getData(datasourceRequest);
}else {
try{ try{
data = cacheViewData(datasourceProvider, datasourceRequest, id); data = cacheViewData(datasourceProvider, datasourceRequest, id);
}catch (Exception e) { }catch (Exception e) {
...@@ -250,6 +254,8 @@ public class ChartViewService { ...@@ -250,6 +254,8 @@ public class ChartViewService {
lock.unlock(); lock.unlock();
} }
} }
}
} }
if (StringUtils.containsIgnoreCase(view.getType(), "pie") && data.size() > 1000) { if (StringUtils.containsIgnoreCase(view.getType(), "pie") && data.size() > 1000) {
......
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item :label="$t('datasource.schema')" v-if="form.type=='oracle'"> <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-select v-model="form.configuration.schema" :placeholder="$t('datasource.please_choose_schema')" class="select-width" :disabled="formType=='modify'">
<el-option <el-option
v-for="item in schemas" v-for="item in schemas"
:key="item" :key="item"
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<script> <script>
import LayoutContent from '@/components/business/LayoutContent' 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 { export default {
name: 'DsForm', name: 'DsForm',
components: { LayoutContent }, components: { LayoutContent },
...@@ -148,7 +148,7 @@ export default { ...@@ -148,7 +148,7 @@ export default {
this.$refs.dsForm.resetFields() this.$refs.dsForm.resetFields()
}, },
save() { save() {
if(!this.form.configuration.schema){ if (!this.form.configuration.schema) {
this.$message.error(this.$t('datasource.please_choose_schema')) this.$message.error(this.$t('datasource.please_choose_schema'))
return return
} }
...@@ -167,7 +167,7 @@ export default { ...@@ -167,7 +167,7 @@ export default {
} }
}) })
}, },
getSchema(){ getSchema() {
this.$refs.dsForm.validate(valid => { this.$refs.dsForm.validate(valid => {
if (valid) { if (valid) {
const data = JSON.parse(JSON.stringify(this.form)) const data = JSON.parse(JSON.stringify(this.form))
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论