From e04c169a1f094e452a16945b5adce15e2dbb8add Mon Sep 17 00:00:00 2001
From: limengnan <420004014@qq.com>
Date: Mon, 7 Jul 2025 11:00:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/watermark/watermark.ts         |  1 -
 .../picture-group/PictureGroupUploadAttr.vue  |  4 +-
 .../data-visualization/utils/components.ts    | 96 +++++++++----------
 3 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/frontend/src/data-visualization/components/watermark/watermark.ts b/frontend/src/data-visualization/components/watermark/watermark.ts
index f7b9f0c..84c319b 100644
--- a/frontend/src/data-visualization/components/watermark/watermark.ts
+++ b/frontend/src/data-visualization/components/watermark/watermark.ts
@@ -168,7 +168,6 @@ export function activeWatermarkCheckUser(domId, canvasId, scale = 1) {
       ipInfoApi().then(res => {
         userInfo.value = res.data
         if (userInfo.value && userInfo.value.model !== 'lose') {
-          debugger
           activeWatermark(
             dvInfo.value.watermarkInfo.settingContent,
             userInfo.value,
diff --git a/frontend/src/data-visualization/custom-component/picture-group/PictureGroupUploadAttr.vue b/frontend/src/data-visualization/custom-component/picture-group/PictureGroupUploadAttr.vue
index 98abce7..c4172cf 100644
--- a/frontend/src/data-visualization/custom-component/picture-group/PictureGroupUploadAttr.vue
+++ b/frontend/src/data-visualization/custom-component/picture-group/PictureGroupUploadAttr.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
-import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
+import { dvMainStoreWithOut } from '@/data-visualization/store/modules/data-visualization/dvMain'
+import { snapshotStoreWithOut } from '@/data-visualization/store/modules/data-visualization/snapshot'
 
 import { storeToRefs } from 'pinia'
 import { ElIcon, ElMessage } from 'element-plus-secondary'
diff --git a/frontend/src/data-visualization/utils/components.ts b/frontend/src/data-visualization/utils/components.ts
index f4b2c97..cd1b142 100644
--- a/frontend/src/data-visualization/utils/components.ts
+++ b/frontend/src/data-visualization/utils/components.ts
@@ -13,30 +13,30 @@ import CanvasIcon from '@/data-visualization/custom-component/canvas-icon/Compon
 import CanvasIconAttr from '@/data-visualization/custom-component/canvas-icon/Attr.vue'
 import DeTabs from '@/data-visualization/custom-component/de-tabs/Component.vue'
 import DeTabsAttr from '@/data-visualization/custom-component/de-tabs/Attr.vue'
-// import DeGraphical from '@/data-visualization/custom-component/de-graphical/Component.vue'
-// import DeGraphicalAttr from '@/data-visualization/custom-component/de-graphical/Attr.vue'
-// import CircleShape from '@/data-visualization/custom-component/circle-shape/Component.vue'
-// import CircleShapeAttr from '@/data-visualization/custom-component/circle-shape/Attr.vue'
-// import RectShape from '@/data-visualization/custom-component/rect-shape/Component.vue'
-// import RectShapeAttr from '@/data-visualization/custom-component/rect-shape/Attr.vue'
-// import SvgTriangle from '@/data-visualization/custom-component/svgs/svg-triangle/Component.vue'
-// import SvgTriangleAttr from '@/data-visualization/custom-component/svgs/svg-triangle/Attr.vue'
-// import DeTimeClock from '@/data-visualization/custom-component/de-time-clock/Component.vue'
-// import DeTimeClockAttr from '@/data-visualization/custom-component/de-time-clock/Attr.vue'
-// import GroupArea from '@/data-visualization/custom-component/group-area/Component.vue'
-// import GroupAreaAttr from '@/data-visualization/custom-component/group-area/Attr.vue'
-// import DeFrame from '@/data-visualization/custom-component/de-frame/ComponentFrame.vue'
-// import DeFrameAttr from '@/data-visualization/custom-component/de-frame/Attr.vue'
-// import DeVideo from '@/data-visualization/custom-component/de-video/Component.vue'
-// import DeVideoAttr from '@/data-visualization/custom-component/de-video/Attr.vue'
-// import DeStreamMedia from '@/data-visualization/custom-component/de-stream-media/Component.vue'
-// import DeStreamMediaAttr from '@/data-visualization/custom-component/de-stream-media/Attr.vue'
-// import ScrollText from '@/data-visualization/custom-component/scroll-text/Component.vue'
-// import ScrollTextAttr from '@/data-visualization/custom-component/scroll-text/Attr.vue'
-// import PopArea from '@/data-visualization/custom-component/pop-area/Component.vue'
-// import PopAreaAttr from '@/data-visualization/custom-component/pop-area/Attr.vue'
-// import PictureGroup from '@/data-visualization/custom-component/picture-group/Component.vue'
-// import PictureGroupAttr from '@/data-visualization/custom-component/picture-group/Attr.vue'
+import DeGraphical from '@/data-visualization/custom-component/de-graphical/Component.vue'
+import DeGraphicalAttr from '@/data-visualization/custom-component/de-graphical/Attr.vue'
+import CircleShape from '@/data-visualization/custom-component/circle-shape/Component.vue'
+import CircleShapeAttr from '@/data-visualization/custom-component/circle-shape/Attr.vue'
+import RectShape from '@/data-visualization/custom-component/rect-shape/Component.vue'
+import RectShapeAttr from '@/data-visualization/custom-component/rect-shape/Attr.vue'
+import SvgTriangle from '@/data-visualization/custom-component/svgs/svg-triangle/Component.vue'
+import SvgTriangleAttr from '@/data-visualization/custom-component/svgs/svg-triangle/Attr.vue'
+import DeTimeClock from '@/data-visualization/custom-component/de-time-clock/Component.vue'
+import DeTimeClockAttr from '@/data-visualization/custom-component/de-time-clock/Attr.vue'
+import GroupArea from '@/data-visualization/custom-component/group-area/Component.vue'
+import GroupAreaAttr from '@/data-visualization/custom-component/group-area/Attr.vue'
+import DeFrame from '@/data-visualization/custom-component/de-frame/ComponentFrame.vue'
+import DeFrameAttr from '@/data-visualization/custom-component/de-frame/Attr.vue'
+import DeVideo from '@/data-visualization/custom-component/de-video/Component.vue'
+import DeVideoAttr from '@/data-visualization/custom-component/de-video/Attr.vue'
+import DeStreamMedia from '@/data-visualization/custom-component/de-stream-media/Component.vue'
+import DeStreamMediaAttr from '@/data-visualization/custom-component/de-stream-media/Attr.vue'
+import ScrollText from '@/data-visualization/custom-component/scroll-text/Component.vue'
+import ScrollTextAttr from '@/data-visualization/custom-component/scroll-text/Attr.vue'
+import PopArea from '@/data-visualization/custom-component/pop-area/Component.vue'
+import PopAreaAttr from '@/data-visualization/custom-component/pop-area/Attr.vue'
+import PictureGroup from '@/data-visualization/custom-component/picture-group/Component.vue'
+import PictureGroupAttr from '@/data-visualization/custom-component/picture-group/Attr.vue'
 export const componentsMap = {
   VText: VText,
   VQuery,
@@ -53,30 +53,30 @@ export const componentsMap = {
   CanvasIconAttr: CanvasIconAttr,
   DeTabs: DeTabs,
   DeTabsAttr: DeTabsAttr,
-  // DeGraphical: DeGraphical,
-  // DeGraphicalAttr: DeGraphicalAttr,
-  // CircleShape: CircleShape,
-  // CircleShapeAttr: CircleShapeAttr,
-  // RectShape: RectShape,
-  // RectShapeAttr: RectShapeAttr,
-  // SvgTriangle: SvgTriangle,
-  // SvgTriangleAttr: SvgTriangleAttr,
-  // DeTimeClock: DeTimeClock,
-  // DeTimeClockAttr: DeTimeClockAttr,
-  // GroupArea: GroupArea,
-  // GroupAreaAttr: GroupAreaAttr,
-  // DeFrame: DeFrame,
-  // DeFrameAttr: DeFrameAttr,
-  // DeVideo: DeVideo,
-  // DeVideoAttr: DeVideoAttr,
-  // DeStreamMedia: DeStreamMedia,
-  // DeStreamMediaAttr: DeStreamMediaAttr,
-  // ScrollText: ScrollText,
-  // ScrollTextAttr: ScrollTextAttr,
-  // PopArea: PopArea,
-  // PopAreaAttr: PopAreaAttr,
-  // PictureGroup: PictureGroup,
-  // PictureGroupAttr: PictureGroupAttr
+  DeGraphical: DeGraphical,
+  DeGraphicalAttr: DeGraphicalAttr,
+  CircleShape: CircleShape,
+  CircleShapeAttr: CircleShapeAttr,
+  RectShape: RectShape,
+  RectShapeAttr: RectShapeAttr,
+  SvgTriangle: SvgTriangle,
+  SvgTriangleAttr: SvgTriangleAttr,
+  DeTimeClock: DeTimeClock,
+  DeTimeClockAttr: DeTimeClockAttr,
+  GroupArea: GroupArea,
+  GroupAreaAttr: GroupAreaAttr,
+  DeFrame: DeFrame,
+  DeFrameAttr: DeFrameAttr,
+  DeVideo: DeVideo,
+  DeVideoAttr: DeVideoAttr,
+  DeStreamMedia: DeStreamMedia,
+  DeStreamMediaAttr: DeStreamMediaAttr,
+  ScrollText: ScrollText,
+  ScrollTextAttr: ScrollTextAttr,
+  PopArea: PopArea,
+  PopAreaAttr: PopAreaAttr,
+  PictureGroup: PictureGroup,
+  PictureGroupAttr: PictureGroupAttr
 }
 
 export default function findComponent(key) {