diff --git a/index.html b/index.html index 5860039..468c412 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + diff --git a/public/favicon.svg b/public/favicon.svg new file mode 100644 index 0000000..ab0871d --- /dev/null +++ b/public/favicon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/api/flow-canvas.ts b/src/api/flow-canvas.ts index 13ce0fe..069b0e4 100644 --- a/src/api/flow-canvas.ts +++ b/src/api/flow-canvas.ts @@ -205,11 +205,13 @@ export const sketchAddPrintApi = (data:sketchAddPrintData) => { * @param data 图片转3d的参数 * @param data.sketchId sketch id * @param data.imageUrls 进行生成的图片。minio地址和正常地址都可以 + * @param data.mode 选择的模型 * @returns 图片转3d */ export interface sketchToThreeData { sketchId?: string imageUrls?: Array + mode?: string } export const sketchToThreeApi = (data:sketchToThreeData) => { return request({ @@ -218,6 +220,7 @@ export const sketchToThreeApi = (data:sketchToThreeData) => { data:{ sketchId: data.sketchId, imageUrls: data.imageUrls, + mode: data.mode, } }) } diff --git a/src/assets/icons/captureView.svg b/src/assets/icons/captureView.svg new file mode 100644 index 0000000..6a519d3 --- /dev/null +++ b/src/assets/icons/captureView.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/three/hdri.hdr b/src/assets/images/three/hdri.hdr new file mode 100644 index 0000000..1a71215 Binary files /dev/null and b/src/assets/images/three/hdri.hdr differ diff --git a/src/assets/images/three/sample.glb b/src/assets/images/three/sample.glb index a8eae0c..fa9cbb2 100644 Binary files a/src/assets/images/three/sample.glb and b/src/assets/images/three/sample.glb differ diff --git a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue index e64bc60..6c23925 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue @@ -176,6 +176,7 @@ ] let tier = (tritList.includes(currentComponent.value.tier) && typeList.includes(currentComponent.value.type))?currentComponent.value.tier - 1:currentComponent.value.tier if(NODE_DATATYPE.TO_REAL_STYLE == currentComponent.value.type && false){ + //一个结果节点里面多个子节点 let imageProcessTasks = taskList nodeManager.createResultNode({ data: { diff --git a/src/components/Canvas/FlowCanvas/components/nodes/cards/to-3d-model.vue b/src/components/Canvas/FlowCanvas/components/nodes/cards/to-3d-model.vue index af223a2..f55f059 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/cards/to-3d-model.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/cards/to-3d-model.vue @@ -5,20 +5,28 @@
+

Mode

+ diff --git a/src/views/home/components/Input.vue b/src/views/home/components/Input.vue index 1149da5..36d958c 100644 --- a/src/views/home/components/Input.vue +++ b/src/views/home/components/Input.vue @@ -499,7 +499,7 @@ // 清理掉已被删除的标签引用(从 DOM 中移除的元素) reportTags.value = reportTags.value.filter((tag) => tag.parentNode !== null) - if (reportTags.value.length > 0 ) { + if (reportTags.value.length > 0) { // 移除所有标签及其关联的零宽空格 reportTags.value.forEach((tag) => { if ( @@ -783,9 +783,9 @@ } const params = { - type: typeValue.value, - area: areaValue.value, - style: styleValue.value, + type: typeValue.value || '', + area: areaValue.value || '', + style: styleValue.value || '', useReport: reportTags.value.length > 0, temperature: 0.7 } diff --git a/src/views/home/left-nav.vue b/src/views/home/left-nav.vue index b9e212c..cdfbca7 100644 --- a/src/views/home/left-nav.vue +++ b/src/views/home/left-nav.vue @@ -141,6 +141,7 @@ const name = e.target.value if (!name) return console.warn('未输入名称,不允许重命名') item.name = name + MyEvent.emit('renameConversation', item) updateProject(item.id, { name }).then(() => { GetProjectList() }) diff --git a/vite.config.ts b/vite.config.ts index 1c71515..87aab9b 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -36,7 +36,7 @@ export default defineConfig(({ mode }) => { inject: 'body-last' // 注入位置优化 }) ], - assetsInclude: ['**/*.glb'], + assetsInclude: ['**/*.glb','**/*.hdr'], define: { __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: false, },