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

# Conflicts: # nezha-fronted/src/components/common/project/popData/Info.vue
2022-04-01 13:33:16 +08:00
parent b6d833150a 7db7e39a47
commit e47e353566
15 changed files with 115 additions and 30 deletions
--- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
@@ -14,7 +14,7 @@
      >
        <template  v-slot:default="slotProps">
          <endpoint-table
-            style="height: calc(100% - 200px)"
+            style="height: 100%"
            ref="dataTable"
            :orderByFa="orderBy"
            v-my-loading="tools.loading"