Skip to content

D
dataease
Unverified 提交 a861223e authored 作者: XiaJunjie2020's avatar XiaJunjie2020 提交者： GitHub
浏览文件
操作

Merge pull request #1143 from dataease/pr@dev@feat_chart_type

feat:视图根据图表类型分类
上级 51799d61 708e2098
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 142 行增加 和 42 行删除
frontend/src/lang/en.js
浏览文件 @ a861223e
...@@ -957,7 +957,19 @@ export default { ...@@ -957,7 +957,19 @@ export default {
chart_word_cloud: 'Word Cloud', chart_word_cloud: 'Word Cloud',
drag_block_word_cloud_label: 'Word Label', drag_block_word_cloud_label: 'Word Label',
drag_block_word_cloud_size: 'Word Size', drag_block_word_cloud_size: 'Word Size',
splitCount_less_100: 'Split Count Range 0-100' splitCount_less_100: 'Split Count Range 0-100',
change_chart_type: 'Change Type',
chart_type_table: 'Table',
chart_type_quota: 'Quota',
chart_type_trend: 'Trend',
chart_type_compare: 'Compare',
chart_type_distribute: 'Distribute',
chart_type_relation: 'Relation',
chart_type_space: 'Space',
preview: 'Preview',
next: 'Next',
select_dataset: 'Select Dataset',
select_chart_type: 'Select Chart Type'
}, },
dataset: { dataset: {
sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default', sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
......
frontend/src/lang/tw.js
浏览文件 @ a861223e
...@@ -958,7 +958,19 @@ export default { ...@@ -958,7 +958,19 @@ export default {
chart_word_cloud: '詞雲', chart_word_cloud: '詞雲',
drag_block_word_cloud_label: '詞標簽', drag_block_word_cloud_label: '詞標簽',
drag_block_word_cloud_size: '詞大小', drag_block_word_cloud_size: '詞大小',
splitCount_less_100: '刻度數範圍0-100' splitCount_less_100: '刻度數範圍0-100',
change_chart_type: '更改類型',
chart_type_table: '表格',
chart_type_quota: '指標',
chart_type_trend: '趨勢',
chart_type_compare: '比較',
chart_type_distribute: '分布',
chart_type_relation: '關系',
chart_type_space: '空間位置',
preview: '上一步',
next: '下一步',
select_dataset: '選擇數據集',
select_chart_type: '選擇圖表類型'
}, },
dataset: { dataset: {
sheet_warn: '有多個 Sheet 頁，默認抽取第一個', sheet_warn: '有多個 Sheet 頁，默認抽取第一個',
......
frontend/src/lang/zh.js
浏览文件 @ a861223e
...@@ -961,7 +961,19 @@ export default { ...@@ -961,7 +961,19 @@ export default {
chart_word_cloud: '词云', chart_word_cloud: '词云',
drag_block_word_cloud_label: '词标签', drag_block_word_cloud_label: '词标签',
drag_block_word_cloud_size: '词大小', drag_block_word_cloud_size: '词大小',
splitCount_less_100: '刻度数范围0-100' splitCount_less_100: '刻度数范围0-100',
change_chart_type: '更改类型',
chart_type_table: '表格',
chart_type_quota: '指标',
chart_type_trend: '趋势',
chart_type_compare: '比较',
chart_type_distribute: '分布',
chart_type_relation: '关系',
chart_type_space: '空间位置',
preview: '上一步',
next: '下一步',
select_dataset: '选择数据集',
select_chart_type: '选择图表类型'
}, },
dataset: { dataset: {
sheet_warn: '有多个 Sheet 页，默认抽取第一个', sheet_warn: '有多个 Sheet 页，默认抽取第一个',
......
frontend/src/views/chart/view/ChartEdit.vue
浏览文件 @ a861223e
...@@ -96,46 +96,110 @@ ...@@ -96,46 +96,110 @@
<el-col <el-col
style="height: 100%;width: 180px;border-right: 1px solid #E6E6E6;" style="height: 100%;width: 180px;border-right: 1px solid #E6E6E6;"
> >
<div style="height: 25vh;overflow:auto" class="padding-lr"> <div style="height: 60px;overflow:auto" class="padding-lr theme-border-class">
<span> <span class="theme-border-class">
<span class="theme-border-class">{{ $t('chart.chart_type') }}</span> <span>{{ $t('chart.chart_type') }}</span>
<span style="float: right;"> <el-row style="padding: 4px 0 4px 10px;">
<el-select v-model="view.render" class="render-select" style="width: 70px" size="mini" @change="save(true,'chart',true,true)"> <span>
<el-option <svg-icon :icon-class="view.type" class="chart-icon" />
v-for="item in renderOptions"
:key="item.value"
:value="item.value"
:label="item.name"
/>
</el-select>
</span>
</span>
<el-row>
<div>
<el-radio-group
v-model="view.type"
style="width: 100%"
:disabled="!hasDataPermission('manage',param.privileges)"
@change="save(true,'chart',true,true)"
>
<chart-type :chart="view" />
</el-radio-group>
</div>
</el-row>
<el-row class="title-text" style="color: #909399;">
<span>
<span v-show="chart.type && (chart.type.includes('pie') || chart.type.includes('funnel') || chart.type.includes('text') || chart.type.includes('gauge') || chart.type.includes('treemap'))">
Tips: {{ $t('chart.only_one_quota') }}
</span> </span>
<!-- <span v-show="chart.type && (chart.type.includes('text'))">--> <span style="float: right;">
<!-- Tips: {{ $t('chart.only_one_result') }}--> <el-popover
<!-- </span>--> placement="bottom-end"
<!-- <span v-show="chart.type && chart.type.includes('gauge')">--> width="400"
<!-- Tips: {{ $t('chart.only_one_quota') }},{{ $t('chart.only_one_result') }}--> trigger="click"
<!-- </span>--> :append-to-body="true"
</span> >
</el-row> <div class="padding-lr">
<span>
<span class="theme-border-class">{{ $t('chart.chart_type') }}</span>
<span style="float: right;">
<el-select v-model="view.render" class="render-select" style="width: 70px" size="mini" @change="save(true,'chart',true,true)">
<el-option
v-for="item in renderOptions"
:key="item.value"
:value="item.value"
:label="item.name"
/>
</el-select>
</span>
</span>
<el-row>
<div>
<el-radio-group
v-model="view.type"
style="width: 100%"
:disabled="!hasDataPermission('manage',param.privileges)"
@change="save(true,'chart',true,true)"
>
<chart-type :chart="view" style="height: 480px" />
</el-radio-group>
</div>
</el-row>
<!-- <el-row class="title-text" style="color: #909399;">-->
<!-- <span>-->
<!-- <span v-show="chart.type && (chart.type.includes('pie') || chart.type.includes('funnel') || chart.type.includes('text') || chart.type.includes('gauge') || chart.type.includes('treemap'))">-->
<!-- Tips: {{ $t('chart.only_one_quota') }}-->
<!-- </span>-->
<!-- &lt;!&ndash; <span v-show="chart.type && (chart.type.includes('text'))">&ndash;&gt;-->
<!-- &lt;!&ndash; Tips: {{ $t('chart.only_one_result') }}&ndash;&gt;-->
<!-- &lt;!&ndash; </span>&ndash;&gt;-->
<!-- &lt;!&ndash; <span v-show="chart.type && chart.type.includes('gauge')">&ndash;&gt;-->
<!-- &lt;!&ndash; Tips: {{ $t('chart.only_one_quota') }},{{ $t('chart.only_one_result') }}&ndash;&gt;-->
<!-- &lt;!&ndash; </span>&ndash;&gt;-->
<!-- </span>-->
<!-- </el-row>-->
</div>
<el-button slot="reference" size="mini" style="padding: 6px;">
{{ $t('chart.change_chart_type') }}
<i class="el-icon-caret-bottom" />
</el-button>
</el-popover>
</span>
</el-row>
</span>
</div> </div>
<!-- <div style="height: 25vh;overflow:auto" class="padding-lr">-->
<!-- <span>-->
<!-- <span class="theme-border-class">{{ $t('chart.chart_type') }}</span>-->
<!-- <span style="float: right;">-->
<!-- <el-select v-model="view.render" class="render-select" style="width: 70px" size="mini" @change="save(true,'chart',true,true)">-->
<!-- <el-option-->
<!-- v-for="item in renderOptions"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.name"-->
<!-- />-->
<!-- </el-select>-->
<!-- </span>-->
<!-- </span>-->
<!-- <el-row>-->
<!-- <div>-->
<!-- <el-radio-group-->
<!-- v-model="view.type"-->
<!-- style="width: 100%"-->
<!-- :disabled="!hasDataPermission('manage',param.privileges)"-->
<!-- @change="save(true,'chart',true,true)"-->
<!-- >-->
<!-- <chart-type :chart="view" />-->
<!-- </el-radio-group>-->
<!-- </div>-->
<!-- </el-row>-->
<!-- <el-row class="title-text" style="color: #909399;">-->
<!-- <span>-->
<!-- <span v-show="chart.type && (chart.type.includes('pie') || chart.type.includes('funnel') || chart.type.includes('text') || chart.type.includes('gauge') || chart.type.includes('treemap'))">-->
<!-- Tips: {{ $t('chart.only_one_quota') }}-->
<!-- </span>-->
<!-- &lt;!&ndash; <span v-show="chart.type && (chart.type.includes('text'))">&ndash;&gt;-->
<!-- &lt;!&ndash; Tips: {{ $t('chart.only_one_result') }}&ndash;&gt;-->
<!-- &lt;!&ndash; </span>&ndash;&gt;-->
<!-- &lt;!&ndash; <span v-show="chart.type && chart.type.includes('gauge')">&ndash;&gt;-->
<!-- &lt;!&ndash; Tips: {{ $t('chart.only_one_quota') }},{{ $t('chart.only_one_result') }}&ndash;&gt;-->
<!-- &lt;!&ndash; </span>&ndash;&gt;-->
<!-- </span>-->
<!-- </el-row>-->
<!-- </div>-->
<div style="overflow:auto;border-top: 1px solid #e6e6e6" class="attr-style theme-border-class"> <div style="overflow:auto;border-top: 1px solid #e6e6e6" class="attr-style theme-border-class">
<el-row style="height: 100%;"> <el-row style="height: 100%;">
<el-row class="padding-lr"> <el-row class="padding-lr">
...@@ -1761,7 +1825,7 @@ export default { ...@@ -1761,7 +1825,7 @@ export default {
} }
.attr-style{ .attr-style{
height: calc(100vh - 56px - 25vh - 40px - 40px); height: calc(100vh - 56px - 60px - 40px - 40px);
} }
.blackTheme .attr-style{ .blackTheme .attr-style{
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论