dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(仪表板、数据大屏): 部分历史数据样式适配

Browse Source
This commit is contained in:
wangjiahao 2024-11-06 17:34:27 +08:00
parent 5d3ca89ca5
commit 2c0c47aab6
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/ComponentColorSelector.vue
View File

@ -20,7 +20,7 @@
<el-checkbox <el-checkbox
size="small" size="small"
:effect="themes" :effect="themes"
v-model="colorForm.basicStyle.gradient" v-model="colorForm['basicStyle']['gradient']"
@change="changeColorCase('gradient')" @change="changeColorCase('gradient')"
> >
{{ $t('chart.gradient') }}{{ $t('chart.color') }} {{ $t('chart.gradient') }}{{ $t('chart.color') }}
@ -36,7 +36,7 @@
<el-form-item class="form-item alpha-slider" :class="'form-item-' + themes"> <el-form-item class="form-item alpha-slider" :class="'form-item-' + themes">
<el-slider <el-slider
:effect="themes" :effect="themes"
v-model="colorForm.basicStyle.alpha" v-model="colorForm['basicStyle']['alpha']"
@change="changeColorCase('alpha')" @change="changeColorCase('alpha')"
/> />
</el-form-item> </el-form-item>
@ -50,7 +50,7 @@
<el-input <el-input
type="number" type="number"
:effect="themes" :effect="themes"
v-model="colorForm.basicStyle.alpha" v-model="colorForm['basicStyle']['alpha']"
:min="0" :min="0"
:max="100" :max="100"
class="alpha-input-number" class="alpha-input-number"
@ -78,7 +78,7 @@
<el-form-item :label="t('chart.table_header_bg')" class="form-item"> <el-form-item :label="t('chart.table_header_bg')" class="form-item">
<el-color-picker <el-color-picker
:trigger-width="colorPickerWidth" :trigger-width="colorPickerWidth"
v-model="colorForm.tableHeader.tableHeaderBgColor" v-model="colorForm['tableHeader']['tableHeaderBgColor']"
size="small" size="small"
:predefine="predefineColors" :predefine="predefineColors"
is-custom is-custom
@ -91,7 +91,7 @@
<el-form-item :label="t('chart.table_item_bg')" class="form-item"> <el-form-item :label="t('chart.table_item_bg')" class="form-item">
<el-color-picker <el-color-picker
:trigger-width="colorPickerWidth" :trigger-width="colorPickerWidth"
v-model="colorForm.tableCell.tableItemBgColor" v-model="colorForm['tableCell']['tableItemBgColor']"
size="small" size="small"
:predefine="predefineColors" :predefine="predefineColors"
:effect="themes" :effect="themes"
@ -106,7 +106,7 @@
<el-form-item :label="t('chart.table_header_font_color')" class="form-item"> <el-form-item :label="t('chart.table_header_font_color')" class="form-item">
<el-color-picker <el-color-picker
:trigger-width="colorPickerWidth" :trigger-width="colorPickerWidth"
v-model="colorForm.tableHeader.tableHeaderFontColor" v-model="colorForm['tableHeader']['tableHeaderFontColor']"
:effect="themes" :effect="themes"
size="small" size="small"
:predefine="predefineColors" :predefine="predefineColors"
@ -119,7 +119,7 @@
<el-form-item :label="t('chart.table_item_font_color')" class="form-item"> <el-form-item :label="t('chart.table_item_font_color')" class="form-item">
<el-color-picker <el-color-picker
:trigger-width="colorPickerWidth" :trigger-width="colorPickerWidth"
v-model="colorForm.tableCell.tableFontColor" v-model="colorForm['tableCell']['tableFontColor']"
size="small" size="small"
:predefine="predefineColors" :predefine="predefineColors"
:effect="themes" :effect="themes"
@ -134,7 +134,7 @@
<el-form-item :label="t('chart.table_border_color')" class="form-item"> <el-form-item :label="t('chart.table_border_color')" class="form-item">
<el-color-picker <el-color-picker
:trigger-width="colorPickerWidth" :trigger-width="colorPickerWidth"
v-model="colorForm.basicStyle.tableBorderColor" v-model="colorForm.basicStyle['tableBorderColor']"
size="small" size="small"
:predefine="predefineColors" :predefine="predefineColors"
:effect="themes" :effect="themes"
@ -147,7 +147,7 @@
<el-form-item :label="t('chart.table_scroll_bar_color')" class="form-item"> <el-form-item :label="t('chart.table_scroll_bar_color')" class="form-item">
<el-color-picker <el-color-picker
:trigger-width="colorPickerWidth" :trigger-width="colorPickerWidth"
v-model="colorForm.basicStyle.tableScrollBarColor" v-model="colorForm.basicStyle['tableScrollBarColor']"
size="small" size="small"
:predefine="predefineColors" :predefine="predefineColors"
color-format="rgb" color-format="rgb"

4
core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
View File

@ -1431,11 +1431,11 @@ export function configMergeCells(chart: Chart, options: S2Options, dataConfig: S
const { showIndex } = parseJson(chart.customAttr).tableHeader const { showIndex } = parseJson(chart.customAttr).tableHeader
if (mergeCells) { if (mergeCells) {
const fields = chart.data.fields || [] const fields = chart.data.fields || []
const fielsMap = fields.reduce((p, n) => { const fieldsMap = fields.reduce((p, n) => {
p[n.dataeaseName] = n p[n.dataeaseName] = n
return p return p
}, {}) || {} }, {}) || {}
const quotaIndex = dataConfig.meta.findIndex(m => fielsMap[m.field].groupType === 'q') const quotaIndex = dataConfig.meta.findIndex(m => fieldsMap[m.field].groupType === 'q')
const data = chart.data?.tableRow const data = chart.data?.tableRow
if (quotaIndex === 0 || !data?.length) { if (quotaIndex === 0 || !data?.length) {
return return