diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue index bdc86c10cc..0c46b2c6da 100644 --- a/frontend/src/components/widget/DeWidget/DeDate.vue +++ b/frontend/src/components/widget/DeWidget/DeDate.vue @@ -35,6 +35,9 @@ export default { }, created() { this.options = this.element.options + if ((this.options.attrs.type === 'date' || this.options.attrs.type === 'daterange') && Array.isArray(this.options.value) && this.options.value.length === 0) { + this.options.value = null + } }, methods: { search() { diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index d78249c451..8d8a71c80e 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1029,7 +1029,7 @@ export default { roleHead: 'All Role', userHead: 'All User', linkAuthHead: 'All Datasource', - datasetAuthHead: 'All Data', + datasetAuthHead: 'All Dataset', chartAuthHead: 'All Chart', panelAuthHead: 'All Chart', view: 'View', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 9882cf983b..0295f1db6d 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1029,7 +1029,7 @@ export default { roleHead: '所有角色', userHead: '所有用戶', linkAuthHead: '所有數據源', - datasetAuthHead: '所有數據', + datasetAuthHead: '所有數據集', chartAuthHead: '所有視圖', panelAuthHead: '所有儀表板', view: '查看', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index fd6a4295ed..b503bc73a1 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1029,7 +1029,7 @@ export default { roleHead: '所有角色', userHead: '所有用户', linkAuthHead: '所有数据源', - datasetAuthHead: '所有数据', + datasetAuthHead: '所有数据集', chartAuthHead: '所有视图', panelAuthHead: '所有仪表板', menuAuthHead: '所有菜单和操作', diff --git a/frontend/src/views/chart/components/component-style/TitleSelector.vue b/frontend/src/views/chart/components/component-style/TitleSelector.vue index 4da0873d01..33b03421ee 100644 --- a/frontend/src/views/chart/components/component-style/TitleSelector.vue +++ b/frontend/src/views/chart/components/component-style/TitleSelector.vue @@ -19,6 +19,7 @@ :placeholder="$t('chart.title')" clearable @blur="changeTitleStyle" + @input="inputOnInput($event)" /> @@ -124,6 +125,9 @@ export default { this.isSetting = false } this.$emit('onTextChange', this.titleForm) + }, + inputOnInput: function(e) { + this.$forceUpdate() } } } diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue index b58e414370..9a2f75a99e 100644 --- a/frontend/src/views/chart/group/Group.vue +++ b/frontend/src/views/chart/group/Group.vue @@ -202,6 +202,7 @@ :show-close="false" width="70%" class="dialog-css" + :destroy-on-close="true" > @@ -544,6 +545,7 @@ export default { selectTable() { this.selectTableFlag = true + this.chartName = this.$t('chart.chartName') }, closeCreateChart() { diff --git a/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue b/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue index d6e965c674..fb852f5afb 100644 --- a/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue +++ b/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue @@ -3,7 +3,7 @@   -
    +
    • @@ -49,7 +49,7 @@   -
        +
        • @@ -141,6 +141,7 @@ export default { const request = { details: JSON.stringify(this.canvasStyleData) } + this.slidersLoading = true saveSubject(request).then(response => { this.$message({ message: '保存成功', @@ -148,6 +149,8 @@ export default { showClose: true }) this.querySubjectWithGroup() + }).catch(() => { + this.slidersLoading = false }) }, querySubjectWithGroup() { @@ -155,6 +158,8 @@ export default { querySubjectWithGroup({}).then(response => { this.sliders = response.data this.slidersLoading = false + }).catch(() => { + this.slidersLoading = false }) }, move(offset, direction, speed) { diff --git a/frontend/src/views/system/authority/authConfig.vue b/frontend/src/views/system/authority/authConfig.vue index ed33c52dbe..4aae4cd2f4 100644 --- a/frontend/src/views/system/authority/authConfig.vue +++ b/frontend/src/views/system/authority/authConfig.vue @@ -100,7 +100,7 @@ export default { }, { tabName: this.$t('auth.chartAuth'), - head: this.$t('auth.linkAuthHead'), + head: this.$t('auth.chartAuthHead'), direction: 'source', authType: 'chart', authTargets: 'dept,role,user' diff --git a/frontend/src/views/system/authority/components/LazyTree.vue b/frontend/src/views/system/authority/components/LazyTree.vue index c341d1cb1c..078782e2b0 100644 --- a/frontend/src/views/system/authority/components/LazyTree.vue +++ b/frontend/src/views/system/authority/components/LazyTree.vue @@ -266,6 +266,9 @@ export default { // 重新加载权限 this.loadAuth() this.loading = false + }).catch((e) => { + // this.$warning(e) + this.loading = false }) }, // 高亮显示搜索内容