Merge remote-tracking branch 'origin/dev-ele-update' into dev
# Conflicts: # package.json
This commit is contained in:
@@ -15,6 +15,7 @@ import 'highlight.js/styles/color-brewer.css'
|
||||
import '@/assets/css/main.scss' // 样式入口
|
||||
import VueGridLayout from 'vue-grid-layout'
|
||||
import ElementPlus from 'element-plus'
|
||||
import 'element-plus/dist/index.css'
|
||||
import bus from 'tiny-emitter'
|
||||
|
||||
import DateTimeRange from '@/components/common/TimeRange/DateTimeRange'
|
||||
@@ -23,6 +24,8 @@ import PanelChartList from '@/views/charts/PanelChartList'
|
||||
import Error from '@/components/common/Error'
|
||||
import Renderer from '@/components/advancedSearch/showhint/Hint/Renderer'
|
||||
import 'lib-flexible'
|
||||
import 'element-plus/theme-chalk/dark/css-vars.css'
|
||||
import * as ElementPlusIconsVue from '@element-plus/icons-vue'
|
||||
|
||||
const emitter = new bus()
|
||||
|
||||
@@ -52,6 +55,10 @@ app.component('panel-chart-list', PanelChartList)
|
||||
app.component('chart-error', Error)
|
||||
app.component('Renderer', Renderer)
|
||||
|
||||
for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
|
||||
app.component(key, component)
|
||||
}
|
||||
|
||||
app.mount('#app')
|
||||
|
||||
app.config.globalProperties.emitter = emitter
|
||||
|
||||
Reference in New Issue
Block a user