rapid-spreadjs 1.0.99 → 1.0.101

package/dist/index.cjs.js

@@ -145,7 +145,8 @@ const SheetUtils = {
         let allCellObjs = [];
         selectRanges.forEach((item, index) => {
             // 得到当前item中所有合并的单元格对象集合
-            const itemSpanCells = sheet.getSpans(item);
+            let itemSpanCells = sheet.getSpans(item);
+            itemSpanCells = rapidUtils.orderByJson(itemSpanCells, !isMulColOrder ? ['row', 'col'] : ['col', 'row'], ['asc', 'asc']);
             itemSpanCells.forEach((itemSpanCell) => {
                 allCellObjs.push({
                     row: itemSpanCell.row,
@@ -4499,7 +4500,7 @@ const EChartsUtilsAll = {
                     max: !yValIsAllNull ? yAxisMax : 0,
                     min: !yValIsAllNull ? yAxisMin : 0,
                     name: yName,
-                    nameGap: !yValIsAllNull ? 40 : 5,
+                    nameGap: !yValIsAllNull ? 40 : 25,
                     nameRotate: 90,
                     nameLocation: 'middle',
                     splitLine: {
@@ -4660,6 +4661,11 @@ const EChartsUtilsAll = {
             yDataSourceXxOld.some((item) => item != null && item != undefined && item != '/')) {
             yValIsAllNull = false;
         }
+        if (xData.filter((x) => x[1] == 0).length == xData.length &&
+            xDataSx.filter((x) => x[1] == 0).length == xDataSx.length &&
+            xDataXx.filter((x) => x[1] == 0).length == xDataXx.length) {
+            yValIsAllNull = true;
+        }
         let option = {
             grid: {
                 // show: true,// 是否显示外边框线
@@ -4732,7 +4738,7 @@ const EChartsUtilsAll = {
                 {
                     type: 'value',
                     name: yName,
-                    nameGap: !yValIsAllNull ? 30 : 5,
+                    nameGap: !yValIsAllNull ? 30 : 30,
                     nameRotate: 90,
                     nameLocation: 'middle',
                     splitLine: {
@@ -4742,6 +4748,7 @@ const EChartsUtilsAll = {
                             type: 'solid',
                         },
                     },
+                    max: 100,
                     splitNumber: 10, // 设置y轴分隔的段数，如0~100之间默认情况可能会按照0、20、40、60……的间隔显示，设置相应的数字后就会根据实际情况显示的更细，如0、10、20、30……
                     axisLabel: {
                         fontSize: xyFontSize,