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

Merge remote-tracking branch 'origin/v1.4' into v1.4

Browse Source
This commit is contained in:
wangjiahao 2021-11-02 23:10:47 +08:00
commit 16c901e662
7 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/lang/en.js
View File

@ -954,7 +954,7 @@ export default {
table_page_size_unit: 'Item/Page',
result_count: 'Result',
result_mode_all: 'ALL',
splitCount_less_100: 'Split Count must less 100'
splitCount_less_100: 'Split Count Range 0-100'
},
dataset: {
sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',

2
frontend/src/lang/tw.js
View File

@ -955,7 +955,7 @@ export default {
table_page_size_unit: '條/頁',
result_count: '結果展示',
result_mode_all: '全部',
splitCount_less_100: '刻度數不能超過100'
splitCount_less_100: '刻度數範圍0-100'
},
dataset: {
sheet_warn: '有多個 Sheet 頁，默認抽取第一個',

2
frontend/src/lang/zh.js
View File

@ -958,7 +958,7 @@ export default {
table_page_size_unit: '条/页',
result_count: '结果展示',
result_mode_all: '全部',
splitCount_less_100: '刻度数不能超过100'
splitCount_less_100: '刻度数范围0-100'
},
dataset: {
sheet_warn: '有多个 Sheet 页，默认抽取第一个',

8
frontend/src/styles/index.scss
View File

@ -676,3 +676,11 @@ div:focus {
}
.el-color-svpanel__black {
background: linear-gradient(to top, #000, rgba(0,0,0,0)) !important;
}
.el-color-svpanel__white {
background: linear-gradient(to right, #fff, rgba(255,255,255,0)) !important;
}

2
frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
View File

@ -160,7 +160,7 @@ export default {
if (!this.axisForm.show) {
this.isSetting = false
}
if (this.axisForm.axisValue.splitCount && parseInt(this.axisForm.axisValue.splitCount) > 100) {
if (this.axisForm.axisValue.splitCount && (parseInt(this.axisForm.axisValue.splitCount) > 100 || parseInt(this.axisForm.axisValue.splitCount) < 0)) {
this.$message({
message: this.$t('chart.splitCount_less_100'),
type: 'error'

2
frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue
View File

@ -163,7 +163,7 @@ export default {
if (!this.axisForm.show) {
this.isSetting = false
}
if (this.axisForm.axisValue.splitCount && parseInt(this.axisForm.axisValue.splitCount) > 100) {
if (this.axisForm.axisValue.splitCount && (parseInt(this.axisForm.axisValue.splitCount) > 100 || parseInt(this.axisForm.axisValue.splitCount) < 0)) {
this.$message({
message: this.$t('chart.splitCount_less_100'),
type: 'error'

2
frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue
View File

@ -171,7 +171,7 @@ export default {
if (!this.axisForm.show) {
this.isSetting = false
}
if (this.axisForm.axisValue.splitCount && parseInt(this.axisForm.axisValue.splitCount) > 100) {
if (this.axisForm.axisValue.splitCount && (parseInt(this.axisForm.axisValue.splitCount) > 100 || parseInt(this.axisForm.axisValue.splitCount) < 0)) {
this.$message({
message: this.$t('chart.splitCount_less_100'),
type: 'error'