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

Merge pull request #163 from dataease/pr@dev@fix_搜索组件纵向拖拽样式

Browse Source 
fix:修复组件查询条件无效
This commit is contained in:
fit2cloud-chenyw 2021-07-06 16:26:52 +08:00 committed by GitHub
commit 1a44dd2030
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -240,17 +240,23 @@ public class ChartViewService {
else { else {
data = (List<String[]>) cache; data = (List<String[]>) cache;
}*/ }*/
try{ // 仪表板有参数不实用缓存
data = cacheViewData(datasourceProvider, datasourceRequest, id); if (CollectionUtils.isNotEmpty(requestList.getFilter())) {
}catch (Exception e) { data = datasourceProvider.getData(datasourceRequest);
LogUtil.error(e); }else {
}finally { try{
// 如果当前对象被锁 且 当前线程冲入次数 > 0 则释放锁 data = cacheViewData(datasourceProvider, datasourceRequest, id);
if (lock.isLocked() && lock.getHoldCount() > 0) { }catch (Exception e) {
lock.unlock(); LogUtil.error(e);
}finally {
// 如果当前对象被锁 且 当前线程冲入次数 > 0 则释放锁
if (lock.isLocked() && lock.getHoldCount() > 0) {
lock.unlock();
}
} }
} }
} }
if (StringUtils.containsIgnoreCase(view.getType(), "pie") && data.size() > 1000) { if (StringUtils.containsIgnoreCase(view.getType(), "pie") && data.size() > 1000) {
data = data.subList(0, 1000); data = data.subList(0, 1000);

10
frontend/src/views/system/datasource/form.vue
View File

@ -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 @@
<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 {
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 {
} }
}) })
}, },
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))