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

Merge branch 'v1.8' of github.com:dataease/dataease into v1.8

Browse Source
This commit is contained in:
taojinlong 2022-02-26 17:08:45 +08:00
commit 9ac2f35992
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
View File

@ -131,7 +131,7 @@ public class PanelGroupService {
panelGroupMapper.insertSelective(newDefaultPanel);
} else if ("copy".equals(request.getOptType())) {
try {
this.panelGroupCopy(request, null, true);
panelId = this.panelGroupCopy(request, null, true);
} catch (Exception e) {
e.printStackTrace();
LOGGER.error("更新panelView出错panelId：{}", request.getId());

4
backend/src/main/resources/db/migration/V32__1.8.sql
View File

@ -315,7 +315,7 @@ ALTER TABLE `chart_view`
ADD COLUMN `is_plugin` bit(1) NULL COMMENT '是否插件' AFTER `chart_type`;
INSERT INTO `my_plugin` VALUES (2, '视图默认插件', 'default', 0, 20000, 'view', '默认视图插件', '1.0-SNAPSHOT', NULL, 'fit2cloud-chenyw', 0, NULL, NULL, 'deplugin-view-backend', NULL);
INSERT INTO `my_plugin` VALUES (2, '视图默认插件', 'default', 0, 20000, 'view', '默认视图插件', '1.0-SNAPSHOT', NULL, 'fit2cloud-chenyw', 0, NULL, NULL, 'dataease-extensions-backend', NULL);
SET NAMES utf8mb4;
@ -365,7 +365,7 @@ ALTER TABLE `datasource`
ALTER TABLE `panel_view`
ADD COLUMN `copy_from_panel` varchar(255) NULL AFTER `position`,
ADD COLUMN `copy_from_view` varchar(255) NULL AFTER `copy_from_panel`,
ADD COLUMN `copy_from` varchar(255) NOT NULL COMMENT '如果有复制 最近一次的复制来源id' AFTER `copy_from_view`,
ADD COLUMN `copy_from` varchar(255) NULL COMMENT '如果有复制 最近一次的复制来源id' AFTER `copy_from_view`,
ADD COLUMN `copy_id` varchar(255) NULL COMMENT '本次复制的执行ID' AFTER `copy_from`;
ALTER TABLE `panel_view_linkage`

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

@ -8,7 +8,7 @@
<el-form-item :label="$t('chart.bar_width')" class="form-item form-item-slider">
<el-slider v-model="sizeForm.barWidth" :disabled="sizeForm.barDefault" show-input :show-input-controls="false" input-size="mini" :min="1" :max="80" @change="changeBarSizeCase" />
</el-form-item>
<el-form-item :label="$t('chart.bar_gap')" class="form-item form-item-slider">
<el-form-item v-show="chart.type && chart.type !== 'bar-stack'" :label="$t('chart.bar_gap')" class="form-item form-item-slider">
<el-slider v-model="sizeForm.barGap" :disabled="sizeForm.barDefault" show-input :show-input-controls="false" input-size="mini" :min="0" :max="5" :step="0.1" @change="changeBarSizeCase" />
</el-form-item>
</el-form>

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

@ -622,7 +622,7 @@
/>
</el-collapse-item>
<el-collapse-item
v-show="view.render && view.render === 'antv' && chart.type !== 'map' && chart.type !== 'waterfall' && chart.type !== 'word-cloud' && chart.type !== 'treemap' && chart.type !== 'funnel'"
v-show="view.render && view.render === 'antv' && chart.type !== 'map' && chart.type !== 'waterfall' && chart.type !== 'word-cloud' && chart.type !== 'treemap' && chart.type !== 'funnel' && chart.type !== 'bar-stack'"
name="size"
:title="(chart.type && chart.type.includes('table')) ? $t('chart.table_config') : $t('chart.size')"
>