Commit e8d5527c02c92381fae7da3c3dc1c7ad6848c31e

Authored by xp.Huang
2 parents 68c3e50e 408ff49d

Merge branch 'fix/views/10-30/2024' into 'main_dev'

perf(src/packages): 优化3D模型,  服务端抛错,3D编辑器未提示错误信息

See merge request yunteng/thingskit-view!306
@@ -150,6 +150,7 @@ function MenubarFile(editor) { @@ -150,6 +150,7 @@ function MenubarFile(editor) {
150 // 获取缩略图片 150 // 获取缩略图片
151 const range = document.querySelector('#viewport').children[3] 151 const range = document.querySelector('#viewport').children[3]
152 const { spin, stop } = useSpin() 152 const { spin, stop } = useSpin()
  153 + const { success, error } = useMessage()
153 try { 154 try {
154 spin() 155 spin()
155 // 生成图片 156 // 生成图片
@@ -175,8 +176,9 @@ function MenubarFile(editor) { @@ -175,8 +176,9 @@ function MenubarFile(editor) {
175 imageUrl: uploadRes?.fileDownloadUri, 176 imageUrl: uploadRes?.fileDownloadUri,
176 data: file_json 177 data: file_json
177 }) 178 })
178 - const { success } = useMessage()  
179 success('保存成功') 179 success('保存成功')
  180 + } catch (e) {
  181 + error(e?.response?.data?.message)
180 } finally { 182 } finally {
181 stop() 183 stop()
182 } 184 }
@@ -10,6 +10,7 @@ import { Menubar } from './js/Menubar.js' @@ -10,6 +10,7 @@ import { Menubar } from './js/Menubar.js'
10 import { Resizer } from './js/Resizer.js' 10 import { Resizer } from './js/Resizer.js'
11 import { getThreeJsModelByJson } from './js/libs/http/api.js' 11 import { getThreeJsModelByJson } from './js/libs/http/api.js'
12 import { useSpin } from './js/libs/spin/useSpin.js' 12 import { useSpin } from './js/libs/spin/useSpin.js'
  13 +import useMessage from './js/MessageDialog.js'
13 14
14 window.URL = window.URL || window.webkitURL 15 window.URL = window.URL || window.webkitURL
15 window.BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder 16 window.BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder
@@ -49,18 +50,18 @@ document.body.appendChild(resizer.dom) @@ -49,18 +50,18 @@ document.body.appendChild(resizer.dom)
49 */ 50 */
50 51
51 editor.storage.init(async function () { 52 editor.storage.init(async function () {
  53 + const { error } = useMessage()
52 const paramsStr = window.location.search 54 const paramsStr = window.location.search
53 const params = new URLSearchParams(paramsStr) 55 const params = new URLSearchParams(paramsStr)
54 const file_uuid = params.get('three_file_uuid') 56 const file_uuid = params.get('three_file_uuid')
55 - const actionType = params.get('action_type')  
56 - // if (actionType === 'create') return  
57 -  
58 const { spin, stop } = useSpin() 57 const { spin, stop } = useSpin()
59 try { 58 try {
60 spin() 59 spin()
61 const fileData = await getThreeJsModelByJson(file_uuid) 60 const fileData = await getThreeJsModelByJson(file_uuid)
62 if (!fileData) return 61 if (!fileData) return
63 await editor.fromJSON(fileData) 62 await editor.fromJSON(fileData)
  63 + } catch (e) {
  64 + error(e?.response?.data?.message)
64 } finally { 65 } finally {
65 stop() 66 stop()
66 } 67 }