Commit e8d5527c02c92381fae7da3c3dc1c7ad6848c31e
Merge branch 'fix/views/10-30/2024' into 'main_dev'
perf(src/packages): 优化3D模型, 服务端抛错,3D编辑器未提示错误信息 See merge request yunteng/thingskit-view!306
Showing
2 changed files
with
7 additions
and
4 deletions
| ... | ... | @@ -150,6 +150,7 @@ function MenubarFile(editor) { |
| 150 | 150 | // 获取缩略图片 |
| 151 | 151 | const range = document.querySelector('#viewport').children[3] |
| 152 | 152 | const { spin, stop } = useSpin() |
| 153 | + const { success, error } = useMessage() | |
| 153 | 154 | try { |
| 154 | 155 | spin() |
| 155 | 156 | // 生成图片 |
| ... | ... | @@ -175,8 +176,9 @@ function MenubarFile(editor) { |
| 175 | 176 | imageUrl: uploadRes?.fileDownloadUri, |
| 176 | 177 | data: file_json |
| 177 | 178 | }) |
| 178 | - const { success } = useMessage() | |
| 179 | 179 | success('保存成功') |
| 180 | + } catch (e) { | |
| 181 | + error(e?.response?.data?.message) | |
| 180 | 182 | } finally { |
| 181 | 183 | stop() |
| 182 | 184 | } | ... | ... |
| ... | ... | @@ -10,6 +10,7 @@ import { Menubar } from './js/Menubar.js' |
| 10 | 10 | import { Resizer } from './js/Resizer.js' |
| 11 | 11 | import { getThreeJsModelByJson } from './js/libs/http/api.js' |
| 12 | 12 | import { useSpin } from './js/libs/spin/useSpin.js' |
| 13 | +import useMessage from './js/MessageDialog.js' | |
| 13 | 14 | |
| 14 | 15 | window.URL = window.URL || window.webkitURL |
| 15 | 16 | window.BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder |
| ... | ... | @@ -49,18 +50,18 @@ document.body.appendChild(resizer.dom) |
| 49 | 50 | */ |
| 50 | 51 | |
| 51 | 52 | editor.storage.init(async function () { |
| 53 | + const { error } = useMessage() | |
| 52 | 54 | const paramsStr = window.location.search |
| 53 | 55 | const params = new URLSearchParams(paramsStr) |
| 54 | 56 | const file_uuid = params.get('three_file_uuid') |
| 55 | - const actionType = params.get('action_type') | |
| 56 | - // if (actionType === 'create') return | |
| 57 | - | |
| 58 | 57 | const { spin, stop } = useSpin() |
| 59 | 58 | try { |
| 60 | 59 | spin() |
| 61 | 60 | const fileData = await getThreeJsModelByJson(file_uuid) |
| 62 | 61 | if (!fileData) return |
| 63 | 62 | await editor.fromJSON(fileData) |
| 63 | + } catch (e) { | |
| 64 | + error(e?.response?.data?.message) | |
| 64 | 65 | } finally { |
| 65 | 66 | stop() |
| 66 | 67 | } | ... | ... |