fix(formula): formula props (#26)

dream-num · Dec 20, 2024 · 467c91b · 467c91b
1 parent 42f67cc
commit 467c91b
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 13 deletions.
diff --git a/packages/preset-sheets-core/src/types.ts b/packages/preset-sheets-core/src/types.ts
@@ -1,4 +1,6 @@
 import type { IUniverConfig, Plugin, PluginCtor } from '@univerjs/core';
+import type { IUniverEngineFormulaConfig } from '@univerjs/engine-formula';
+import type { IUniverSheetsFormulaBaseConfig } from '@univerjs/sheets-formula';
 
 /**
  * A collection of plugins and their default configs.
@@ -11,3 +13,12 @@ export interface IPreset {
 export interface IPresetOptions {
     lazy?: boolean;
 }
+
+export interface IUniverFormulaConfig extends
+    Pick<IUniverEngineFormulaConfig, 'function'>,
+    Pick<IUniverSheetsFormulaBaseConfig, 'description'> {
+}
+
+export interface IUniverFormulaWorkerConfig extends
+    Pick<IUniverEngineFormulaConfig, 'function'> {
+}
diff --git a/packages/preset-sheets-core/src/umd.ts b/packages/preset-sheets-core/src/umd.ts
@@ -1,7 +1,7 @@
 import type { IUniverRPCMainThreadConfig } from '@univerjs/rpc';
 import type { IUniverSheetsUIConfig } from '@univerjs/sheets-ui';
 import type { IUniverUIConfig } from '@univerjs/ui';
-import type { IPreset } from './types';
+import type { IPreset, IUniverFormulaConfig } from './types';
 import { UniverDocsPlugin } from '@univerjs/docs';
 import { UniverDocsUIPlugin } from '@univerjs/docs-ui';
 import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';
@@ -35,6 +35,14 @@ export interface IUniverSheetsCorePresetConfig extends
     Pick<IUniverUIConfig, 'container' | 'header' | 'footer' | 'toolbar' | 'menu' | 'contextMenu' | 'disableAutoFocus'>,
     Pick<IUniverSheetsUIConfig, 'formulaBar'> {
 
+    /**
+     * The formula configuration.
+     */
+    formula?: IUniverFormulaConfig;
+
+    /**
+     * The URL of the worker script.
+     */
     workerURL: IUniverRPCMainThreadConfig['workerURL'];
 }
 
@@ -51,6 +59,7 @@ export function UniverSheetsCorePreset(config: Partial<IUniverSheetsCorePresetCo
         menu,
         contextMenu,
         disableAutoFocus,
+        formula,
     } = config;
 
     const useWorker = !!workerSrc;
@@ -73,14 +82,14 @@ export function UniverSheetsCorePreset(config: Partial<IUniverSheetsCorePresetCo
             useWorker
                 ? [UniverRPCMainThreadPlugin, { workerURL: workerSrc }]
                 : null,
-            [UniverFormulaEnginePlugin, { notExecuteFormula: useWorker }],
+            [UniverFormulaEnginePlugin, { notExecuteFormula: useWorker, function: formula?.function }],
 
             [UniverSheetsPlugin, { notExecuteFormula: useWorker, onlyRegisterFormulaRelatedMutations: false }],
             UniverSheetsUIPlugin,
             UniverSheetsNumfmtPlugin,
             UniverSheetsNumfmtUIPlugin,
 
-            UniverSheetsFormulaPlugin,
+            [UniverSheetsFormulaPlugin, { notExecuteFormula: useWorker, description: formula?.description }],
             UniverSheetsFormulaUIPlugin,
         ].filter(v => !!v) as IPreset['plugins'],
     };

diff --git a/packages/preset-sheets-core/src/worker.ts b/packages/preset-sheets-core/src/worker.ts
@@ -1,14 +1,24 @@
-import type { IPreset } from './types';
+import type { IPreset, IUniverFormulaWorkerConfig } from './types';
 import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';
 import { UniverRPCWorkerThreadPlugin } from '@univerjs/rpc';
 import { UniverSheetsPlugin } from '@univerjs/sheets';
 import { UniverRemoteSheetsFormulaPlugin } from '@univerjs/sheets-formula';
 
-export function UniverSheetsCoreWorkerPreset(): IPreset {
+export interface IUniverSheetsCoreWorkerPresetConfig {
+    /**
+     * The formula worker config.
+     */
+    formula?: IUniverFormulaWorkerConfig;
+}
+
+export function UniverSheetsCoreWorkerPreset(config: Partial<IUniverSheetsCoreWorkerPresetConfig> = {}): IPreset {
+    const {
+        formula,
+    } = config;
     return {
         plugins: [
             [UniverSheetsPlugin, { onlyRegisterFormulaRelatedMutations: true }],
-            UniverFormulaEnginePlugin,
+            [UniverFormulaEnginePlugin, { function: formula?.function }],
             UniverRPCWorkerThreadPlugin,
             UniverRemoteSheetsFormulaPlugin,
         ],

diff --git a/packages/preset-sheets-node-core/src/types.ts b/packages/preset-sheets-node-core/src/types.ts
@@ -1,4 +1,6 @@
 import type { IUniverConfig, Plugin, PluginCtor } from '@univerjs/core';
+import type { IUniverEngineFormulaConfig } from '@univerjs/engine-formula';
+import type { IUniverSheetsFormulaBaseConfig } from '@univerjs/sheets-formula';
 
 /**
  * A collection of plugins and their default configs.
@@ -11,3 +13,12 @@ export interface IPreset {
 export interface IPresetOptions {
     lazy?: boolean;
 }
+
+export interface IUniverFormulaConfig extends
+    Pick<IUniverEngineFormulaConfig, 'function'>,
+    Pick<IUniverSheetsFormulaBaseConfig, 'description'> {
+}
+
+export interface IUniverFormulaWorkerConfig extends
+    Pick<IUniverEngineFormulaConfig, 'function'> {
+}
diff --git a/packages/preset-sheets-node-core/src/umd.ts b/packages/preset-sheets-node-core/src/umd.ts
@@ -1,4 +1,4 @@
-import type { IPreset } from './types';
+import type { IPreset, IUniverFormulaConfig } from './types';
 import { UniverDocsPlugin } from '@univerjs/docs';
 import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';
 import { UniverRPCNodeMainPlugin } from '@univerjs/rpc-node';
@@ -19,11 +19,19 @@ import '@univerjs/engine-formula/facade';
 import '@univerjs/sheets-filter/facade';
 
 export interface IUniverSheetsNodeCorePresetConfig {
+    /**
+     * The formula configuration.
+     */
+    formula?: IUniverFormulaConfig;
+
+    /**
+     * The URL of the worker script.
+     */
     workerSrc?: string;
 }
 
 export function UniverSheetsNodeCorePreset(config: Partial<IUniverSheetsNodeCorePresetConfig>): IPreset {
-    const { workerSrc } = config;
+    const { workerSrc, formula } = config;
 
     const useWorker = !!workerSrc;
 
@@ -32,13 +40,13 @@ export function UniverSheetsNodeCorePreset(config: Partial<IUniverSheetsNodeCore
             useWorker
                 ? [UniverRPCNodeMainPlugin, { workerSrc }]
                 : null,
-            [UniverFormulaEnginePlugin, { notExecuteFormula: useWorker }],
+            [UniverFormulaEnginePlugin, { notExecuteFormula: useWorker, function: formula?.function }],
 
             UniverThreadCommentPlugin,
             UniverDocsPlugin,
 
             UniverSheetsPlugin,
-            [UniverSheetsFormulaPlugin, { notExecuteFormula: useWorker }],
+            [UniverSheetsFormulaPlugin, { notExecuteFormula: useWorker, description: formula?.description }],
             UniverSheetsDataValidationPlugin,
             UniverSheetsFilterPlugin,
             UniverSheetsHyperLinkPlugin,

diff --git a/packages/preset-sheets-node-core/src/worker.ts b/packages/preset-sheets-node-core/src/worker.ts
@@ -1,4 +1,4 @@
-import type { IPreset } from './types';
+import type { IPreset, IUniverFormulaWorkerConfig } from './types';
 import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';
 import { UniverRPCNodeWorkerPlugin } from '@univerjs/rpc-node';
 import { UniverSheetsPlugin } from '@univerjs/sheets';
@@ -9,11 +9,22 @@ export * from '@univerjs/rpc-node';
 export * from '@univerjs/sheets';
 export * from '@univerjs/sheets-formula';
 
-export function UniverSheetsNodeCoreWorkerPreset(): IPreset {
+export interface IUniverSheetsNodeCoreWorkerPresetConfig {
+    /**
+     * The formula worker config.
+     */
+    formula?: IUniverFormulaWorkerConfig;
+}
+
+export function UniverSheetsNodeCoreWorkerPreset(config: Partial<IUniverSheetsNodeCoreWorkerPresetConfig> = {}): IPreset {
+    const {
+        formula,
+    } = config;
+
     return {
         plugins: [
             [UniverSheetsPlugin, { onlyRegisterFormulaRelatedMutations: true }],
-            UniverFormulaEnginePlugin,
+            [UniverFormulaEnginePlugin, { function: formula?.function }],
             UniverRPCNodeWorkerPlugin,
             UniverRemoteSheetsFormulaPlugin,
         ],