@univerjs/sheets-formula 0.1.17 → 0.2.0

package/lib/locale/zh-CN.json

@@ -1155,7 +1155,7 @@
         }
       },
       "DATEVALUE": {
-        "description": "将文本格式的日期转换为序列号",
+        "description": "将文本格式的日期转换为序列号。",
         "abstract": "将文本格式的日期转换为序列号",
         "links": [
           {
@@ -1164,13 +1164,9 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
-          },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "dateText": {
+            "name": "日期文本",
+            "detail": "表示 Excel 日期格式的日期的文本，或对包含表示 Excel 日期格式的日期的文本的单元格的引用。 例如，“1/30/2008”或“30-Jan-2008”是表示日期的引号内的文本字符串。\n使用 Microsoft Excel for Windows 中的默认日期系统， date_text 参数必须表示 1900 年 1 月 1 日至 9999 年 12 月 31 日的日期。 DATEVALUE 函数返回 #VALUE！ 如果 date_text 参数的值超出此范围，则为 error 值。\n如果省略参数 date_text 中的年份部分，则 DATEVALUE 函数会使用计算机内置时钟的当前年份。 参数 date_text 中的时间信息将被忽略。"
           }
         }
       },
@@ -1387,7 +1383,7 @@
         }
       },
       "NOW": {
-        "description": "返回当前日期和时间的序列号",
+        "description": "返回当前日期和时间的序列号。",
         "abstract": "返回当前日期和时间的序列号",
         "links": [
           {
@@ -1395,16 +1391,7 @@
             "url": "https://support.microsoft.com/zh-cn/office/now-%E5%87%BD%E6%95%B0-3337fd29-145a-4347-b2e6-20c904739c46"
           }
         ],
-        "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
-          },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
-          }
-        }
+        "functionParameter": {}
       },
       "SECOND": {
         "description": "将序列号转换为秒",
@@ -1427,7 +1414,7 @@
         }
       },
       "TIME": {
-        "description": "返回特定时间的序列号",
+        "description": "返回特定时间的序列号。",
         "abstract": "返回特定时间的序列号",
         "links": [
           {
@@ -1436,18 +1423,22 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "hour": {
+            "name": "小时",
+            "detail": "0（零）到 32767 之间的数字，代表小时。 任何大于 23 的值都会除以 24，余数将作为小时值。 例如，TIME(27,0,0) = TIME(3,0,0) = .125 或 3:00 AM。"
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "minute": {
+            "name": "分钟",
+            "detail": " 0 到 32767 之间的数字，代表分钟。 任何大于 59 的值将转换为小时和分钟。 例如，TIME(0,750,0) = TIME(12,30,0) = .520833 或 12:30 PM。"
+          },
+          "second": {
+            "name": "秒",
+            "detail": "0 到 32767 之间的数字，代表秒。 任何大于 59 的值将转换为小时、分钟和秒。 例如，TIME(0,0,2000) = TIME(0,33,22) = .023148 或 12:33:20 AM。"
           }
         }
       },
       "TIMEVALUE": {
-        "description": "将文本格式的时间转换为序列号",
+        "description": "将文本格式的时间转换为序列号。",
         "abstract": "将文本格式的时间转换为序列号",
         "links": [
           {
@@ -1456,13 +1447,9 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
-          },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "timeText": {
+            "name": "time_text",
+            "detail": "一个文本字符串，代表以任一 Microsoft Excel 时间格式表示的时间（例如，代表时间的具有引号的文本字符串 \"6:45 PM\" 和 \"18:45\"）。"
           }
         }
       },
@@ -1718,7 +1705,7 @@
         }
       },
       "ASIN": {
-        "description": "返回数字的反正弦值",
+        "description": "返回数字的反正弦值。",
         "abstract": "返回数字的反正弦值",
         "links": [
           {
@@ -1727,18 +1714,14 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
-          },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "number": {
+            "name": "数值",
+            "detail": " 所求角度的正弦值，必须介于 -1 到 1 之间。"
           }
         }
       },
       "ASINH": {
-        "description": "返回数字的反双曲正弦值",
+        "description": "返回数字的反双曲正弦值。",
         "abstract": "返回数字的反双曲正弦值",
         "links": [
           {
@@ -1747,18 +1730,14 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
-          },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "number": {
+            "name": "数值",
+            "detail": "任意实数。"
           }
         }
       },
       "ATAN": {
-        "description": "返回数字的反正切值",
+        "description": "返回数字的反正切值。",
         "abstract": "返回数字的反正切值",
         "links": [
           {
@@ -1767,18 +1746,14 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
-          },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "number": {
+            "name": "数值",
+            "detail": "所求角度的正切值。"
           }
         }
       },
       "ATAN2": {
-        "description": "返回 X 和 Y 坐标的反正切值",
+        "description": "返回 X 和 Y 坐标的反正切值。",
         "abstract": "返回 X 和 Y 坐标的反正切值",
         "links": [
           {
@@ -1787,18 +1762,18 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "xNum": {
+            "name": "x 坐标",
+            "detail": "点的 x 坐标。"
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "yNum": {
+            "name": "y 坐标",
+            "detail": "点的 y 坐标。"
           }
         }
       },
       "ATANH": {
-        "description": "返回数字的反双曲正切值",
+        "description": "返回数字的反双曲正切值。",
         "abstract": "返回数字的反双曲正切值",
         "links": [
           {
@@ -1807,13 +1782,9 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
-          },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "number": {
+            "name": "数值",
+            "detail": "-1 到 1 之间的任意实数。"
           }
         }
       },
@@ -1938,7 +1909,7 @@
         }
       },
       "COS": {
-        "description": "返回数字的余弦值",
+        "description": "返回数字的余弦值。",
         "abstract": "返回数字的余弦值",
         "links": [
           {
@@ -1947,13 +1918,9 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
-          },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "number": {
+            "name": "数值",
+            "detail": "想要求余弦的角度，以弧度表示。"
           }
         }
       },
@@ -3178,7 +3145,7 @@
         }
       },
       "TAN": {
-        "description": "返回数字的正切值",
+        "description": "返回数字的正切值。",
         "abstract": "返回数字的正切值",
         "links": [
           {
@@ -3187,18 +3154,14 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
-          },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "number": {
+            "name": "数值",
+            "detail": "要求正切的角度，以弧度表示。"
           }
         }
       },
       "TANH": {
-        "description": "返回数字的双曲正切值",
+        "description": "返回数字的双曲正切值。",
         "abstract": "返回数字的双曲正切值",
         "links": [
           {
@@ -3207,13 +3170,9 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
-          },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "number": {
+            "name": "数值",
+            "detail": "任意实数。"
           }
         }
       },
@@ -3238,7 +3197,7 @@
         }
       },
       "AVEDEV": {
-        "description": "返回数据点与它们的平均值的绝对偏差平均值",
+        "description": "返回数据点与它们的平均值的绝对偏差平均值。",
         "abstract": "返回数据点与它们的平均值的绝对偏差平均值",
         "links": [
           {
@@ -3248,12 +3207,12 @@
         ],
         "functionParameter": {
           "number1": {
-            "name": "number1",
-            "detail": "first"
+            "name": "数值 1",
+            "detail": "要计算平均值的第一个数字、单元格引用或单元格区域。"
           },
           "number2": {
-            "name": "number2",
-            "detail": "second"
+            "name": "数值 2",
+            "detail": "要计算平均值的其他数字、单元格引用或单元格区域，最多可包含 255 个。"
           }
         }
       },
@@ -3298,7 +3257,7 @@
         }
       },
       "AVERAGEIF": {
-        "description": "返回区域中满足给定条件的所有单元格的平均值（算术平均值）",
+        "description": "返回区域中满足给定条件的所有单元格的平均值（算术平均值）。",
         "abstract": "返回区域中满足给定条件的所有单元格的平均值（算术平均值）",
         "links": [
           {
@@ -3307,18 +3266,22 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "range": {
+            "name": "范围",
+            "detail": "要计算平均值的一个或多个单元格，其中包含数字或包含数字的名称、数组或引用。"
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "criteria": {
+            "name": "条件",
+            "detail": "形式为数字、表达式、单元格引用或文本的条件，用来定义将计算平均值的单元格。 例如，条件可以表示为 32、\"32\"、\">32\"、\"苹果\" 或 B4。"
+          },
+          "averageRange": {
+            "name": "平均范围",
+            "detail": "计算平均值的实际单元格组。 如果省略，则使用 range。"
           }
         }
       },
       "AVERAGEIFS": {
-        "description": "返回满足多个条件的所有单元格的平均值（算术平均值）",
+        "description": "返回满足多个条件的所有单元格的平均值（算术平均值）。",
         "abstract": "返回满足多个条件的所有单元格的平均值（算术平均值）",
         "links": [
           {
@@ -3327,13 +3290,25 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "averageRange": {
+            "name": "平均值范围",
+            "detail": "要计算平均值的一个或多个单元格，其中包含数字或包含数字的名称、数组或引用。"
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "criteriaRange1": {
+            "name": "条件范围 1",
+            "detail": "是一组用于条件计算的单元格。"
+          },
+          "criteria1": {
+            "name": "条件 1",
+            "detail": "用来定义将计算平均值的单元格。 例如，条件可以表示为 32、\"32\"、\">32\"、\"苹果\" 或 B4"
+          },
+          "criteriaRange2": {
+            "name": "条件范围 2",
+            "detail": "附加区域。 最多可以输入 127 个区域。"
+          },
+          "criteria2": {
+            "name": "条件 2",
+            "detail": "附加关联条件。 最多可以输入 127 个条件。"
           }
         }
       },
@@ -3638,7 +3613,7 @@
         }
       },
       "COUNTBLANK": {
-        "description": "计算区域内空白单元格的数量",
+        "description": "计算区域内空白单元格的数量。",
         "abstract": "计算区域内空白单元格的数量",
         "links": [
           {
@@ -3647,18 +3622,14 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
-          },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "range": {
+            "name": "范围",
+            "detail": "需要计算其中空白单元格个数的区域。"
           }
         }
       },
       "COUNTIF": {
-        "description": "计算区域内符合给定条件的单元格的数量",
+        "description": "计算区域内符合给定条件的单元格的数量。",
         "abstract": "计算区域内符合给定条件的单元格的数量",
         "links": [
           {
@@ -3667,18 +3638,18 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "range": {
+            "name": "范围",
+            "detail": "要进行计数的单元格组。 区域可以包括数字、数组、命名区域或包含数字的引用。 空白和文本值将被忽略。"
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "criteria": {
+            "name": "条件",
+            "detail": "用于决定要统计哪些单元格的数量的数字、表达式、单元格引用或文本字符串。\n例如，可以使用 32 之类数字，“>32”之类比较，B4 之类单元格，或“苹果”之类单词。\nCOUNTIF 仅使用一个条件。 如果要使用多个条件，请使用 COUNTIFS。"
           }
         }
       },
       "COUNTIFS": {
-        "description": "计算区域内符合多个条件的单元格的数量",
+        "description": "计算区域内符合多个条件的单元格的数量。",
         "abstract": "计算区域内符合多个条件的单元格的数量",
         "links": [
           {
@@ -3687,13 +3658,21 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "criteriaRange1": {
+            "name": "条件范围 1",
+            "detail": "在其中计算关联条件的第一个区域。"
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "criteria1": {
+            "name": "条件 1",
+            "detail": "条件的形式为数字、表达式、单元格引用或文本，它定义了要计数的单元格范围。 例如，条件可以表示为 32、\">32\"、B4、\"apples\"或 \"32\"。"
+          },
+          "criteriaRange2": {
+            "name": "条件范围 2",
+            "detail": "附加区域。 最多可以输入 127 个区域。"
+          },
+          "criteria2": {
+            "name": "条件 2",
+            "detail": "附加关联条件。 最多可以输入 127 个条件。"
           }
         }
       },
@@ -4418,7 +4397,7 @@
         }
       },
       "MAXA": {
-        "description": "返回参数列表中的最大值，包括数字、文本和逻辑值",
+        "description": "返回参数列表中的最大值，包括数字、文本和逻辑值。",
         "abstract": "返回参数列表中的最大值，包括数字、文本和逻辑值",
         "links": [
           {
@@ -4427,13 +4406,13 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "value1": {
+            "name": "值 1",
+            "detail": "要从中找出最大值的第一个数值参数。"
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "value2": {
+            "name": "值 2",
+            "detail": "要从中找出最大值的 2 到 255 个数值参数。"
           }
         }
       },
@@ -4453,19 +4432,19 @@
           },
           "criteriaRange1": {
             "name": "条件范围 1",
-            "detail": "条件1 一组用于条件计算的单元格。"
+            "detail": "是一组用于条件计算的单元格。"
           },
           "criteria1": {
             "name": "条件 1",
-            "detail": "条件 1 用于确定哪些单元格是最大值的条件，格式为数字、表达式或文本。"
+            "detail": "用于确定哪些单元格是最大值的条件，格式为数字、表达式或文本。 一组相同的条件适用于 MINIFS、SUMIFS 和 AVERAGEIFS 函数。"
           },
           "criteriaRange2": {
             "name": "条件范围 2",
-            "detail": "附加区域及其关联条件。 最多可以输入 127 个区域/条件对。"
+            "detail": "附加区域。 最多可以输入 127 个区域。"
           },
           "criteria2": {
             "name": "条件 2",
-            "detail": "附加区域及其关联条件。 最多可以输入 127 个区域/条件对。"
+            "detail": "附加关联条件。 最多可以输入 127 个条件。"
           }
         }
       },
@@ -4510,7 +4489,7 @@
         }
       },
       "MINA": {
-        "description": "返回参数列表中的最小值，包括数字、文本和逻辑值",
+        "description": "返回参数列表中的最小值，包括数字、文本和逻辑值。",
         "abstract": "返回参数列表中的最小值，包括数字、文本和逻辑值",
         "links": [
           {
@@ -4519,19 +4498,19 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "value1": {
+            "name": "值 1",
+            "detail": "要计算最小值的第一个数字、单元格引用或单元格区域。"
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "value2": {
+            "name": "值 2",
+            "detail": "要计算最小值的其他数字、单元格引用或单元格区域，最多可包含 255 个。"
           }
         }
       },
       "MINIFS": {
         "description": "返回一组给定条件或标准指定的单元格之间的最小值。",
-        "abstract": "返回一组给定条件或标准指定的单元格之间的最小值。",
+        "abstract": "返回一组给定条件或标准指定的单元格之间的最小值",
         "links": [
           {
             "title": "教学",
@@ -4539,13 +4518,25 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "minRange": {
+            "name": "最小值范围",
+            "detail": "确定最小值的实际单元格区域。"
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "criteriaRange1": {
+            "name": "条件范围 1",
+            "detail": "是一组用于条件计算的单元格。"
+          },
+          "criteria1": {
+            "name": "条件 1",
+            "detail": "用于确定哪些单元格是最小值的条件，格式为数字、表达式或文本。 一组相同的条件适用于 MAXIFS、SUMIFS 和 AVERAGEIFS 函数。"
+          },
+          "criteriaRange2": {
+            "name": "条件范围 2",
+            "detail": "附加区域。 最多可以输入 127 个区域。"
+          },
+          "criteria2": {
+            "name": "条件 2",
+            "detail": "附加关联条件。 最多可以输入 127 个条件。"
           }
         }
       },

package/lib/types/commands/operations/__tests__/create-command-test-bed.d.ts

@@ -4,12 +4,12 @@ import { Dependency } from '@wendellhu/redi';
 export declare function createCommandTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): {
     univer: Univer;
     get: {
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp | undefined): T;
-        <T_1>(id: import('@wendellhu/redi').DependencyIdentifier<T_1>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_1[];
-        <T_2>(id: import('@wendellhu/redi').DependencyIdentifier<T_2>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_2 | null;
-        <T_3>(id: import('@wendellhu/redi').DependencyIdentifier<T_3>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_3;
-        <T_4>(id: import('@wendellhu/redi').DependencyIdentifier<T_4>, quantity?: import('@wendellhu/redi').Quantity | undefined, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_4 | T_4[] | null;
-        <T_5>(id: import('@wendellhu/redi').DependencyIdentifier<T_5>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp | undefined, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_5 | T_5[] | null;
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp): T;
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp): T[];
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp): T | null;
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp): T;
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity?: import('@wendellhu/redi').Quantity, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
     };
     sheet: import('@univerjs/core').UnitModel<object, number>;
 };

package/lib/types/controllers/formula-editor-show.controller.d.ts

@@ -1,24 +1,20 @@
 import { Workbook, Disposable, ICommandService, ThemeService } from '@univerjs/core';
-import { FormulaDataModel, LexerTreeBuilder } from '@univerjs/engine-formula';
+import { FormulaDataModel } from '@univerjs/engine-formula';
 import { IRenderContext, IRenderModule, IRenderManagerService } from '@univerjs/engine-render';
-import { SheetInterceptorService } from '@univerjs/sheets';
 import { IEditorBridgeService, ISelectionRenderService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
 
 export declare class FormulaEditorShowController extends Disposable implements IRenderModule {
     private readonly _context;
     private _editorBridgeService;
     private readonly _formulaDataModel;
-    private readonly _lexerTreeBuilder;
     private readonly _themeService;
     private readonly _renderManagerService;
     private readonly _selectionRenderService;
     private readonly _sheetSkeletonManagerService;
     private readonly _commandService;
-    private _sheetInterceptorService;
     private _previousShape;
-    constructor(_context: IRenderContext<Workbook>, _editorBridgeService: IEditorBridgeService, _formulaDataModel: FormulaDataModel, _lexerTreeBuilder: LexerTreeBuilder, _themeService: ThemeService, _renderManagerService: IRenderManagerService, _selectionRenderService: ISelectionRenderService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService, _sheetInterceptorService: SheetInterceptorService);
+    constructor(_context: IRenderContext<Workbook>, _editorBridgeService: IEditorBridgeService, _formulaDataModel: FormulaDataModel, _themeService: ThemeService, _renderManagerService: IRenderManagerService, _selectionRenderService: ISelectionRenderService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService);
     private _initInterceptorEditorStart;
-    private _initInterceptorCell;
     private _commandExecutedListener;
     private _createArrayFormulaRangeShape;
     private _removeArrayFormulaRangeShape;