perf: 看板组件地图新增选择单数据源结构体时选择经纬度

@@ -10,7 +10,8 @@
 
 
   const alert = {
   const alert = {
     [PackagesCategoryEnum.MAP]: [
     [PackagesCategoryEnum.MAP]: [
-      '地图组件，需绑定两个数据源，且数据源为同一设备。第一数据源为经度，第二数据源为纬度，否则地图组件不能正常显示。',
+      '1、绑定一种数据源，选择属性为结构体时，可以自行选择结构体里的值作为经纬度',
+      '2、绑定两个数据源，且数据源为同一设备。第一数据源为经度，第二数据源为纬度，否则地图组件不能正常显示。',
     ],
     ],
   };
   };
 
 

@@ -34,14 +34,6 @@
         const { unit, fontColor, showDeviceName } = item.componentInfo || {};
         const { unit, fontColor, showDeviceName } = item.componentInfo || {};
         const { deviceName, deviceRename, attribute, attributeRename, deviceId, attributeName } =
         const { deviceName, deviceRename, attribute, attributeRename, deviceId, attributeName } =
           item;
           item;
-        // return {
-        //   unit: unit ?? persetUnit,
-        //   fontColor: fontColor ?? persetFontColor,
-        //   showDeviceName: showDeviceName ?? persetShowDeviceName,
-        //   attribute,
-        //   deviceName,
-        //   deviceRename,
-        // };
         return {
         return {
           unit: unit ?? presetUnit,
           unit: unit ?? presetUnit,
           fontColor: fontColor ?? presetFontColor,
           fontColor: fontColor ?? presetFontColor,
@@ -58,7 +50,6 @@
   });
   });
 
 
   const getOffset = (length: number, index: number) => {
   const getOffset = (length: number, index: number) => {
-    // try {
     const offsetList = ref<any>([]);
     const offsetList = ref<any>([]);
     switch (length) {
     switch (length) {
       case 1:
       case 1:
@@ -147,7 +138,6 @@
         break;
         break;
     }
     }
     return unref(offsetList);
     return unref(offsetList);
-    // } catch {}
   };
   };
 
 
   const series = ref(
   const series = ref(
@@ -263,7 +253,6 @@
       series.value.forEach((item) => {
       series.value.forEach((item) => {
         if (item.id === deviceId && item.attribute === attribute && value) {
         if (item.id === deviceId && item.attribute === attribute && value) {
           item.value = getNumberValue(value);
           item.value = getNumberValue(value);
-          // time.value = timespan;
         }
         }
       });
       });
     });
     });

@@ -62,7 +62,6 @@
   const options = (): EChartsOption => {
   const options = (): EChartsOption => {
     const { unit, fontColor, pointerColor, maxNumber, valueSize } = unref(getDesign);
     const { unit, fontColor, pointerColor, maxNumber, valueSize } = unref(getDesign);
 
 
-    // getStageColor(gradientInfo);
     return {
     return {
       series: [
       series: [
         {
         {
@@ -103,14 +102,6 @@
               color: pointerColor,
               color: pointerColor,
             },
             },
           },
           },
-          // anchor: {
-          //   show: true,
-          //   showAbove: true,
-          //   size: 10,
-          //   itemStyle: {
-          //     borderWidth: 4,
-          //   },
-          // },
           title: {
           title: {
             show: false,
             show: false,
           },
           },

@@ -19,6 +19,9 @@
     ],
     ],
   });
   });
 
 
+  const loading = ref(false);
+  const getDesign = ref();
+
   const getTwoMap = async (dataSource) => {
   const getTwoMap = async (dataSource) => {
     if (dataSource.length < 2) return;
     if (dataSource.length < 2) return;
     dataSource = dataSource.splice(0, 2);
     dataSource = dataSource.splice(0, 2);
@@ -87,8 +90,6 @@
     });
     });
   };
   };
 
 
-  const getDesign = ref();
-
   const [registerModal, { closeModal }] = useModalInner(async (dataSource: DataSource[]) => {
   const [registerModal, { closeModal }] = useModalInner(async (dataSource: DataSource[]) => {
     try {
     try {
       getDesign.value = dataSource;
       getDesign.value = dataSource;
@@ -133,6 +134,7 @@
     return track;
     return track;
   };
   };
 
 
+  // 单数据源选择结构体
   const getSingleDataSource = async (res) => {
   const getSingleDataSource = async (res) => {
     const [keys] = Object.keys(res);
     const [keys] = Object.keys(res);
     const track: Record<'lng' | 'lat', number>[] = [];
     const track: Record<'lng' | 'lat', number>[] = [];
@@ -152,7 +154,7 @@
         list.push(item.value);
         list.push(item.value);
       }
       }
     });
     });
-    const { latitude, longitude } = unref(getDesign)?.[0]; //获取选择得经纬度选项
+    const { latitude, longitude } = unref(getDesign)?.[0]; //获取选择的经纬度选项
 
 
     list.forEach((item) => {
     list.forEach((item) => {
       const lng = item[longitude];
       const lng = item[longitude];
@@ -165,7 +167,6 @@
   const validEffective = (value = '') => {
   const validEffective = (value = '') => {
     return !!(value && !isNaN(value as unknown as number));
     return !!(value && !isNaN(value as unknown as number));
   };
   };
-  const loading = ref(false);
   const handleOk = async () => {
   const handleOk = async () => {
     try {
     try {
       await validate();
       await validate();
@@ -179,7 +180,7 @@
         ...value,
         ...value,
         [SchemaFiled.KEYS]: value[SchemaFiled.KEYS].join(','),
         [SchemaFiled.KEYS]: value[SchemaFiled.KEYS].join(','),
       });
       });
-      const ifSingle = unref(getDesign).length === 1 && unref(getDesign)?.[0]?.lal;
+      const ifSingle = unref(getDesign)?.length === 1 && unref(getDesign)?.[0]?.lal;
 
 
       const track = ifSingle ? await getSingleDataSource(res) : await getMultipleDataSource(res);
       const track = ifSingle ? await getSingleDataSource(res) : await getMultipleDataSource(res);
       emit('ok', { track, value } as HistoryModalOkEmitParams);
       emit('ok', { track, value } as HistoryModalOkEmitParams);

@@ -78,7 +78,7 @@
     const bindMessage = data[deviceId];
     const bindMessage = data[deviceId];
     const [, values] = attribute && bindMessage?.[attribute][0];
     const [, values] = attribute && bindMessage?.[attribute][0];
 
 
-    const mapValues = values ? JSON.parse(values) : [];
+    const mapValues = values ? JSON.parse(values) : {};
     const lng = longitude && mapValues[longitude];
     const lng = longitude && mapValues[longitude];
     const lat = latitude && mapValues[latitude];
     const lat = latitude && mapValues[latitude];
 
 
@@ -89,9 +89,8 @@
 
 
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId) => {
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId) => {
     const { lal } = unref(getDesign)?.dataSource?.[0] || {};
     const { lal } = unref(getDesign)?.dataSource?.[0] || {};
-
-    // 属性选择结构体时
-    if (lal) {
+    // 属性选择结构体类型时
+    if (lal && unref(getDesign)?.dataSource?.length == 1) {
       getOneMap(message, deviceId);
       getOneMap(message, deviceId);
       return;
       return;
     }
     }
@@ -137,11 +136,3 @@
     <div v-show="!loading" ref="wrapRef" :id="wrapId" class="w-full h-full no-drag"> </div>
     <div v-show="!loading" ref="wrapRef" :id="wrapId" class="w-full h-full no-drag"> </div>
   </main>
   </main>
 </template>
 </template>
-
-<style lang="less" scoped>
-  // .map-spin-wrapper {
-  //   :deep(.ant-spin-container) {
-  //     @apply justify-center items-center p-2 w-full h-full;
-  //   }
-  // }
-</style>