diff --git a/src/components/modules/widgets/pageStyle.vue b/src/components/modules/widgets/pageStyle.vue index d99b02a..879c08f 100644 --- a/src/components/modules/widgets/pageStyle.vue +++ b/src/components/modules/widgets/pageStyle.vue @@ -69,7 +69,6 @@ import TabPanel from '@palxp/color-picker/comps/TabPanel.vue' import { useCanvasStore, useWidgetStore } from '@/store' import { TPageState } from '@/store/design/canvas/d' import { storeToRefs } from 'pinia' -import { proxyToObject } from '@/utils/utils' import { Delete as iconDelete, Download as iconDownload } from '@element-plus/icons-vue' import wImageSetting from '@/components/modules/widgets/wImage/wImageSetting' // import setImageData from '@/common/methods/DesignFeatures/setImage' @@ -144,7 +143,7 @@ function onChangeMode(value: string) { function change() { state.mode = state.modes[0] state.tag = true - state.innerElement = proxyToObject(dActiveElement.value || {}) + state.innerElement = dActiveElement.value || {} state.innerElement.backgroundImage && (state.mode = state.modes[1]) } function changeValue() { diff --git a/src/store/design/history/actions/pushHistory.ts b/src/store/design/history/actions/pushHistory.ts index d3171e6..11894da 100644 --- a/src/store/design/history/actions/pushHistory.ts +++ b/src/store/design/history/actions/pushHistory.ts @@ -2,13 +2,12 @@ * @Author: Jeremy Yu * @Date: 2024-03-18 21:00:00 * @Description: - * @LastEditors: Jeremy Yu - * @LastEditTime: 2024-03-27 21:00:00 + * @LastEditors: ShawnPhang + * @LastEditTime: 2024-04-02 21:10:53 */ import { useCanvasStore, useWidgetStore } from "@/store" import { THistoryStore } from ".." -import { proxyToObject } from "@/utils/utils" /** push操作历史记录 */ export function pushHistory(store: THistoryStore, msg: string = "") { @@ -28,7 +27,7 @@ export function pushHistory(store: THistoryStore, msg: string = "") { store.dHistoryParams.index = store.dHistory.length - 1 } store.dHistory.push(JSON.stringify(widgetStore.dWidgets)) - store.dPageHistory.push(JSON.stringify(proxyToObject(pageStore.dPage))) + store.dPageHistory.push(JSON.stringify(pageStore.dPage)) store.dHistoryParams.index = store.dHistory.length - 1 store.dHistoryParams.length = store.dHistory.length } diff --git a/src/store/design/widget/actions/select.ts b/src/store/design/widget/actions/select.ts index 393158a..9f56a65 100644 --- a/src/store/design/widget/actions/select.ts +++ b/src/store/design/widget/actions/select.ts @@ -1,6 +1,5 @@ import { useControlStore, useHistoryStore, useCanvasStore } from "@/store" import { TWidgetStore } from ".." -import { proxyToObject } from "@/utils/utils" export type TSelectWidgetData = { uuid: string @@ -51,7 +50,7 @@ export function selectWidget(store: TWidgetStore, { uuid }: TSelectWidgetData) { store.dActiveElement = pageStore.dPage const pageHistory = historyStore.dPageHistory if (pageHistory.length === 0) { - pageHistory.push(JSON.stringify(proxyToObject(pageStore.dPage))) + pageHistory.push(JSON.stringify(pageStore.dPage)) } setTimeout(() => { store.dSelectWidgets = []