Merge pull request #2352 from dataease/dev

Dev
This commit is contained in:
王嘉豪 2022-05-30 14:43:59 +08:00 committed by GitHub
commit ae2c447dcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions

View File

@ -1536,7 +1536,7 @@ export const TYPE_CONFIGS = [
'nameTextStyle', 'nameTextStyle',
'splitLine' 'splitLine'
], ],
'y-ext-axis-selector': [ 'y-axis-ext-selector': [
'show', 'show',
'position', 'position',
'name', 'name',

View File

@ -3,7 +3,7 @@
<el-col> <el-col>
<el-form ref="sizeFormBar" :model="sizeForm" label-width="80px" size="mini"> <el-form ref="sizeFormBar" :model="sizeForm" label-width="80px" size="mini">
<!--bar-begin--> <!--bar-begin-->
<el-form-item v-show="showProperty('adapt')" :label="$t('chart.adapt')" class="form-item"> <el-form-item v-show="showProperty('barDefault')" :label="$t('chart.adapt')" class="form-item">
<el-checkbox v-model="sizeForm.barDefault" @change="changeBarSizeCase('barDefault')">{{ $t('chart.adapt') }}</el-checkbox> <el-checkbox v-model="sizeForm.barDefault" @change="changeBarSizeCase('barDefault')">{{ $t('chart.adapt') }}</el-checkbox>
</el-form-item> </el-form-item>
<el-form-item v-show="showProperty('barGap')" :label="$t('chart.bar_gap')" class="form-item form-item-slider"> <el-form-item v-show="showProperty('barGap')" :label="$t('chart.bar_gap')" class="form-item form-item-slider">

View File

@ -214,7 +214,11 @@
@onChangeSplitForm="onChangeSplitForm($event,'split-selector-ant-v')" @onChangeSplitForm="onChangeSplitForm($event,'split-selector-ant-v')"
/> />
</el-collapse-item> </el-collapse-item>
<el-collapse-item v-show="view.type" name="title" :title="$t('chart.title')"> <el-collapse-item
v-show="showPropertiesCollapse(['title-selector','title-selector-ant-v'])"
name="title"
:title="$t('chart.title')"
>
<title-selector <title-selector
v-if="showProperties('title-selector')" v-if="showProperties('title-selector')"
:param="param" :param="param"