From 1c8644983bdd19f03f65992adc7ccd3b5a480f70 Mon Sep 17 00:00:00 2001
From: hy <1298386937@qq.com>
Date: Fri, 5 Jul 2024 16:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=20=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E8=AE=BE=E7=BD=AE=E6=B0=B4=E5=8D=B0?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2=E4=BA=A7=E5=93=813D?=
 =?UTF-8?q?=E5=9B=BEbug=20=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E4=BC=9A=E8=A2=AB=E8=A1=A8=E6=A0=BC=E4=B8=8B?=
 =?UTF-8?q?=E9=9D=A2=E6=95=B0=E6=8D=AE=E6=A1=86=E8=A6=86=E7=9B=96=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/js/custom_form_status_indicator.js    | 58 +++++++++----------
 .../static/src/scss/custom_style.scss         |  9 ++-
 .../static/src/js/3d_viewer.js                |  9 ++-
 3 files changed, 45 insertions(+), 31 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 306142d4..912c8efa 100644
--- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js
+++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
@@ -5,7 +5,7 @@ import {patch} from '@web/core/utils/patch';
 import {_t} from "@web/core/l10n/translation";
 import {FormStatusIndicator} from "@web/views/form/form_status_indicator/form_status_indicator";
 import {ListRenderer} from "@web/views/list/list_renderer";
-import {StatusBarField} from "@web/views/fields/statusbar/statusbar_field";
+// import {StatusBarField} from "@web/views/fields/statusbar/statusbar_field";
 
 import {Field} from "@web/views/fields/field";
 
@@ -153,34 +153,34 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
 
 
 // 根据进度条设置水印
-const statusbar_params = {
-    '已完工': 'bg-primary',
-    '完成': 'bg-primary',
-    '采购订单': 'bg-primary',
-    '作废': 'bg-danger',
-    '封存(报废)': 'bg-danger',
-}
-patch(StatusBarField.prototype, 'jikimo_frontend.StatusBarField', {
-   setup() {
-        owl.onMounted(this.ribbons);
-        return this._super(...arguments);
-   },
-   ribbons() {
-       try {
-           const dom = $('.o_form_sheet.position-relative')
-           const status = statusbar_params[this.currentName]
-           if(status && dom.length) {
-               dom.prepend(`<div class="o_widget o_widget_web_ribbon">
-                                <div class="ribbon ribbon-top-right">
-                                    <span class="bg-opacity-75 ${status}" title="">${this.currentName}</span>
-                                </div>
-                            </div>`)
-           }
-       } catch (e) {
-           console.log(e)
-       }
-   }
-})
+// const statusbar_params = {
+//     '已完工': 'bg-primary',
+//     '完成': 'bg-primary',
+//     '采购订单': 'bg-primary',
+//     '作废': 'bg-danger',
+//     '封存(报废)': 'bg-danger',
+// }
+// patch(StatusBarField.prototype, 'jikimo_frontend.StatusBarField', {
+//    setup() {
+//         owl.onMounted(this.ribbons);
+//         return this._super(...arguments);
+//    },
+//    ribbons() {
+//        try {
+//            const dom = $('.o_form_sheet.position-relative')
+//            const status = statusbar_params[this.currentName]
+//            if(status && dom.length) {
+//                dom.prepend(`<div class="o_widget o_widget_web_ribbon">
+//                                 <div class="ribbon ribbon-top-right">
+//                                     <span class="bg-opacity-75 ${status}" title="">${this.currentName}</span>
+//                                 </div>
+//                             </div>`)
+//            }
+//        } catch (e) {
+//            console.log(e)
+//        }
+//    }
+// })
 
 $(function () {
     document.addEventListener('click', function () {
diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index 0b6fb8bb..cbd1bb4d 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -530,4 +530,11 @@ div:has(.o_required_modifier) > label::before {
 // 修复表格内容覆盖表头bug
 .o_list_renderer .o_list_table tbody th {
   position: unset;
-}
\ No newline at end of file
+}
+
+// 修改表格下拉框会被表格下面数据框覆盖的bug
+.tab-pane .o_field_widget {
+  position: relative;
+  z-index: 1;
+}
+
diff --git a/web_widget_model_viewer/static/src/js/3d_viewer.js b/web_widget_model_viewer/static/src/js/3d_viewer.js
index 15374070..4ed9dcc1 100644
--- a/web_widget_model_viewer/static/src/js/3d_viewer.js
+++ b/web_widget_model_viewer/static/src/js/3d_viewer.js
@@ -10,11 +10,18 @@ import {session} from "@web/session";
 
 // var QWeb = core.qweb;
 
-import {Component} from "@odoo/owl";
+import {Component, onPatched} from "@odoo/owl";
 
 export class StepViewer extends Component {
     setup() {
         this.props.url = this.formatUrl();
+        onPatched(() => {
+            this.props.url = this.formatUrl();
+            const dom = $(this.__owl__.bdom.parentEl).children('model-viewer')
+            if(dom && dom.length) {
+                dom.attr('src', this.formatUrl())
+            }
+        })
     }
 
     formatUrl() {