refactor: 优化视图归属于仪表板功能,更新flyway和文案

This commit is contained in:
wangjiahao 2022-02-15 11:56:38 +08:00
parent a58f92ed03
commit b449734df5
8 changed files with 119 additions and 24 deletions

View File

@ -23,7 +23,7 @@ public class VAuthModelDTO extends VAuthModelWithBLOBs implements ITreeBase<VAu
private String innerId;
public String toString(){
return this.getId();
return this.getName();
}
}

View File

@ -244,7 +244,7 @@ public class PanelGroupService {
if(CollectionUtils.isNotEmpty(viewResult)){
result.addAll(viewResult);
}
result = TreeUtils.mergeTree(panelResult,"panel_list");
result = TreeUtils.mergeTree(result,"panel_list");
// 原有视图的目录结构
List<VAuthModelDTO> viewOriginal = extVAuthModelMapper.queryAuthViewsOriginal(viewRequest);
if(CollectionUtils.isNotEmpty(viewOriginal) && viewOriginal.size()>1){

File diff suppressed because one or more lines are too long

View File

@ -119,4 +119,4 @@ i18n_cp_exist=Column permission of the same type already exists
connection_failed=Connection Failed
theme_name_repeat=name of theme has been existed
theme_name_empty=name can not be empty
i18n_public_chart= Public Chart
i18n_public_chart=Public Chart

View File

@ -118,4 +118,4 @@ i18n_cp_exist=已有同类型的列权限存在
connection_failed=连接失败
theme_name_repeat=名称已存在
theme_name_empty=名称不能为空
i18n_public_chart= 存量视图
i18n_public_chart=存量视图

View File

@ -119,4 +119,4 @@ i18n_cp_exist=已有同類型的列權限存在
connection_failed=連接失敗
theme_name_repeat=名稱已存在
theme_name_empty=名稱不能為空
i18n_public_chart= 存量视图
i18n_public_chart=存量视图

View File

@ -188,20 +188,6 @@
<el-input v-model="chartName" style="height: 34px" size="mini" />
</el-form-item>
</el-col>
<el-col v-if="optFrom==='panel'" :span="12">
<el-form-item :label="$t('chart.belong_group')">
<treeselect
v-model="currGroup.id"
:clearable="false"
:options="chartGroupTreeAvailable"
:normalizer="normalizer"
:placeholder="$t('chart.select_group')"
:no-children-text="$t('commons.treeselect.no_children_text')"
:no-options-text="$t('commons.treeselect.no_options_text')"
:no-results-text="$t('commons.treeselect.no_results_text')"
/>
</el-form-item>
</el-col>
</el-form>
</el-row>

View File

@ -801,12 +801,9 @@ export default {
}
},
newChart() {
this.adviceGroupId = null
this.adviceGroupId = this.panelInfo.id
this.show = false
searchAdviceSceneId(this.panelInfo.id).then(res => {
this.adviceGroupId = res.data
this.$refs['chartGroup'].selectTable()
})
this.$refs['chartGroup'].selectTable()
},
newViewInfo(newViewInfo) {
let component