Merge branch 'fix/DEFECT-1888' into 'main_dev'

fix: 修复引用模板创建组态时图表组件不显示设备名称 See merge request yunteng/thingskit-scada!215

Merge branch 'fix/DEFECT-1888' into 'main_dev'
fix: 修复引用模板创建组态时图表组件不显示设备名称 See merge request yunteng/thingskit-scada!215
xp.Huang
2 parents b823113d 460a6b4e
Showing 10 changed files with 37 additions and 20 deletions
src/core/Library/components/PublicForm/index.vue
src/core/Library/packages/Chart/CircularFlowMeter/config.vue
src/core/Library/packages/Chart/CircularFlowMeter/index.vue
src/core/Library/packages/Chart/Histogram/config.vue
src/core/Library/packages/Chart/Instrument/config.vue
src/core/Library/packages/Chart/Instrument/index.vue
src/core/Library/packages/Chart/Line/config.vue
src/core/Library/packages/Chart/RectFlowMeter/config.vue
src/core/Library/packages/Chart/RectFlowMeter/index.vue
src/core/Library/packages/Chart/Thermometer/index.vue
--- a/src/core/Library/components/PublicForm/index.vue
View file @36e69e2
+++ b/src/core/Library/components/PublicForm/index.vue
View file @36e69e2
@@ -111,7 +111,7 @@ const handleSave = async () => {
     if (operationPassword.checked)
       await validatePassword()
     if (contentDataStore.getIsTemplate)// 判断组态是不是模板
-      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null }
+      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null, deviceName: null }
     await saveNodeAllData({ dataSourceJson, eventJson: { ...eventJson, OPERATION_PASSWORD: unref(getCellInfo).category === PackageCategoryEnum.CONTROL ? operationPassword : undefined }, actJson })
     createMessage.success('操作成功')
     savePageContent()
--- a/src/core/Library/packages/Chart/CircularFlowMeter/config.vue
View file @36e69e2
+++ b/src/core/Library/packages/Chart/CircularFlowMeter/config.vue
View file @36e69e2
@@ -34,7 +34,7 @@ const handleSubmit = async () => {
     const formValues = unref(dataSourceFormRef)?.getFieldsValue()
     let dataSourceJson = formValues
     if (contentDataStore.getIsTemplate)
-      dataSourceJson = { ...formValues, deviceProfileId: formValues?.deviceProfileTemplateId, deviceId: null }
+      dataSourceJson = { ...formValues, deviceProfileId: formValues?.deviceProfileTemplateId, deviceId: null, deviceName: null }
     saveNodeAllData({ dataSourceJson: { ...dataSourceJson, circularFlowMeterOption: unref(colorConfig) } })
     createMessage.success('保存成功~')
--- a/src/core/Library/packages/Chart/CircularFlowMeter/index.vue
View file @36e69e2
+++ b/src/core/Library/packages/Chart/CircularFlowMeter/index.vue
View file @36e69e2
@@ -9,6 +9,7 @@ import { useOnMessage } from '@/core/Library/hook/useOnMessage'
 import type { NodeDataDataSourceJsonType } from '@/api/node/model'
 import { useLatestMessageValue } from '@/core/Library/hook/useLatestMessageValue'
 import { useContentDataStore } from '@/store/modules/contentData'
+import { useProductsStore } from '@/store/modules/products'
 const props = defineProps<{
   config: CreateComponentType
@@ -24,6 +25,8 @@ const chartElRef = ref<Nullable<HTMLDivElement>>()
 const chartInstance = ref<Nullable<ECharts>>()
+const productsStore = useProductsStore()
+
 function initChartInstance() {
   const { dataSourceJson } = unref(getCurrentNodeData) || {}
   const { circularFlowMeterOption } = dataSourceJson || {}
@@ -34,11 +37,13 @@ function initChartInstance() {
 const { onMessage } = useOnMessage({
   onReceiveDataSourceMessage(commandSource, message) {
     const { data } = commandSource
-    const { attr } = data as NodeDataDataSourceJsonType
-    const { latestValue } = useLatestMessageValue(message.data, attr)
+    const { attr, deviceName, deviceProfileId } = data as NodeDataDataSourceJsonType
+
+    const { functionName } = productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, (attr) as string) || {}
+    const { latestValue } = useLatestMessageValue(message.data, (attr as string))
     unref(chartInstance)?.setOption({
       title: {
-        // text: `${deviceName || ''}-${attrInfo.name || ''}`,
+        text: `${deviceName || ''} - ${functionName || ''}`,
       },
       series: [{
         data: getSetValue(Number(latestValue)),
--- a/src/core/Library/packages/Chart/Histogram/config.vue
View file @36e69e2
+++ b/src/core/Library/packages/Chart/Histogram/config.vue
View file @36e69e2
@@ -45,7 +45,7 @@ const handleSubmit = async () => {
     const values = getFieldsValue()
     let dataSourceJson = value
     if (contentDataStore.getIsTemplate)
-      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null }
+      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null, deviceName: null }
     await saveNodeAllData({ dataSourceJson: { ...dataSourceJson, attr: typeof value.attr == 'string' ? [value.attr] : value.attr, chartOption: { ...values } } })
     savePageContent()
--- a/src/core/Library/packages/Chart/Instrument/config.vue
View file @36e69e2
+++ b/src/core/Library/packages/Chart/Instrument/config.vue
View file @36e69e2
@@ -42,7 +42,7 @@ const handleSubmit = async () => {
     const values = getFieldsValue()
     let dataSourceJson = value
     if (contentDataStore.getIsTemplate)
-      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null }
+      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null, deviceName: null }
     await saveNodeAllData({ dataSourceJson: { ...dataSourceJson, chartOption: values } })
     createMessage.success('操作成功～')
@@ -55,9 +55,9 @@ const handleSubmit = async () => {
 const handleSetFormValues = async () => {
   const { dataSourceJson } = unref(getNodeData) || {}
-  const { deviceId, attr, chartOption, deviceProfileId, deviceProfileTemplateId } = dataSourceJson || {}
+  const { deviceId, attr, chartOption, deviceProfileId, deviceProfileTemplateId, deviceName } = dataSourceJson || {}
   await nextTick()
-  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, deviceProfileTemplateId })
+  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, deviceName, deviceProfileTemplateId })
   setFieldsValue({ ...chartOption })
 }
--- a/src/core/Library/packages/Chart/Instrument/index.vue
View file @36e69e2
+++ b/src/core/Library/packages/Chart/Instrument/index.vue
View file @36e69e2
@@ -10,6 +10,7 @@ import type { CommandSource } from '@/core/websocket/processor'
 import type { NodeDataDataSourceJsonType } from '@/api/node/model'
 import type { SubscriptionUpdateMsg } from '@/core/websocket/type/message'
 import { useContentDataStore } from '@/store/modules/contentData'
+import { useProductsStore } from '@/store/modules/products'
 const props = defineProps<{
   config: CreateComponentType
@@ -23,6 +24,8 @@ const chartInstance = ref<Nullable<ECharts>>()
 const contentDataStore = useContentDataStore()
+const productsStore = useProductsStore()
+
 function initChartInstance() {
   chartInstance.value = init(unref(chartElRef))
   const currentNodeData = unref(contentDataStore.getCurrentNodeDataById(props.config))
@@ -36,15 +39,16 @@ onMounted(() => {
 const onReceiveDataSourceMessage = (commandSource: CommandSource, message: SubscriptionUpdateMsg) => {
   const { data } = commandSource
-  const { attr } = data as NodeDataDataSourceJsonType
-  const { latestValue } = useLatestMessageValue(message.data, attr)
+  const { attr, deviceName, deviceProfileId } = data as NodeDataDataSourceJsonType
+  const { functionName } = productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, (attr) as string) || {}
+  const { latestValue } = useLatestMessageValue(message.data, (attr as string))
   unref(chartInstance)?.setOption({
     series: [{
       data: [{ value: latestValue }],
     }],
     title: {
-      // text: `${deviceName || ''}-${attrInfo.name || ''}`,
+      text: `${deviceName || ''}- ${functionName || ''} `,
     },
   } as EChartsOption)
 }
--- a/src/core/Library/packages/Chart/Line/config.vue
View file @36e69e2
+++ b/src/core/Library/packages/Chart/Line/config.vue
View file @36e69e2
@@ -54,7 +54,7 @@ const handleSubmit = async () => {
     const values = getFieldsValue()
     let dataSourceJson = value
     if (contentDataStore.getIsTemplate)
-      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null }
+      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null, deviceName: null }
     saveNodeAllData({ dataSourceJson: { ...dataSourceJson, attr: typeof value.attr == 'string' ? [value.attr] : value.attr, chartOption: { ...values } } })
     createMessage.success('操作成功~')
--- a/src/core/Library/packages/Chart/RectFlowMeter/config.vue
View file @36e69e2
+++ b/src/core/Library/packages/Chart/RectFlowMeter/config.vue
View file @36e69e2
@@ -34,7 +34,7 @@ const handleSubmit = async () => {
     const formValues = unref(dataSourceFormRef)?.getFieldsValue()
     let dataSourceJson = formValues
     if (contentDataStore.getIsTemplate)
-      dataSourceJson = { ...formValues, deviceProfileId: formValues?.deviceProfileTemplateId, deviceId: null }
+      dataSourceJson = { ...formValues, deviceProfileId: formValues?.deviceProfileTemplateId, deviceId: null, deviceName: null }
     await saveNodeAllData({ dataSourceJson: { ...dataSourceJson, rectFlowMeterOption: unref(colorConfig) } })
     createMessage.success('保存成功')
--- a/src/core/Library/packages/Chart/RectFlowMeter/index.vue
View file @36e69e2
+++ b/src/core/Library/packages/Chart/RectFlowMeter/index.vue
View file @36e69e2
@@ -9,6 +9,7 @@ import { useOnMessage } from '@/core/Library/hook/useOnMessage'
 import type { NodeDataDataSourceJsonType } from '@/api/node/model'
 import { useLatestMessageValue } from '@/core/Library/hook/useLatestMessageValue'
 import { useContentDataStore } from '@/store/modules/contentData'
+import { useProductsStore } from '@/store/modules/products'
 const props = defineProps<{
   config: CreateComponentType
@@ -22,6 +23,8 @@ const getCellBounds = computed(() => props.config.cellBounds || { width: 300, he
 const chartElRef = ref<Nullable<HTMLDivElement>>()
+const productsStore = useProductsStore()
+
 const chartInstance = ref<Nullable<ECharts>>()
 function initChartInstance() {
@@ -34,11 +37,12 @@ function initChartInstance() {
 const { onMessage } = useOnMessage({
   onReceiveDataSourceMessage(commandSource, message) {
     const { data } = commandSource
-    const { attr } = data as NodeDataDataSourceJsonType
-    const { latestValue } = useLatestMessageValue(message.data, attr)
+    const { attr, deviceName, deviceProfileId } = data as NodeDataDataSourceJsonType
+    const { functionName } = productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, (attr as string)) || {}
+    const { latestValue } = useLatestMessageValue(message.data, (attr as string))
     unref(chartInstance)?.setOption({
       title: {
-        // text: `${deviceName || ''}-${attrInfo.name || ''}`,
+        text: `${deviceName || ''} - ${functionName || ''}`,
       },
       series: [{
         data: getSetValue(Number(latestValue)),
--- a/src/core/Library/packages/Chart/Thermometer/index.vue
View file @36e69e2
+++ b/src/core/Library/packages/Chart/Thermometer/index.vue
View file @36e69e2
@@ -7,6 +7,7 @@ import type { CreateComponentType, RenderComponentExposeType } from '@/core/Libr
 import type { NodeDataDataSourceJsonType } from '@/api/node/model'
 import { useLatestMessageValue } from '@/core/Library/hook/useLatestMessageValue'
 import { useOnMessage } from '@/core/Library/hook/useOnMessage'
+import { useProductsStore } from '@/store/modules/products'
 const props = defineProps<{
   config: CreateComponentType
@@ -18,6 +19,8 @@ const chartElRef = ref<Nullable<HTMLDivElement>>()
 const chartInstance = ref<Nullable<ECharts>>()
+const productsStore = useProductsStore()
+
 function initChartInstance() {
   chartInstance.value = init(unref(chartElRef))
   chartInstance.value.setOption(getDefaultOption)
@@ -26,11 +29,12 @@ function initChartInstance() {
 const { onMessage } = useOnMessage({
   onReceiveDataSourceMessage(commandSource, message) {
     const { data } = commandSource
-    const { attr } = data as NodeDataDataSourceJsonType
-    const { latestValue } = useLatestMessageValue(message.data, attr)
+    const { attr, deviceName, deviceProfileId } = data as NodeDataDataSourceJsonType
+    const { functionName } = productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, (attr as string)) || {}
+    const { latestValue } = useLatestMessageValue(message.data, (attr as string))
     unref(chartInstance)?.setOption({
       title: {
-        // text: `${deviceName || ''}-${attrInfo.name || ''}`,
+        text: `${deviceName || ''} - ${functionName || ''}`,
       },
       series: [{
         data: [{