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

# Conflicts:
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/pagination.vue
#	nezha-fronted/src/components/common/searchInput.vue
#	nezha-fronted/src/components/common/table/settings/endpointTable.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
This commit is contained in:
chenjinsong
2021-11-15 14:06:42 +08:00
25 changed files with 2178 additions and 122 deletions

View File

@@ -14,7 +14,8 @@
<li v-for="(val,ind) in history_once" @click="select_history(ind,$event)" :key="ind" :id="'search-history-pick-'+ind">
<span v-for="(item,key) in val" :key="key">
<span class="name">{{item.name}}: </span>
<span class="value">{{item.val+' '}}</span>
<span class="value" v-if="item.val">{{item.val+' '}}</span>
<span class="value" v-else>{{' '}}</span>
</span>
</li>
</ul>