Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
njgzx
dataease
Commits
ad239360
提交
ad239360
authored
7月 12, 2021
作者:
junjie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: SQL拼接
上级
250b9b89
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
32 行增加
和
17 行删除
+32
-17
DorisQueryProvider.java
...n/java/io/dataease/provider/doris/DorisQueryProvider.java
+10
-4
MysqlQueryProvider.java
...n/java/io/dataease/provider/mysql/MysqlQueryProvider.java
+12
-6
OracleQueryProvider.java
...java/io/dataease/provider/oracle/OracleQueryProvider.java
+10
-4
Preview.vue
frontend/src/components/canvas/components/Editor/Preview.vue
+0
-1
UserViewDialog.vue
...src/components/canvas/custom-component/UserViewDialog.vue
+0
-1
TableNormal.vue
frontend/src/views/chart/components/table/TableNormal.vue
+0
-1
没有找到文件。
backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
浏览文件 @
ad239360
...
...
@@ -391,7 +391,7 @@ public class DorisQueryProvider extends QueryProvider {
case
"null"
:
return
" IN "
;
case
"not_null"
:
return
"
NOT IN
"
;
return
"
IS NOT NULL AND %s <> ''
"
;
case
"between"
:
return
" BETWEEN "
;
default
:
...
...
@@ -420,8 +420,10 @@ public class DorisQueryProvider extends QueryProvider {
}
else
{
whereName
=
originName
;
}
if
(
StringUtils
.
contain
sIgnoreCase
(
request
.
getTerm
(),
"null"
))
{
if
(
StringUtils
.
equal
sIgnoreCase
(
request
.
getTerm
(),
"null"
))
{
whereValue
=
DorisConstants
.
WHERE_VALUE_NULL
;
}
else
if
(
StringUtils
.
equalsIgnoreCase
(
request
.
getTerm
(),
"not_null"
))
{
whereTerm
=
String
.
format
(
whereTerm
,
originName
);
}
else
if
(
StringUtils
.
containsIgnoreCase
(
request
.
getTerm
(),
"in"
))
{
whereValue
=
"('"
+
StringUtils
.
join
(
value
,
"','"
)
+
"')"
;
}
else
if
(
StringUtils
.
containsIgnoreCase
(
request
.
getTerm
(),
"like"
))
{
...
...
@@ -551,8 +553,10 @@ public class DorisQueryProvider extends QueryProvider {
}
else
{
whereName
=
originField
;
}
if
(
StringUtils
.
contain
sIgnoreCase
(
f
.
getTerm
(),
"null"
))
{
if
(
StringUtils
.
equal
sIgnoreCase
(
f
.
getTerm
(),
"null"
))
{
whereValue
=
DorisConstants
.
WHERE_VALUE_NULL
;
}
else
if
(
StringUtils
.
equalsIgnoreCase
(
f
.
getTerm
(),
"not_null"
))
{
whereTerm
=
String
.
format
(
whereTerm
,
originField
);
}
else
if
(
StringUtils
.
containsIgnoreCase
(
f
.
getTerm
(),
"in"
))
{
whereValue
=
"('"
+
StringUtils
.
join
(
f
.
getValue
(),
"','"
)
+
"')"
;
}
else
if
(
StringUtils
.
containsIgnoreCase
(
f
.
getTerm
(),
"like"
))
{
...
...
@@ -600,8 +604,10 @@ public class DorisQueryProvider extends QueryProvider {
String
whereTerm
=
transMysqlFilterTerm
(
f
.
getTerm
());
String
whereValue
=
""
;
// 原始类型不是时间,在de中被转成时间的字段做处理
if
(
StringUtils
.
contain
sIgnoreCase
(
f
.
getTerm
(),
"null"
))
{
if
(
StringUtils
.
equal
sIgnoreCase
(
f
.
getTerm
(),
"null"
))
{
whereValue
=
DorisConstants
.
WHERE_VALUE_NULL
;
}
else
if
(
StringUtils
.
equalsIgnoreCase
(
f
.
getTerm
(),
"not_null"
))
{
whereTerm
=
String
.
format
(
whereTerm
,
originField
);
}
else
if
(
StringUtils
.
containsIgnoreCase
(
f
.
getTerm
(),
"in"
))
{
whereValue
=
"('"
+
StringUtils
.
join
(
f
.
getValue
(),
"','"
)
+
"')"
;
}
else
if
(
StringUtils
.
containsIgnoreCase
(
f
.
getTerm
(),
"like"
))
{
...
...
backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
浏览文件 @
ad239360
...
...
@@ -340,9 +340,9 @@ public class MysqlQueryProvider extends QueryProvider {
public
String
createRawQuerySQL
(
String
table
,
List
<
DatasetTableField
>
fields
)
{
String
[]
array
=
fields
.
stream
().
map
(
f
->
{
StringBuilder
stringBuilder
=
new
StringBuilder
();
if
(
f
.
getDeExtractType
()
==
4
)
{
// 处理 tinyint
if
(
f
.
getDeExtractType
()
==
4
)
{
// 处理 tinyint
stringBuilder
.
append
(
"concat(`"
).
append
(
f
.
getOriginName
()).
append
(
"`,'') AS "
).
append
(
f
.
getDataeaseName
());
}
else
{
}
else
{
stringBuilder
.
append
(
"`"
).
append
(
f
.
getOriginName
()).
append
(
"` AS "
).
append
(
f
.
getDataeaseName
());
}
return
stringBuilder
.
toString
();
...
...
@@ -380,7 +380,7 @@ public class MysqlQueryProvider extends QueryProvider {
case
"null"
:
return
" IN "
;
case
"not_null"
:
return
"
NOT IN
"
;
return
"
IS NOT NULL AND %s <> ''
"
;
case
"between"
:
return
" BETWEEN "
;
default
:
...
...
@@ -409,8 +409,10 @@ public class MysqlQueryProvider extends QueryProvider {
}
else
{
whereName
=
originName
;
}
if
(
StringUtils
.
contain
sIgnoreCase
(
request
.
getTerm
(),
"null"
))
{
if
(
StringUtils
.
equal
sIgnoreCase
(
request
.
getTerm
(),
"null"
))
{
whereValue
=
MySQLConstants
.
WHERE_VALUE_NULL
;
}
else
if
(
StringUtils
.
equalsIgnoreCase
(
request
.
getTerm
(),
"not_null"
))
{
whereTerm
=
String
.
format
(
whereTerm
,
originName
);
}
else
if
(
StringUtils
.
containsIgnoreCase
(
request
.
getTerm
(),
"in"
))
{
whereValue
=
"('"
+
StringUtils
.
join
(
value
,
"','"
)
+
"')"
;
}
else
if
(
StringUtils
.
containsIgnoreCase
(
request
.
getTerm
(),
"like"
))
{
...
...
@@ -547,8 +549,10 @@ public class MysqlQueryProvider extends QueryProvider {
}
else
{
whereName
=
originField
;
}
if
(
StringUtils
.
contain
sIgnoreCase
(
f
.
getTerm
(),
"null"
))
{
if
(
StringUtils
.
equal
sIgnoreCase
(
f
.
getTerm
(),
"null"
))
{
whereValue
=
MySQLConstants
.
WHERE_VALUE_NULL
;
}
else
if
(
StringUtils
.
equalsIgnoreCase
(
f
.
getTerm
(),
"not_null"
))
{
whereTerm
=
String
.
format
(
whereTerm
,
originField
);
}
else
if
(
StringUtils
.
containsIgnoreCase
(
f
.
getTerm
(),
"in"
))
{
whereValue
=
"('"
+
StringUtils
.
join
(
f
.
getValue
(),
"','"
)
+
"')"
;
}
else
if
(
StringUtils
.
containsIgnoreCase
(
f
.
getTerm
(),
"like"
))
{
...
...
@@ -595,8 +599,10 @@ public class MysqlQueryProvider extends QueryProvider {
String
whereTerm
=
transMysqlFilterTerm
(
f
.
getTerm
());
String
whereValue
=
""
;
// 原始类型不是时间,在de中被转成时间的字段做处理
if
(
StringUtils
.
contain
sIgnoreCase
(
f
.
getTerm
(),
"null"
))
{
if
(
StringUtils
.
equal
sIgnoreCase
(
f
.
getTerm
(),
"null"
))
{
whereValue
=
MySQLConstants
.
WHERE_VALUE_NULL
;
}
else
if
(
StringUtils
.
equalsIgnoreCase
(
f
.
getTerm
(),
"not_null"
))
{
whereTerm
=
String
.
format
(
whereTerm
,
originField
);
}
else
if
(
StringUtils
.
containsIgnoreCase
(
f
.
getTerm
(),
"in"
))
{
whereValue
=
"('"
+
StringUtils
.
join
(
f
.
getValue
(),
"','"
)
+
"')"
;
}
else
if
(
StringUtils
.
containsIgnoreCase
(
f
.
getTerm
(),
"like"
))
{
...
...
backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
浏览文件 @
ad239360
...
...
@@ -395,7 +395,7 @@ public class OracleQueryProvider extends QueryProvider {
case
"null"
:
return
" IN "
;
case
"not_null"
:
return
"
NOT IN
"
;
return
"
IS NOT NULL AND %s <> ''
"
;
case
"between"
:
return
" BETWEEN "
;
default
:
...
...
@@ -424,8 +424,10 @@ public class OracleQueryProvider extends QueryProvider {
}
else
{
whereName
=
originName
;
}
if
(
StringUtils
.
contain
sIgnoreCase
(
request
.
getTerm
(),
"null"
))
{
if
(
StringUtils
.
equal
sIgnoreCase
(
request
.
getTerm
(),
"null"
))
{
whereValue
=
OracleConstants
.
WHERE_VALUE_NULL
;
}
else
if
(
StringUtils
.
equalsIgnoreCase
(
request
.
getTerm
(),
"not_null"
))
{
whereTerm
=
String
.
format
(
whereTerm
,
originName
);
}
else
if
(
StringUtils
.
containsIgnoreCase
(
request
.
getTerm
(),
"in"
))
{
whereValue
=
"('"
+
StringUtils
.
join
(
value
,
"','"
)
+
"')"
;
}
else
if
(
StringUtils
.
containsIgnoreCase
(
request
.
getTerm
(),
"like"
))
{
...
...
@@ -575,8 +577,10 @@ public class OracleQueryProvider extends QueryProvider {
}
else
{
whereName
=
originField
;
}
if
(
StringUtils
.
contain
sIgnoreCase
(
f
.
getTerm
(),
"null"
))
{
if
(
StringUtils
.
equal
sIgnoreCase
(
f
.
getTerm
(),
"null"
))
{
whereValue
=
OracleConstants
.
WHERE_VALUE_NULL
;
}
else
if
(
StringUtils
.
equalsIgnoreCase
(
f
.
getTerm
(),
"not_null"
))
{
whereTerm
=
String
.
format
(
whereTerm
,
originField
);
}
else
if
(
StringUtils
.
containsIgnoreCase
(
f
.
getTerm
(),
"in"
))
{
whereValue
=
"('"
+
StringUtils
.
join
(
f
.
getValue
(),
"','"
)
+
"')"
;
}
else
if
(
StringUtils
.
containsIgnoreCase
(
f
.
getTerm
(),
"like"
))
{
...
...
@@ -623,8 +627,10 @@ public class OracleQueryProvider extends QueryProvider {
String
whereTerm
=
transMysqlFilterTerm
(
f
.
getTerm
());
String
whereValue
=
""
;
// 原始类型不是时间,在de中被转成时间的字段做处理
if
(
StringUtils
.
contain
sIgnoreCase
(
f
.
getTerm
(),
"null"
))
{
if
(
StringUtils
.
equal
sIgnoreCase
(
f
.
getTerm
(),
"null"
))
{
whereValue
=
OracleConstants
.
WHERE_VALUE_NULL
;
}
else
if
(
StringUtils
.
equalsIgnoreCase
(
f
.
getTerm
(),
"not_null"
))
{
whereTerm
=
String
.
format
(
whereTerm
,
originField
);
}
else
if
(
StringUtils
.
containsIgnoreCase
(
f
.
getTerm
(),
"in"
))
{
whereValue
=
"('"
+
StringUtils
.
join
(
f
.
getValue
(),
"','"
)
+
"')"
;
}
else
if
(
StringUtils
.
containsIgnoreCase
(
f
.
getTerm
(),
"like"
))
{
...
...
frontend/src/components/canvas/components/Editor/Preview.vue
浏览文件 @
ad239360
...
...
@@ -186,7 +186,6 @@ export default {
}
},
openChartDetailsDialog
(
chartInfo
)
{
debugger
this
.
showChartInfo
=
chartInfo
.
chart
this
.
showChartTableInfo
=
chartInfo
.
tableChart
this
.
chartDetailsVisible
=
true
...
...
frontend/src/components/canvas/custom-component/UserViewDialog.vue
浏览文件 @
ad239360
...
...
@@ -40,7 +40,6 @@ export default {
},
methods
:
{
exportExcel
()
{
debugger
const
excelHeader
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
chart
.
data
.
fields
)).
map
(
item
=>
item
.
name
)
const
excelHeaderKeys
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
chart
.
data
.
fields
)).
map
(
item
=>
item
.
dataeaseName
)
const
excelData
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
chart
.
data
.
tableRow
)).
map
(
item
=>
excelHeaderKeys
.
map
(
i
=>
item
[
i
]))
...
...
frontend/src/views/chart/components/table/TableNormal.vue
浏览文件 @
ad239360
...
...
@@ -108,7 +108,6 @@ export default {
})
},
initData
()
{
debugger
const
that
=
this
let
datas
=
[]
if
(
this
.
chart
.
data
)
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论