Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

# Conflicts:
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/login.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
This commit is contained in:
chenjinsong
2021-11-04 14:49:40 +08:00
53 changed files with 1140 additions and 238 deletions

View File

@@ -47,7 +47,8 @@
<i class="nz-icon-create-square nz-icon"></i>
</button>
<top-tool-more-options
<top-tool-more-options
:delete-objs="batchDeleteObjs"
id="panel"
:params="filter"
:permissions="{
@@ -213,7 +214,8 @@ export default {
panelId: 0,
filterPanel: '',
// ---图表相关参数--end
scrollbarWrap: null
scrollbarWrap: null,
batchDeleteObjs: []
}
},
components: {