rapid-spreadjs 1.0.102 → 1.0.104

package/dist/index.cjs.js

@@ -4093,6 +4093,40 @@ const EChartsUtilsAll = {
         xDataSource2 = isTwoLine ? xDataArr[1] : [], // [1.5, 2.4, 3.6, 4.3, 5.4],
         yDataSource1 = yDataArr[0], // [2.25, 2.29, 2.34, 2.29, 2.23],
         yDataSource2 = isTwoLine ? yDataArr[1] : []; // [2.27, 2.32, 2.36, 2.33, 2.26];
+        let xDataLs1 = [], yDataLs1 = [];
+        xDataSource1.forEach((x, index) => {
+            if (x != '/' &&
+                x != 0 &&
+                x != null &&
+                x != undefined &&
+                yDataSource1[index] != '/' &&
+                yDataSource1[index] != 0 &&
+                yDataSource1[index] != null &&
+                yDataSource1[index] != undefined) {
+                xDataLs1.push(x);
+                yDataLs1.push(yDataSource1[index]);
+            }
+        });
+        xDataSource1 = xDataLs1;
+        yDataSource1 = yDataLs1;
+        if (isTwoLine) {
+            let xDataLs2 = [], yDataLs2 = [];
+            xDataSource2.forEach((x, index) => {
+                if (x != '/' &&
+                    x != 0 &&
+                    x != null &&
+                    x != undefined &&
+                    yDataSource2[index] != '/' &&
+                    yDataSource2[index] != 0 &&
+                    yDataSource2[index] != null &&
+                    yDataSource2[index] != undefined) {
+                    xDataLs2.push(x);
+                    yDataLs2.push(yDataSource2[index]);
+                }
+            });
+            xDataSource2 = xDataLs2;
+            yDataSource2 = yDataLs2;
+        }
         let title = config.chartTitle, xName = config.chartXName, yName = config.chartYName, legendName = '图例1';
         const lineFunc = (xDataSource, yDataSource, isShowMarkPoint, isShowMarkLine, isTwoLineData) => {
             //原始数据
@@ -8634,13 +8668,13 @@ const EChartsUtilsAll = {
         return option;
     },
     /**
-     * 最大剪应力与法向应力关系曲线
+     * 土工合成材料（拉拔摩擦特性）
      * @param config 折线配置
      * @param xDataArr x轴原始数据（二维数组）
      * @param yDataArr y轴原始数据（二维数组）
      * @returns 返回ECharts配置项
      */
-    chart450: (config, xDataArr, yDataArr, sheet) => {
+    chart450: (config, xDataArr, yDataArr) => {
         let lineData = JSON.parse(config.chartLinesJson);
         // const chartExtJson = config.chartExtJson == null || config.chartExtJson == undefined ? null : JSON.parse(config.chartExtJson);
         let title = config.chartTitle, xName = config.chartXName, yName = config.chartYName, color = lineData[0].lineColor;
@@ -9067,6 +9101,9 @@ const EChartsUtils = {
         else if (config.chartType == 430) {
             option = EChartsUtilsAll.chart430(config, xDataArr, yDataArr, sheet);
         }
+        else if (config.chartType == 450) {
+            option = EChartsUtilsAll.chart450(config, xDataArr, yDataArr);
+        }
         if (option && typeof option === 'object') {
             //如果是隐藏的图表，则需要禁用ECharts的动画效果
             //原因是：如果ECharts使用了动画效果，图表渲染完成可能需要0.5秒，但是在导出ECharts统计图为图片的场景下时，可能在图表还没有渲染完成（动画效果还没结束）前就要获取图像了，此时可能就会造成获取到的图像内容丢失的情况