diff --git a/package.json b/package.json index be845fa..65b5f35 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,7 @@ "vite-plugin-compression": "^0.5.1", "vue": "3.4.19", "vue-router": "^4.0.0-0", - "vuedraggable": "^4.1.0", - "vuex": "^4.0.0-0" + "vuedraggable": "^4.1.0" }, "devDependencies": { "@types/cropperjs": "^1.3.0", diff --git a/src/common/hooks/dragHelper.ts b/src/common/hooks/dragHelper.ts index c003700..877a648 100644 --- a/src/common/hooks/dragHelper.ts +++ b/src/common/hooks/dragHelper.ts @@ -6,7 +6,7 @@ * @LastEditTime: 2023-11-22 18:11:15 */ -import { useControlStore, useWidgetStore } from "@/pinia" +import { useControlStore, useWidgetStore } from "@/store" // import store from '@/store' diff --git a/src/common/methods/DesignFeatures/setComponents.ts b/src/common/methods/DesignFeatures/setComponents.ts index a72eca6..19f1b7a 100644 --- a/src/common/methods/DesignFeatures/setComponents.ts +++ b/src/common/methods/DesignFeatures/setComponents.ts @@ -5,8 +5,8 @@ * @LastEditors: ShawnPhang , Jeremy Yu * @LastEditTime: 2024-03-02 11:50:00 */ -import { useCanvasStore, usePageStore } from '@/pinia' -import { TdWidgetData } from '@/pinia/design/widget' +import { useCanvasStore, usePageStore } from '@/store' +import { TdWidgetData } from '@/store/design/widget' // import store from '@/store' export default async function setCompData(item: TdWidgetData[] | string) { diff --git a/src/common/methods/DesignFeatures/setImage.ts b/src/common/methods/DesignFeatures/setImage.ts index 6bbde50..4a89f23 100644 --- a/src/common/methods/DesignFeatures/setImage.ts +++ b/src/common/methods/DesignFeatures/setImage.ts @@ -7,7 +7,7 @@ */ // import store from '@/store' import { getImage } from '../getImgDetail' -import { useCanvasStore, usePageStore } from '@/pinia' +import { useCanvasStore, usePageStore } from '@/store' export type TItem2DataParam = { id?: string | number diff --git a/src/common/methods/addMouseWheel.ts b/src/common/methods/addMouseWheel.ts index 415e2b9..9767ed7 100644 --- a/src/common/methods/addMouseWheel.ts +++ b/src/common/methods/addMouseWheel.ts @@ -5,7 +5,7 @@ * @LastEditors: ShawnPhang , Jeremy Yu * @LastEditTime: 2024-03-02 11:50:00 */ -import { useControlStore } from '@/pinia' +import { useControlStore } from '@/store' // import store from '@/store' type TAddEventCb = (e: Event) => void diff --git a/src/components/business/cropper/CropImage/CropImage.vue b/src/components/business/cropper/CropImage/CropImage.vue index 6348ed0..003e067 100644 --- a/src/components/business/cropper/CropImage/CropImage.vue +++ b/src/components/business/cropper/CropImage/CropImage.vue @@ -26,7 +26,7 @@ import { ref, defineComponent, toRefs, reactive, nextTick } from 'vue' // import { useStore } from 'vuex' import 'cropperjs/dist/cropper.css' import Cropper from 'cropperjs' -import { useControlStore } from '@/pinia' +import { useControlStore } from '@/store' export default defineComponent({ components: { ElDialog }, diff --git a/src/components/business/cropper/CropImage/index.vue b/src/components/business/cropper/CropImage/index.vue index 853ee46..ded8d44 100644 --- a/src/components/business/cropper/CropImage/index.vue +++ b/src/components/business/cropper/CropImage/index.vue @@ -26,7 +26,7 @@ import { ref, reactive, nextTick, toRefs } from 'vue' // import { useStore } from 'vuex' import 'cropperjs/dist/cropper.css' import Cropper from 'cropperjs' -import { useControlStore } from '@/pinia' +import { useControlStore } from '@/store' type TDoneParams = { newImg: string, diff --git a/src/components/business/image-cutout/ImageCutout/index.vue b/src/components/business/image-cutout/ImageCutout/index.vue index 603c106..dc5d663 100644 --- a/src/components/business/image-cutout/ImageCutout/index.vue +++ b/src/components/business/image-cutout/ImageCutout/index.vue @@ -48,7 +48,7 @@ import uploader from '@/components/common/Uploader/index.vue' import _dl from '@/common/methods/download' import ImageExtraction from '../ImageExtraction/index.vue' import { selectImageFile, uploadCutPhotoToCloud } from './method' -import { useControlStore } from '@/pinia' +import { useControlStore } from '@/store' export type TImageCutoutState = { show: boolean; diff --git a/src/components/business/moveable/Moveable.vue b/src/components/business/moveable/Moveable.vue index 1192567..d188433 100644 --- a/src/components/business/moveable/Moveable.vue +++ b/src/components/business/moveable/Moveable.vue @@ -18,7 +18,7 @@ import MoveableHelper from 'moveable-helper' import useSelecto from './Selecto' // import { useSetupMapGetters } from '@/common/hooks/mapGetters' import { storeToRefs } from 'pinia' -import { useCanvasStore, useControlStore, useWidgetStore, useForceStore, useHistoryStore } from '@/pinia' +import { useCanvasStore, useControlStore, useWidgetStore, useForceStore, useHistoryStore } from '@/store' // const store = useStore() const widgetStore = useWidgetStore() diff --git a/src/components/business/moveable/Selecto.ts b/src/components/business/moveable/Selecto.ts index 4f6ca1b..4d4e40d 100644 --- a/src/components/business/moveable/Selecto.ts +++ b/src/components/business/moveable/Selecto.ts @@ -1,7 +1,7 @@ import Selecto from 'selecto' import Moveable, { getElementInfo } from 'moveable' // import store from '@/store' -import { useWidgetStore } from '@/pinia' +import { useWidgetStore } from '@/store' export default function(moveable: Moveable) { const widgetStore = useWidgetStore() diff --git a/src/components/business/picture-selector/index.vue b/src/components/business/picture-selector/index.vue index 48c46d4..557675d 100644 --- a/src/components/business/picture-selector/index.vue +++ b/src/components/business/picture-selector/index.vue @@ -36,7 +36,7 @@ import { reactive } from 'vue' import { ElTabPane, ElTabs, TabPaneName } from 'element-plus' import api from '@/api' import { TGetImageListResult } from '@/api/material' -import { useControlStore } from '@/pinia' +import { useControlStore } from '@/store' type TEmits = (event: 'select', data: TGetImageListResult) => void diff --git a/src/components/business/right-click-menu/RcMenu.vue b/src/components/business/right-click-menu/RcMenu.vue index 8fe07b6..5cf06ac 100644 --- a/src/components/business/right-click-menu/RcMenu.vue +++ b/src/components/business/right-click-menu/RcMenu.vue @@ -25,7 +25,7 @@ import { import { getTarget } from '@/common/methods/target' // import { useSetupMapGetters } from '@/common/hooks/mapGetters'; import { storeToRefs } from 'pinia'; -import { useControlStore, useWidgetStore } from '@/pinia'; +import { useControlStore, useWidgetStore } from '@/store'; // const store = useStore() const menuListData = ref({...menu}) diff --git a/src/components/business/save-download/CreateCover.vue b/src/components/business/save-download/CreateCover.vue index 537e855..85eab6d 100644 --- a/src/components/business/save-download/CreateCover.vue +++ b/src/components/business/save-download/CreateCover.vue @@ -15,7 +15,7 @@ import html2canvas from 'html2canvas' import Qiniu from '@/common/methods/QiNiu' // import { useSetupMapGetters } from '@/common/hooks/mapGetters' import { storeToRefs } from 'pinia'; -import { useCanvasStore, useWidgetStore } from '@/pinia'; +import { useCanvasStore, useWidgetStore } from '@/store'; // const store = useStore(); // const { dZoom } = useSetupMapGetters(['dZoom']) diff --git a/src/components/modules/layout/designBoard/index.vue b/src/components/modules/layout/designBoard/index.vue index 70784b9..ba56669 100644 --- a/src/components/modules/layout/designBoard/index.vue +++ b/src/components/modules/layout/designBoard/index.vue @@ -84,9 +84,9 @@ import PointImg from '@/utils/plugins/pointImg' import getComponentsData from '@/common/methods/DesignFeatures/setComponents' import { debounce } from 'throttle-debounce' import { move, moveInit } from '@/mixins/move' -import { useCanvasStore, useControlStore, useGroupStore, usePageStore, useWidgetStore } from '@/pinia' +import { useCanvasStore, useControlStore, useGroupStore, usePageStore, useWidgetStore } from '@/store' import { storeToRefs } from 'pinia' -import { TPageState } from '@/pinia/design/page' +import { TPageState } from '@/store/design/page' // 页面设计组件 type TProps = { pageDesignCanvasId: string diff --git a/src/components/modules/layout/lineGuides.vue b/src/components/modules/layout/lineGuides.vue index 4c18790..4946fea 100644 --- a/src/components/modules/layout/lineGuides.vue +++ b/src/components/modules/layout/lineGuides.vue @@ -13,7 +13,7 @@ import { watch } from 'vue' // import { useStore } from 'vuex' import Guides, { GuideOptions } from '@scena/guides' -import { useCanvasStore } from '@/pinia'; +import { useCanvasStore } from '@/store'; type TProps = { show: boolean diff --git a/src/components/modules/layout/zoomControl/index.vue b/src/components/modules/layout/zoomControl/index.vue index 08ebf19..c8b1937 100644 --- a/src/components/modules/layout/zoomControl/index.vue +++ b/src/components/modules/layout/zoomControl/index.vue @@ -27,7 +27,7 @@ import { OtherList, TZoomData, ZoomList } from './data'; // import { useSetupMapGetters } from '@/common/hooks/mapGetters'; import { useRoute } from 'vue-router'; import { storeToRefs } from 'pinia'; -import { useCanvasStore, useForceStore, usePageStore } from '@/pinia'; +import { useCanvasStore, useForceStore, usePageStore } from '@/store'; const route = useRoute() // const store = useStore() diff --git a/src/components/modules/panel/components/layerList.vue b/src/components/modules/panel/components/layerList.vue index 03973ab..f1dd271 100644 --- a/src/components/modules/panel/components/layerList.vue +++ b/src/components/modules/panel/components/layerList.vue @@ -39,8 +39,8 @@