forked from github/dataease
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
ecf1be4486
@ -2,8 +2,8 @@ export const DEFAULT_COLOR_CASE = {
|
||||
value: 'default',
|
||||
colors: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'],
|
||||
alpha: 100,
|
||||
tableHeaderBgColor: '#4e81bb',
|
||||
tableItemBgColor: '#c6d9f0',
|
||||
tableHeaderBgColor: '#c1d1f6',
|
||||
tableItemBgColor: '#e2eafe',
|
||||
tableFontColor: '#000000',
|
||||
tableStripe: true,
|
||||
dimensionColor: '#000000',
|
||||
@ -31,7 +31,7 @@ export const DEFAULT_SIZE = {
|
||||
tableTitleHeight: 36,
|
||||
tableItemHeight: 36,
|
||||
tablePageSize: '20',
|
||||
tableColumnMode: 'adapt',
|
||||
tableColumnMode: 'custom',
|
||||
tableColumnWidth: 100,
|
||||
gaugeMin: 0,
|
||||
gaugeMax: 100,
|
||||
|
@ -222,29 +222,28 @@
|
||||
|
||||
<plugin-com v-if="isPlugin" :component-name="view.type + '-data'" :obj="{view, param, chart}" />
|
||||
<div v-else>
|
||||
|
||||
|
||||
<el-row v-if="view.type ==='map'" class="padding-lr">
|
||||
<span style="width: 80px;text-align: right;">
|
||||
<span>{{ $t('chart.map_range') }}</span>
|
||||
</span>
|
||||
<span class="tree-select-span">
|
||||
<treeselect
|
||||
ref="mapSelector"
|
||||
v-model="view.customAttr.areaCode"
|
||||
:options="places"
|
||||
:placeholder="$t('chart.select_map_range')"
|
||||
:normalizer="normalizer"
|
||||
:no-children-text="$t('commons.treeselect.no_children_text')"
|
||||
:no-options-text="$t('commons.treeselect.no_options_text')"
|
||||
:no-results-text="$t('commons.treeselect.no_results_text')"
|
||||
:disabled="!hasDataPermission('manage',param.privileges)"
|
||||
@input="calcData"
|
||||
@deselect="calcData"
|
||||
/>
|
||||
</span>
|
||||
</el-row>
|
||||
|
||||
<el-row v-if="view.type ==='map'" class="padding-lr">
|
||||
<span style="width: 80px;text-align: right;">
|
||||
<span>{{ $t('chart.map_range') }}</span>
|
||||
</span>
|
||||
<span class="tree-select-span">
|
||||
<treeselect
|
||||
ref="mapSelector"
|
||||
v-model="view.customAttr.areaCode"
|
||||
:options="places"
|
||||
:placeholder="$t('chart.select_map_range')"
|
||||
:normalizer="normalizer"
|
||||
:no-children-text="$t('commons.treeselect.no_children_text')"
|
||||
:no-options-text="$t('commons.treeselect.no_options_text')"
|
||||
:no-results-text="$t('commons.treeselect.no_results_text')"
|
||||
:disabled="!hasDataPermission('manage',param.privileges)"
|
||||
@input="calcData"
|
||||
@deselect="calcData"
|
||||
/>
|
||||
</span>
|
||||
</el-row>
|
||||
|
||||
<!--xAxisExt-->
|
||||
<el-row
|
||||
v-if="view.type === 'table-pivot'"
|
||||
|
Loading…
Reference in New Issue
Block a user