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

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

Browse Source
This commit is contained in:
taojinlong 2022-04-07 17:20:11 +08:00
commit 8a9f3d38bd
14 changed files with 59 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -524,6 +524,9 @@ public class ChartViewService {
fieldMap.put("extBubble",extBubble);
PluginViewParam pluginViewParam = buildPluginParam(fieldMap, fieldCustomFilter, extFilterList, ds, table, view);
String sql = pluginViewSql(pluginViewParam, view);
if (StringUtils.isBlank(sql)) {
return emptyChartViewDTO(view);
}
datasourceRequest.setQuery(sql);
data = datasourceProvider.getData(datasourceRequest);

4
backend/src/main/java/io/dataease/service/panel/PanelViewService.java
View File

@ -128,9 +128,9 @@ public class PanelViewService {
viewIds = panelViewInsertDTOList.stream().map(panelView ->panelView.getChartViewId()).collect(Collectors.toList());
extChartViewMapper.copyCacheToView(viewIds);
}
extChartViewMapper.deleteCacheWithPanel(viewIds,panelId);
extChartViewMapper.deleteNoUseView(viewIds,panelId);
}
extChartViewMapper.deleteCacheWithPanel(viewIds,panelId);
extChartViewMapper.deleteNoUseView(viewIds,panelId);
panelGroup.setMobileLayout(mobileLayout);
return viewIds;
}

6
backend/src/main/java/io/dataease/service/sys/PluginService.java
View File

@ -255,14 +255,14 @@ public class PluginService {
}
public boolean versionMatch(String pluginVersion) {
List<Integer> versionLists = Arrays.stream(version.split(".")).map(CodingUtil::string2Integer).collect(Collectors.toList());
List<Integer> requireVersionLists = Arrays.stream(pluginVersion.split(".")).map(CodingUtil::string2Integer).collect(Collectors.toList());
List<Integer> versionLists = Arrays.stream(version.split("\\.")).map(CodingUtil::string2Integer).collect(Collectors.toList());
List<Integer> requireVersionLists = Arrays.stream(pluginVersion.split("\\.")).map(CodingUtil::string2Integer).collect(Collectors.toList());
int maxSize = Math.max(versionLists.size(), requireVersionLists.size());
for (int i = 0; i < maxSize; i++) {
Integer currentV = versionLists.size() == i ? 0 : versionLists.get(i);
Integer requireV = requireVersionLists.size() == i ? 0 : requireVersionLists.get(i);
if (requireV > currentV) return false;
}
return false;
return true;
}
}

2
frontend/src/api/system/plugin.js
View File

@ -14,7 +14,7 @@ export function pluginLists(page, size, data) {
export function uninstall(pluginId) {
return request({
url: pathMap.queryPath + pluginId,
url: pathMap.uninstallPath + pluginId,
method: 'post',
loading: true
})

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

@ -25,7 +25,7 @@
/>
<!--视图详情-->
<el-dialog
:title="'['+showChartInfo.name+']'+$t('chart.chart_details')"
:title="$t('chart.chart_details')"
:visible.sync="chartDetailsVisible"
width="70%"
class="dialog-css"

2
frontend/src/components/canvas/components/Editor/PreviewMobile.vue
View File

@ -22,7 +22,7 @@
/>
<!--视图详情-->
<el-dialog
:title="'['+showChartInfo.name+']'+$t('chart.chart_details')"
:title="$t('chart.chart_details')"
:visible.sync="chartDetailsVisible"
width="70%"
class="dialog-css"

2
frontend/src/components/canvas/components/Editor/index.vue
View File

@ -143,7 +143,7 @@
<!--视图详情-->
<el-dialog
:title="'['+showChartInfo.name+']'+$t('chart.chart_details')"
:title="$t('chart.chart_details')"
:visible.sync="chartDetailsVisible"
width="70%"
class="dialog-css"

13
frontend/src/views/chart/chart/gauge/gauge.js
View File

@ -87,17 +87,24 @@ export function baseGaugeOption(chart_option, chart) {
show: false
}
chart_option.series[0].axisTick = {
splitNumber: 5, // TODO 刻度间隔数
length: 10, // TODO 子刻度线长度
lineStyle: {
color: 'auto'
color: 'auto',
width: 2// TODO 子刻度线宽度
}
}
chart_option.series[0].splitLine = {
length: 18, // TODO 刻度线长度
lineStyle: {
color: 'auto'
color: 'auto',
width: 2// TODO 刻度线宽度
}
}
chart_option.series[0].axisLabel = {
color: 'auto'
color: 'auto',
distance: 20, // TODO 刻度值文字里刻度线距离
fontSize: 20// TODO 刻度值字体大小
}
}
}

20
frontend/src/views/chart/chart/gauge/gauge_antv.js
View File

@ -72,6 +72,26 @@ export function baseGaugeOptionAntV(plot, container, chart, action) {
// indicator: null,
statistic: {
content: labelContent
},
axis: {
label: {
style: {
fontSize: 14// TODO 刻度值字体大小
}
},
tickLine: {
length: -12, // TODO 刻度线长度
style: {
lineWidth: 1// TODO 刻度线宽度
}
},
subTickLine: {
count: 4, // TODO 子刻度数
length: -6, // TODO 子刻度线长度
style: {
lineWidth: 1// TODO 子刻度线宽度
}
}
}
// range: {
// width: 12

17
frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue
View File

@ -43,6 +43,7 @@
<script>
import { COLOR_PANEL, DEFAULT_TITLE_STYLE } from '../../chart/chart'
import { checkTitle } from '@/api/chart/chart'
export default {
name: 'TitleSelectorAntV',
@ -107,10 +108,18 @@ export default {
this.titleForm.title = this.chart.title
return
}
if (!this.titleForm.show) {
this.isSetting = false
}
this.$emit('onTextChange', this.titleForm)
checkTitle({ id: this.chart.id, title: this.titleForm.title, sceneId: this.chart.sceneId }).then((rsp) => {
if (rsp.data === 'success') {
if (!this.titleForm.show) {
this.isSetting = false
}
this.$emit('onTextChange', this.titleForm)
} else {
this.$error(this.$t('chart.title_repeat'))
this.titleForm.title = this.chart.title
return
}
})
},
inputOnInput: function(e) {
this.$forceUpdate()

2
frontend/src/views/chart/group/Group.vue
View File

@ -224,7 +224,7 @@
</el-row>
</el-row>
<el-row class="chart-box" style="text-align: center;">
<svg-icon :icon-class="view.isPlugin ? ('/api/pluginCommon/staticInfo/' + view.type + '/svg') : view.type" class="chart-icon" />
<svg-icon :icon-class="view.isPlugin && view.type && view.type !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + view.type + '/svg') : view.type" class="chart-icon" />
</el-row>
</el-row>

2
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -154,7 +154,7 @@
<span>{{ $t('chart.chart_type') }}</span>
<el-row style="padding: 4px 0 4px 10px;">
<span>
<svg-icon :icon-class="view.isPlugin ? ('/api/pluginCommon/staticInfo/' + view.type + '/svg') : view.type" class="chart-icon" />
<svg-icon :icon-class="view.isPlugin && view.type && view.type !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + view.type + '/svg') : view.type" class="chart-icon" />
</span>
<span style="float: right;">
<el-popover

2
frontend/src/views/panel/ViewSelect/index.vue
View File

@ -46,7 +46,7 @@
<svg-icon icon-class="panel" class="ds-icon-scene" />
</span>
<span v-else>
<svg-icon :icon-class="data.isPlugin ? ('/api/pluginCommon/staticInfo/' + data.modelInnerType + '/svg') : data.modelInnerType" style="width: 14px;height: 14px" />
<svg-icon :icon-class="data.isPlugin && data.type && data.type !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + data.modelInnerType + '/svg') : data.modelInnerType" style="width: 14px;height: 14px" />
</span>
<span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ data.name }}</span>
</span>

2
frontend/src/views/panel/list/EditPanel/TemplateAllList.vue
View File

@ -29,7 +29,7 @@
<span v-if="data.nodeType==='folder'">
<i class="el-icon-folder" />
</span>
<span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
<span :title="data.name" style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
</span>
</span>
</el-tree>