SingleRef

Author: m.r

src/data-model/excel-table.ts

@@ -279,26 +279,37 @@ export interface Checkbox {
   endStr?: string;
 }
 export type FormulaType = "AVERAGE" | "SUM" | "COUNT" | "MAX" | "MIN";
-export type RelativeFormulaType = "LEN";
+export type SingleRefFormulaType = "LEN"| "MODE"
+  | "POWER"
+  | "FLOOR"
+  | "CEILING"
+  | "ROUND"
+  | "SQRT"
+  | "COS"
+  | "SIN"
+  | "TAN"
+  | "COT";
 export interface FormatMap {
   [format: string]: {
     key: number;
     value?: string;
   };
 }
 export interface Formula {
-  [insertCell: string]: FormulaSetting;
+  [insertCell: string]:
+    | FormulaSetting
+    | SingleRefFormulaSetting
 }
-
 export interface FormulaSetting {
   type: FormulaType;
   start: string;
   end: string;
   styleId?: string;
 }
-export interface RelativeFormulaSetting {
-  type: RelativeFormulaType;
+export interface SingleRefFormulaSetting {
+  type: SingleRefFormulaType;
   refrenceCell: string;
+  value?: number | string;
   styleId?: string;
 }
 export interface StyleMapper {

src/utils/generate-excel.ts

@@ -1253,7 +1253,9 @@ export async function generateExcel(data: ExcelTable) {
         });
       }
       if (formulaSheetObj) {
-        const remindFormulaKey = Object.keys(formulaSheetObj);
+        const remindFormulaKey = Object.keys(formulaSheetObj).sort((a, b) =>
+          a > b ? 1 : -1
+        );
         if (remindFormulaKey.length) {
           let rF: {
             [row: number]: string;
@@ -1276,9 +1278,9 @@ export async function generateExcel(data: ExcelTable) {
             }
           });
           Object.keys(rF).forEach((v) => {
-            const l = rF[v as keyof object];
-            debugger
-            let rowDataMap = rowMap[v as keyof object];
+            const val = v as keyof object;
+            const l = rF[val];
+            let rowDataMap = rowMap[val];
             if (rowDataMap) {
               const body =
                 rowDataMap.startTag +
@@ -1297,6 +1299,11 @@ export async function generateExcel(data: ExcelTable) {
                 '"  >' +
                 l +
                 "</row>";
+              rowMap[val] = {
+                startTag: '<row r="' + v + '" spans="1:' + colsLength + '"  >',
+                endTag: "</row>",
+                details: l,
+              };
             }
           });
         }

src/utils/generate-formula-cell.ts

@@ -1,12 +1,12 @@
 import {
   FormulaSetting,
-  RelativeFormulaSetting,
+  SingleRefFormulaSetting,
   Styles,
 } from "../data-model/excel-table";
 
 export function generateCellRowCol(
   string: string,
-  formula: FormulaSetting | RelativeFormulaSetting,
+  formula: FormulaSetting | SingleRefFormulaSetting,
   sheetIndex: number,
   styles?: Styles
 ) {
@@ -15,19 +15,29 @@ export function generateCellRowCol(
   let row = parseInt(string.substr(column.length));
   let needCalcChain = false;
   let chainCell = "";
-  if ((<RelativeFormulaSetting>formula).refrenceCell) {
-    const form = <RelativeFormulaSetting>formula;
+  if ((<SingleRefFormulaSetting>formula).refrenceCell) {
+    const form = <SingleRefFormulaSetting>formula;
+    let value = "";
+    if (typeof form.value != "undefined") {
+      value = "," + form.value;
+    }
+    let className = "";
+    if (form.type == "COT") {
+      className = "_xlfn.";
+    }
     const styleString =
-      "styleId" in formula ? 's="' + styles![form.styleId!].index + '"' : "";
+      "styleId" in form ? 's="' + styles![form.styleId!].index + '"' : "";
     cell =
       '<c r="' +
       string +
       '" ' +
       styleString +
       "><f>" +
+      className +
       formula.type +
       "(" +
       form.refrenceCell +
+      value +
       ")</f></c>";
     chainCell = '<c r="' + string + '" i="' + sheetIndex + '"/>';
   } else {