rapid-spreadjs 1.0.74 → 1.0.76

package/dist/index.cjs.js

@@ -137,9 +137,10 @@ const SheetUtils = {
      * @param sheet 工作表实例
      * @param selectRanges 单元格范围集合，格式如：[{ row: 0, col: 0, rowCount: 2, colCount: 2 }]
      * @param isMulColOrder 是否按照多列的顺序排序单元格（true：按照第一列从上到下、第二列从上到下……的顺序获取单元格数据、false：按照第一行从左到右、第二行从左到右……的顺序获取单元格数据）
+     * @param isDoSelectRangesOrder 是否按照selectRanges范围中的所有单元格顺序进行获取并返回，默认为：false
      * @returns 返回数组集合，格式如：[{ row: 0, col: 0, rowCount: 1, colCount: 1 }]
      */
-    getAllCellObjsByRanges: (sheet, selectRanges, isMulColOrder = false) => {
+    getAllCellObjsByRanges: (sheet, selectRanges, isMulColOrder = false, isDoSelectRangesOrder = false) => {
         // 得到所有的单元格坐标对象集合，格式如：[{ row: 0, col: 0, rowCount: 1, colCount: 1 }]
         let allCellObjs = [];
         selectRanges.forEach((item, index) => {
@@ -173,7 +174,9 @@ const SheetUtils = {
             }
         });
         // 对所有单元格坐标对象集合进行排序
-        allCellObjs = rapidUtils.orderByJson(allCellObjs, !isMulColOrder ? ['row', 'col'] : ['col', 'row'], ['asc', 'asc']);
+        if (!isDoSelectRangesOrder) {
+            allCellObjs = rapidUtils.orderByJson(allCellObjs, !isMulColOrder ? ['row', 'col'] : ['col', 'row'], ['asc', 'asc']);
+        }
         return allCellObjs;
     },
     /**
@@ -8215,13 +8218,13 @@ const EChartsUtilsAll = {
         const gsS = EChartsUtilsComm.calcTrend(xData, yDataSource, xData[0]);
         //输出方程表达式
         if (chartExtJson != null) {
-            if (chartExtJson.jxhslSnShScfc != null && chartExtJson.jxhslSnShScfc != undefined) {
+            if (chartExtJson.yhmhlBzHgx != null && chartExtJson.yhmhlBzHgx != undefined) {
                 // console.log('输出公式：',`Y=${getRound(gsS.xl,0.0001)}X+${getRound(gsS.jj,0.0001)}`)
                 if (gsS.xl == '' || gsS.jj == '') {
-                    sheet.setValue(chartExtJson.jxhslSnShScfc.row, chartExtJson.jxhslSnShScfc.col, '/');
+                    sheet.setValue(chartExtJson.yhmhlBzHgx.row, chartExtJson.yhmhlBzHgx.col, '/');
                 }
                 else {
-                    sheet.setValue(chartExtJson.jxhslSnShScfc.row, chartExtJson.jxhslSnShScfc.col, `Y=${EChartsUtilsComm.getRound(gsS.xl, 0.0001)}X+${EChartsUtilsComm.getRound(gsS.jj, 0.0001)}`);
+                    sheet.setValue(chartExtJson.yhmhlBzHgx.row, chartExtJson.yhmhlBzHgx.col, `Y=${EChartsUtilsComm.getRound(gsS.xl, 0.0001)}X+${EChartsUtilsComm.getRound(gsS.jj, 0.0001)}`);
                 }
             }
         }