Unverified 提交 53a415e3 authored 作者: XiaJunjie2020's avatar XiaJunjie2020 提交者: GitHub

Merge pull request #1111 from dataease/pr@v1.4@refactor_axis_split_count

refactor: 轴线自定义刻度数限制不超过100
...@@ -953,7 +953,8 @@ export default { ...@@ -953,7 +953,8 @@ export default {
table_page_size: 'Page Size', table_page_size: 'Page Size',
table_page_size_unit: 'Item/Page', table_page_size_unit: 'Item/Page',
result_count: 'Result', result_count: 'Result',
result_mode_all: 'ALL' result_mode_all: 'ALL',
splitCount_less_100: 'Split Count must less 100'
}, },
dataset: { dataset: {
sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default', sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
......
...@@ -954,7 +954,8 @@ export default { ...@@ -954,7 +954,8 @@ export default {
table_page_size: '分頁', table_page_size: '分頁',
table_page_size_unit: '條/頁', table_page_size_unit: '條/頁',
result_count: '結果展示', result_count: '結果展示',
result_mode_all: '全部' result_mode_all: '全部',
splitCount_less_100: '刻度數不能超過100'
}, },
dataset: { dataset: {
sheet_warn: '有多個 Sheet 頁,默認抽取第一個', sheet_warn: '有多個 Sheet 頁,默認抽取第一個',
......
...@@ -957,7 +957,8 @@ export default { ...@@ -957,7 +957,8 @@ export default {
table_page_size: '分页', table_page_size: '分页',
table_page_size_unit: '条/页', table_page_size_unit: '条/页',
result_count: '结果展示', result_count: '结果展示',
result_mode_all: '全部' result_mode_all: '全部',
splitCount_less_100: '刻度数不能超过100'
}, },
dataset: { dataset: {
sheet_warn: '有多个 Sheet 页,默认抽取第一个', sheet_warn: '有多个 Sheet 页,默认抽取第一个',
......
...@@ -160,6 +160,13 @@ export default { ...@@ -160,6 +160,13 @@ export default {
if (!this.axisForm.show) { if (!this.axisForm.show) {
this.isSetting = false this.isSetting = false
} }
if (this.axisForm.axisValue.splitCount && parseInt(this.axisForm.axisValue.splitCount) > 100) {
this.$message({
message: this.$t('chart.splitCount_less_100'),
type: 'error'
})
return
}
this.$emit('onChangeXAxisForm', this.axisForm) this.$emit('onChangeXAxisForm', this.axisForm)
} }
} }
......
...@@ -163,6 +163,13 @@ export default { ...@@ -163,6 +163,13 @@ export default {
if (!this.axisForm.show) { if (!this.axisForm.show) {
this.isSetting = false this.isSetting = false
} }
if (this.axisForm.axisValue.splitCount && parseInt(this.axisForm.axisValue.splitCount) > 100) {
this.$message({
message: this.$t('chart.splitCount_less_100'),
type: 'error'
})
return
}
this.$emit('onChangeYAxisForm', this.axisForm) this.$emit('onChangeYAxisForm', this.axisForm)
} }
} }
......
...@@ -171,6 +171,13 @@ export default { ...@@ -171,6 +171,13 @@ export default {
if (!this.axisForm.show) { if (!this.axisForm.show) {
this.isSetting = false this.isSetting = false
} }
if (this.axisForm.axisValue.splitCount && parseInt(this.axisForm.axisValue.splitCount) > 100) {
this.$message({
message: this.$t('chart.splitCount_less_100'),
type: 'error'
})
return
}
this.$emit('onChangeYAxisForm', this.axisForm) this.$emit('onChangeYAxisForm', this.axisForm)
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论