diff --git a/web_widget_model_viewer/static/src/images/not_model.png b/web_widget_model_viewer/static/src/images/not_model.png new file mode 100644 index 00000000..16e69cea Binary files /dev/null and b/web_widget_model_viewer/static/src/images/not_model.png differ 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 582c887f..f93cf207 100644 --- a/web_widget_model_viewer/static/src/js/3d_viewer.js +++ b/web_widget_model_viewer/static/src/js/3d_viewer.js @@ -19,31 +19,34 @@ var QWeb = core.qweb; import { Component, onWillUpdateProps, useState, useRef, useEffect } from "@odoo/owl"; export class StepViewer extends Component { - setup() { - console.log('setup') + setup() { this.props.url = this.formatUrl(); } - formatUrl(){ var url = ''; if (this.props.value) { - if (utils.is_bin_size(this.props.value)) { + if (this.props.value.slice(-1) == 'b' && !isNaN(this.props.value.split(' ')[0])) { var url_props = { base_url: session['web.base.url'], model: this.props.record.resModel, id: JSON.stringify(this.props.record.data['id']), field: this.props.name} - url = url_props['base_url']+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true' - console.log('url', url) - + 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) + return url } else { - url = "data:model/gltf-binary;base64," + this.props.value; - console.log('url222', url) + url = "data:model/gltf-binary;base64," + this.props.value; + console.log('url2',url) + return url + // localStorage.setItem('url',url) + // let new_url = localStorage.getItem(('url')) + // var oViewer = document.getElementsByTagName('model-viewer')[0]; + // return new_url + // url = "web_widget_model_viewer/static/src/images/not_model.png"; } } - return url - } - + } } StepViewer.template = "web_widget_model_viewer.BinaryField3d";