From bcdd1978d74129cfa29a2a1597b3248ea10f3e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Fri, 3 Jan 2025 21:09:42 +0800
Subject: [PATCH] =?UTF-8?q?ljm=20=E6=A8=AA=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_property/__manifest__.py                  | 10 +++++-----
 .../static/{ => src}/scss/approval.scss          | 16 ++++++++++------
 yuthon_property/views/yuthon_property_views.xml  |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)
 rename yuthon_property/static/{ => src}/scss/approval.scss (72%)

diff --git a/yuthon_property/__manifest__.py b/yuthon_property/__manifest__.py
index 236bd126d..46f7947f8 100644
--- a/yuthon_property/__manifest__.py
+++ b/yuthon_property/__manifest__.py
@@ -49,11 +49,11 @@
         'wizard/yuthon_property_wizard_views.xml',
         'views/menuitem.xml',
     ],
-    # 'assets': {
-    #     'web.assets_backend': [
-    #         'yuthon_property/static/src/scss/approval.scss',
-    #     ],
-    # },
+    'assets': {
+        'web.assets_backend': [
+            'yuthon_property/static/src/scss/approval.scss',
+        ],
+    },
     'demo': [],
     'depends': ['mail', 'documents'],
     'installable': True,
diff --git a/yuthon_property/static/scss/approval.scss b/yuthon_property/static/src/scss/approval.scss
similarity index 72%
rename from yuthon_property/static/scss/approval.scss
rename to yuthon_property/static/src/scss/approval.scss
index 350e1aa18..6a7117a1a 100644
--- a/yuthon_property/static/scss/approval.scss
+++ b/yuthon_property/static/src/scss/approval.scss
@@ -1,7 +1,9 @@
-.o_kanban_row {
+.kk_kanban_row {
    @media (min-width: 768px) {
-      display: block;
-
+      //display: block !important;
+      .o_kanban_grouped {
+         display: block !important;
+      }
       .o_kanban_group {
          display: flex; /* 使用 flex 布局 */
          flex-flow: row wrap; /* 横向排列，并支持换行 */
@@ -10,7 +12,8 @@
          .o_kanban_header {
             min-width: 100%; /* 确保标题宽度占满行 */
             width: 100%;
-
+o_kanban_renderer o_renderer d-flex o_kanban_grouped align-content-stretch
+o_kanban_renderer o_renderer d-flex o_kanban_ungrouped align-content-start flex-wrap justify-content-start
             .o_kanban_header_title {
                .o_column_title {
                   font-weight: bold; /* 确保标题加粗 */
@@ -22,7 +25,8 @@
             display: inline-block; /* 横向排列 */
             min-width: 332px; /* 设置最小宽度 */
             width: 332px; /* 固定宽度 */
-            margin: 4px 8px; /* 设置间距 */
+            //margin: 1px 4px !important; /* 设置间距 */
+            padding-right: 4px;
          }
 
          .o_kanban_load_more {
@@ -40,7 +44,7 @@
                .o_column_title {
                   transform: none; /* 禁用变形 */
                   top: 10px;
-                  left: 20px; /* 调整位置 */
+                  left: 40px; /* 调整位置 */
                }
             }
          }
diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index 2bc469a52..8d066a0fd 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -227,7 +227,7 @@
         <field name="name">yuthon.property.kanban</field>
         <field name="model">yuthon.property</field>
         <field name="arch" type="xml">
-            <kanban>
+            <kanban class="kk_kanban_row">
                 <field name="id"/>
                 <templates>
                     <t t-name="kanban-box">