海外数据源无合约时的数据兼容

src/views/chartShow/index.vue

@@ -1274,12 +1274,16 @@ export default defineComponent({
               let obj_item = data.find((_:any) => _.Name === item.series.name);
               let index = commodityXData.findIndex(_ => _.Name === ctx.x);
 
-              str+=`<b>${ commodityEdbList.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>`
+              //合约显示
+              let haveContract = obj_item.XEdbInfoIdList[index];
+              if(haveContract) {
+                str+=`<b>${ commodityEdbList.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>`
+                }
               }
             })
           }else {
@@ -1288,17 +1292,20 @@ export default defineComponent({
               let obj_item = data.find((_: any) => _.NameEn === item.series.name);
               let index = commodityXData.findIndex(_ => _.NameEn === ctx.x);
 
-              str+=`<b>${ commodityEdbList.find(_ => _.EdbInfoId === obj_item.XEdbInfoIdList[index]).EdbNameEn }</b>`
+              let haveContract = obj_item.XEdbInfoIdList[index];
+              if(haveContract) {
+                str+=`<b>${ commodityEdbList.find(_ => _.EdbInfoId === obj_item.XEdbInfoIdList[index]).EdbNameEn }</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
       }
@@ -1315,7 +1322,7 @@ export default defineComponent({
     };
     /* 处理无效数据为null */
     const filterInvalidData = (item:{ Value: number[]; Name: string; Date: string; Color: string;NameEn: string,XEdbInfoIdList: number[],NoDataEdbList: number[] })=> {
-      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]);