diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostTerminalServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostTerminalServiceImpl.java index 7e4a3618..b8c8cee6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostTerminalServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostTerminalServiceImpl.java @@ -75,6 +75,10 @@ public class HostTerminalServiceImpl implements HostTerminalService { @Override public List getTerminalThemes() { + // if (true) { + // String arr = ""; + // return JSON.parseArray(arr, HostTerminalThemeVO.class); + // } List themes = dictValueApi.getDictValue(THEME_DICT_KEY); return themes.stream() .map(s -> HostTerminalThemeVO.builder() diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/com/orion/visor/module/asset/meta/TerminalThemeGenerator.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/com/orion/visor/module/asset/meta/TerminalThemeGenerator.java index a1118e64..8b380d25 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/com/orion/visor/module/asset/meta/TerminalThemeGenerator.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/com/orion/visor/module/asset/meta/TerminalThemeGenerator.java @@ -28,13 +28,15 @@ public class TerminalThemeGenerator { List files = Files1.listFiles("D:\\idea-project\\iTerm2-Color-Schemes\\vhs"); // 过滤的 theme List schemaFilter = Lists.of( - "Dracula", "Atom", - "catppuccin-mocha", "MaterialDesignColors", - "catppuccin-macchiato", "OneHalfDark", - "Apple System Colors", "Builtin Tango Light", - "Duotone Dark", "BlulocoLight", - "Chester", "CLRS", - "Calamity", "Tomorrow" + "Dracula", "Builtin Tango Light", + "Atom", "AtomOneLight", + "OneHalfDark", "OneHalfLight", + "Apple System Colors", "Tomorrow", + "catppuccin-mocha", "catppuccin-latte", + "catppuccin-macchiato", "BlulocoLight", + "catppuccin-frappe", "MaterialDesignColors", + "GitHub Dark", "Github", + "DimmedMonokai", "Duotone Dark" ); // 颜色大写 ValueFilter colorFilter = (Object object, String name, Object value) -> { @@ -60,7 +62,7 @@ public class TerminalThemeGenerator { theme.setDark(Colors.isDarkColor(background)); theme.setSchema(JSON.parseObject(JSON.toJSONString(schema), TerminalThemeSchema.class)); return theme; - }).collect(Collectors.toList()); + }).skip(0).limit(50).collect(Collectors.toList()); // 排序 if (!Lists.isEmpty(schemaFilter)) { arr.sort(Comparator.comparing(s -> schemaFilter.indexOf(s.getName()))); @@ -70,11 +72,12 @@ public class TerminalThemeGenerator { for (TerminalTheme theme : arr) { System.out.println("name: " + theme.name); System.out.println("dark: " + theme.dark); - System.out.println("value: \n" + JSON.toJSONString(theme.schema, colorFilter)); + System.out.println("value: " + JSON.toJSONString(theme.schema, colorFilter)); + System.out.println("json: " + JSON.toJSONString(theme, colorFilter)); System.out.println(); } - // String json = JSON.toJSONString(arr, colorFilter); - // System.out.println("\n" + json); + String json = JSON.toJSONString(arr, colorFilter); + System.out.println("\n" + json); } /* diff --git a/orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue b/orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue index 3d8fccef..e20c6c3e 100644 --- a/orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue +++ b/orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue @@ -49,22 +49,21 @@ @@ -101,17 +100,17 @@ } &-tabs { - width: calc(100% - @logo-width - var(--sidebar-icon-wrapper-size)); + width: calc(100% - @logo-width - 100px); display: flex; } &-right { - width: var(--sidebar-icon-wrapper-size); + width: 100px; display: flex; justify-content: flex-end; &-actions { - width: var(--sidebar-icon-wrapper-size); + width: 100px; display: flex; justify-content: flex-end; } diff --git a/orion-visor-ui/src/views/host/terminal/index.vue b/orion-visor-ui/src/views/host/terminal/index.vue index bb1fa5f9..f7ff9d0e 100644 --- a/orion-visor-ui/src/views/host/terminal/index.vue +++ b/orion-visor-ui/src/views/host/terminal/index.vue @@ -1,8 +1,10 @@