github/go-view
4
0
Fork 0
mirror of https://gitee.com/dromara/go-view.git synced 2026-05-12 00:00:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 合并修复序列化代码，解决冲突

Browse Source
This commit is contained in:
奔跑的面条
2023-01-17 15:34:10 +08:00
parent 6d91262faa 923b7759f8
commit 7bda46021a
9 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/chart/hooks/useSync.hook.ts
+2 -1
View File
@@ -17,7 +17,8 @@ import { ResultEnum } from '@/enums/httpEnum'
import { saveProjectApi, fetchProjectApi, uploadFile, updateProjectApi } from '@/api/path'
// 画布枚举
import { SyncEnum } from '@/enums/editPageEnum'
import { BaseEvent, EventLife, CreateComponentType, CreateComponentGroupType, ConfigType } from '@/packages/index.d'
import { CreateComponentType, CreateComponentGroupType, ConfigType } from '@/packages/index.d'
import { BaseEvent, EventLife } from '@/enums/eventEnum'
import { PublicGroupConfigClass } from '@/packages/public/publicConfig'
import merge from 'lodash/merge'