Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1

# Conflicts:
#	nezha-fronted/src/components/common/language/cn.js
#	nezha-fronted/src/components/common/language/en.js
This commit is contained in:
zhangyu
2021-10-22 18:08:37 +08:00
63 changed files with 436 additions and 59 deletions

View File

@@ -132,6 +132,14 @@
</el-dropdown>
</div>
</el-table-column>
<template v-if="!loading" slot="empty">
<div class="right-no-data">
<svg class="icon" aria-hidden="true">
<use xlink:href="#nz-icon-no-data-list"></use>
</svg>
<div style="font-size: 16px;color: #333333;font-weight: 400;">No results found</div>
</div>
</template>
</el-table>
</template>
@@ -151,7 +159,8 @@ export default {
type: Boolean,
default: true
},
assetTab: Boolean
assetTab: Boolean,
loading: Boolean
},
data () {
return {