Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # src/saas/AppGridManagement/AppGridManagement.vue
2022-02-11 11:22:00 +08:00
parent 0045ab1fec cb60138cdb
commit e5d35b859f
17 changed files with 113 additions and 72 deletions
--- a/src/saas/AppGridManagement/AppGridManagement.vue
+++ b/src/saas/AppGridManagement/AppGridManagement.vue
@@ -146,7 +146,7 @@ export default {
    vertical-align: middle;
  }

-  div {
+  .gird-name-div {
    display: inline-block;
    padding: 0 20px;
    box-sizing: border-box;
@@ -159,6 +159,15 @@ export default {
    img {
      margin-left: 8px;
    }
+
+    .gird-name{
+      display: inline-block;
+      max-width: calc(100% - 50px);
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      vertical-align: middle;
+    }
  }

  span {