diff --git a/src/assets/icons/textToolsDecoration.svg b/src/assets/icons/textToolsDecoration.svg new file mode 100644 index 0000000..725777a --- /dev/null +++ b/src/assets/icons/textToolsDecoration.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/icons/textToolsStyle.svg b/src/assets/icons/textToolsStyle.svg new file mode 100644 index 0000000..8c9a101 --- /dev/null +++ b/src/assets/icons/textToolsStyle.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/textToolsweight.svg b/src/assets/icons/textToolsweight.svg new file mode 100644 index 0000000..2cbd3b4 --- /dev/null +++ b/src/assets/icons/textToolsweight.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/components/Canvas/DepthCanvas/components/ai-selectbox-panel.vue b/src/components/Canvas/DepthCanvas/components/ai-selectbox-panel.vue index e972bfd..58f33bf 100644 --- a/src/components/Canvas/DepthCanvas/components/ai-selectbox-panel.vue +++ b/src/components/Canvas/DepthCanvas/components/ai-selectbox-panel.vue @@ -4,51 +4,63 @@
{{ item.label }}
- + - + diff --git a/src/components/Canvas/FlowCanvas/components/tools/my-select.vue b/src/components/Canvas/FlowCanvas/components/tools/my-select.vue index ccfc13c..ff9d156 100644 --- a/src/components/Canvas/FlowCanvas/components/tools/my-select.vue +++ b/src/components/Canvas/FlowCanvas/components/tools/my-select.vue @@ -43,6 +43,7 @@ .el-select-dropdown { li { padding-left: 8px; + padding-right: 8px; height: 30px; line-height: 30px; font-size: 12px; diff --git a/src/components/Canvas/FlowCanvas/components/tools/my-textTools.vue b/src/components/Canvas/FlowCanvas/components/tools/my-textTools.vue new file mode 100644 index 0000000..480fb48 --- /dev/null +++ b/src/components/Canvas/FlowCanvas/components/tools/my-textTools.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/components/Canvas/FlowCanvas/components/tools/upload-file.vue b/src/components/Canvas/FlowCanvas/components/tools/upload-file.vue index 09be9ed..20bb8cf 100644 --- a/src/components/Canvas/FlowCanvas/components/tools/upload-file.vue +++ b/src/components/Canvas/FlowCanvas/components/tools/upload-file.vue @@ -96,18 +96,18 @@ } } > .preview { - width: 80px; height: 80px; + max-height: 100%; position: relative; > img { height: 100%; - width: 100%; + max-height: 100%; object-fit: contain; } > .close { position: absolute; - top: 0.1px; - right: 0.1px; + top: -10px; + right: -10px; border-radius: 50%; background-color: #fff; cursor: pointer; diff --git a/src/components/Canvas/FlowCanvas/manager/NodeManager.ts b/src/components/Canvas/FlowCanvas/manager/NodeManager.ts index ee1298b..50b202c 100644 --- a/src/components/Canvas/FlowCanvas/manager/NodeManager.ts +++ b/src/components/Canvas/FlowCanvas/manager/NodeManager.ts @@ -47,7 +47,7 @@ export class NodeManager { //获取上级节点所生成的最后一个node，设置位置为最后一个节点的xy 加上 节点间距 const superiorGenerateNodes = this.stateManager.getSubordNodes(superiorID) const currentNode = superiorGenerateNodes.find((node) => { - return node.data.createIndexPosition === options?.data?.createIndexPosition + return (node.data.createIndexPosition === options?.data?.createIndexPosition && options?.data?.createIndexPosition) }) const endGenerateNode = superiorGenerateNodes.reduce((max, current) => { return current.data.createIndexPosition > max.data.createIndexPosition ? current : max diff --git a/src/components/Canvas/FlowCanvas/manager/StateManager.ts b/src/components/Canvas/FlowCanvas/manager/StateManager.ts index 5165bb4..8b6c546 100644 --- a/src/components/Canvas/FlowCanvas/manager/StateManager.ts +++ b/src/components/Canvas/FlowCanvas/manager/StateManager.ts @@ -127,7 +127,7 @@ export class StateManager { getNodeById(id: string) { return this.nodes.value.find((node: NodesItem) => node.id === id) } /** 获取下级节点 */ getSubordNodeById(id: string) { return this.nodes.value.find((node: NodesItem) => node.data.superiorID === id) } - getLastNode() { console.log(this.nodes.value); return this.nodes.value[this.nodes.value.length - 1] } + getLastNode() { return this.nodes.value[this.nodes.value.length - 1] } /** 获取上级生成节点的图片 */ getSuperiorNodeImage(superiorID: string) { diff --git a/src/views/home/agent/components/versionTree/index.vue b/src/views/home/agent/components/versionTree/index.vue index 9448ee0..7edfbbc 100644 --- a/src/views/home/agent/components/versionTree/index.vue +++ b/src/views/home/agent/components/versionTree/index.vue @@ -5,6 +5,7 @@ import Tree from './tree/index.vue' import { findAndAddChild, findAndRemoveChild } from '../../../../../utils/treeDiagram' import { useProjectStore } from '@/stores' import { versionTree } from '@/api/versitonTree' +import { downloadImage } from '@/components/Canvas/tools/tools' const props = defineProps({ versionTreeData: { @@ -138,7 +139,7 @@ const {} = toRefs(data)
-
+
@@ -211,8 +212,10 @@ const {} = toRefs(data) margin-left: auto; margin-top: 2.2rem; margin-right: 3rem; + height: 3.3rem; > .btn{ - padding: .6rem 1.8rem; + padding: 0 1.8rem; + line-height: 3rem; cursor: pointer; display: flex; align-items: center; diff --git a/src/views/home/test.vue b/src/views/home/test.vue index 7f4f9d7..2e7c94b 100644 --- a/src/views/home/test.vue +++ b/src/views/home/test.vue @@ -10,12 +10,13 @@ import { computed, onMounted } from 'vue' import { useRoute } from 'vue-router' const route = useRoute() - const url = 'https://www.minio-api.aida.com.hk/fida-test/furniture/sketches/1a48ed3a-1faa-4fcd-bf07-765dba1702c5.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20260320%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20260320T020948Z&X-Amz-Expires=604800&X-Amz-SignedHeaders=host&X-Amz-Signature=7dc192bac887bce7b02c99d7037c08d9d684310f00add9b0e63b74b36ee63d37' + const url = + 'https://www.minio-api.aida.com.hk/fida-test/furniture/sketches/1a48ed3a-1faa-4fcd-bf07-765dba1702c5.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20260320%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20260320T020948Z&X-Amz-Expires=604800&X-Amz-SignedHeaders=host&X-Amz-Signature=7dc192bac887bce7b02c99d7037c08d9d684310f00add9b0e63b74b36ee63d37' const openCanvas = () => { myEvent.emit('openFlowCanvas', { url }) } const openDepthCanvas = () => { - myEvent.emit('openDepthCanvas', { url }) + myEvent.emit('openDepthCanvas', { url, canvasId: '69c34539ce996b52f07e625f' }) } onMounted(() => { if (route.query.depth) {