From 757d86a76582168524edfe26fa3c6ea73acec582 Mon Sep 17 00:00:00 2001
From: wintel <yubaolee@163.com>
Date: Sat, 19 Apr 2025 22:44:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=20#IC2GBH=20=E6=B5=81=E7=A8=8B=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=87=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/FlowInstances/Verification.cshtml   | 61 +++++++++++++++----
 OpenAuth.Mvc/wwwroot/css/main.css             |  1 -
 2 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/OpenAuth.Mvc/Views/FlowInstances/Verification.cshtml b/OpenAuth.Mvc/Views/FlowInstances/Verification.cshtml
index 5693156d..55ef2957 100644
--- a/OpenAuth.Mvc/Views/FlowInstances/Verification.cshtml
+++ b/OpenAuth.Mvc/Views/FlowInstances/Verification.cshtml
@@ -1,17 +1,52 @@
-
-@section header
+@section header
 {
      
     <link rel="stylesheet" href="/js/dtree/dtree.css" />
     <link rel="stylesheet" href="/js/dtree/font/dtreefont.css" />
     <link href="/js/flow/GooFlow.css" rel="stylesheet" />
     <link href="/css/formpreview.css" rel="stylesheet" />
+    
+    <!-- 添加自定义样式覆盖main.css中的冲突样式 -->
+    <style>
+        .verification-flex-container {
+            display: flex;
+            width: 100%;
+            min-height: 600px;
+        }
+        
+        .verification-left-panel {
+            flex: 8;
+            padding-right: 10px;
+        }
+        
+        .verification-right-panel {
+            flex: 4;
+            background-color: gainsboro;
+            padding: 10px;
+        }
+        
+        /* 覆盖main.css中的绝对定位样式 */
+        .verification-tab .layui-tab-item {
+            position: relative !important;
+            top: auto !important;
+            bottom: auto !important;
+            left: auto !important;
+            right: auto !important;
+            min-height: 500px;
+            padding: 10px;
+        }
+        
+        .verification-tab .layui-tab-content {
+            min-height: 500px;
+            position: relative;
+        }
+    </style>
 }
 
 <form class="layui-form " action="" id="formEdit">
-    <div class="layui-row ">
-        <div class="layui-col-xs8">
-            <div class="layui-tab layui-tab-brief" lay-filter="tab" style="margin: 0px">
+    <div class="verification-flex-container">
+        <div class="verification-left-panel">
+            <div class="layui-tab layui-tab-brief verification-tab" lay-filter="tab" style="margin: 0px">
                 <ul class="layui-tab-title">
                     <li class="layui-this">流程信息</li>
                     <li>表单信息</li>
@@ -19,18 +54,22 @@
 
                 <div class="layui-tab-content">
                     <div class="layui-tab-item layui-show">
-                        <div id="flowPanel"></div>
+                        <div id="flowPanel">
+                            <!-- 测试内容 -->
+                            <p>流程内容应该显示在这里</p>
+                        </div>
                     </div>
 
                     <div class="layui-tab-item">
-                        <div id="frmPreview"></div>
+                        <div id="frmPreview">
+                            <!-- 测试内容 -->
+                            <p>表单内容应该显示在这里</p>
+                        </div>
                     </div>
-
                 </div>
             </div>
-
         </div>
-        <div class="layui-col-xs4" style="background-color: gainsboro; min-height: 600px">
+        <div class="verification-right-panel">
             <input type="hidden" id="FlowInstanceId" name="FlowInstanceId"/>
 
             <div class="layui-form-item">
@@ -50,7 +89,7 @@
                 </div>
             </div>
         </div>
-        </div>
+    </div>
     
     <input type="hidden" lay-submit id="btnSubmit" lay-filter="formSubmit"/>
 </form>
diff --git a/OpenAuth.Mvc/wwwroot/css/main.css b/OpenAuth.Mvc/wwwroot/css/main.css
index cb540bd0..bdedeef0 100644
--- a/OpenAuth.Mvc/wwwroot/css/main.css
+++ b/OpenAuth.Mvc/wwwroot/css/main.css
@@ -101,7 +101,6 @@
 .layui-tab .layui-tab-title{
 	height: 35px;
 }
-.layui-tab-title .layui-this{ background-color:#18A093;}
 .layui-tab-title .layui-this:after{ border:none; }
 .layui-tab-title li cite{ font-style: normal; padding-left:5px; }
 .layui-tab-card .layui-tab-title{background-color: #ffffff}