去除 根据进度条设置水印

修复切换产品3D图bug
修改表格下拉框会被表格下面数据框覆盖的bug

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 = {
+// const statusbar_params = {
-    '已完工': 'bg-primary',
+//     '已完工': 'bg-primary',
-    '完成': 'bg-primary',
+//     '完成': 'bg-primary',
-    '采购订单': 'bg-primary',
+//     '采购订单': 'bg-primary',
-    '作废': 'bg-danger',
+//     '作废': 'bg-danger',
-    '封存(报废)': 'bg-danger',
+//     '封存(报废)': 'bg-danger',
-}
+// }
-patch(StatusBarField.prototype, 'jikimo_frontend.StatusBarField', {
+// patch(StatusBarField.prototype, 'jikimo_frontend.StatusBarField', {
-   setup() {
+//    setup() {
-        owl.onMounted(this.ribbons);
+//         owl.onMounted(this.ribbons);
-        return this._super(...arguments);
+//         return this._super(...arguments);
-   },
+//    },
-   ribbons() {
+//    ribbons() {
-       try {
+//        try {
-           const dom = $('.o_form_sheet.position-relative')
+//            const dom = $('.o_form_sheet.position-relative')
-           const status = statusbar_params[this.currentName]
+//            const status = statusbar_params[this.currentName]
-           if(status && dom.length) {
+//            if(status && dom.length) {
-               dom.prepend(`<div class="o_widget o_widget_web_ribbon">
+//                dom.prepend(`<div class="o_widget o_widget_web_ribbon">
-                                <div class="ribbon ribbon-top-right">
+//                                 <div class="ribbon ribbon-top-right">
-                                    <span class="bg-opacity-75 ${status}" title="">${this.currentName}</span>
+//                                     <span class="bg-opacity-75 ${status}" title="">${this.currentName}</span>
-                                </div>
+//                                 </div>
-                            </div>`)
+//                             </div>`)
-           }
+//            }
-       } catch (e) {
+//        } catch (e) {
-           console.log(e)
+//            console.log(e)
-       }
+//        }
-   }
+//    }
-})
+// })
 
 $(function () {
     document.addEventListener('click', function () {

jikimo_frontend/static/src/scss/custom_style.scss

@@ -531,3 +531,10 @@ div:has(.o_required_modifier) > label::before {
 .o_list_renderer .o_list_table tbody th {
   position: unset;
 }
+
+// 修改表格下拉框会被表格下面数据框覆盖的bug
+.tab-pane .o_field_widget {
+  position: relative;
+  z-index: 1;
+}
+

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() {