Merge remote-tracking branch 'origin/fix/zfl' into perf/main_dev

@@ -148,6 +148,7 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
               [FormFieldsEnum.SERVICE]: undefined,
               [FormFieldsEnum.SERVICE]: undefined,
               [FormFieldsEnum.CUSTOM_COMMAND]: null,
               [FormFieldsEnum.CUSTOM_COMMAND]: null,
               [FormFieldsEnum.WAY]: CommandWayEnum.ONE_WAY,
               [FormFieldsEnum.WAY]: CommandWayEnum.ONE_WAY,
+              [FormFieldsEnum.THINGS_MODEL]: null,
             })
             })
           },
           },
         }
         }
@@ -205,6 +206,9 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
             formModel[FormFieldsEnum.THINGS_MODEL] = value ? options : null
             formModel[FormFieldsEnum.THINGS_MODEL] = value ? options : null
             formModel.callType = options.callType
             formModel.callType = options.callType
           },
           },
+          onChange(value: string | number | undefined) { // 因为select不会执行清除选择 所以使用change时间
+            if (!value) formModel[FormFieldsEnum.THINGS_MODEL] = null
+          },
           onOptionsChange(options: ThingsModel[]) {
           onOptionsChange(options: ThingsModel[]) {
             const service = formModel[FormFieldsEnum.SERVICE]
             const service = formModel[FormFieldsEnum.SERVICE]
             if (service) {
             if (service) {

@@ -60,7 +60,7 @@ export const formSchemas = (componentKey?: string): FormSchema[] => {
             formModel[ContentDataFieldsEnum.ATTR] = null
             formModel[ContentDataFieldsEnum.ATTR] = null
           },
           },
           filterOption: (inputValue: string, option: DeviceItemType) => {
           filterOption: (inputValue: string, option: DeviceItemType) => {
-            option.alias?.includes?.(inputValue) || option.name?.includes?.(inputValue)
+            return option.alias?.includes?.(inputValue) || option.name?.includes?.(inputValue)
           },
           },
         }
         }
       },
       },
@@ -89,8 +89,9 @@ export const formSchemas = (componentKey?: string): FormSchema[] => {
           onSelect(value: string, option: ThingsModelItemType) {
           onSelect(value: string, option: ThingsModelItemType) {
             formModel[ContentDataFieldsEnum.ATTR_INFO] = value && option ? toRaw(unref(option)) : null
             formModel[ContentDataFieldsEnum.ATTR_INFO] = value && option ? toRaw(unref(option)) : null
           },
           },
-          filterOption: (inputValue: string, option: ThingsModelItemType) =>
-            option.name.includes(inputValue),
+          filterOption: (inputValue: string, option: ThingsModelItemType) => {
+            return option.name.includes(inputValue)
+          },
         }
         }
       },
       },
     },
     },

@@ -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, deviceProfileTemplateId, attrInfo } = dataSourceJson || {}
+  const { deviceId, attr, chartOption, deviceProfileId, deviceProfileTemplateId, attrInfo, deviceInfo } = dataSourceJson || {}
   await nextTick()
   await nextTick()
-  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, attrInfo, deviceProfileTemplateId })
+  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, attrInfo, deviceProfileTemplateId, deviceInfo })
   setFieldsValue({ ...chartOption })
   setFieldsValue({ ...chartOption })
 }
 }
 
 

@@ -55,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, deviceProfileTemplateId } = dataSourceJson || {}
+  const { deviceId, attr, chartOption, deviceProfileId, attrInfo, deviceProfileTemplateId, deviceInfo } = dataSourceJson || {}
   await nextTick()
   await nextTick()
-  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, attrInfo, deviceProfileTemplateId })
+  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, attrInfo, deviceInfo, deviceProfileTemplateId })
   setFieldsValue({ ...chartOption })
   setFieldsValue({ ...chartOption })
 }
 }
 
 

@@ -36,9 +36,15 @@ onMounted(() => {
 
 
 const onReceiveDataSourceMessage = (commandSource: CommandSource, message: SubscriptionUpdateMsg) => {
 const onReceiveDataSourceMessage = (commandSource: CommandSource, message: SubscriptionUpdateMsg) => {
   const { data } = commandSource
   const { data } = commandSource
+  const { chartOption } = data || {}
+  const { unit } = chartOption || {}
   const { attr } = data as NodeDataDataSourceJsonType
   const { attr } = data as NodeDataDataSourceJsonType
   const { latestValue } = useLatestMessageValue(message.data, attr)
   const { latestValue } = useLatestMessageValue(message.data, attr)
-  unref(chartInstance)?.setOption({ series: [{ data: [{ value: latestValue }] }] } as EChartsOption)
+  unref(chartInstance)?.setOption({
+    series: [{
+      data: [{ value: latestValue }], detail: { formatter: `{value} ${unit || '℃'}` },
+    }],
+  } as EChartsOption)
 }
 }
 
 
 const { onMessage } = useOnMessage({ onReceiveDataSourceMessage })
 const { onMessage } = useOnMessage({ onReceiveDataSourceMessage })

@@ -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, deviceProfileTemplateId, attrInfo } = dataSourceJson || {}
+  const { deviceId, attr, chartOption, deviceProfileId, deviceProfileTemplateId, attrInfo, deviceInfo } = dataSourceJson || {}
   await nextTick()
   await nextTick()
-  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, deviceProfileTemplateId, attrInfo })
+  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, deviceProfileTemplateId, attrInfo, deviceInfo })
   setFieldsValue({ ...chartOption })
   setFieldsValue({ ...chartOption })
 }
 }