节点日志支持抽屉方式打开

Author: erupts

erupt-annotation/src/main/java/xyz/erupt/annotation/Erupt.java

@@ -67,10 +67,6 @@
     //布局配置
     Layout layout() default @Layout;
 
-//    @Comment("自定义页头")
-//    @Match("#value.path() != ''")
-//    Tpl header() default @Tpl(path = "");
-//
 //    @Comment("画册视图定义")
 //    @Match("#value.enable() == true")
 //    Card cardView() default @Card(enable = false, galleryField = "", viewFields = {});

erupt-annotation/src/main/java/xyz/erupt/annotation/sub_erupt/OpenWay.java

@@ -0,0 +1,8 @@
+package xyz.erupt.annotation.sub_erupt;
+
+public enum OpenWay {
+    //抽屉
+    DRAWER,
+    //对话框
+    MODAL
+}

erupt-annotation/src/main/java/xyz/erupt/annotation/sub_erupt/Placement.java

@@ -0,0 +1,12 @@
+package xyz.erupt.annotation.sub_erupt;
+
+/**
+ * @author YuePeng
+ * date 2024/8/25 15:53
+ */
+public enum Placement {
+    TOP,
+    BOTTOM,
+    LEFT,
+    RIGHT
+}

erupt-annotation/src/main/java/xyz/erupt/annotation/sub_erupt/Tpl.java

@@ -33,6 +33,15 @@
     @Comment("弹出层宽度")
     String width() default "";
 
+    @Comment("弹出层高度")
+    String height() default "";
+
+    @Comment("弹出层打开方式")
+    OpenWay openWay() default OpenWay.MODAL;
+
+    @Comment("抽屉打开方向")
+    Placement drawerPlacement() default Placement.RIGHT;
+
     @Getter
     enum Engine {
         @Comment("原生H5, Native模式下不支持tplHandler")

erupt-cloud/erupt-cloud-server/src/main/java/xyz/erupt/cloud/server/model/CloudNode.java

@@ -10,9 +10,7 @@
 import xyz.erupt.annotation.EruptI18n;
 import xyz.erupt.annotation.constant.AnnotationConst;
 import xyz.erupt.annotation.expr.ExprBool;
-import xyz.erupt.annotation.sub_erupt.Layout;
-import xyz.erupt.annotation.sub_erupt.RowOperation;
-import xyz.erupt.annotation.sub_erupt.Tpl;
+import xyz.erupt.annotation.sub_erupt.*;
 import xyz.erupt.annotation.sub_field.Edit;
 import xyz.erupt.annotation.sub_field.EditType;
 import xyz.erupt.annotation.sub_field.View;
@@ -48,7 +46,7 @@
                         title = "节点日志", mode = RowOperation.Mode.SINGLE,
                         ifExpr = "item.version && item.version != '-'",
                         show = @ExprBool(exprHandler = ViaMenuValueCtrl.class, params = CloudServerConst.ERUPT_CLOUD_NODE_LOG),
-                        type = RowOperation.Type.TPL, tpl = @Tpl(path = "/tpl/erupt-log.html", width = "85%")
+                        type = RowOperation.Type.TPL, tpl = @Tpl(path = "/tpl/erupt-log.html", height = "80%", openWay = OpenWay.DRAWER, drawerPlacement = Placement.BOTTOM)
                 ),
         }, layout = @Layout(tableLeftFixed = 1, pageSize = 30)
 )

erupt-upms/src/main/resources/tpl/erupt-log.html

@@ -17,7 +17,7 @@
 
         @font-face {
             font-family: 'Courier New';
-            src: url('monitor/Courier-New.ttf');
+            src: url('log/Courier-New.ttf');
         }
     </style>
 </head>
@@ -34,8 +34,23 @@
     let cloudNode = new URLSearchParams(location.search).get("_erupt") === 'CloudNode';
     if (cloudNode) {
         if (window.self !== window.top) {
-            window.parent.document.getElementsByClassName("ant-modal-header")[0].remove();
-            window.parent.document.getElementsByClassName("ant-modal-close-x")[0].style.color = "#fff";
+            let interval;
+
+            function removeHeader() {
+                try {
+                    // window.parent.document.getElementsByClassName("ant-modal-header")[0].remove();
+                    // window.parent.document.getElementsByClassName("ant-modal-close-x")[0].style.color = "#fff";
+                    window.parent.document.getElementsByClassName("ant-drawer-header")[0].remove();
+                } catch (e) {
+                    console.warn(e);
+                    interval && clearInterval(interval);
+                }
+            }
+
+            removeHeader()
+            interval = setInterval(() => {
+                removeHeader()
+            }, 100)
         }
     }
     const xterm = new Terminal({

erupt-web/src/main/resources/public/266.c57f2d264c9f36f2.js

@@ -46,6 +46,6 @@
 </div>
 <![endif]-->
 <app-root></app-root>
-<script src="runtime.2d916b1c30f84159.js" type="module"></script><script src="polyfills.827684443b3599b2.js" type="module"></script><script src="main.edf9f05f94530a4d.js" type="module"></script>
+<script src="runtime.3662cf2f1d7c5084.js" type="module"></script><script src="polyfills.827684443b3599b2.js" type="module"></script><script src="main.20cc715d5299c0f5.js" type="module"></script>
 
 </body></html>