fix: graph wrapper max height

seal-io · Aug 29, 2023 · 3b160ec · 3b160ec
1 parent 6ab9dbf
commit 3b160ec
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/config/vite.config.prod.ts b/config/vite.config.prod.ts
@@ -45,7 +45,7 @@ export default mergeConfig(
           manualChunks: {
             arco: ['@arco-design/web-vue'],
             chart: ['echarts', 'vue-echarts'],
-            g6: ['@antv/g6'],
+            // g6: ['@antv/g6'],
             vue: ['vue', 'vue-router', 'pinia', '@vueuse/core', 'vue-i18n']
           }
         }

diff --git a/src/views/application-management/environments/components/environment-graph.vue b/src/views/application-management/environments/components/environment-graph.vue
@@ -159,7 +159,9 @@
     if (windownFullScreen.value) {
       containerHeight.value = minHeight;
     }
-    resizeDebounce();
+    nextTick(() => {
+      windownFullScreen.value = false;
+    });
   }, 400);
   defineExpose({
     handleRefresh

diff --git a/src/views/application-management/locale/en-US.ts b/src/views/application-management/locale/en-US.ts
@@ -16,7 +16,7 @@ export default {
   'applications.applications.table.type': 'Type',
   'applications.applications.table.content': 'Content',
   'applications.applications.table.target': 'Target',
-  'applications.applications.table.holder': 'please enter an service',
+  'applications.applications.table.holder': 'please enter a service',
   'applications.applications.project.holder': 'please select a project',
   'applications.applications.form.name': 'Name',
   'applications.applications.form.label': 'Labels',

diff --git a/...ews/application-management/services/components/instance/tab-graph/components/graph-g6.vue b/...ews/application-management/services/components/instance/tab-graph/components/graph-g6.vue
@@ -5,7 +5,10 @@
         <div
           ref="graphWrapper"
           class="graph-wrapper"
-          :style="{ height: `max(${wrapHeight}, 600px)`, width: '100%' }"
+          :style="{
+            height: `max(${wrapHeight}, 600px, ${containerHeight})`,
+            width: '100%'
+          }"
         >
           <div
             id="graph-mount"
@@ -259,7 +262,6 @@
 
   useResizeObserver(graphWrapper, (entries) => {
     const entry = entries[0];
-    graphWrapper.value.style.height = wrapHeight.value;
     const { width: boxWidth, height: boxHeight } = entry.contentRect;
     width.value = boxWidth;
     height.value = boxHeight < 600 ? 600 : boxHeight;

diff --git a/src/views/operation-hub/catalogs/locale/en-US.ts b/src/views/operation-hub/catalogs/locale/en-US.ts
@@ -1,7 +1,7 @@
 export default {
   'catalogs.list.button.add': 'Add Catalog',
   'catalogs.list.button.edit': 'Edit Catalog',
-  'catalogs.list.query.holder': 'Please enter catalog name',
+  'catalogs.list.query.holder': 'please enter catalog name',
   'catalogs.list.name': 'Catalog Name',
   'catalogs.list.total': 'Template Counts',
   'catalogs.list.sync.time': 'Sync Time',

diff --git a/src/views/operation-hub/locale/en-US.ts b/src/views/operation-hub/locale/en-US.ts
@@ -1,8 +1,8 @@
 export default {
   'operation.connectors.menu': 'Connectors',
   'operation.connectors.create': 'New Connector',
-  'operation.connectors.table.holder': 'Please enter a connector',
-  'operation.connectors.category.holder': 'Please choose a category',
+  'operation.connectors.table.holder': 'please enter a connector',
+  'operation.connectors.category.holder': 'please choose a category',
   'operation.connectors.table.name': 'Name',
   'operation.connectors.table.type': 'Type',
   'operation.connectors.table.connector': 'Connector',