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(`
-
- ${this.currentName} -
-
`) - } - } 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(`
+//
+// ${this.currentName} +//
+//
`) +// } +// } 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() {