diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml index 1f3dc50b..f575b9cf 100644 --- a/sf_dlm_management/views/product_template_management_view.xml +++ b/sf_dlm_management/views/product_template_management_view.xml @@ -16,13 +16,16 @@ + - + - + + @@ -68,6 +71,7 @@ + - - + + 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 4ed9dcc1..8cd9ba87 100644 --- a/web_widget_model_viewer/static/src/js/3d_viewer.js +++ b/web_widget_model_viewer/static/src/js/3d_viewer.js @@ -27,7 +27,10 @@ export class StepViewer extends Component { formatUrl() { var url = ''; if (this.props.value) { - if (this.props.value.slice(-1) == 'b' && !isNaN(this.props.value.split(' ')[0])) { + if (this.props.value.startsWith('http')) { + // 从url读取文件内容 + url = this.props.value; + } else 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, @@ -37,21 +40,19 @@ 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) - return url; + } else { 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"; } - } else { - // var oImg = document.getElementsByClassName('test')[0] - // console.log(oImg) - } + } + return url; } }