From b0a8d40efcbea70276cc4870520c67e51bc79f69 Mon Sep 17 00:00:00 2001
From: dingyongliang <dingyongliang@easycorp.ltd>
Date: Thu, 29 Jun 2023 17:02:10 +0800
Subject: [PATCH] * zin: fix detailSide style.

---
 lib/zin/wg/detailbody/css/v1.css |  1 +
 lib/zin/wg/detailbody/v1.php     |  5 +++++
 lib/zin/wg/detailside/css/v1.css |  4 +++-
 lib/zin/wg/detailside/v1.php     |  2 +-
 lib/zin/wg/tabs/css/v1.css       |  3 ++-
 lib/zin/wg/tabs/v1.php           | 11 ++++++-----
 6 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 lib/zin/wg/detailbody/css/v1.css

diff --git a/lib/zin/wg/detailbody/css/v1.css b/lib/zin/wg/detailbody/css/v1.css
new file mode 100644
index 0000000000..857c3bb4d9
--- /dev/null
+++ b/lib/zin/wg/detailbody/css/v1.css
@@ -0,0 +1 @@
+.detail-body > .form-actions:last-child {margin-top: 0;}
diff --git a/lib/zin/wg/detailbody/v1.php b/lib/zin/wg/detailbody/v1.php
index b71dda71a3..130fbe7bdc 100644
--- a/lib/zin/wg/detailbody/v1.php
+++ b/lib/zin/wg/detailbody/v1.php
@@ -15,6 +15,11 @@ class detailBody extends wg
         'floating' => array('map' => 'floatToolbar'),
     );
 
+    public static function getPageCSS(): string|false
+    {
+        return file_get_contents(__DIR__ . DS . 'css' . DS . 'v1.css');
+    }
+
     public static function getPageJS(): string|false
     {
         return file_get_contents(__DIR__ . DS . 'js' . DS . 'v1.js');
diff --git a/lib/zin/wg/detailside/css/v1.css b/lib/zin/wg/detailside/css/v1.css
index fdc1ccde7c..98a86465fd 100644
--- a/lib/zin/wg/detailside/css/v1.css
+++ b/lib/zin/wg/detailside/css/v1.css
@@ -1,4 +1,6 @@
 .detail-side {width: 370px;}
 .detail-side .tab-content>.tab-pane {padding-left: 0 !important;}
-.detail-side {background: #fff;}
+.detail-side {background: #fff; height: min-content;}
 .detail-side .tabs:not(:first-child) {border-top: 1px solid #E6EAF1;}
+.detail-side .tabs {padding-top: 12px; padding-bottom: 20px;}
+.detail-side > .table-data {margin-top: 16px;}
diff --git a/lib/zin/wg/detailside/v1.php b/lib/zin/wg/detailside/v1.php
index 3c331cfb5e..9e31eab443 100644
--- a/lib/zin/wg/detailside/v1.php
+++ b/lib/zin/wg/detailside/v1.php
@@ -13,7 +13,7 @@ class detailSide extends wg
     {
         return div
         (
-            setClass('detail-side flex-none px-6 py-3'),
+            setClass('detail-side flex-none px-6'),
             set($this->props->skip(array_keys(static::getDefinedProps()))),
             $this->children()
         );
diff --git a/lib/zin/wg/tabs/css/v1.css b/lib/zin/wg/tabs/css/v1.css
index c6fc80ebb8..bdd7621885 100644
--- a/lib/zin/wg/tabs/css/v1.css
+++ b/lib/zin/wg/tabs/css/v1.css
@@ -4,4 +4,5 @@
 .nav-tabs>.nav-item>a.active {color: var(--color-primary-500);}
 .nav-tabs>.nav-item>a.active:after {border-bottom-color: var(--color-primary-500) !important; border-bottom-width: 2px;}
 .nav-tabs>.divider {height: 20px; border-right: 1px solid #DDD;}
-.tabs .tabs-collapse-btn {position: absolute; top: 16px; right: 24px; width: 24px; height: 24px;}
+.tabs .tabs-collapse-btn {position: absolute; top: 3px; right: 0; width: 24px; height: 24px;}
+.tabs .tab-content {padding-top: 10px;}
diff --git a/lib/zin/wg/tabs/v1.php b/lib/zin/wg/tabs/v1.php
index 00ab2529d9..d5ead4d405 100644
--- a/lib/zin/wg/tabs/v1.php
+++ b/lib/zin/wg/tabs/v1.php
@@ -54,11 +54,14 @@ class tabs extends wg
     protected function buildTabHeader(array $titleViews): wg
     {
         $isVertical = $this->prop('direction') === 'v';
+        $collapse   = $this->prop('collapse');
+
         return ul
         (
-            setClass('nav nav-tabs gap-x-5'),
+            setClass('nav nav-tabs gap-x-5', $collapse ? 'relative' : null),
             $isVertical ? setClass('nav-stacked') : null,
-            $titleViews
+            $titleViews,
+            $this->buildCollapseBtn(),
         );
     }
 
@@ -105,7 +108,6 @@ class tabs extends wg
     protected function build(): wg
     {
         $isVertical = $this->prop('direction') === 'v';
-        $collapse   = $this->prop('collapse');
 
         $this->filterChildren();
 
@@ -123,12 +125,11 @@ class tabs extends wg
 
         return div
         (
-            setClass('tabs', $isVertical ? 'flex' : null, $collapse ? 'relative' : null),
+            setClass('tabs', $isVertical ? 'flex' : null),
             set($this->props->skip(array_keys(static::getDefinedProps()))),
 
             $this->buildTabHeader($titleViews),
             $this->buildTabBody($contentViews),
-            $this->buildCollapseBtn(),
             $this->children
         );
     }