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

Merge pull request #2566 from dataease/pr@dev@fix_line-style

Browse Source 
fix(视图): 基础折线图/堆叠折线图-大小设置缺少实线/虚线设置、折点大小设置项
This commit is contained in:
王嘉豪 2022-07-04 13:48:51 +08:00 committed by GitHub
commit 982d3568d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1393,6 +1393,7 @@ export const TYPE_CONFIGS = [
'size-selector': [ 'size-selector': [
'lineWidth', 'lineWidth',
'lineSymbol', 'lineSymbol',
'lineType',
'lineSymbolSize', 'lineSymbolSize',
'lineSmooth' 'lineSmooth'
], ],
@ -1472,6 +1473,7 @@ export const TYPE_CONFIGS = [
'size-selector': [ 'size-selector': [
'lineWidth', 'lineWidth',
'lineSymbol', 'lineSymbol',
'lineType',
'lineSymbolSize', 'lineSymbolSize',
'lineSmooth' 'lineSmooth'
], ],

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

@ -34,6 +34,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('chart.line_symbol_size')" v-show="showProperty('lineSymbolSize')" class="form-item form-item-slider">
<el-slider v-model="sizeForm.lineSymbolSize" show-input :show-input-controls="false" input-size="mini" :min="0" :max="20" @change="changeBarSizeCase" />
</el-form-item>
<el-form-item v-show="showProperty('lineSmooth')" :label="$t('chart.line_smooth')" class="form-item"> <el-form-item v-show="showProperty('lineSmooth')" :label="$t('chart.line_smooth')" class="form-item">
<el-checkbox v-model="sizeForm.lineSmooth" @change="changeBarSizeCase('lineSmooth')">{{ $t('chart.line_smooth') }}</el-checkbox> <el-checkbox v-model="sizeForm.lineSmooth" @change="changeBarSizeCase('lineSmooth')">{{ $t('chart.line_smooth') }}</el-checkbox>
</el-form-item> </el-form-item>
@ -187,7 +190,7 @@
<el-form-item :label="$t('chart.line_width')" class="form-item form-item-slider"> <el-form-item :label="$t('chart.line_width')" class="form-item form-item-slider">
<el-slider v-model="sizeForm.lineWidth" show-input :show-input-controls="false" input-size="mini" :min="0" :max="10" @change="changeBarSizeCase('lineWidth')" /> <el-slider v-model="sizeForm.lineWidth" show-input :show-input-controls="false" input-size="mini" :min="0" :max="10" @change="changeBarSizeCase('lineWidth')" />
</el-form-item> </el-form-item>
<el-form-item v-show="false" :label="$t('chart.line_type')" class="form-item"> <el-form-item :label="$t('chart.line_type')" class="form-item">
<el-radio-group v-model="sizeForm.lineType" @change="changeBarSizeCase('lineType')"> <el-radio-group v-model="sizeForm.lineType" @change="changeBarSizeCase('lineType')">
<el-radio-button label="solid">{{ $t('chart.line_type_solid') }}</el-radio-button> <el-radio-button label="solid">{{ $t('chart.line_type_solid') }}</el-radio-button>
<el-radio-button label="dashed">{{ $t('chart.line_type_dashed') }}</el-radio-button> <el-radio-button label="dashed">{{ $t('chart.line_type_dashed') }}</el-radio-button>
@ -203,6 +206,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('chart.line_symbol_size')" class="form-item form-item-slider">
<el-slider v-model="sizeForm.lineSymbolSize" show-input :show-input-controls="false" input-size="mini" :min="0" :max="20" @change="changeBarSizeCase" />
</el-form-item>
<el-form-item :label="$t('chart.line_smooth')" class="form-item"> <el-form-item :label="$t('chart.line_smooth')" class="form-item">
<el-checkbox v-model="sizeForm.lineSmooth" @change="changeBarSizeCase('lineSmooth')">{{ $t('chart.line_smooth') }}</el-checkbox> <el-checkbox v-model="sizeForm.lineSmooth" @change="changeBarSizeCase('lineSmooth')">{{ $t('chart.line_smooth') }}</el-checkbox>
</el-form-item> </el-form-item>