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

Merge branch 'main' of github.com:dataease/dataease into main

Browse Source
This commit is contained in:
taojinlong 2021-05-19 17:09:47 +08:00
commit 12e0310256
12 changed files with 71 additions and 23 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(",")) {

12
frontend/src/components/canvas/components/Editor/Preview.vue
View File

@ -1,5 +1,8 @@
<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>

2
frontend/src/components/canvas/custom-component/UserView.vue
View File

@ -155,7 +155,7 @@ export default {
.rect-shape {
width: 100%;
height: 100%;
overflow: auto;
overflow: hidden;
}
.chart-class{
height: 100%;

9
frontend/src/lang/en.js
View File

@ -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',

9
frontend/src/lang/tw.js
View File

@ -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: '本地安裝',

3
frontend/src/lang/zh.js
View File

@ -880,7 +880,8 @@ export default {
clean_canvas: '清空画布',
insert_picture: '插入图片',
redo: '重做',
undo: '撤销'
undo: '撤销',
panel_null: '这是个空的仪表板，可以通过编辑来丰富内容'
},
plugin: {
local_install: '本地安装',

35
frontend/src/views/chart/chart/chart.js
View File

@ -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

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 + ''

4
frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
View File

@ -1,6 +1,6 @@
<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"

4
frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
View File

@ -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;

8
frontend/src/views/panel/list/PanelList.vue
View File

@ -184,8 +184,8 @@ export default {
nodeType: null,
panelType: null,
panelStyle: JSON.stringify({
width: 1680,
height: 1050,
width: 1280,
height: 720,
scale: 100,
openCommonStyle: true,
panel: DEFAULT_PANEL_STYLE,
@ -225,8 +225,8 @@ export default {
nodeType: null,
panelType: null,
panelStyle: JSON.stringify({
width: 1680,
height: 1050,
width: 1280,
height: 720,
scale: 100,
openCommonStyle: true,
panel: DEFAULT_PANEL_STYLE,

4
frontend/src/views/panel/panel.js
View File

@ -19,8 +19,8 @@ export const DEFAULT_PANEL_STYLE = {
}
export const DEFAULT_COMMON_CANVAS_STYLE = {
width: 1680,
height: 1050,
width: 1280,
height: 720,
scale: 100,
openCommonStyle: true,
panel: DEFAULT_PANEL_STYLE,