Merge branch 'perf/configuration-id' into 'main_dev'

fix: 修复组态相关保存由id改为configurationNodeId

See merge request yunteng/thingskit-scada!259

@@ -1309,7 +1309,7 @@ operationPassword=操作密码
 dataSource=数据源
 dataSource=数据源
 dataInteraction=数据交互
 dataInteraction=数据交互
 display=显示
 display=显示
-actHidden=隐藏
+acrHidden=隐藏
 flow=流动
 flow=流动
 stop=停止
 stop=停止
 actOpen=开启
 actOpen=开启

@@ -17,7 +17,7 @@ export const tableColumns = (): BasicColumn[] => {
       title: t('state'),
       title: t('state'),
       dataIndex: 'type',
       dataIndex: 'type',
       format(text) {
       format(text) {
-        return ActRangListItemTypeNameEnum[text as ActRangListItemTypeEnum]
+        return t(ActRangListItemTypeNameEnum[text as ActRangListItemTypeEnum])
       },
       },
     },
     },
     {
     {

@@ -88,7 +88,7 @@ export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: N
 
 
       if (nodeUtils.getNodeComponentKey(cell) === ControlComponentEnum.SWITCH) {
       if (nodeUtils.getNodeComponentKey(cell) === ControlComponentEnum.SWITCH) {
         const contentDataStore = useContentDataStoreWithOut()
         const contentDataStore = useContentDataStoreWithOut()
-        const currentData = contentDataStore.contentData.find(item => item.id === cell.getId())
+        const currentData = contentDataStore.contentData.find(item => item.configurationNodeId === cell.getId())
         if (!currentData) return
         if (!currentData) return
         const { actJson } = currentData
         const { actJson } = currentData
         const { rangeList } = actJson.STATUS_SETTING
         const { rangeList } = actJson.STATUS_SETTING

@@ -53,7 +53,8 @@ export const getVideoTypeByUrl = (url: string) => {
 export async function getPlayUrl(
 export async function getPlayUrl(
   params: VideoItemRecordType,
   params: VideoItemRecordType,
 ): Promise<Undefineable<{ url: string; type: StreamType }>> {
 ): Promise<Undefineable<{ url: string; type: StreamType }>> {
-  const { accessMode } = params
+  let { accessMode } = params
+  accessMode = Number(accessMode)
   if (accessMode === VideoAccessModeEnum.ManuallyEnter) {
   if (accessMode === VideoAccessModeEnum.ManuallyEnter) {
     const { videoUrl } = params
     const { videoUrl } = params
     if (params.videoUrl) {
     if (params.videoUrl) {

@@ -99,7 +99,7 @@ const [register, { getFieldsValue, validate, setFieldsValue }] = useForm({
     {
     {
       field: VideoFormFieldsEnum.ACCESS_MODE,
       field: VideoFormFieldsEnum.ACCESS_MODE,
       label: t(VideoFormFieldsNameEnum.ACCESS_MODE),
       label: t(VideoFormFieldsNameEnum.ACCESS_MODE),
-      component: ComponentEnum.INPUT,
+      component: ComponentEnum.INPUT_NUMBER,
       ifShow: false,
       ifShow: false,
     },
     },
     {
     {

@@ -30,10 +30,10 @@ export default class Config implements CreateComponentType {
 }
 }
 
 
 export const dataSubscribers: ComponentConfigModuleType['dataSubscribers'] = (telemetryService, nodeData) => {
 export const dataSubscribers: ComponentConfigModuleType['dataSubscribers'] = (telemetryService, nodeData) => {
-  const { dataSourceJson, id } = nodeData
+  const { dataSourceJson, configurationNodeId } = nodeData
   const { deviceId, attr, chartOption } = dataSourceJson
   const { deviceId, attr, chartOption } = dataSourceJson
   const { agg, interval, effectScope = 0 } = chartOption!
   const { agg, interval, effectScope = 0 } = chartOption!
-  const subscribe = TelemetrySubscriber.createHistorySubscription(telemetryService, { id: deviceId, entityType: EntityType.DEVICE }, attr, telemetryService.getCommandSource(id, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
+  const subscribe = TelemetrySubscriber.createHistorySubscription(telemetryService, { id: deviceId, entityType: EntityType.DEVICE }, attr, telemetryService.getCommandSource(configurationNodeId, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
 
 
   const subscriptionCommand = subscribe.subscriptionCommand as HistorySubscriptionCmd
   const subscriptionCommand = subscribe.subscriptionCommand as HistorySubscriptionCmd
   subscriptionCommand.agg = agg
   subscriptionCommand.agg = agg

@@ -30,15 +30,15 @@ export default class Config implements CreateComponentType {
 }
 }
 
 
 export const dataSubscribers: ComponentConfigModuleType['dataSubscribers'] = (telemetryService, nodeData) => {
 export const dataSubscribers: ComponentConfigModuleType['dataSubscribers'] = (telemetryService, nodeData) => {
-  const { dataSourceJson, id } = nodeData
+  const { dataSourceJson, configurationNodeId } = nodeData
   const { deviceId, attr, chartOption } = dataSourceJson
   const { deviceId, attr, chartOption } = dataSourceJson
   const { agg, interval, effectScope = 0, queryType } = chartOption!
   const { agg, interval, effectScope = 0, queryType } = chartOption!
 
 
   let subscribe
   let subscribe
   if (queryType === SocketSubscriberEnum.HISTORY_CMDS)
   if (queryType === SocketSubscriberEnum.HISTORY_CMDS)
-    subscribe = TelemetrySubscriber.createHistorySubscription(telemetryService, { id: deviceId, entityType: EntityType.DEVICE }, attr, telemetryService.getCommandSource(id, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
+    subscribe = TelemetrySubscriber.createHistorySubscription(telemetryService, { id: deviceId, entityType: EntityType.DEVICE }, attr, telemetryService.getCommandSource(configurationNodeId, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
   else
   else
-    subscribe = TelemetrySubscriber.createTimeseriesSubscription(telemetryService, { id: deviceId, entityType: EntityType.DEVICE }, attr, telemetryService.getCommandSource(id, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
+    subscribe = TelemetrySubscriber.createTimeseriesSubscription(telemetryService, { id: deviceId, entityType: EntityType.DEVICE }, attr, telemetryService.getCommandSource(configurationNodeId, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
 
 
   const subscriptionCommand = subscribe.subscriptionCommand as HistorySubscriptionCmd
   const subscriptionCommand = subscribe.subscriptionCommand as HistorySubscriptionCmd
   subscriptionCommand.agg = agg
   subscriptionCommand.agg = agg

@@ -67,7 +67,7 @@ export class EventHandler {
     if (!cell) return
     if (!cell) return
     const id = cell.getId()
     const id = cell.getId()
 
 
-    const node = this.service.dataSource.find(item => item.id === id)
+    const node = this.service.dataSource.find(item => item.configurationNodeId === id)
 
 
     if (node && node.eventJson) {
     if (node && node.eventJson) {
       const instanceId = getAppInstanceId(cell)
       const instanceId = getAppInstanceId(cell)

@@ -24,7 +24,6 @@ export class MessageHandler {
     const telemetrySubscriber = this.service.subscribersMap.get(subscriptionId)
     const telemetrySubscriber = this.service.subscribersMap.get(subscriptionId)
 
 
     if (!telemetrySubscriber) return
     if (!telemetrySubscriber) return
-
     const { commandSource } = telemetrySubscriber
     const { commandSource } = telemetrySubscriber
     const { dataType } = commandSource
     const { dataType } = commandSource
     if (dataType === DataSourceTypeEnum.DATASOURCE)
     if (dataType === DataSourceTypeEnum.DATASOURCE)