Merge branch 'fix/3d-model-thumbnail' into 'main_dev'

fix: 修复3d模型在大屏中无法保存缩略图与模型加载与上传时间调整为2min

See merge request yunteng/thingskit-view!314

 import { UIPanel, UIRow, UIHorizontalRule } from './libs/ui.js'
-import useMessage from './MessageDialog.js'
-import { saveOrUpdateThreeJsModel } from './libs/http/api.js'
-import html2canvas from 'html2canvas'
-import { fetchRouteParamsLocation } from '@/utils'
-import { uploadFile } from '@/api/external/contentSave/content'
-import { base64toFile } from '../utils/Base64ToFile.js'
-import { useSpin } from '../js/libs/spin/useSpin.js'
 import arkanoid from '../examples/arkanoid.app.json?url'
 import camera from '../examples/camera.app.json?url'
 import particles from '../examples/particles.app.json?url'

@@ -15,6 +15,8 @@ function Strings( config ) {
 			'prompt/history/preserve': 'The history will be preserved across sessions.\nThis can have an impact on performance when working with textures.',
 			'prompt/history/forbid': 'Undo/Redo disabled while scene is playing.',
 			'prompt/rendering/realistic/unsupportedMaterial': 'REALISTIC Shading: Only MeshStandardMaterial and MeshPhysicalMaterial are supported',
+			'prompt/save/success': "Save successfully",
+			'prompt/save/faild': "Save failure",
 
 			'command/AddObject': 'Add Object',
 			'command/AddScript': 'Add Script',
@@ -418,6 +420,8 @@ function Strings( config ) {
 			'prompt/history/preserve': 'L\'histoire sera conservée entre les sessions.\nCela peut avoir un impact sur les performances lors de la manipulation des textures.',
 			'prompt/history/forbid': 'Les fonctions Annuler/Rétablir sont désactivées pendant la lecture de la scène.',
 			'prompt/rendering/realistic/unsupportedMaterial': 'Ombrage REALISTIC : seuls MeshStandardMaterial et MeshPhysicalMaterial sont pris en charge',
+			'prompt/save/success': "Sauvé avec succès",
+			'prompt/save/faild': "Échec de sauvegarde",
 
 			'command/AddObject': 'Ajouter un objet',
 			'command/AddScript': 'Ajouter un script',
@@ -821,6 +825,8 @@ function Strings( config ) {
 			'prompt/history/preserve': '历史将在会话之间保留。\n这可能会影响在处理纹理时的性能。',
 			'prompt/history/forbid': '在播放场景时，撤消/重做被禁用。',
 			'prompt/rendering/realistic/unsupportedMaterial': 'REALISTIC着色：仅支持 MeshStandardMaterial 和 MeshPhysicalMaterial',
+			'prompt/save/success': "保存成功",
+			'prompt/save/faild': "保存失败",
 
 			'command/AddObject': '添加对象',
 			'command/AddScript': '添加脚本',
@@ -1224,6 +1230,8 @@ function Strings( config ) {
 			'prompt/history/preserve': '履歴はセッションをまたいで保存されます。\nこれは、テクスチャを操作する際のパフォーマンスに影響を与える可能性があります。',
 			'prompt/history/forbid': 'シーンの再生中は元に戻す/やり直しは無効になります。',
 			'prompt/rendering/realistic/unsupportedMaterial': 'REALISTIC シェーディング: MeshStandardmaterial と MeshPhysicalmaterial のみがサポートされています',
+			'prompt/save/success': "保存成功です",
+			'prompt/save/faild': "保存に失敗しました",
 
 			'command/AddObject': 'オブジェクトを追加',
 			'command/AddScript': 'スクリプトを追加',
@@ -1626,6 +1634,8 @@ function Strings( config ) {
 			'prompt/history/preserve': '기록은 세션을 통해 저장됩니다. 이는 텍스처를 조작할 때 성능에 영향을 미칠 수 있습니다.',
 			'prompt/history/forbid': '씬을 재생하는 동안 되돌리기/다시하기는 비활성화됩니다.',
 			'prompt/rendering/realistic/unsupportedMaterial': 'REALISTIC 셰이딩: MeshStandardmaterial 및 MeshPhysicalmaterial만 지원됩니다',
+			'prompt/save/success': "성공적으로 저장했습니다",
+			'prompt/save/faild': "저장 실패",
 	
 			'command/AddObject': '객체 추가',
 			'command/AddScript': '스크립트 추가',

@@ -7,6 +7,7 @@ import { base64toFile } from '../../../utils/Base64ToFile.js'
 import { useSpin } from '../spin/useSpin'
 
 export function useSave(editor) {
+  const strings = editor.strings
 
   async function save() {
     // 获取缩略图片
@@ -38,9 +39,9 @@ export function useSave(editor) {
         imageUrl: uploadRes?.fileStaticUri,
         data: file_json
       })
-      success('保存成功')
+      success(strings.getKey('prompt/save/success'))
     } catch (e) {
-      error(e?.message || e?.msg || '网络错误')
+      error(e?.message || e?.msg || e?.response?.statusText || strings.getKey('prompt/save/faild'))
     } finally {
       stop()
     }

@@ -12,10 +12,10 @@ export function saveOrUpdateThreeJsModel(params) {
     {
       url: `${API['URL']}?id=${params['id']}&imageUrl=${params['imageUrl']}`,
       data: params['data'],
-      timeout: 30 * 1000
+      timeout: 60 * 1000 * 2
     },
     {
-      errorMessageMode: ''
+      errorMessageMode: 'none'
     }
   )
 }
@@ -41,7 +41,7 @@ export function getThreeJsModelByJson(id) {
   return defHttp.get(
     {
       url: API['URL'] + '/json' + '/' + id + '/root.json',
-      timeout: 30 * 1000
+      timeout: 60 * 1000 * 2
     },
     {
       errorMessageMode: ''

@@ -4,10 +4,11 @@ import { ModelComponentItemType } from './model';
 
 
 
-export const doGet3DComponentJson = (id: string, ) => {
+export const doGet3DComponentJson = (id: string,) => {
   return defHttp.get<ModelComponentItemType | null>(
     {
-      url: `/3d_component/json/${id}/root.json`
+      url: `/3d_component/json/${id}/root.json`,
+      timeout: 1000 * 60 * 2
     }
   )
 }

@@ -24,7 +24,7 @@ export class ModelLoader {
       height = window.innerHeight
     }: ModelLoaderConstructorOptions = {}
   ) {
-    this.renderer = new WebGLRenderer({ alpha: true, antialias: true })
+    this.renderer = new WebGLRenderer({ alpha: true, antialias: true, preserveDrawingBuffer: true })
     this.scene = new Scene()
     this.camera = new PerspectiveCamera()
     this.objectLoader = new ObjectLoader()