Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
12e03102
提交
12e03102
authored
5月 19, 2021
作者:
taojinlong
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'main' of github.com:dataease/dataease into main
上级
bfeaabf5
8b4753d9
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
71 行增加
和
23 行删除
+71
-23
MysqlQueryProvider.java
...n/java/io/dataease/provider/mysql/MysqlQueryProvider.java
+1
-1
Preview.vue
frontend/src/components/canvas/components/Editor/Preview.vue
+12
-0
UserView.vue
frontend/src/components/canvas/custom-component/UserView.vue
+1
-1
en.js
frontend/src/lang/en.js
+8
-1
tw.js
frontend/src/lang/tw.js
+8
-1
zh.js
frontend/src/lang/zh.js
+2
-1
chart.js
frontend/src/views/chart/chart/chart.js
+28
-7
SizeSelector.vue
...nd/src/views/chart/components/shape-attr/SizeSelector.vue
+1
-1
Slider.vue
...tend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
+2
-2
SubjectTemplateItem.vue
...s/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
+2
-2
PanelList.vue
frontend/src/views/panel/list/PanelList.vue
+4
-4
panel.js
frontend/src/views/panel/panel.js
+2
-2
没有找到文件。
backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
浏览文件 @
12e03102
...
...
@@ -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
(
","
))
{
...
...
frontend/src/components/canvas/components/Editor/Preview.vue
浏览文件 @
12e03102
<
template
>
<div
id=
"canvasInfo"
:style=
"customStyle"
class=
"bg"
>
<el-row
v-if=
"componentDataShow.length===0"
style=
"height: 100%;"
class=
"custom-position"
>
{{
$t
(
'panel.panel_null'
)
}}
</el-row>
<ComponentWrapper
v-for=
"(item, index) in componentDataInfo"
:key=
"index"
...
...
@@ -148,4 +151,13 @@ export default {
}
}
}
.custom-position
{
flex
:
1
;
display
:
flex
;
align-items
:
center
;
justify-content
:
space-between
;
font-size
:
14px
;
flex-flow
:
row
nowrap
;
color
:
#9ea6b2
;
}
</
style
>
frontend/src/components/canvas/custom-component/UserView.vue
浏览文件 @
12e03102
...
...
@@ -155,7 +155,7 @@ export default {
.rect-shape
{
width
:
100%
;
height
:
100%
;
overflow
:
auto
;
overflow
:
hidden
;
}
.chart-class
{
height
:
100%
;
...
...
frontend/src/lang/en.js
浏览文件 @
12e03102
...
...
@@ -806,6 +806,12 @@ export default {
delete_warning
:
'Confirm to delete?'
},
panel
:
{
copy_link_passwd
:
'Copy link and password'
,
copy_link
:
'Copy link'
,
passwd_protect
:
'Password Protect'
,
link
:
'Link'
,
link_share
:
'Share Link'
,
link_share_desc
:
'After opening the link, anyone can access the dashboard through this link.'
,
share
:
'Share'
,
datalist
:
'Chart List'
,
group
:
'Catalogue'
,
...
...
@@ -872,7 +878,8 @@ export default {
clean_canvas
:
'Clean Canvas'
,
insert_picture
:
'Insert Picture'
,
redo
:
'Redo'
,
undo
:
'UToolbar.vuendo'
undo
:
'UToolbar.vuendo'
,
panel_null
:
'This is a Empty Panel,You Can Edit and Enrich It'
},
plugin
:
{
local_install
:
'Local installation'
,
...
...
frontend/src/lang/tw.js
浏览文件 @
12e03102
...
...
@@ -806,6 +806,12 @@ export default {
delete_warning
:
'確認刪除?'
},
panel
:
{
copy_link_passwd
:
'複製鏈接及密碼'
,
copy_link
:
'複製鏈接'
,
passwd_protect
:
'密碼保護'
,
link
:
'鏈接'
,
link_share
:
'鏈接分享'
,
link_share_desc
:
'開啟鏈接後,任何人可通過此鏈接訪問儀表板。'
,
share
:
'分享'
,
datalist
:
'視圖列表'
,
group
:
'目錄'
,
...
...
@@ -872,7 +878,8 @@ export default {
clean_canvas
:
'清空畫布'
,
insert_picture
:
'插入圖片'
,
redo
:
'重做'
,
undo
:
'撤銷'
undo
:
'撤銷'
,
panel_null
:
'这是个空的儀表盤,可以通过编辑来丰富内容'
},
plugin
:
{
local_install
:
'本地安裝'
,
...
...
frontend/src/lang/zh.js
浏览文件 @
12e03102
...
...
@@ -880,7 +880,8 @@ export default {
clean_canvas
:
'清空画布'
,
insert_picture
:
'插入图片'
,
redo
:
'重做'
,
undo
:
'撤销'
undo
:
'撤销'
,
panel_null
:
'这是个空的仪表板,可以通过编辑来丰富内容'
},
plugin
:
{
local_install
:
'本地安装'
,
...
...
frontend/src/views/chart/chart/chart.js
浏览文件 @
12e03102
...
...
@@ -98,7 +98,10 @@ export const DEFAULT_BACKGROUND_COLOR = {
// chart config
export
const
BASE_BAR
=
{
title
:
{
text
:
''
text
:
''
,
textStyle
:
{
fontWeight
:
'normal'
}
},
// grid: {
// containLabel: true
...
...
@@ -127,7 +130,10 @@ export const BASE_BAR = {
}
export
const
HORIZONTAL_BAR
=
{
title
:
{
text
:
''
text
:
''
,
textStyle
:
{
fontWeight
:
'normal'
}
},
// grid: {
// containLabel: true
...
...
@@ -157,7 +163,10 @@ export const HORIZONTAL_BAR = {
export
const
BASE_LINE
=
{
title
:
{
text
:
''
text
:
''
,
textStyle
:
{
fontWeight
:
'normal'
}
},
// grid: {
// containLabel: true
...
...
@@ -188,7 +197,10 @@ export const BASE_LINE = {
export
const
BASE_PIE
=
{
title
:
{
text
:
''
text
:
''
,
textStyle
:
{
fontWeight
:
'normal'
}
},
// grid: {
// containLabel: true
...
...
@@ -221,7 +233,10 @@ export const BASE_PIE = {
export
const
BASE_FUNNEL
=
{
title
:
{
text
:
''
text
:
''
,
textStyle
:
{
fontWeight
:
'normal'
}
},
// grid: {
// containLabel: true
...
...
@@ -277,7 +292,10 @@ export const BASE_FUNNEL = {
export
const
BASE_RADAR
=
{
title
:
{
text
:
''
text
:
''
,
textStyle
:
{
fontWeight
:
'normal'
}
},
// grid: {
// containLabel: true
...
...
@@ -312,7 +330,10 @@ export const BASE_RADAR = {
export
const
BASE_GAUGE
=
{
title
:
{
text
:
''
text
:
''
,
textStyle
:
{
fontWeight
:
'normal'
}
},
// grid: {
// containLabel: true
...
...
frontend/src/views/chart/components/shape-attr/SizeSelector.vue
浏览文件 @
12e03102
...
...
@@ -194,7 +194,7 @@ export default {
methods
:
{
init
()
{
const
arr
=
[]
for
(
let
i
=
10
;
i
<=
3
0
;
i
=
i
+
2
)
{
for
(
let
i
=
10
;
i
<=
6
0
;
i
=
i
+
2
)
{
arr
.
push
({
name
:
i
+
''
,
value
:
i
+
''
...
...
frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
浏览文件 @
12e03102
<
template
>
<el-row>
<el-row>
<el-row
v-loading=
"$store.getters.loadingMap[$store.getters.currentPath]"
>
<el-col
:span=
"2"
>
<span>
&
nbsp
</span>
<ul
class=
"direction"
>
...
...
@@ -14,7 +14,7 @@
<div
class=
"window"
>
<ul
class=
"container"
:style=
"containerStyle"
>
<li>
<div
style=
"width:240px; height: 208px;"
>
<div
style=
"width:240px; height: 208px;
overflow: hidden
"
>
<subject-template-item
v-for=
"item in sliders[sliders.length - 1]"
:key=
"item.id"
...
...
frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
浏览文件 @
12e03102
...
...
@@ -80,7 +80,7 @@ export default {
background
:
'background: 0% 0% / cover rgb(255, 255, 255)'
}
if
(
this
.
subjectItemDetails
)
{
if
(
this
.
subjectItemDetails
.
panel
.
backgroundType
===
'image'
&&
this
.
subjectItemDetails
.
panel
.
imageUrl
)
{
if
(
this
.
subjectItemDetails
.
panel
.
backgroundType
===
'image'
&&
this
.
subjectItemDetails
.
panel
.
imageUrl
)
{
style
=
{
width
:
'100%'
,
height
:
'100%'
,
...
...
@@ -224,7 +224,7 @@ export default {
}
.vertical-layout
{
overflow
:
hidden
auto
;
overflow
:
hidden
;
position
:
absolute
;
inset
:
0px
0px
30px
;
width
:
108px
;
height
:
58px
;
...
...
frontend/src/views/panel/list/PanelList.vue
浏览文件 @
12e03102
...
...
@@ -184,8 +184,8 @@ export default {
nodeType
:
null
,
panelType
:
null
,
panelStyle
:
JSON
.
stringify
({
width
:
1
6
80
,
height
:
105
0
,
width
:
1
2
80
,
height
:
72
0
,
scale
:
100
,
openCommonStyle
:
true
,
panel
:
DEFAULT_PANEL_STYLE
,
...
...
@@ -225,8 +225,8 @@ export default {
nodeType
:
null
,
panelType
:
null
,
panelStyle
:
JSON
.
stringify
({
width
:
1
6
80
,
height
:
105
0
,
width
:
1
2
80
,
height
:
72
0
,
scale
:
100
,
openCommonStyle
:
true
,
panel
:
DEFAULT_PANEL_STYLE
,
...
...
frontend/src/views/panel/panel.js
浏览文件 @
12e03102
...
...
@@ -19,8 +19,8 @@ export const DEFAULT_PANEL_STYLE = {
}
export
const
DEFAULT_COMMON_CANVAS_STYLE
=
{
width
:
1
6
80
,
height
:
105
0
,
width
:
1
2
80
,
height
:
72
0
,
scale
:
100
,
openCommonStyle
:
true
,
panel
:
DEFAULT_PANEL_STYLE
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论