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

feat:fontsize fix;仪表板视图过滤组件

Browse Source
This commit is contained in:
junjie 2021-05-19 16:21:20 +08:00
parent 1d2e5d846d
commit f525d9154a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
View File

@ -184,7 +184,7 @@ public class MysqlQueryProvider extends QueryProvider {
StringUtils.join(groupField, ","),
StringUtils.join(field, ","),
table,
xFilter.length > 0 ? StringUtils.join(xFilter, " ") : "" + transMysqlExtFilter(extFilterRequestList),// origin field filter and panel field filter
(xFilter.length > 0 ? StringUtils.join(xFilter, " ") : "") + transMysqlExtFilter(extFilterRequestList),// origin field filter and panel field filter
StringUtils.join(group, ","),
StringUtils.join(order, ","));
if (sql.endsWith(",")) {

2
frontend/src/views/chart/components/shape-attr/SizeSelector.vue
View File

@ -194,7 +194,7 @@ export default {
methods: {
init() {
const arr = []
for (let i = 10; i <= 30; i = i + 2) {
for (let i = 10; i <= 60; i = i + 2) {
arr.push({
name: i + '',
value: i + ''