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

Merge pull request #7324 from dataease/pr@dev@fix_chart_table_freeze

Browse Source 
fix(视图-表格): 表格冻结字段校验。
This commit is contained in:
wisonic-s 2023-12-25 15:38:31 +08:00 committed by GitHub
commit c60b4c3c28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/frontend/src/lang/en.js
View File

@ -1594,7 +1594,8 @@ export default {
gauge_axis_label: 'Axis Label',
word_size_range: 'Word Size Range',
word_spacing: 'Word Spacing',
axis_multi_select_tip: 'Hold down the Ctrl/Cmd or Shift key and click to select more than one'
axis_multi_select_tip: 'Hold down the Ctrl/Cmd or Shift key and click to select more than one',
needs_to_be_integer: 'Needs ti be an integer'
},
dataset: {
scope_edit: 'Effective only when editing',

3
core/frontend/src/lang/tw.js
View File

@ -1586,7 +1586,8 @@ export default {
gauge_axis_label: '刻度標籤',
word_size_range: '字號區間',
word_spacing: '文字間隔',
axis_multi_select_tip: '按住 Ctrl/Cmd 鍵或者 Shift 鍵再點擊可多選'
axis_multi_select_tip: '按住 Ctrl/Cmd 鍵或者 Shift 鍵再點擊可多選',
needs_to_be_integer: '需要為整數'
},
dataset: {
scope_edit: '僅編輯時生效',

3
core/frontend/src/lang/zh.js
View File

@ -1586,7 +1586,8 @@ export default {
gauge_axis_label: '刻度标签',
word_size_range: '字号区间',
word_spacing: '文字间隔',
axis_multi_select_tip: '按住 Ctrl/Cmd 键或者 Shift 键再点击可多选'
axis_multi_select_tip: '按住 Ctrl/Cmd 键或者 Shift 键再点击可多选',
needs_to_be_integer: '需要为整数'
},
dataset: {
scope_edit: '仅编辑时生效',

8
core/frontend/src/views/chart/chart/table/table-info.js
View File

@ -121,9 +121,7 @@ export function baseTableInfo(s2, container, chart, action, tableData, pageInfo)
}
}
s2Options.colCell = (node) => {
if (node.colIndex === 0) {
node.label = ' '
}
node.label = ' '
}
}
@ -312,9 +310,7 @@ export function baseTableNormal(s2, container, chart, action, tableData) {
}
}
s2Options.colCell = (node) => {
if (node.colIndex === 0) {
node.label = ' '
}
node.label = ' '
}
}

5
core/frontend/src/views/chart/components/shapeAttr/SizeSelector.vue
View File

@ -1307,6 +1307,11 @@ export default {
this.$message.error(this.$t('chart.max_more_than_mix'))
return
}
const reg = /^\d+$/m
if (!reg.test(this.sizeForm.tableColumnFreezeHead)) {
this.$message.error(this.$t('chart.table_freeze') + this.$t('chart.needs_to_be_integer'))
return
}
this.$emit('onSizeChange', this.sizeForm)
},
showProperty(property) {

5
core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue
View File

@ -1782,6 +1782,11 @@ export default {
this.$message.error(this.$t('chart.max_more_than_mix'))
return
}
const reg = /^\d+$/m
if (!reg.test(this.sizeForm.tableRowFreezeHead) || !reg.test(this.sizeForm.tableColumnFreezeHead)) {
this.$message.error(this.$t('chart.table_freeze') + this.$t('chart.needs_to_be_integer'))
return
}
this.$emit('onSizeChange', this.sizeForm)
},
showProperty(property) {

10
core/frontend/src/views/chart/components/table/TableNormal.vue
View File

@ -478,16 +478,6 @@ export default {
}
}
this.table_item_class_stripe = JSON.parse(JSON.stringify(this.table_item_class))
// 暂不支持斑马纹
// if (customAttr.color.tableStripe) {
// // this.table_item_class_stripe.background = hexColorToRGBA(customAttr.color.tableItemBgColor, customAttr.color.alpha - 40)
// if (this.chart.customStyle) {
// const customStyle = JSON.parse(this.chart.customStyle)
// if (customStyle.background) {
// this.table_item_class_stripe.background = hexColorToRGBA(customStyle.background.color, customStyle.background.alpha)
// }
// }
// }
if (customAttr.color.enableTableCrossBG) {
this.table_item_class_stripe.background = hexColorToRGBA(customAttr.color.tableItemSubBgColor, customAttr.color.alpha)
}