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

Merge branch 'dev' into pr@dev_eslint_auto_fix

Browse Source
This commit is contained in:
dataeaseShu 2022-10-18 11:49:47 +08:00
commit 99ac692ab1
14 changed files with 202 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/components/widget/DeWidget/DeNumberRange.vue
View File

@ -4,10 +4,14 @@
v-if="element.options!== null && element.options.attrs!==null"
ref="form"
:model="form"
style="width: 100%;"
:rules="rules"
>
<div class="de-number-range-container">
<el-form-item prop="min">
<el-form-item
prop="min"
style="padding-left: 0px;"
>
<el-input
ref="de-number-range-min"
v-model="form.min"
@ -18,7 +22,10 @@
/>
</el-form-item>
<span>{{ $t('denumberrange.split_placeholder') }}</span>
<el-form-item prop="max">
<el-form-item
prop="max"
style="padding-right: 0px;width: calc(50% - 6px) !important;"
>
<el-input
ref="de-number-range-max"
v-model="form.max"

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

@ -1153,6 +1153,10 @@ export default {
axis_color: 'Axis Color',
axis_width: 'Axis Width',
axis_type: 'Axis Type',
grid_show: 'Grid Show',
grid_color: 'Grid Color',
grid_width: 'Grid Width',
grid_type: 'Grid Type',
axis_type_solid: 'Solid',
axis_type_dashed: 'Dashed',
axis_type_dotted: 'Dotted',

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

@ -1153,6 +1153,10 @@ export default {
axis_color: '軸線顔色',
axis_width: '軸線寬度',
axis_type: '軸線類型',
grid_show: '網格線顯示',
grid_color: '網格線顏色',
grid_width: '網格線寬度',
grid_type: '網格線類型',
axis_type_solid: '實線',
axis_type_dashed: '虛線',
axis_type_dotted: '點',

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

@ -1152,6 +1152,10 @@ export default {
axis_color: '轴线颜色',
axis_width: '轴线宽度',
axis_type: '轴线类型',
grid_show: '网格线显示',
grid_color: '网格线颜色',
grid_width: '网格线宽度',
grid_type: '网格线类型',
axis_type_solid: '实线',
axis_type_dashed: '虚线',
axis_type_dotted: '点',

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

@ -242,6 +242,14 @@ export const DEFAULT_XAXIS_STYLE = {
rotate: 0,
formatter: '{value}'
},
axisLine: {
show: true,
lineStyle: {
color: '#cccccc',
width: 1,
style: 'solid'
}
},
splitLine: {
show: false,
lineStyle: {
@ -280,6 +288,14 @@ export const DEFAULT_YAXIS_STYLE = {
rotate: 0,
formatter: '{value}'
},
axisLine: {
show: false,
lineStyle: {
color: '#cccccc',
width: 1,
style: 'solid'
}
},
splitLine: {
show: true,
lineStyle: {
@ -318,6 +334,14 @@ export const DEFAULT_YAXIS_EXT_STYLE = {
rotate: 0,
formatter: '{value}'
},
axisLine: {
show: false,
lineStyle: {
color: '#cccccc',
width: 1,
style: 'solid'
}
},
splitLine: {
show: true,
lineStyle: {

12
frontend/src/views/chart/chart/common/common.js
View File

@ -67,6 +67,9 @@ export function componentStyle(chart_option, chart) {
chart_option.xAxis.axisLabel = customStyle.xAxis.axisLabel
chart_option.xAxis.splitLine = customStyle.xAxis.splitLine
chart_option.xAxis.nameTextStyle = customStyle.xAxis.nameTextStyle
const axisLine = customStyle.xAxis.axisLine ? customStyle.xAxis.axisLine : DEFAULT_XAXIS_STYLE.axisLine
chart_option.xAxis.axisLine = axisLine
chart_option.xAxis.axisTick = axisLine
chart_option.xAxis.axisLabel.showMaxLabel = true
chart_option.xAxis.axisLabel.showMinLabel = true
@ -96,6 +99,9 @@ export function componentStyle(chart_option, chart) {
chart_option.yAxis.axisLabel = customStyle.yAxis.axisLabel
chart_option.yAxis.splitLine = customStyle.yAxis.splitLine
chart_option.yAxis.nameTextStyle = customStyle.yAxis.nameTextStyle
const axisLine = customStyle.yAxis.axisLine ? customStyle.yAxis.axisLine : DEFAULT_YAXIS_STYLE.axisLine
chart_option.yAxis.axisLine = axisLine
chart_option.yAxis.axisTick = axisLine
chart_option.yAxis.axisLabel.showMaxLabel = true
chart_option.yAxis.axisLabel.showMinLabel = true
@ -125,6 +131,9 @@ export function componentStyle(chart_option, chart) {
chart_option.yAxis[0].axisLabel = customStyle.yAxis.axisLabel
chart_option.yAxis[0].splitLine = customStyle.yAxis.splitLine
chart_option.yAxis[0].nameTextStyle = customStyle.yAxis.nameTextStyle
const axisLine0 = customStyle.yAxis[0].axisLine ? customStyle.yAxis[0].axisLine : DEFAULT_YAXIS_STYLE.axisLine
chart_option.yAxis[0].axisLine = axisLine0
chart_option.yAxis[0].axisTick = axisLine0
chart_option.yAxis[0].axisLabel.showMaxLabel = true
chart_option.yAxis[0].axisLabel.showMinLabel = true
@ -155,6 +164,9 @@ export function componentStyle(chart_option, chart) {
chart_option.yAxis[1].axisLabel = customStyle.yAxisExt.axisLabel
chart_option.yAxis[1].splitLine = customStyle.yAxisExt.splitLine
chart_option.yAxis[1].nameTextStyle = customStyle.yAxisExt.nameTextStyle
const axisLine1 = customStyle.yAxis[1].axisLine ? customStyle.yAxis[1].axisLine : DEFAULT_YAXIS_EXT_STYLE.axisLine
chart_option.yAxis[1].axisLine = axisLine1
chart_option.yAxis[1].axisTick = axisLine1
chart_option.yAxis[1].axisLabel.showMaxLabel = true
chart_option.yAxis[1].axisLabel.showMinLabel = true

50
frontend/src/views/chart/chart/common/common_antv.js
View File

@ -1,6 +1,6 @@
import { hexColorToRGBA } from '@/views/chart/chart/util'
import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
import { DEFAULT_XAXIS_STYLE, DEFAULT_YAXIS_STYLE } from '@/views/chart/chart/chart'
import { DEFAULT_XAXIS_STYLE, DEFAULT_YAXIS_EXT_STYLE, DEFAULT_YAXIS_STYLE } from '@/views/chart/chart/chart'
export function getPadding(chart) {
if (chart.drill) {
@ -455,6 +455,18 @@ export function getXAxis(chart) {
}
}
} : null
const axisCfg = a.axisLine ? a.axisLine : DEFAULT_XAXIS_STYLE.axisLine
const axisLine = axisCfg.show ? {
style: {
stroke: axisCfg.lineStyle.color,
lineWidth: parseInt(axisCfg.lineStyle.width)
}
} : null
const tickLine = axisCfg.show ? {
style: {
stroke: axisCfg.lineStyle.color
}
} : null
const label = a.axisLabel.show ? {
rotate: parseInt(a.axisLabel.rotate) * Math.PI / 180,
style: {
@ -478,7 +490,9 @@ export function getXAxis(chart) {
position: transAxisPosition(chart, a),
title: title,
grid: grid,
label: label
label: label,
line: axisLine,
tickLine: tickLine
}
// 轴值设置
@ -526,6 +540,18 @@ export function getYAxis(chart) {
}
}
} : null
const axisCfg = a.axisLine ? a.axisLine : DEFAULT_YAXIS_STYLE.axisLine
const axisLine = axisCfg.show ? {
style: {
stroke: axisCfg.lineStyle.color,
lineWidth: parseInt(axisCfg.lineStyle.width)
}
} : null
const tickLine = axisCfg.show ? {
style: {
stroke: axisCfg.lineStyle.color
}
} : null
const label = a.axisLabel.show ? {
rotate: parseInt(a.axisLabel.rotate) * Math.PI / 180,
style: {
@ -553,7 +579,9 @@ export function getYAxis(chart) {
position: transAxisPosition(chart, a),
title: title,
grid: grid,
label: label
label: label,
line: axisLine,
tickLine: tickLine
}
// 轴值设置
@ -601,6 +629,18 @@ export function getYAxisExt(chart) {
}
}
} : null
const axisCfg = a.axisLine ? a.axisLine : DEFAULT_YAXIS_EXT_STYLE.axisLine
const axisLine = axisCfg.show ? {
style: {
stroke: axisCfg.lineStyle.color,
lineWidth: parseInt(axisCfg.lineStyle.width)
}
} : null
const tickLine = axisCfg.show ? {
style: {
stroke: axisCfg.lineStyle.color
}
} : null
const label = a.axisLabel.show ? {
rotate: parseInt(a.axisLabel.rotate) * Math.PI / 180,
style: {
@ -628,7 +668,9 @@ export function getYAxisExt(chart) {
position: transAxisPosition(chart, a),
title: title,
grid: grid,
label: label
label: label,
line: axisLine,
tickLine: tickLine
}
// 轴值设置

1
frontend/src/views/chart/chart/util.js
View File

@ -592,7 +592,6 @@ export const TYPE_CONFIGS = [
]
}
},
{
render: 'antv',
category: 'chart.chart_type_compare',

21
frontend/src/views/chart/components/component-style/XAxisSelector.vue
View File

@ -154,15 +154,25 @@
v-show="showProperty('splitLine')"
:label="$t('chart.axis_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.axisLine.show"
@change="changeXAxisStyle('axisLine')"
>{{ $t('chart.axis_show') }}</el-checkbox>
</el-form-item>
<el-form-item
v-show="showProperty('splitLine')"
:label="$t('chart.grid_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.splitLine.show"
@change="changeXAxisStyle('splitLine')"
>{{ $t('chart.axis_show') }}</el-checkbox>
>{{ $t('chart.grid_show') }}</el-checkbox>
</el-form-item>
<span v-show="showProperty('splitLine') && axisForm.splitLine.show">
<el-form-item
:label="$t('chart.axis_color')"
:label="$t('chart.grid_color')"
class="form-item"
>
<el-color-picker
@ -173,7 +183,7 @@
/>
</el-form-item>
<el-form-item
:label="$t('chart.axis_width')"
:label="$t('chart.grid_width')"
class="form-item form-item-slider"
>
<el-slider
@ -187,7 +197,7 @@
/>
</el-form-item>
<el-form-item
:label="$t('chart.axis_type')"
:label="$t('chart.grid_type')"
class="form-item"
>
<el-radio-group
@ -420,6 +430,9 @@ export default {
if (!this.axisForm.axisLabelFormatter) {
this.axisForm.axisLabelFormatter = JSON.parse(JSON.stringify(DEFAULT_XAXIS_STYLE.axisLabelFormatter))
}
if (!this.axisForm.axisLine) {
this.axisForm.axisLine = JSON.parse(JSON.stringify(DEFAULT_XAXIS_STYLE.axisLine))
}
}
}
},

19
frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
View File

@ -154,15 +154,25 @@
v-show="showProperty('splitLine')"
:label="$t('chart.axis_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.axisLine.show"
@change="changeXAxisStyle('axisLine')"
>{{ $t('chart.axis_show') }}</el-checkbox>
</el-form-item>
<el-form-item
v-show="showProperty('splitLine')"
:label="$t('chart.grid_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.splitLine.show"
@change="changeXAxisStyle('splitLine')"
>{{ $t('chart.axis_show') }}</el-checkbox>
>{{ $t('chart.grid_show') }}</el-checkbox>
</el-form-item>
<span v-show="showProperty('splitLine') && axisForm.splitLine.show">
<el-form-item
:label="$t('chart.axis_color')"
:label="$t('chart.grid_color')"
class="form-item"
>
<el-color-picker
@ -173,7 +183,7 @@
/>
</el-form-item>
<el-form-item
:label="$t('chart.axis_width')"
:label="$t('chart.grid_width')"
class="form-item form-item-slider"
>
<el-slider
@ -393,6 +403,9 @@ export default {
if (!this.axisForm.axisLabelFormatter) {
this.axisForm.axisLabelFormatter = JSON.parse(JSON.stringify(DEFAULT_XAXIS_STYLE.axisLabelFormatter))
}
if (!this.axisForm.axisLine) {
this.axisForm.axisLine = JSON.parse(JSON.stringify(DEFAULT_XAXIS_STYLE.axisLine))
}
}
}
},

21
frontend/src/views/chart/components/component-style/YAxisExtSelector.vue
View File

@ -151,16 +151,26 @@
v-show="showProperty('splitLine')"
:label="$t('chart.axis_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.axisLine.show"
@change="changeYAxisStyle('axisLine')"
>{{ $t('chart.axis_show') }}</el-checkbox>
</el-form-item>
<el-form-item
v-show="showProperty('splitLine')"
:label="$t('chart.grid_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.splitLine.show"
@change="changeYAxisStyle('splitLine')"
>{{ $t('chart.axis_show') }}</el-checkbox>
>{{ $t('chart.grid_show') }}</el-checkbox>
</el-form-item>
<span v-show="axisForm.splitLine.show">
<el-form-item
v-show="showProperty('splitLine')"
:label="$t('chart.axis_color')"
:label="$t('chart.grid_color')"
class="form-item"
>
<el-color-picker
@ -172,7 +182,7 @@
</el-form-item>
<el-form-item
v-show="showProperty('splitLine')"
:label="$t('chart.axis_width')"
:label="$t('chart.grid_width')"
class="form-item form-item-slider"
>
<el-slider
@ -187,7 +197,7 @@
</el-form-item>
<el-form-item
v-show="showProperty('splitLine')"
:label="$t('chart.axis_type')"
:label="$t('chart.grid_type')"
class="form-item"
>
<el-radio-group
@ -410,6 +420,9 @@ export default {
if (!this.axisForm.axisLabelFormatter) {
this.axisForm.axisLabelFormatter = JSON.parse(JSON.stringify(DEFAULT_YAXIS_EXT_STYLE.axisLabelFormatter))
}
if (!this.axisForm.axisLine) {
this.axisForm.axisLine = JSON.parse(JSON.stringify(DEFAULT_YAXIS_EXT_STYLE.axisLine))
}
}
}
},

19
frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue
View File

@ -154,15 +154,25 @@
v-show="showProperty('splitLine')"
:label="$t('chart.axis_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.axisLine.show"
@change="changeYAxisStyle('axisLine')"
>{{ $t('chart.axis_show') }}</el-checkbox>
</el-form-item>
<el-form-item
v-show="showProperty('splitLine')"
:label="$t('chart.grid_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.splitLine.show"
@change="changeYAxisStyle('splitLine')"
>{{ $t('chart.axis_show') }}</el-checkbox>
>{{ $t('chart.grid_show') }}</el-checkbox>
</el-form-item>
<span v-show="showProperty('splitLine') && axisForm.splitLine.show">
<el-form-item
:label="$t('chart.axis_color')"
:label="$t('chart.grid_color')"
class="form-item"
>
<el-color-picker
@ -173,7 +183,7 @@
/>
</el-form-item>
<el-form-item
:label="$t('chart.axis_width')"
:label="$t('chart.grid_width')"
class="form-item form-item-slider"
>
<el-slider
@ -396,6 +406,9 @@ export default {
if (!this.axisForm.axisLabelFormatter) {
this.axisForm.axisLabelFormatter = JSON.parse(JSON.stringify(DEFAULT_YAXIS_EXT_STYLE.axisLabelFormatter))
}
if (!this.axisForm.axisLine) {
this.axisForm.axisLine = JSON.parse(JSON.stringify(DEFAULT_YAXIS_EXT_STYLE.axisLine))
}
}
}
},

21
frontend/src/views/chart/components/component-style/YAxisSelector.vue
View File

@ -154,16 +154,26 @@
v-show="showProperty('splitLine')"
:label="$t('chart.axis_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.axisLine.show"
@change="changeYAxisStyle('axisLine')"
>{{ $t('chart.axis_show') }}</el-checkbox>
</el-form-item>
<el-form-item
v-show="showProperty('splitLine')"
:label="$t('chart.grid_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.splitLine.show"
@change="changeYAxisStyle('splitLine')"
>{{ $t('chart.axis_show') }}</el-checkbox>
>{{ $t('chart.grid_show') }}</el-checkbox>
</el-form-item>
<span v-show="axisForm.splitLine.show">
<el-form-item
v-show="showProperty('splitLine')"
:label="$t('chart.axis_color')"
:label="$t('chart.grid_color')"
class="form-item"
>
<el-color-picker
@ -175,7 +185,7 @@
</el-form-item>
<el-form-item
v-show="showProperty('splitLine')"
:label="$t('chart.axis_width')"
:label="$t('chart.grid_width')"
class="form-item form-item-slider"
>
<el-slider
@ -190,7 +200,7 @@
</el-form-item>
<el-form-item
v-show="showProperty('splitLine')"
:label="$t('chart.axis_type')"
:label="$t('chart.grid_type')"
class="form-item"
>
<el-radio-group
@ -413,6 +423,9 @@ export default {
if (!this.axisForm.axisLabelFormatter) {
this.axisForm.axisLabelFormatter = JSON.parse(JSON.stringify(DEFAULT_YAXIS_STYLE.axisLabelFormatter))
}
if (!this.axisForm.axisLine) {
this.axisForm.axisLine = JSON.parse(JSON.stringify(DEFAULT_YAXIS_STYLE.axisLine))
}
}
}
},

19
frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue
View File

@ -151,15 +151,25 @@
v-show="showProperty('splitLine')"
:label="$t('chart.axis_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.axisLine.show"
@change="changeYAxisStyle('axisLine')"
>{{ $t('chart.axis_show') }}</el-checkbox>
</el-form-item>
<el-form-item
v-show="showProperty('splitLine')"
:label="$t('chart.grid_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.splitLine.show"
@change="changeYAxisStyle('splitLine')"
>{{ $t('chart.axis_show') }}</el-checkbox>
>{{ $t('chart.grid_show') }}</el-checkbox>
</el-form-item>
<span v-show="showProperty('splitLine') && axisForm.splitLine.show">
<el-form-item
:label="$t('chart.axis_color')"
:label="$t('chart.grid_color')"
class="form-item"
>
<el-color-picker
@ -170,7 +180,7 @@
/>
</el-form-item>
<el-form-item
:label="$t('chart.axis_width')"
:label="$t('chart.grid_width')"
class="form-item form-item-slider"
>
<el-slider
@ -390,6 +400,9 @@ export default {
if (!this.axisForm.axisLabelFormatter) {
this.axisForm.axisLabelFormatter = JSON.parse(JSON.stringify(DEFAULT_YAXIS_STYLE.axisLabelFormatter))
}
if (!this.axisForm.axisLine) {
this.axisForm.axisLine = JSON.parse(JSON.stringify(DEFAULT_YAXIS_STYLE.axisLine))
}
}
}
},