Merge branch 'fix_bug_first_stage'

# Conflicts: # jero-web/src/components/CollectionType/index.vue
2022-07-05 19:48:17 +08:00
parent 7ddac7eb75 eb6ab02004
commit 4b092fc07c
15 changed files with 415 additions and 251 deletions
@@ -277,9 +277,6 @@
    font-weight: bold;
  }

-  .ant-table td {
-    white-space: nowrap;
-  }
  .split-detail-wrap{
    .table{
      .ant-table-row-cell-break-word{
@@ -305,6 +302,9 @@
  }
 </style>
 <style lang="less" scoped>
+  .ant-table td {
+    white-space: nowrap;
+  }
  .box {
    width: 100%;
    height: calc(100% - 100px);