diff --git a/src/components/Canvas/FlowCanvas/components/cards/add-print.vue b/src/components/Canvas/FlowCanvas/components/cards/add-print.vue index c1907f9..34b1ac2 100644 --- a/src/components/Canvas/FlowCanvas/components/cards/add-print.vue +++ b/src/components/Canvas/FlowCanvas/components/cards/add-print.vue @@ -88,11 +88,11 @@ diff --git a/src/components/Canvas/components/fullscreen-dialog.vue b/src/components/Canvas/components/fullscreen-dialog.vue index b2c2fc6..b58726b 100644 --- a/src/components/Canvas/components/fullscreen-dialog.vue +++ b/src/components/Canvas/components/fullscreen-dialog.vue @@ -55,7 +55,7 @@ left: 0; overflow: hidden; z-index: 1000; - background-color: rgba(0, 0, 0, 0); + background-color: #FFFCF4; transition: opacity var(--transition-time); opacity: 0; &.show { diff --git a/src/components/Canvas/components/node/InputNode.vue b/src/components/Canvas/components/node/InputNode.vue new file mode 100644 index 0000000..ce5ae2f --- /dev/null +++ b/src/components/Canvas/components/node/InputNode.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/canvas1/components/node/secondaryNode.vue b/src/components/Canvas/components/node/secondaryNode.vue similarity index 52% rename from src/views/canvas1/components/node/secondaryNode.vue rename to src/components/Canvas/components/node/secondaryNode.vue index ca2d09e..e423cfb 100644 --- a/src/views/canvas1/components/node/secondaryNode.vue +++ b/src/components/Canvas/components/node/secondaryNode.vue @@ -1,21 +1,20 @@ diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue index e00e238..5b303ce 100644 --- a/src/components/SvgIcon/index.vue +++ b/src/components/SvgIcon/index.vue @@ -3,7 +3,7 @@ @@ -25,6 +25,10 @@ const props = defineProps({ type: [Number, String], default: 16, }, + sizeUnit: { + type: String, + default: 'rem', + } }); const iconName = computed(() => `#icon-${props.name}`); const svgClass = computed(() => { diff --git a/src/main.ts b/src/main.ts index d148cc9..72485ab 100644 --- a/src/main.ts +++ b/src/main.ts @@ -9,7 +9,6 @@ import SvgIcon from "@/components/SvgIcon/index.vue"; import "virtual:svg-icons-register"; import i18n from "./lang/index"; - import flexible from "./utils/flexible.js"; import "./router/router-config" // 路由守卫,做动态路由的地方 @@ -18,11 +17,11 @@ import 'element-plus/dist/index.css' const app = createApp(App) app.use(router) -.use(ElementPlus) -.use(store) -.component("SvgIcon", SvgIcon) -.use(i18n) -.mount('#app') + .use(ElementPlus) + .use(store) + .component("SvgIcon", SvgIcon) + .use(i18n) + .mount('#app') flexible(); diff --git a/src/utils/treeDiagram.js b/src/utils/treeDiagram.js index d827306..e1f26ff 100644 --- a/src/utils/treeDiagram.js +++ b/src/utils/treeDiagram.js @@ -47,7 +47,7 @@ export function useLayout() { } dagre.layout(dagreGraph) - + // set nodes with updated positions return nodes.map((node) => { const nodeWithPosition = dagreGraph.node(node.id) @@ -75,7 +75,6 @@ export function useLayout() { targetPosition = Position.Top sourcePosition = Position.Bottom } - return { ...node, targetPosition, diff --git a/src/views/canvas1/components/cards/add-print.vue b/src/views/canvas1/components/cards/add-print.vue deleted file mode 100644 index c1907f9..0000000 --- a/src/views/canvas1/components/cards/add-print.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - - - diff --git a/src/views/canvas1/components/cards/color-palette.vue b/src/views/canvas1/components/cards/color-palette.vue deleted file mode 100644 index e4ee1ee..0000000 --- a/src/views/canvas1/components/cards/color-palette.vue +++ /dev/null @@ -1,65 +0,0 @@ - - - - - diff --git a/src/views/canvas1/components/cards/edit-material.vue b/src/views/canvas1/components/cards/edit-material.vue deleted file mode 100644 index e2ec238..0000000 --- a/src/views/canvas1/components/cards/edit-material.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/src/views/canvas1/components/cards/index.vue b/src/views/canvas1/components/cards/index.vue deleted file mode 100644 index a82e11f..0000000 --- a/src/views/canvas1/components/cards/index.vue +++ /dev/null @@ -1,186 +0,0 @@ - - - - - diff --git a/src/views/canvas1/components/cards/scene-composition.vue b/src/views/canvas1/components/cards/scene-composition.vue deleted file mode 100644 index 65ae059..0000000 --- a/src/views/canvas1/components/cards/scene-composition.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - - - diff --git a/src/views/canvas1/components/cards/to-3d-model.vue b/src/views/canvas1/components/cards/to-3d-model.vue deleted file mode 100644 index 7cb286f..0000000 --- a/src/views/canvas1/components/cards/to-3d-model.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/src/views/canvas1/components/cards/to-cad.vue b/src/views/canvas1/components/cards/to-cad.vue deleted file mode 100644 index c84d459..0000000 --- a/src/views/canvas1/components/cards/to-cad.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/src/views/canvas1/components/cards/to-real-style.vue b/src/views/canvas1/components/cards/to-real-style.vue deleted file mode 100644 index a6f4e2b..0000000 --- a/src/views/canvas1/components/cards/to-real-style.vue +++ /dev/null @@ -1,74 +0,0 @@ - - - - - diff --git a/src/views/canvas1/components/cards/to-video.vue b/src/views/canvas1/components/cards/to-video.vue deleted file mode 100644 index 8328e03..0000000 --- a/src/views/canvas1/components/cards/to-video.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - - - diff --git a/src/views/canvas1/components/node/InputNode.vue b/src/views/canvas1/components/node/InputNode.vue deleted file mode 100644 index cce43fc..0000000 --- a/src/views/canvas1/components/node/InputNode.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/src/views/canvas1/components/tools/my-input.vue b/src/views/canvas1/components/tools/my-input.vue deleted file mode 100644 index a413a07..0000000 --- a/src/views/canvas1/components/tools/my-input.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - diff --git a/src/views/canvas1/components/tools/my-textarea.vue b/src/views/canvas1/components/tools/my-textarea.vue deleted file mode 100644 index f62a6c2..0000000 --- a/src/views/canvas1/components/tools/my-textarea.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - diff --git a/src/views/canvas1/components/tools/offset-tool.vue b/src/views/canvas1/components/tools/offset-tool.vue deleted file mode 100644 index 0bf804f..0000000 --- a/src/views/canvas1/components/tools/offset-tool.vue +++ /dev/null @@ -1,217 +0,0 @@ - - - - - diff --git a/src/views/canvas1/components/tools/pixel-ratio-selection.vue b/src/views/canvas1/components/tools/pixel-ratio-selection.vue deleted file mode 100644 index 7643e36..0000000 --- a/src/views/canvas1/components/tools/pixel-ratio-selection.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - - - diff --git a/src/views/canvas1/components/tools/slider.vue b/src/views/canvas1/components/tools/slider.vue deleted file mode 100644 index 46cd80a..0000000 --- a/src/views/canvas1/components/tools/slider.vue +++ /dev/null @@ -1,172 +0,0 @@ - - - - - diff --git a/src/views/canvas1/components/tools/upload-file.vue b/src/views/canvas1/components/tools/upload-file.vue deleted file mode 100644 index eb5c28b..0000000 --- a/src/views/canvas1/components/tools/upload-file.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - - - diff --git a/src/views/canvas1/index.vue b/src/views/canvas1/index.vue deleted file mode 100644 index 04abcd3..0000000 --- a/src/views/canvas1/index.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - - - 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 1c49695..efced12 100644 --- a/src/views/home/agent/components/versionTree/tree/view2/index.vue +++ b/src/views/home/agent/components/versionTree/tree/view2/index.vue @@ -167,8 +167,6 @@ defineExpose({push})