From d53e6648819457caa747d54528ae1dd77eeece0f Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Mon, 20 Nov 2023 17:38:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E4=BC=98=E5=8C=96=E4=B8=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_bf_connect/models/process_status.py | 2 +- sf_manufacturing/models/stock.py | 4 ++-- web_widget_model_viewer/static/src/js/3d_viewer.js | 14 ++++---------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/sf_bf_connect/models/process_status.py b/sf_bf_connect/models/process_status.py index 069ef2d4..ceb566c5 100644 --- a/sf_bf_connect/models/process_status.py +++ b/sf_bf_connect/models/process_status.py @@ -1,10 +1,10 @@ from datetime import datetime +from collections import defaultdict, namedtuple import logging import requests from odoo import api, fields, models, SUPERUSER_ID, _ from odoo.exceptions import UserError from odoo.exceptions import ValidationError -from collections import defaultdict, namedtuple _logger = logging.getLogger(__name__) diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 49d6f140..27cb69f9 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- import base64 +from collections import defaultdict, namedtuple import logging import json +from re import split as regex_split from re import findall as regex_findall from datetime import datetime, timedelta -from re import split as regex_split import requests from odoo import SUPERUSER_ID, _, api, fields, models from odoo.tools import float_compare -from collections import defaultdict, namedtuple from odoo.addons.stock.models.stock_rule import ProcurementException from odoo.addons.sf_base.commons.common import Common from odoo.exceptions import ValidationError, UserError 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 0f8ef168..9d3afd50 100644 --- a/web_widget_model_viewer/static/src/js/3d_viewer.js +++ b/web_widget_model_viewer/static/src/js/3d_viewer.js @@ -3,20 +3,14 @@ import {registry} from "@web/core/registry"; import {_lt} from "@web/core/l10n/translation"; import {standardFieldProps} from "@web/views/fields/standard_field_props"; -import {useInputField} from "@web/views/fields/input_field_hook"; -import {FileUploader} from "@web/views/fields/file_handler"; import {session} from "@web/session"; -import {useService} from "@web/core/utils/hooks"; -import {isBinarySize} from "@web/core/utils/binary"; -import {download} from "@web/core/network/download"; -import utils from 'web.utils'; import core from 'web.core'; -import rpc from 'web.rpc'; + var QWeb = core.qweb; -import {Component, onWillUpdateProps, useState, useRef, useEffect} from "@odoo/owl"; +import {Component} from "@odoo/owl"; export class StepViewer extends Component { setup() { @@ -35,11 +29,11 @@ export class StepViewer extends Component { } url = url_props['base_url'].replace('http://', 'https://') + '/web/content/' + url_props['model'] + '/' + url_props['id'] + '/' + url_props['field'] + '?download=true' // url = 'http://localhost:8069'+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true' - console.log('url111111', url) + // console.log('url111111', url) return url } else { url = "data:model/gltf-binary;base64," + this.props.value; - console.log('url2', url) + // console.log('url2', url) return url // localStorage.setItem('url',url) // let new_url = localStorage.getItem(('url'))