Commit 48141291e631892a7032a65e1256bf92ed46fbd7
Merge branch 'fix/checkd-status-lose' into 'main_dev'
Fix/checkd status lose See merge request yunteng/thingskit-scada!183
Showing
2 changed files
with
5 additions
and
3 deletions
| @@ -147,6 +147,7 @@ export interface OperationPasswordDataType { | @@ -147,6 +147,7 @@ export interface OperationPasswordDataType { | ||
| 147 | checked: boolean | 147 | checked: boolean |
| 148 | value?: string | 148 | value?: string |
| 149 | label: string | 149 | label: string |
| 150 | + enable: boolean | ||
| 150 | } | 151 | } |
| 151 | 152 | ||
| 152 | export interface NodeDataEventJsonType { | 153 | export interface NodeDataEventJsonType { |
| @@ -5,8 +5,9 @@ import { usePublicFormContext } from '../../usePublicFormContext' | @@ -5,8 +5,9 @@ import { usePublicFormContext } from '../../usePublicFormContext' | ||
| 5 | import type { OpenDynamicModalParamsType } from '.' | 5 | import type { OpenDynamicModalParamsType } from '.' |
| 6 | import type { ModalProps } from '@/components/Modal' | 6 | import type { ModalProps } from '@/components/Modal' |
| 7 | import { BasicModal, useModalInner } from '@/components/Modal' | 7 | import { BasicModal, useModalInner } from '@/components/Modal' |
| 8 | +import type { ActTypeEnum, EventTypeEnum } from '@/enums/datasource' | ||
| 8 | import { DataSourceTypeEnum } from '@/enums/datasource' | 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 | import { useContentDataStoreWithOut } from '@/store/modules/contentData' | 11 | import { useContentDataStoreWithOut } from '@/store/modules/contentData' |
| 11 | 12 | ||
| 12 | defineEmits(['register']) | 13 | defineEmits(['register']) |
| @@ -36,7 +37,7 @@ const handleDoSaveEventData = async () => { | @@ -36,7 +37,7 @@ const handleDoSaveEventData = async () => { | ||
| 36 | const { event } = unref(componentProps)! | 37 | const { event } = unref(componentProps)! |
| 37 | const { eventJson } = toRaw(unref(getNodeData)) || {} | 38 | const { eventJson } = toRaw(unref(getNodeData)) || {} |
| 38 | const value = unref(componentInstance)?.getFieldsValue() | 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 | const handleDoSaveActData = async () => { | 42 | const handleDoSaveActData = async () => { |
| 42 | const { event } = unref(componentProps)! | 43 | const { event } = unref(componentProps)! |
| @@ -45,7 +46,7 @@ const handleDoSaveActData = async () => { | @@ -45,7 +46,7 @@ const handleDoSaveActData = async () => { | ||
| 45 | 46 | ||
| 46 | if (contentDataStore.getIsTemplate) value.deviceId = null | 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 | const handleOk = async () => { | 52 | const handleOk = async () => { |