From c4df014c0334935592cfac96d70dcc515c0d8cc4 Mon Sep 17 00:00:00 2001 From: lzp Date: Fri, 27 Mar 2026 09:29:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?12345=E4=B8=8A=E5=B1=B1=E6=89=93=E8=80=81?= =?UTF-8?q?=E8=99=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/dc/create.svg | 3 +++ src/assets/icons/dc/reset.svg | 3 +++ .../components/ai-selectbox-panel.vue | 27 +++++++++++++++++-- .../components/tools/depth-input.vue | 23 +++++++++------- .../DepthCanvas/manager/LayerManager.ts | 3 ++- src/lang/en.ts | 2 ++ src/lang/zh-cn.ts | 2 ++ 7 files changed, 51 insertions(+), 12 deletions(-) create mode 100644 src/assets/icons/dc/create.svg create mode 100644 src/assets/icons/dc/reset.svg diff --git a/src/assets/icons/dc/create.svg b/src/assets/icons/dc/create.svg new file mode 100644 index 0000000..a3aa896 --- /dev/null +++ b/src/assets/icons/dc/create.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/dc/reset.svg b/src/assets/icons/dc/reset.svg new file mode 100644 index 0000000..eae205a --- /dev/null +++ b/src/assets/icons/dc/reset.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/Canvas/DepthCanvas/components/ai-selectbox-panel.vue b/src/components/Canvas/DepthCanvas/components/ai-selectbox-panel.vue index eb8d3e9..879e978 100644 --- a/src/components/Canvas/DepthCanvas/components/ai-selectbox-panel.vue +++ b/src/components/Canvas/DepthCanvas/components/ai-selectbox-panel.vue @@ -10,8 +10,14 @@ {{ item.label }} - - + + @@ -114,5 +120,22 @@ background: rgba(235, 235, 235, 0.9); } } + > button { + cursor: pointer; + border: none; + display: flex; + align-items: center; + justify-content: center; + height: 2.5rem; + background-color: rgba(13, 13, 13, 1); + color: #fff; + font-size: 1.2rem; + border-radius: 0.4rem; + padding: 0 0.8rem; + gap: 0.8rem; + &:active { + opacity: 0.8; + } + } } diff --git a/src/components/Canvas/DepthCanvas/components/tools/depth-input.vue b/src/components/Canvas/DepthCanvas/components/tools/depth-input.vue index 53cc57f..6cbb258 100644 --- a/src/components/Canvas/DepthCanvas/components/tools/depth-input.vue +++ b/src/components/Canvas/DepthCanvas/components/tools/depth-input.vue @@ -5,7 +5,9 @@ {{ before }} + - - diff --git a/src/components/Canvas/DepthCanvas/manager/LayerManager.ts b/src/components/Canvas/DepthCanvas/manager/LayerManager.ts index 2955341..d3471a2 100644 --- a/src/components/Canvas/DepthCanvas/manager/LayerManager.ts +++ b/src/components/Canvas/DepthCanvas/manager/LayerManager.ts @@ -136,10 +136,11 @@ export class LayerManager { copyLayerById(id) { const object = this.canvasManager.getObjectById(id) if (!object) return console.warn('复制图层失败，对象不存在ID:', id) + this.canvasManager.discardActiveObject() cloneObjects([object]).then(objects => { const newObject = objects[0] const info = JSON.parse(JSON.stringify(newObject.info)) - info.id = createId("image") + info.id = createId("copylayer") // info.name = info.name newObject.set({ top: newObject.top + 15, diff --git a/src/lang/en.ts b/src/lang/en.ts index 7c397cd..8eafdf9 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -242,5 +242,7 @@ export default { remove: "Remove", brush: "Brush", erase: "Erase", + create: "Create", + reset: "Reset" } } diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts index b06177f..5fa5790 100644 --- a/src/lang/zh-cn.ts +++ b/src/lang/zh-cn.ts @@ -239,5 +239,7 @@ export default { remove: "删除", brush: "画笔", erase: "擦除", + create: "创建", + reset: "重置" } } From 41820a2f9d99b84497f2b9fddc247786d8173f75 Mon Sep 17 00:00:00 2001 From: "X1627315083@163.com" <1627315083@qq.com> Date: Fri, 27 Mar 2026 09:35:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E8=A3=81=E5=89=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.development b/.env.development index f844c2d..8eca712 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # VITE_APP_URL = http://192.168.31.82:8771 VITE_APP_URL = http://18.167.251.121:10015 # VITE_APP_URL = http://192.168.31.118:8080 -# VITE_APP_URL = http://192.168.31.82:8755 +VITE_APP_URL = http://192.168.31.82:8755 VITE_GOOGLE_CLIENT_ID = 216037134725-7q8vqp0ohtmohlosltkfg7bd2v29rm5a.apps.googleusercontent.com From 98d92cbf303d4039d20617eec0ffba001ff1df6b Mon Sep 17 00:00:00 2001 From: "X1627315083@163.com" <1627315083@qq.com> Date: Fri, 27 Mar 2026 09:36:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E8=A3=81=E5=89=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/assets/icons/clipAdd.svg | 3 + src/assets/icons/clipMinus.svg | 3 + src/components/Assistant/assistant.vue | 2 +- .../FlowCanvas/components/tools/my-select.vue | 7 +- .../components/tools/my-textTools.vue | 6 +- .../Canvas/FlowCanvas/flow-canvas.vue | 2 + src/components/Canvas/tools/tools.ts | 18 + src/components/clipDialog.vue | 738 ++++++++++++++++++ src/lang/en.ts | 5 + src/lang/zh-cn.ts | 5 + src/views/home/setting/General.vue | 20 +- 12 files changed, 801 insertions(+), 10 deletions(-) create mode 100644 src/assets/icons/clipAdd.svg create mode 100644 src/assets/icons/clipMinus.svg create mode 100644 src/components/clipDialog.vue diff --git a/.env.development b/.env.development index 8eca712..f844c2d 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # VITE_APP_URL = http://192.168.31.82:8771 VITE_APP_URL = http://18.167.251.121:10015 # VITE_APP_URL = http://192.168.31.118:8080 -VITE_APP_URL = http://192.168.31.82:8755 +# VITE_APP_URL = http://192.168.31.82:8755 VITE_GOOGLE_CLIENT_ID = 216037134725-7q8vqp0ohtmohlosltkfg7bd2v29rm5a.apps.googleusercontent.com diff --git a/src/assets/icons/clipAdd.svg b/src/assets/icons/clipAdd.svg new file mode 100644 index 0000000..d7b4773 --- /dev/null +++ b/src/assets/icons/clipAdd.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/clipMinus.svg b/src/assets/icons/clipMinus.svg new file mode 100644 index 0000000..dec342c --- /dev/null +++ b/src/assets/icons/clipMinus.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/Assistant/assistant.vue b/src/components/Assistant/assistant.vue index 64a8193..502b225 100644 --- a/src/components/Assistant/assistant.vue +++ b/src/components/Assistant/assistant.vue @@ -86,7 +86,7 @@ width: 46.69rem; height: 56.6rem; flex-shrink: 0; - // background-color: #fff; + background-color: #fff; box-shadow: 0px 19.44px 27.22px 0px #0000000d; border: 1px solid; border-image-source: linear-gradient( diff --git a/src/components/Canvas/FlowCanvas/components/tools/my-select.vue b/src/components/Canvas/FlowCanvas/components/tools/my-select.vue index ff9d156..66493af 100644 --- a/src/components/Canvas/FlowCanvas/components/tools/my-select.vue +++ b/src/components/Canvas/FlowCanvas/components/tools/my-select.vue @@ -1,7 +1,12 @@ diff --git a/src/components/Canvas/FlowCanvas/components/tools/my-textTools.vue b/src/components/Canvas/FlowCanvas/components/tools/my-textTools.vue index f95ee47..5c92f70 100644 --- a/src/components/Canvas/FlowCanvas/components/tools/my-textTools.vue +++ b/src/components/Canvas/FlowCanvas/components/tools/my-textTools.vue @@ -3,7 +3,11 @@
- + + +
diff --git a/src/components/Canvas/FlowCanvas/flow-canvas.vue b/src/components/Canvas/FlowCanvas/flow-canvas.vue index e8bc2d2..3b11ab2 100644 --- a/src/components/Canvas/FlowCanvas/flow-canvas.vue +++ b/src/components/Canvas/FlowCanvas/flow-canvas.vue @@ -62,6 +62,7 @@ + + + diff --git a/src/lang/en.ts b/src/lang/en.ts index 31f6a52..df676dc 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -200,5 +200,10 @@ export default { threeModel: { loading: 'Loading', download: 'Download' + }, + clipDialog: { + title: 'Upload your profile photo', + cancel: 'Cancel', + confirm: 'Save' } } diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts index e7e33e4..0e666c7 100644 --- a/src/lang/zh-cn.ts +++ b/src/lang/zh-cn.ts @@ -197,5 +197,10 @@ export default { threeModel: { loading: '加载中', download: '下载' + }, + clipDialog: { + title: '上传您的个人资料照片', + cancel: '取消', + confirm: '保存' } } diff --git a/src/views/home/setting/General.vue b/src/views/home/setting/General.vue index a6e754a..6d872db 100644 --- a/src/views/home/setting/General.vue +++ b/src/views/home/setting/General.vue @@ -31,6 +31,7 @@
{{ $t('Home.logoutDevice') }}
+