Showing
2 changed files
with
5 additions
and
3 deletions
| ... | ... | @@ -5,8 +5,9 @@ import { usePublicFormContext } from '../../usePublicFormContext' |
| 5 | 5 | import type { OpenDynamicModalParamsType } from '.' |
| 6 | 6 | import type { ModalProps } from '@/components/Modal' |
| 7 | 7 | import { BasicModal, useModalInner } from '@/components/Modal' |
| 8 | +import type { ActTypeEnum, EventTypeEnum } from '@/enums/datasource' | |
| 8 | 9 | import { DataSourceTypeEnum } from '@/enums/datasource' |
| 9 | -import type { NodeDataActJsonType, NodeDataEventJsonType } from '@/api/node/model' | |
| 10 | +import type { NodeDataActJsonType, NodeDataEventJsonType, SingleClickEventDataType } from '@/api/node/model' | |
| 10 | 11 | import { useContentDataStoreWithOut } from '@/store/modules/contentData' |
| 11 | 12 | |
| 12 | 13 | defineEmits(['register']) |
| ... | ... | @@ -36,7 +37,7 @@ const handleDoSaveEventData = async () => { |
| 36 | 37 | const { event } = unref(componentProps)! |
| 37 | 38 | const { eventJson } = toRaw(unref(getNodeData)) || {} |
| 38 | 39 | const value = unref(componentInstance)?.getFieldsValue() |
| 39 | - await saveNodeAllData({ ...toRaw(unref(getNodeData)), eventJson: { ...(eventJson || {} as NodeDataEventJsonType), [event]: value } }) | |
| 40 | + await saveNodeAllData({ ...toRaw(unref(getNodeData)), eventJson: { ...(eventJson || {} as NodeDataEventJsonType), [event]: { ...value, enable: (eventJson || {})?.[event as EventTypeEnum]?.enable } } }) | |
| 40 | 41 | } |
| 41 | 42 | const handleDoSaveActData = async () => { |
| 42 | 43 | const { event } = unref(componentProps)! |
| ... | ... | @@ -45,7 +46,7 @@ const handleDoSaveActData = async () => { |
| 45 | 46 | |
| 46 | 47 | if (contentDataStore.getIsTemplate) value.deviceId = null |
| 47 | 48 | |
| 48 | - await saveNodeAllData({ ...toRaw(unref(getNodeData)), actJson: { ...(actJson || {} as NodeDataActJsonType), [event]: value } }) | |
| 49 | + await saveNodeAllData({ ...toRaw(unref(getNodeData)), actJson: { ...(actJson || {} as NodeDataActJsonType), [event]: { ...value, enable: (actJson || {})?.[event as ActTypeEnum]?.enable } } }) | |
| 49 | 50 | } |
| 50 | 51 | |
| 51 | 52 | const handleOk = async () => { | ... | ... |