center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat(frontend):数据集名称长度限制提示修改；视图名称和标题统一，保存按钮优化

Browse Source
This commit is contained in:
junjie 2021-06-09 10:54:16 +08:00
parent a6e9dd3465
commit 6e60a265d5
9 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -838,7 +838,8 @@ export default {
excel_add: 'Add',
dataset_group: 'Dataset Group',
m1: 'Move ',
m2: ' To'
m2: ' To',
char_can_not_more_50: 'Dataset name can not more 50'
},
datasource: {
datasource: 'Data Source',

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

@ -838,7 +838,8 @@ export default {
excel_add: '追加',
dataset_group: '數據集分組',
m1: '將 ',
m2: ' 移動到'
m2: ' 移動到',
char_can_not_more_50: '數據集名稱不能超過50個字符'
},
datasource: {
datasource: '數據源',

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

@ -838,7 +838,8 @@ export default {
excel_add: '追加',
dataset_group: '数据集分组',
m1: '将 ',
m2: ' 移动到'
m2: ' 移动到',
char_can_not_more_50: '数据集名称不能超过50个字符'
},
datasource: {
datasource: '数据源',

5
frontend/src/views/chart/components/component-style/TitleSelector.vue
View File

@ -115,6 +115,11 @@ export default {
this.fontSize = arr
},
changeTitleStyle() {
if (this.titleForm.title.length < 1) {
this.$error(this.$t('chart.title_cannot_empty'))
this.titleForm.title = this.chart.title
return
}
if (!this.titleForm.show) {
this.isSetting = false
}

7
frontend/src/views/chart/group/Group.vue
View File

@ -168,9 +168,9 @@
/>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-edit-outline" :command="beforeClickMore('renameChart',data,node)">
{{ $t('chart.rename') }}
</el-dropdown-item>
<!-- <el-dropdown-item icon="el-icon-edit-outline" :command="beforeClickMore('renameChart',data,node)">-->
<!-- {{ $t('chart.rename') }}-->
<!-- </el-dropdown-item>-->
<el-dropdown-item icon="el-icon-delete" :command="beforeClickMore('deleteChart',data,node)">
{{ $t('chart.delete') }}
</el-dropdown-item>
@ -536,6 +536,7 @@ export default {
this.chartData.forEach(function(ele) {
if (ele.id === that.$store.state.chart.chartSceneData.id) {
ele.type = that.$store.state.chart.chartSceneData.type
ele.name = that.$store.state.chart.chartSceneData.name
}
})
}

6
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -486,9 +486,9 @@ export default {
const view = JSON.parse(JSON.stringify(this.view))
view.id = this.view.id
view.sceneId = this.view.sceneId
view.name = this.view.name ? this.view.name : this.table.name
view.name = this.view.title ? this.view.title : this.table.name
if (view.title.length > 50) {
this.$warning(this.$t('chart.title_limit'))
this.$error(this.$t('chart.title_limit'))
return
}
view.tableId = this.view.tableId
@ -623,7 +623,7 @@ export default {
}
// 从仪表板入口关闭
bus.$emit('PanelSwitchComponent', { name: 'PanelEdit' })
this.$emit('switchComponent', { name: '' })
// this.$emit('switchComponent', { name: '' })
},
getData(id) {
if (id) {

2
frontend/src/views/dataset/add/AddCustom.vue
View File

@ -192,7 +192,7 @@ export default {
if (this.name.length > 50) {
this.$message({
showClose: true,
message: this.$t('commons.char_can_not_more_50'),
message: this.$t('dataset.char_can_not_more_50'),
type: 'error'
})
return

2
frontend/src/views/dataset/add/AddExcel.vue
View File

@ -171,7 +171,7 @@ export default {
if (this.name.length > 50) {
this.$message({
showClose: true,
message: this.$t('commons.char_can_not_more_50'),
message: this.$t('dataset.char_can_not_more_50'),
type: 'error'
})
return

2
frontend/src/views/dataset/add/AddSQL.vue
View File

@ -248,7 +248,7 @@ export default {
if (this.name.length > 50) {
this.$message({
showClose: true,
message: this.$t('commons.char_can_not_more_50'),
message: this.$t('dataset.char_can_not_more_50'),
type: 'error'
})
return