github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki 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(groupField, ","),
StringUtils.join(field, ","), StringUtils.join(field, ","),
table, 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(group, ","),
StringUtils.join(order, ",")); StringUtils.join(order, ","));
if (sql.endsWith(",")) { if (sql.endsWith(",")) {

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

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