海外期货无合约时的数据处理

src/views/hzyb/chart/Detail.vue

@@ -650,15 +650,21 @@ const setCommodityChart = () => {
               let obj_item = data.find(_ => _.Name === item.series.name);
               let index = commodityXData.value.findIndex(_ => _.Name === ctx.x);
 
-              str+=`<b>${ commodityEdbList.value.find(_ => _.EdbInfoId === obj_item.XEdbInfoIdList[index]).EdbName }</b>`
+                //合约显示
+                let haveContract = obj_item.XEdbInfoIdList[index];
+                
+                if(haveContract) {
+                    str+=`<b>${ commodityEdbList.value.find(_ => _.EdbInfoId === obj_item.XEdbInfoIdList[index]).EdbName }</b>`
+
+                    if(!obj_item.NoDataEdbList.includes(obj_item.XEdbInfoIdList[index])) {
+                        str += `<br><span style="color:${item.color}">\u25CF</span>${obj_item.Date}: ${item.y}<br>`
+                    }else {
+                        str += `<br><span style="color:${item.color}">\u25CF</span>${obj_item.Date}: 无<br>`
+                    }
+                }
 
-              if(!obj_item.NoDataEdbList.includes(obj_item.XEdbInfoIdList[index])) {
-                str += `<br><span style="color:${item.color}">\u25CF</span>${obj_item.Date}: ${item.y}<br>`
-              }else {
-                str += `<br><span style="color:${item.color}">\u25CF</span>${obj_item.Date}: 无<br>`
-              }
             })
-            return str
+            return str||'无合约'
         },
         shared: true
     }
@@ -675,7 +681,7 @@ const setCommodityChart = () => {
 };
 /* 处理无效数据为null */
 const filterInvalidData = (item)=> {
-    let validateArr = item.XEdbInfoIdList.filter(_ =>!item.NoDataEdbList.includes(_));
+    let validateArr = item.XEdbInfoIdList.filter(_ =>_&&!item.NoDataEdbList.includes(_));
 
     let first_index = item.XEdbInfoIdList.findIndex(_ => _ === validateArr[0]);
     let last_index = item.XEdbInfoIdList.findIndex(_ => _ === validateArr[validateArr.length-1]);