mkm/goview_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into master-fetch-dev

Browse Source
This commit is contained in:
奔跑的面条 2022-11-22 12:43:27 +08:00
commit ae7f1bcb3e
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hooks/useLifeHandler.hook.ts
View File

@ -9,6 +9,8 @@ export const npmPkgs = { echarts }
// 组件事件处理 hook // 组件事件处理 hook
export const useLifeHandler = (chartConfig: CreateComponentType | CreateComponentGroupType) => { export const useLifeHandler = (chartConfig: CreateComponentType | CreateComponentGroupType) => {
if (!chartConfig.events) return {}
// 处理基础事件 // 处理基础事件
const baseEvent: { [key: string]: any } = {} const baseEvent: { [key: string]: any } = {}
for (const key in chartConfig.events.baseEvent) { for (const key in chartConfig.events.baseEvent) {

6
src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventAdvancedHandle/index.vue
View File

@ -18,7 +18,9 @@
<br /> <br />
<span class="func-keyword">async {{ eventName }}</span> (e, components, echarts, node_modules) { <span class="func-keyword">async {{ eventName }}</span> (e, components, echarts, node_modules) {
</p> </p>
<p class="go-ml-4"><n-code :code="(targetData.events.advancedEvents || {})[eventName]" language="typescript"></n-code></p> <p class="go-ml-4">
<n-code :code="(targetData.events.advancedEvents || {})[eventName] || ''" language="typescript"></n-code>
</p>
<p>}<span>,</span></p> <p>}<span>,</span></p>
</div> </div>
</n-card> </n-card>
@ -227,7 +229,7 @@ const saveEvents = () => {
// 清空事件 // 清空事件
targetData.value.events.advancedEvents = { targetData.value.events.advancedEvents = {
vnodeBeforeMount: undefined, vnodeBeforeMount: undefined,
vnodeMounted: undefined, vnodeMounted: undefined
} }
} else { } else {
targetData.value.events.advancedEvents = { ...advancedEvents.value } targetData.value.events.advancedEvents = { ...advancedEvents.value }

2
src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventBaseHandle/index.vue
View File

@ -19,7 +19,7 @@
<span class="func-keyword">async {{ eventName }}</span> (mouseEvent) { <span class="func-keyword">async {{ eventName }}</span> (mouseEvent) {
</p> </p>
<p class="go-ml-4"> <p class="go-ml-4">
<n-code :code="(targetData.events.baseEvent || {})[eventName]" language="typescript"></n-code> <n-code :code="(targetData.events.baseEvent || {})[eventName] || ''" language="typescript"></n-code>
</p> </p>
<p>}<span>,</span></p> <p>}<span>,</span></p>
</div> </div>

15
src/views/chart/hooks/useSync.hook.ts
View File

@ -15,7 +15,7 @@ import { ResultEnum } from '@/enums/httpEnum'
import { saveProjectApi, fetchProjectApi, uploadFile, updateProjectApi } from '@/api/path' import { saveProjectApi, fetchProjectApi, uploadFile, updateProjectApi } from '@/api/path'
// 画布枚举 // 画布枚举
import { SyncEnum } from '@/enums/editPageEnum' import { SyncEnum } from '@/enums/editPageEnum'
import { CreateComponentType, CreateComponentGroupType, ConfigType } from '@/packages/index.d' import { BaseEvent, EventLife, CreateComponentType, CreateComponentGroupType, ConfigType } from '@/packages/index.d'
import { PublicGroupConfigClass } from '@/packages/public/publicConfig' import { PublicGroupConfigClass } from '@/packages/public/publicConfig'
import merge from 'lodash/merge' import merge from 'lodash/merge'
@ -47,7 +47,18 @@ const componentVersionUpdatePolyfill = (newObject: any, sources: any) => {
newObject.events.advancedEvents.vnodeMounted = sources?.events.vnodeMounted newObject.events.advancedEvents.vnodeMounted = sources?.events.vnodeMounted
} }
if (hasVnodeBeforeMount || hasVnodeMounted) { if (hasVnodeBeforeMount || hasVnodeMounted) {
sources.events = undefined sources.events = {
baseEvent: {
[BaseEvent.ON_CLICK]: undefined,
[BaseEvent.ON_DBL_CLICK]: undefined,
[BaseEvent.ON_MOUSE_ENTER]: undefined,
[BaseEvent.ON_MOUSE_LEAVE]: undefined
},
advancedEvents: {
[EventLife.VNODE_MOUNTED]: undefined,
[EventLife.VNODE_BEFORE_MOUNT]: undefined
}
}
} }
return newObject return newObject
} }