From 51a8964b89a860f8b29b2704e04af56c6db13791 Mon Sep 17 00:00:00 2001
From: hyyy <123@qq.com>
Date: Wed, 7 May 2025 15:48:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=87=BA=E5=8E=82=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E8=B4=A8=E6=A3=80=E5=8D=95=E8=AF=A6=E6=83=85=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E6=96=B0=E5=A2=9E=E6=98=8E=E7=BB=86=E8=A1=8C=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B3=E8=BE=B9=E7=9A=84=E3=80=90=E5=88=A0=E9=99=A4=E3=80=91?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/js/custom_form_status_indicator.js    | 23 ++++++++++++++-----
 .../views/quality.check.measures.line.xml     |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/jikimo_frontend/static/src/js/custom_form_status_indicator.js b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
index 8f5ffae7..600cf1c8 100644
--- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js
+++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
@@ -119,13 +119,24 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
             this.listherHeaderBodyNum()
         })
         const treeModifiers = this.getFieldModifiers(this.props.archInfo.__rawArch);
+        
         if(treeModifiers) {
-            this.props.merge_key = treeModifiers.merge_key;
-            this.props.merge_fields = treeModifiers.merge_fields.split(',');
-            const data = this.setColumns(this.props.merge_key);
-            owl.onMounted(() => {
-                this.mergeColumns(this.props.merge_fields,  data)
-            })
+            if(treeModifiers.merge_fields) {
+                this.props.merge_key = treeModifiers.merge_key;
+                this.props.merge_fields = treeModifiers.merge_fields.split(',');
+                const data = this.setColumns(this.props.merge_key);
+                owl.onMounted(() => {
+                    this.mergeColumns(this.props.merge_fields,  data)
+                })
+            }
+            if(treeModifiers.pacthResize) {
+
+                owl.onPatched(() => {
+                    this.columnWidths = null;
+                    this.freezeColumnWidths();
+                    
+                })
+            }
         }
         return this._super(...arguments);
     },
diff --git a/quality_control/views/quality.check.measures.line.xml b/quality_control/views/quality.check.measures.line.xml
index e15a853f..1e37334a 100644
--- a/quality_control/views/quality.check.measures.line.xml
+++ b/quality_control/views/quality.check.measures.line.xml
@@ -4,7 +4,7 @@
         <field name="name">quality.check.measure.line.tree</field>
         <field name="model">quality.check.measure.line</field>
         <field name="arch" type="xml">
-            <tree editable="bottom"  class="measureTable">
+            <tree editable="bottom"  class="measureTable" attrs="{ 'pacthResize': True }">
 <!--                 <field name="sequence" class="measureTableSequence"/> -->
                 <!-- <field name="column_nums"/> -->
                 <field name="measure_item"/>