Merge branch 'fix/zfl' into 'perf/main_dev'

修改参数下发问题

See merge request yunteng/thingskit-scada!156

@@ -6,10 +6,13 @@ export interface ProductAndDevice {
   profileId: string
   profileId: string
   transportType?: string
   transportType?: string
   deviceType?: string
   deviceType?: string
-  deviceList: {
-    deviceId: string
-    name: string
-  }[]
+  deviceList: DeviceList[]
+}
+
+interface DeviceList {
+  deviceId: string
+  name: string
+  codeType: string
 }
 }
 
 
 export interface ConfigurationContentType {
 export interface ConfigurationContentType {

@@ -91,6 +91,7 @@ export interface DeviceInfoType {
 export interface NodeDataDataSourceJsonType {
 export interface NodeDataDataSourceJsonType {
   deviceId: string
   deviceId: string
   deviceProfileId: string
   deviceProfileId: string
+  deviceProfileTemplateId?: string
   attr: string
   attr: string
   attrInfo: ThingsModelItemType
   attrInfo: ThingsModelItemType
 
 

@@ -29,7 +29,7 @@ const loading = ref<boolean>(false)
 const dataSourceJson = ref<any>({})
 const dataSourceJson = ref<any>({})
 const thingsModelElRef = ref()
 const thingsModelElRef = ref()
 
 
-const isInputData = ref<boolean>(false)// 判断使用那个表单
+const isInputData = ref<boolean>(false)// 判断使用那个表单  true: 用封装的表单  false：用自己写的表单
 
 
 const zoomFactorValue = ref<number>(1) // 缩放因子
 const zoomFactorValue = ref<number>(1) // 缩放因子
 const isShowMultiply = ref<boolean>(false) // 只有tcp --> int和double类型才相乘缩放因子
 const isShowMultiply = ref<boolean>(false) // 只有tcp --> int和double类型才相乘缩放因子
@@ -100,7 +100,7 @@ const open = async (_data: SingleClickEventDataType) => {
   const { type } = dataType || {}
   const { type } = dataType || {}
 
 
   const { code, transportType, deviceProfileId, alias, name: deviceName } = await getDeviceDetail(deviceId) || {}// 设备信息
   const { code, transportType, deviceProfileId, alias, name: deviceName } = await getDeviceDetail(deviceId) || {}// 设备信息
-  deviceTitle.value = alias || deviceName
+  deviceTitle.value = alias || deviceName// 产品名称
   const { registerAddress, actionType, zoomFactor } = extensionDesc || {} // 获取扩展描述内容
   const { registerAddress, actionType, zoomFactor } = extensionDesc || {} // 获取扩展描述内容
 
 
   const schemas = [{ dataType, identifier, functionName: name } as StructJSON]
   const schemas = [{ dataType, identifier, functionName: name } as StructJSON]
@@ -117,7 +117,7 @@ const open = async (_data: SingleClickEventDataType) => {
   visible.value = true
   visible.value = true
 
 
   if (transportType === TransportTypeEnum.TCP) {
   if (transportType === TransportTypeEnum.TCP) {
-    if (commandWay === CommandDeliveryWayEnum.SERVICE) { // 命令下发方式是服务或则自定义调用
+    if (commandWay === CommandDeliveryWayEnum.SERVICE) { // 判断命令下发方式是服务或者自定义调用 服务调用用封装的组件 自定义和modbus就用输入框
       getServiceInfo(deviceProfileId, service, serviceCommand)
       getServiceInfo(deviceProfileId, service, serviceCommand)
     }
     }
     else if (commandWay === CommandDeliveryWayEnum.CUSTOM) { // 自定义
     else if (commandWay === CommandDeliveryWayEnum.CUSTOM) { // 自定义
@@ -132,7 +132,7 @@ const open = async (_data: SingleClickEventDataType) => {
       ])
       ])
       setFieldsValue({ sendValue: customCommand })
       setFieldsValue({ sendValue: customCommand })
     }
     }
-    else {
+    else { // modBus调用
       isShowModBUS.value = true
       isShowModBUS.value = true
       modBUSForm.value = {
       modBUSForm.value = {
         crc: 'CRC_16_LOWER',
         crc: 'CRC_16_LOWER',
@@ -174,7 +174,7 @@ const error = () => {
 }
 }
 
 
 const handleSubmit = async () => {
 const handleSubmit = async () => {
-  unref(isPasswordInfo)?.checked && await validatePassword()
+  unref(isPasswordInfo)?.checked && await validatePassword()// 操作密码
   !unref(isInputData) && await validate()
   !unref(isInputData) && await validate()
   unref(isInputData) && await unref(thingsModelElRef).validate()
   unref(isInputData) && await unref(thingsModelElRef).validate()
 
 

@@ -7,6 +7,7 @@ import { CommandWayEnum, CommandWayNameEnum } from '@/enums/commandEnum'
 import { CommandDeliveryWayEnum, CommandDeliveryWayNameEnum, DeviceTypeEnum, EventActionTypeEnum, EventActionTypeNameEnum, EventTypeEnum, EventTypeNameEnum, TransportTypeEnum } from '@/enums/datasource'
 import { CommandDeliveryWayEnum, CommandDeliveryWayNameEnum, DeviceTypeEnum, EventActionTypeEnum, EventActionTypeNameEnum, EventTypeEnum, EventTypeNameEnum, TransportTypeEnum } from '@/enums/datasource'
 import type { ThingsModel } from '@/api/device/model'
 import type { ThingsModel } from '@/api/device/model'
 import { PackageCategoryEnum } from '@/core/Library/enum'
 import { PackageCategoryEnum } from '@/core/Library/enum'
+import { useContentDataStoreWithOut } from '@/store/modules/contentData'
 
 
 export enum FormFieldsEnum {
 export enum FormFieldsEnum {
   ACTION_TYPE = 'actionType',
   ACTION_TYPE = 'actionType',
@@ -31,13 +32,17 @@ export enum FormFieldsNameEnum {
   SERVICE = '服务',
   SERVICE = '服务',
 }
 }
 
 
+const contentDataStore = useContentDataStoreWithOut()
+
 export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
 export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
   const { getNodeData, getCellInfo } = usePublicFormContext()
   const { getNodeData, getCellInfo } = usePublicFormContext()
   const { dataSourceJson } = unref(getNodeData) || {}
   const { dataSourceJson } = unref(getNodeData) || {}
-  const { deviceProfileId, deviceInfo } = dataSourceJson || {}
+  const { deviceProfileId, deviceInfo, deviceId } = dataSourceJson || {}
   // transportType:判断是什么类型的设备 code:设备地址码  deviceType:设备类型
   // transportType:判断是什么类型的设备 code:设备地址码  deviceType:设备类型
-  const { transportType, deviceType } = deviceInfo || {}
-
+  let codeType: string | null = ''
+  const { transportType, deviceType, codeType: deviceCodeType } = deviceInfo || {}
+  codeType = deviceCodeType || (deviceId ? contentDataStore.diveceDetailMap?.[deviceId].codeType : null)
+  const isTemplate = contentDataStore.isTemplate // 判断是否是模板
   return [
   return [
     {
     {
       field: 'eventName',
       field: 'eventName',
@@ -115,11 +120,25 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
           { label: CommandDeliveryWayNameEnum.MODBUS, value: CommandDeliveryWayEnum.MODBUS },
           { label: CommandDeliveryWayNameEnum.MODBUS, value: CommandDeliveryWayEnum.MODBUS },
         ]
         ]
         let options = [...values]
         let options = [...values]
-        if (deviceType === DeviceTypeEnum.SENSOR && transportType === TransportTypeEnum.TCP)
-          options = values.filter(item => item.value !== CommandDeliveryWayEnum.SERVICE)
+        if (transportType === TransportTypeEnum.TCP) { // 只有TCP类型的才有MODBUS
+          if (codeType === CommandDeliveryWayEnum.CUSTOM) {
+            if (deviceType !== DeviceTypeEnum.SENSOR)
+              options = values.filter(item => item.value !== CommandDeliveryWayEnum.MODBUS)
 
 
-        if (transportType !== TransportTypeEnum.TCP)
+            else
+              options = values.filter(item => item.value === CommandDeliveryWayEnum.CUSTOM)
+          }
+          else {
+            if (deviceType === DeviceTypeEnum.SENSOR)
+              options = values.filter(item => item.value !== CommandDeliveryWayEnum.SERVICE)
+          }
+        }
+        else {
           options = values.filter(item => item.value !== CommandDeliveryWayEnum.MODBUS)
           options = values.filter(item => item.value !== CommandDeliveryWayEnum.MODBUS)
+        }
+
+        if (isTemplate)// 是模板的话选择不到设备标识符类型所以就判断为放开自定义命令
+          options = values.filter(item => item.value === CommandDeliveryWayEnum.CUSTOM)
 
 
         return {
         return {
           options,
           options,

@@ -43,7 +43,7 @@ const setFieldsValue = (record: Partial<Record<EventTypeEnum, boolean>>) => {
 }
 }
 
 
 const getDisabledStatus = (key: EventTypeEnum) => {
 const getDisabledStatus = (key: EventTypeEnum) => {
-  const data = unref(getNodeData)?.eventJson[key]
+  const data = unref(getNodeData)?.eventJson?.[key]
   return !data
   return !data
 }
 }
 
 

@@ -30,7 +30,7 @@ export const formSchemas = (componentKey?: string): FormSchema[] => {
           placeholder: '请选择产品',
           placeholder: '请选择产品',
           onSelect(value: string, option: any) {
           onSelect(value: string, option: any) {
             formModel[ContentDataFieldsEnum.DEVICE_PROFILE_ID] = value
             formModel[ContentDataFieldsEnum.DEVICE_PROFILE_ID] = value
-            formModel[ContentDataFieldsEnum.DEVICE_INFO] = value && option ? { transportType: option.transportType, deviceType: option.deviceType } : null
+            formModel[ContentDataFieldsEnum.DEVICE_INFO] = value && option ? { transportType: option.transportType, deviceType: option.deviceType, codeType: option?.codeType } : null
           },
           },
           getPopupContainer: () => document.body,
           getPopupContainer: () => document.body,
         }
         }
@@ -56,11 +56,12 @@ export const formSchemas = (componentKey?: string): FormSchema[] => {
           fieldNames: { label: 'name', value: 'tbDeviceId' },
           fieldNames: { label: 'name', value: 'tbDeviceId' },
           onSelect(value: string, option: DeviceItemType) {
           onSelect(value: string, option: DeviceItemType) {
             formModel[ContentDataFieldsEnum.DEVICE_PROFILE_ID] = value ? option.deviceProfileId : null
             formModel[ContentDataFieldsEnum.DEVICE_PROFILE_ID] = value ? option.deviceProfileId : null
-            formModel[ContentDataFieldsEnum.DEVICE_INFO] = value && option ? { code: option.code, transportType: option.transportType, deviceType: option.deviceType, deviceProfileId: option.deviceProfileId, deviceName: option.alias || option.name } : null
+            formModel[ContentDataFieldsEnum.DEVICE_INFO] = value && option ? { code: option.code, transportType: option.transportType, deviceType: option.deviceType, deviceProfileId: option.deviceProfileId, deviceName: option.alias || option.name, codeType: option?.codeType } : null
             formModel[ContentDataFieldsEnum.ATTR] = null
             formModel[ContentDataFieldsEnum.ATTR] = null
           },
           },
-          filterOption: (inputValue: string, option: DeviceItemType) =>
-            option.alias?.includes?.(inputValue) || option.name?.includes?.(inputValue),
+          filterOption: (inputValue: string, option: DeviceItemType) => {
+            option.alias?.includes?.(inputValue) || option.name?.includes?.(inputValue)
+          },
         }
         }
       },
       },
     },
     },

@@ -95,7 +95,7 @@ const handleSave = async () => {
     if (operationPassword.checked)
     if (operationPassword.checked)
       await validatePassword()
       await validatePassword()
     if (contentDataStore.getIsTemplate)// 判断组态是不是模板
     if (contentDataStore.getIsTemplate)// 判断组态是不是模板
-      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null, deviceInfo: null }
+      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null }
     await saveNodeAllData({ dataSourceJson, eventJson: { ...eventJson, OPERATION_PASSWORD: unref(getCellInfo).category === PackageCategoryEnum.CONTROL ? operationPassword : undefined }, actJson })
     await saveNodeAllData({ dataSourceJson, eventJson: { ...eventJson, OPERATION_PASSWORD: unref(getCellInfo).category === PackageCategoryEnum.CONTROL ? operationPassword : undefined }, actJson })
     createMessage.success('操作成功～')
     createMessage.success('操作成功～')
     savePageContent()
     savePageContent()

@@ -51,9 +51,9 @@ const handleSubmit = async () => {
 
 
 const handleSetFormValues = async () => {
 const handleSetFormValues = async () => {
   const { dataSourceJson } = unref(getNodeData) || {}
   const { dataSourceJson } = unref(getNodeData) || {}
-  const { deviceId, attr, chartOption, deviceProfileId, attrInfo } = dataSourceJson || {}
+  const { deviceId, attr, chartOption, deviceProfileId, deviceProfileTemplateId, attrInfo } = dataSourceJson || {}
   await nextTick()
   await nextTick()
-  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, attrInfo })
+  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, attrInfo, deviceProfileTemplateId })
   setFieldsValue({ ...chartOption })
   setFieldsValue({ ...chartOption })
 }
 }
 
 

@@ -12,6 +12,7 @@ import type { ConfigComponentProps } from '@/core/Library/types'
 import { createPublicFormContext } from '@/core/Library/components/PublicForm/usePublicFormContext'
 import { createPublicFormContext } from '@/core/Library/components/PublicForm/usePublicFormContext'
 import { useMessage } from '@/hooks/web/useMessage'
 import { useMessage } from '@/hooks/web/useMessage'
 import { useSavePageContent } from '@/core/Library/hook/useSavePageContent'
 import { useSavePageContent } from '@/core/Library/hook/useSavePageContent'
+import { useContentDataStoreWithOut } from '@/store/modules/contentData'
 
 
 const props = defineProps<ConfigComponentProps>()
 const props = defineProps<ConfigComponentProps>()
 
 
@@ -28,6 +29,7 @@ const [register, { getFieldsValue, setFieldsValue, validate }] = useForm({
   labelWidth: 70,
   labelWidth: 70,
 })
 })
 
 
+const contentDataStore = useContentDataStoreWithOut()
 const loading = ref(false)
 const loading = ref(false)
 const { createMessage } = useMessage()
 const { createMessage } = useMessage()
 const { savePageContent } = useSavePageContent()
 const { savePageContent } = useSavePageContent()
@@ -38,7 +40,11 @@ const handleSubmit = async () => {
     await validate()
     await validate()
     const value = unref(dataSourceElRef)?.getFieldsValue()
     const value = unref(dataSourceElRef)?.getFieldsValue()
     const values = getFieldsValue()
     const values = getFieldsValue()
-    await saveNodeAllData({ dataSourceJson: { ...value, chartOption: values } })
+    let dataSourceJson = value
+    if (contentDataStore.getIsTemplate)
+      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null }
+
+    await saveNodeAllData({ dataSourceJson: { ...dataSourceJson, chartOption: values } })
     createMessage.success('操作成功～')
     createMessage.success('操作成功～')
     savePageContent()
     savePageContent()
   }
   }
@@ -49,9 +55,9 @@ const handleSubmit = async () => {
 
 
 const handleSetFormValues = async () => {
 const handleSetFormValues = async () => {
   const { dataSourceJson } = unref(getNodeData) || {}
   const { dataSourceJson } = unref(getNodeData) || {}
-  const { deviceId, attr, chartOption, deviceProfileId, attrInfo } = dataSourceJson || {}
+  const { deviceId, attr, chartOption, deviceProfileId, attrInfo, deviceProfileTemplateId } = dataSourceJson || {}
   await nextTick()
   await nextTick()
-  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, attrInfo })
+  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, attrInfo, deviceProfileTemplateId })
   setFieldsValue({ ...chartOption })
   setFieldsValue({ ...chartOption })
 }
 }
 
 

@@ -32,9 +32,9 @@ const dataSourceElRef = ref<Nullable<InstanceType<typeof DataSourceForm>>>()
 
 
 const handleSetFormValues = async () => {
 const handleSetFormValues = async () => {
   const { dataSourceJson } = unref(getNodeData) || {}
   const { dataSourceJson } = unref(getNodeData) || {}
-  const { deviceId, attr, chartOption, deviceProfileId, attrInfo } = dataSourceJson || {}
+  const { deviceId, attr, chartOption, deviceProfileId, deviceProfileTemplateId, attrInfo } = dataSourceJson || {}
   await nextTick()
   await nextTick()
-  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, attrInfo })
+  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, deviceProfileTemplateId, attrInfo })
   setFieldsValue({ ...chartOption })
   setFieldsValue({ ...chartOption })
 }
 }
 
 

 import { defineStore } from 'pinia'
 import { defineStore } from 'pinia'
+import { toRaw, unref } from 'vue'
 import { store } from '..'
 import { store } from '..'
 import type { NodeDataType } from '@/api/node/model'
 import type { NodeDataType } from '@/api/node/model'
 import type { ProductAndDevice } from '@/api/content/model'
 import type { ProductAndDevice } from '@/api/content/model'
 
 
+interface DeviceList {
+  deviceId: string
+  name: string
+  codeType: string
+}
+
 interface ContentDataStoreType {
 interface ContentDataStoreType {
   contentData: NodeDataType[]
   contentData: NodeDataType[]
   configurationId: Nullable<string>
   configurationId: Nullable<string>
@@ -11,6 +18,7 @@ interface ContentDataStoreType {
   isTemplate?: number | null | string
   isTemplate?: number | null | string
   configurationContentList?: any
   configurationContentList?: any
   configurationContentId: Nullable<string>
   configurationContentId: Nullable<string>
+  diveceDetailMap: Record<string, DeviceList>
 }
 }
 
 
 export const useContentDataStore = defineStore('app-content-data', {
 export const useContentDataStore = defineStore('app-content-data', {
@@ -22,6 +30,7 @@ export const useContentDataStore = defineStore('app-content-data', {
     productAndDevice: [],
     productAndDevice: [],
     configurationContentList: [],
     configurationContentList: [],
     configurationContentId: null,
     configurationContentId: null,
+    diveceDetailMap: {},
   }),
   }),
   actions: {
   actions: {
 
 
@@ -47,8 +56,17 @@ export const useContentDataStore = defineStore('app-content-data', {
       this.isTemplate = string
       this.isTemplate = string
     },
     },
 
 
-    setProductAndDevice(string: ProductAndDevice[]) {
-      return this.productAndDevice = string
+    setProductAndDevice(list: ProductAndDevice[]) {
+      this.productAndDevice = list
+      this.doBuildDeviceMap()
+      return list
+    },
+
+    doBuildDeviceMap() {
+      const list = this.productAndDevice.map(item => toRaw(unref(item.deviceList))).flat(1)
+      this.diveceDetailMap = list.reduce((prev, next) => {
+        return { ...prev, [next?.deviceId]: next }
+      }, {} as Record<'string', ProductAndDevice>)
     },
     },
   },
   },