Merge branch 'eta1.6.8' into debug

src/hooks/chart/useChartRender.ts

@@ -1565,6 +1565,10 @@ const setCrossVarietyChart = () => {
 
     //数据列
   let series:any[] = [];
+  const tagMap = { //标签对应文字
+    1: '最新',
+    3: 'Fix'
+  }
   DataList.forEach(item => {
     //数据列
     let series_item = {
@@ -1577,7 +1581,16 @@ const setCrossVarietyChart = () => {
       zIndex:1
     }
     item.CoordinatePointData.forEach(_ => {
-      series_item.data.push({x: _.X,y: _.Y,})
+      series_item.data.push({
+        x: _.X,
+        y: _.Y,
+        dataLabels: {
+          enabled: _.ShowTips===1,
+          allowOverlap: true,
+          align: 'left',
+          format: tagMap[_.DateType] || `-${_.DaysAgo}T`,
+        }
+      })
     })
     series.push(series_item);
   })