diff --git a/src/App.vue b/src/App.vue index 72ed79d..e35e315 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,6 +12,7 @@ const router = useRouter() const globalStore = useGlobalStore() const loading = computed(() => globalStore.state.loading || globalStore.state.view_loading) + globalStore.setLoading(false) window['onClickPrivacy'] = () => { // window.event?.preventDefault() console.log('onClickPrivacy') @@ -28,7 +29,7 @@ #app { font-size: 1.6rem; } - .el-message{ + .el-message { font-size: 1.6rem; } #loading { diff --git a/src/views/canvas/components/cards/add-print.vue b/src/components/Canvas/FlowCanvas/components/cards/add-print.vue similarity index 100% rename from src/views/canvas/components/cards/add-print.vue rename to src/components/Canvas/FlowCanvas/components/cards/add-print.vue diff --git a/src/views/canvas/components/cards/color-palette.vue b/src/components/Canvas/FlowCanvas/components/cards/color-palette.vue similarity index 100% rename from src/views/canvas/components/cards/color-palette.vue rename to src/components/Canvas/FlowCanvas/components/cards/color-palette.vue diff --git a/src/views/canvas/components/cards/edit-material.vue b/src/components/Canvas/FlowCanvas/components/cards/edit-material.vue similarity index 100% rename from src/views/canvas/components/cards/edit-material.vue rename to src/components/Canvas/FlowCanvas/components/cards/edit-material.vue diff --git a/src/views/canvas/components/cards/index.vue b/src/components/Canvas/FlowCanvas/components/cards/index.vue similarity index 100% rename from src/views/canvas/components/cards/index.vue rename to src/components/Canvas/FlowCanvas/components/cards/index.vue diff --git a/src/views/canvas/components/cards/scene-composition.vue b/src/components/Canvas/FlowCanvas/components/cards/scene-composition.vue similarity index 100% rename from src/views/canvas/components/cards/scene-composition.vue rename to src/components/Canvas/FlowCanvas/components/cards/scene-composition.vue diff --git a/src/views/canvas/components/cards/to-3d-model.vue b/src/components/Canvas/FlowCanvas/components/cards/to-3d-model.vue similarity index 100% rename from src/views/canvas/components/cards/to-3d-model.vue rename to src/components/Canvas/FlowCanvas/components/cards/to-3d-model.vue diff --git a/src/views/canvas/components/cards/to-cad.vue b/src/components/Canvas/FlowCanvas/components/cards/to-cad.vue similarity index 100% rename from src/views/canvas/components/cards/to-cad.vue rename to src/components/Canvas/FlowCanvas/components/cards/to-cad.vue diff --git a/src/views/canvas/components/cards/to-real-style.vue b/src/components/Canvas/FlowCanvas/components/cards/to-real-style.vue similarity index 100% rename from src/views/canvas/components/cards/to-real-style.vue rename to src/components/Canvas/FlowCanvas/components/cards/to-real-style.vue diff --git a/src/views/canvas/components/cards/to-video.vue b/src/components/Canvas/FlowCanvas/components/cards/to-video.vue similarity index 100% rename from src/views/canvas/components/cards/to-video.vue rename to src/components/Canvas/FlowCanvas/components/cards/to-video.vue diff --git a/src/views/canvas/components/tools/my-input.vue b/src/components/Canvas/FlowCanvas/components/tools/my-input.vue similarity index 100% rename from src/views/canvas/components/tools/my-input.vue rename to src/components/Canvas/FlowCanvas/components/tools/my-input.vue diff --git a/src/views/canvas/components/tools/my-textarea.vue b/src/components/Canvas/FlowCanvas/components/tools/my-textarea.vue similarity index 100% rename from src/views/canvas/components/tools/my-textarea.vue rename to src/components/Canvas/FlowCanvas/components/tools/my-textarea.vue diff --git a/src/views/canvas/components/tools/offset-tool.vue b/src/components/Canvas/FlowCanvas/components/tools/offset-tool.vue similarity index 100% rename from src/views/canvas/components/tools/offset-tool.vue rename to src/components/Canvas/FlowCanvas/components/tools/offset-tool.vue diff --git a/src/views/canvas/components/tools/pixel-ratio-selection.vue b/src/components/Canvas/FlowCanvas/components/tools/pixel-ratio-selection.vue similarity index 100% rename from src/views/canvas/components/tools/pixel-ratio-selection.vue rename to src/components/Canvas/FlowCanvas/components/tools/pixel-ratio-selection.vue diff --git a/src/views/canvas/components/tools/slider.vue b/src/components/Canvas/FlowCanvas/components/tools/slider.vue similarity index 100% rename from src/views/canvas/components/tools/slider.vue rename to src/components/Canvas/FlowCanvas/components/tools/slider.vue diff --git a/src/views/canvas/components/tools/upload-file.vue b/src/components/Canvas/FlowCanvas/components/tools/upload-file.vue similarity index 100% rename from src/views/canvas/components/tools/upload-file.vue rename to src/components/Canvas/FlowCanvas/components/tools/upload-file.vue diff --git a/src/views/canvas/index.vue b/src/components/Canvas/FlowCanvas/index.vue similarity index 64% rename from src/views/canvas/index.vue rename to src/components/Canvas/FlowCanvas/index.vue index 90479b4..d303a14 100644 --- a/src/views/canvas/index.vue +++ b/src/components/Canvas/FlowCanvas/index.vue @@ -1,32 +1,43 @@ diff --git a/src/components/MyInfo.vue b/src/components/MyInfo.vue new file mode 100644 index 0000000..58d9441 --- /dev/null +++ b/src/components/MyInfo.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/router/index.ts b/src/router/index.ts index 4a4cf55..0a10198 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -56,12 +56,6 @@ const router = createRouter({ name: 'mainInput', component: () => import('../views/home/mainInput.vue') }, - { - path: 'canvas', - name: 'canvas', - component: () => import('../views/canvas/index.vue'), - meta: { topNavStyle: '2' } - }, { path: 'agent', name: 'agent', diff --git a/src/views/home/agent/components/versionTree/tools/tools.js b/src/utils/treeDiagram.js similarity index 100% rename from src/views/home/agent/components/versionTree/tools/tools.js rename to src/utils/treeDiagram.js diff --git a/src/views/canvas1/components/cards/add-print.vue b/src/views/canvas1/components/cards/add-print.vue new file mode 100644 index 0000000..c1907f9 --- /dev/null +++ b/src/views/canvas1/components/cards/add-print.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/views/canvas1/components/cards/color-palette.vue b/src/views/canvas1/components/cards/color-palette.vue new file mode 100644 index 0000000..e4ee1ee --- /dev/null +++ b/src/views/canvas1/components/cards/color-palette.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/canvas1/components/cards/edit-material.vue b/src/views/canvas1/components/cards/edit-material.vue new file mode 100644 index 0000000..e2ec238 --- /dev/null +++ b/src/views/canvas1/components/cards/edit-material.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/src/views/canvas1/components/cards/index.vue b/src/views/canvas1/components/cards/index.vue new file mode 100644 index 0000000..a82e11f --- /dev/null +++ b/src/views/canvas1/components/cards/index.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/views/canvas1/components/cards/scene-composition.vue b/src/views/canvas1/components/cards/scene-composition.vue new file mode 100644 index 0000000..65ae059 --- /dev/null +++ b/src/views/canvas1/components/cards/scene-composition.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/src/views/canvas1/components/cards/to-3d-model.vue b/src/views/canvas1/components/cards/to-3d-model.vue new file mode 100644 index 0000000..7cb286f --- /dev/null +++ b/src/views/canvas1/components/cards/to-3d-model.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/src/views/canvas1/components/cards/to-cad.vue b/src/views/canvas1/components/cards/to-cad.vue new file mode 100644 index 0000000..c84d459 --- /dev/null +++ b/src/views/canvas1/components/cards/to-cad.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/src/views/canvas1/components/cards/to-real-style.vue b/src/views/canvas1/components/cards/to-real-style.vue new file mode 100644 index 0000000..a6f4e2b --- /dev/null +++ b/src/views/canvas1/components/cards/to-real-style.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/src/views/canvas1/components/cards/to-video.vue b/src/views/canvas1/components/cards/to-video.vue new file mode 100644 index 0000000..8328e03 --- /dev/null +++ b/src/views/canvas1/components/cards/to-video.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/src/views/canvas1/components/node/InputNode.vue b/src/views/canvas1/components/node/InputNode.vue new file mode 100644 index 0000000..cce43fc --- /dev/null +++ b/src/views/canvas1/components/node/InputNode.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/src/views/canvas1/components/node/secondaryNode.vue b/src/views/canvas1/components/node/secondaryNode.vue new file mode 100644 index 0000000..ca2d09e --- /dev/null +++ b/src/views/canvas1/components/node/secondaryNode.vue @@ -0,0 +1,33 @@ + + + + + diff --git a/src/views/canvas1/components/tools/my-input.vue b/src/views/canvas1/components/tools/my-input.vue new file mode 100644 index 0000000..a413a07 --- /dev/null +++ b/src/views/canvas1/components/tools/my-input.vue @@ -0,0 +1,79 @@ + + + + diff --git a/src/views/canvas1/components/tools/my-textarea.vue b/src/views/canvas1/components/tools/my-textarea.vue new file mode 100644 index 0000000..f62a6c2 --- /dev/null +++ b/src/views/canvas1/components/tools/my-textarea.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/src/views/canvas1/components/tools/offset-tool.vue b/src/views/canvas1/components/tools/offset-tool.vue new file mode 100644 index 0000000..0bf804f --- /dev/null +++ b/src/views/canvas1/components/tools/offset-tool.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/canvas1/components/tools/pixel-ratio-selection.vue b/src/views/canvas1/components/tools/pixel-ratio-selection.vue new file mode 100644 index 0000000..7643e36 --- /dev/null +++ b/src/views/canvas1/components/tools/pixel-ratio-selection.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/src/views/canvas1/components/tools/slider.vue b/src/views/canvas1/components/tools/slider.vue new file mode 100644 index 0000000..46cd80a --- /dev/null +++ b/src/views/canvas1/components/tools/slider.vue @@ -0,0 +1,172 @@ + + + + + diff --git a/src/views/canvas1/components/tools/upload-file.vue b/src/views/canvas1/components/tools/upload-file.vue new file mode 100644 index 0000000..eb5c28b --- /dev/null +++ b/src/views/canvas1/components/tools/upload-file.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/canvas1/index.vue b/src/views/canvas1/index.vue new file mode 100644 index 0000000..04abcd3 --- /dev/null +++ b/src/views/canvas1/index.vue @@ -0,0 +1,143 @@ + + + + + diff --git a/src/views/home/agent/components/versionTree/index.vue b/src/views/home/agent/components/versionTree/index.vue index 3e2b9ff..63921cb 100644 --- a/src/views/home/agent/components/versionTree/index.vue +++ b/src/views/home/agent/components/versionTree/index.vue @@ -3,7 +3,7 @@ import { ref, onMounted, onUnmounted, reactive, toRefs, watch } from 'vue' import Tree from './tree/index.vue' import Detail from './detail/index.vue' // import { versionsList } from './tools/versionsData' -import { findAndAddChild, findAndRemoveChild } from './tools/tools' +import { findAndAddChild, findAndRemoveChild } from '../../../../../utils/treeDiagram' import { useProjectStore } from '@/stores' import { versionTree, getChatNodeDetail } from '@/api/versitonTree' diff --git a/src/views/home/agent/components/versionTree/tree/view2/index.vue b/src/views/home/agent/components/versionTree/tree/view2/index.vue index 5971502..1c49695 100644 --- a/src/views/home/agent/components/versionTree/tree/view2/index.vue +++ b/src/views/home/agent/components/versionTree/tree/view2/index.vue @@ -5,7 +5,7 @@ import { VueFlow, useVueFlow } from '@vue-flow/core' import SpecialEdge from './speciaiEdge.vue' import InputNode from './InputNode.vue'//主 import SecondaryNode from './secondaryNode.vue'//分支 -import { useLayout } from '../../tools/tools' +import { useLayout } from '@/utils/treeDiagram' import dialogVue from "../../components/dialog.vue"; const props = defineProps({ selectItem: { diff --git a/src/views/home/index.vue b/src/views/home/index.vue index bd9b8aa..a8b7f57 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -16,6 +16,7 @@ + diff --git a/src/views/login/login.vue b/src/views/login/login.vue index dbffb06..d5779a0 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -48,7 +48,12 @@
- + @@ -84,11 +89,14 @@ router.back() } } + const visibleCodeRef = ref(null) const onSubmit = () => { formRef.value?.validate?.((valid) => { if (valid) { // console.log('submit!') - isVisible.value = true + visibleCodeRef.value?.onSendCode().then(() => { + isVisible.value = true + }) } else { console.warn('error submit!') } diff --git a/src/views/login/register.vue b/src/views/login/register.vue index 3598ccc..aa60600 100644 --- a/src/views/login/register.vue +++ b/src/views/login/register.vue @@ -52,7 +52,12 @@
- + @@ -90,11 +95,14 @@ router.back() } } + const visibleCodeRef = ref(null) const onSubmit = () => { formRef.value?.validate?.((valid) => { if (valid) { // console.log('submit!') - isVisible.value = true + visibleCodeRef.value?.onSendCode().then(() => { + isVisible.value = true + }) } else { console.warn('error submit!') } diff --git a/src/views/login/visible-code.vue b/src/views/login/visible-code.vue index 7d79a86..dea0bc9 100644 --- a/src/views/login/visible-code.vue +++ b/src/views/login/visible-code.vue @@ -45,16 +45,17 @@ clearTime() }) onMounted(() => { - onSendCode() + // onSendCode() }) const onSendCode = async () => { const email = props.email if (!email) { console.warn('请输入邮箱') - return + return Promise.reject('请输入邮箱') } - setTime() await SendVerificationCode({ email }) + setTime() + return Promise.resolve() } const onResend = () => { if (time.value > 0) return @@ -64,6 +65,9 @@ if (code.value.length !== 6) return emit('submit', code.value) } + defineExpose({ + onSendCode + })