Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

chore(conditional-formatting): configure package bundling setup (#1721)

白熱dbb918dc9f06
diff --git a/README-ja.md b/README-ja.md
index e033cd3992..cc1eb986d5 100644
--- a/README-ja.md
+++ b/README-ja.md
@@ -98,6 +98,7 @@ Univer を npm パッケージとしてインポートすることをお勧め
| [network](./packages/network) | WebSocket と HTTP をベースにしたネットワークサービスを実装します。 | [![npm version](https://img.shields.io/npm/v/@univerjs/network)](https://npmjs.org/package/@univerjs/network) |
| [rpc](./packages/rpc) | Univer 文書の異なるレプリカ間でデータを同期するための RPC メカニズムとメソッドを実装します。 | [![npm version](https://img.shields.io/npm/v/@univerjs/rpc)](https://npmjs.org/package/@univerjs/rpc) |
| [sheets](./packages/sheets) | スプレッドシート機能の基本ロジック。 | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets)](https://npmjs.org/package/@univerjs/sheets) |
+| [sheets-conditional-formatting](./packages/sheets-conditional-formatting) | スプレッドシートの条件付き書式設定機能を実装します。 | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-conditional-formatting)](https://npmjs.org/package/@univerjs/sheets-conditional-formatting) |
| [sheets-find-replace](./packages/sheets-find-replace) | スプレッドシートの検索と置換機能を実装しています。 | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-find-replace)](https://npmjs.org/package/@univerjs/sheets-find-replace) |
| [sheets-formula](./packages/sheets-formula) | スプレッドシートに数式を実装します。 | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-formula)](https://npmjs.org/package/@univerjs/sheets-formula) |
| [sheets-numfmt](./packages/sheets-numfmt) | スプレッドシートの数値フォーマットを実装します。 | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-numfmt)](https://npmjs.org/package/@univerjs/sheets-numfmt) |
@@ -154,4 +155,4 @@ Univer は Apache-2.0 ライセンスの下で配布されています。
---
-Copyright DreamNum Inc. 2023-現在
+Copyright © 2019-2024 Shanghai DreamNum Technology Co., Ltd. All rights reserved
diff --git a/README-zh.md b/README-zh.md
index d78aa639f8..a38c3565a9 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -100,6 +100,7 @@ Univer 基于插件化架构设计,你可以安装以下包来增强 Univer
| [network](./packages/network) | 实现了 Univer 的网络服务,包括 WebSocket 和 HTTP。 | [![npm version](https://img.shields.io/npm/v/@univerjs/network)](https://npmjs.org/package/@univerjs/network) |
| [rpc](./packages/rpc) | 实现 RPC 机制,以及在主从文档副本之间同步数据的方法,方便 web worker 等跨线程场景的开发 | [![npm version](https://img.shields.io/npm/v/@univerjs/rpc)](https://npmjs.org/package/@univerjs/rpc) |
| [sheets](./packages/sheets) | 实现电子表格的基本业务 | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets)](https://npmjs.org/package/@univerjs/sheets) |
+| [sheets-conditional-formatting](./packages/sheets-conditional-formatting) | 实现电子表格的条件格式功能 | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-conditional-formatting)](https://npmjs.org/package/@univerjs/sheets-sheets-conditional-formatting) |
| [sheets-find-replace](./packages/sheets-find-replace) | 实现电子表格的查找替换 | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-find-replace)](https://npmjs.org/package/@univerjs/sheets-find-replace) |
| [sheets-formula](./packages/sheets-formula) | 实现电子表格的公式编辑 | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-formula)](https://npmjs.org/package/@univerjs/sheets-formula) |
| [sheets-numfmt](./packages/sheets-numfmt) | 实现电子表格中的数字格式编辑 | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-numfmt)](https://npmjs.org/package/@univerjs/sheets-numfmt) |
@@ -160,4 +161,4 @@ Univer 基于 Apache-2.0 协议分发。
---
-上海梦数科技有限公司 2023 版权所有
+Copyright © 2019-2024 Shanghai DreamNum Technology Co., Ltd. All rights reserved
diff --git a/README.md b/README.md
index d1c7c50645..40f3dde51f 100644
--- a/README.md
+++ b/README.md
@@ -84,27 +84,28 @@ Univer bases on a plugin architecture. You can install the following packages to
### Packages
-| Name | Description | Version |
-| :----------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------ |
-| [core](./packages/core) | Implements plugin system and architecture of Univer. It also provides basic services and models of different types of documents. | [![npm version](https://img.shields.io/npm/v/@univerjs/core)](https://npmjs.org/package/@univerjs/core) |
-| [design](./packages/design) | Implements the design system on Univer. It provides CSS and a component kit based on React. | [![npm version](https://img.shields.io/npm/v/@univerjs/design)](https://npmjs.org/package/@univerjs/design) |
-| [docs](./packages/docs) | Implements basic logics of rich text editing features. It also facilitates text editing in other types of documents. | [![npm version](https://img.shields.io/npm/v/@univerjs/docs)](https://npmjs.org/package/@univerjs/docs) |
-| [docs-ui](./packages/docs-ui) | Provides user interface of Univer Documents | [![npm version](https://img.shields.io/npm/v/@univerjs/docs-ui)](https://npmjs.org/package/@univerjs/docs-ui) |
-| [engine-formula](./packages/engine-formula) | It implements a rendering engine based on Canvas and is extensible for | [![npm version](https://img.shields.io/npm/v/@univerjs/engine-formula)](https://npmjs.org/package/@univerjs/engine-formula) |
-| [engine-numfmt](./packages/engine-numfmt) | It implements a number format engine. | [![npm version](https://img.shields.io/npm/v/@univerjs/engine-numfmt)](https://npmjs.org/package/@univerjs/engine-numfmt) |
-| [engine-render](./packages/engine-render) | It implements a rendering engine based on canvas context2d. | [![npm version](https://img.shields.io/npm/v/@univerjs/engine-render)](https://npmjs.org/package/@univerjs/engine-render) |
-| [facade](./packages/facade) | It serves as an API layer to make it easier to use Univer | [![npm version](https://img.shields.io/npm/v/@univerjs/facade)](https://npmjs.org/package/@univerjs/facade) |
-| [find-replace](./packages/find-replace) | It implements find and replace features in Univer. | [![npm version](https://img.shields.io/npm/v/@univerjs/find-replace)](https://npmjs.org/package/@univerjs/find-replace) |
-| [network](./packages/network) | It implements network services based on WebSocket and HTTP. | [![npm version](https://img.shields.io/npm/v/@univerjs/network)](https://npmjs.org/package/@univerjs/network) |
-| [rpc](./packages/rpc) | It implements a RPC mechanism and methods to sync data between different replicas of Univer documents. | [![npm version](https://img.shields.io/npm/v/@univerjs/rpc)](https://npmjs.org/package/@univerjs/rpc) |
-| [sheets](./packages/sheets) | Basic logics of spreadsheet features. | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets)](https://npmjs.org/package/@univerjs/sheets) |
-| [sheets-find-replace](./packages/sheets-find-replace) | It implements find and replace features in Univer Spreadsheets. | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-find-replace)](https://npmjs.org/package/@univerjs/sheets-find-replace) |
-| [sheets-formula](./packages/sheets-formula) | It implements formula in spreadsheets. | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-formula)](https://npmjs.org/package/@univerjs/sheets-formula) |
-| [sheets-numfmt](./packages/sheets-numfmt) | It implements number format in spreadsheets. | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-numfmt)](https://npmjs.org/package/@univerjs/sheets-numfmt) |
-| [sheets-zen-editor](./packages/sheets-zen-editor) | It implements Zen editing mode in spreadsheets. | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-zen-editor)](https://npmjs.org/package/@univerjs/sheets-zen-editor) |
-| [sheets-ui](./packages/sheets-ui) | Provides user interface of Univer Spreadsheets | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-ui)](https://npmjs.org/package/@univerjs/sheets-ui) |
-| [ui](./packages/ui) | Implements basic user interactions with Univer and workbench layout based on React. | [![npm version](https://img.shields.io/npm/v/@univerjs/ui)](https://npmjs.org/package/@univerjs/ui) |
-| [uniscript](./packages/uniscript) (experimental) | Implements a DSL based on Typescript that empowers users to accomplish more sophisticated tasks | [![npm version](https://img.shields.io/npm/v/@univerjs/uniscript)](https://npmjs.org/package/@univerjs/uniscript) |
+| Name | Description | Version |
+| :-------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| [core](./packages/core) | Implements plugin system and architecture of Univer. It also provides basic services and models of different types of documents. | [![npm version](https://img.shields.io/npm/v/@univerjs/core)](https://npmjs.org/package/@univerjs/core) |
+| [design](./packages/design) | Implements the design system on Univer. It provides CSS and a component kit based on React. | [![npm version](https://img.shields.io/npm/v/@univerjs/design)](https://npmjs.org/package/@univerjs/design) |
+| [docs](./packages/docs) | Implements basic logics of rich text editing features. It also facilitates text editing in other types of documents. | [![npm version](https://img.shields.io/npm/v/@univerjs/docs)](https://npmjs.org/package/@univerjs/docs) |
+| [docs-ui](./packages/docs-ui) | Provides user interface of Univer Documents | [![npm version](https://img.shields.io/npm/v/@univerjs/docs-ui)](https://npmjs.org/package/@univerjs/docs-ui) |
+| [engine-formula](./packages/engine-formula) | It implements a rendering engine based on Canvas and is extensible for | [![npm version](https://img.shields.io/npm/v/@univerjs/engine-formula)](https://npmjs.org/package/@univerjs/engine-formula) |
+| [engine-numfmt](./packages/engine-numfmt) | It implements a number format engine. | [![npm version](https://img.shields.io/npm/v/@univerjs/engine-numfmt)](https://npmjs.org/package/@univerjs/engine-numfmt) |
+| [engine-render](./packages/engine-render) | It implements a rendering engine based on canvas context2d. | [![npm version](https://img.shields.io/npm/v/@univerjs/engine-render)](https://npmjs.org/package/@univerjs/engine-render) |
+| [facade](./packages/facade) | It serves as an API layer to make it easier to use Univer | [![npm version](https://img.shields.io/npm/v/@univerjs/facade)](https://npmjs.org/package/@univerjs/facade) |
+| [find-replace](./packages/find-replace) | It implements find and replace features in Univer. | [![npm version](https://img.shields.io/npm/v/@univerjs/find-replace)](https://npmjs.org/package/@univerjs/find-replace) |
+| [network](./packages/network) | It implements network services based on WebSocket and HTTP. | [![npm version](https://img.shields.io/npm/v/@univerjs/network)](https://npmjs.org/package/@univerjs/network) |
+| [rpc](./packages/rpc) | It implements a RPC mechanism and methods to sync data between different replicas of Univer documents. | [![npm version](https://img.shields.io/npm/v/@univerjs/rpc)](https://npmjs.org/package/@univerjs/rpc) |
+| [sheets](./packages/sheets) | Basic logics of spreadsheet features. | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets)](https://npmjs.org/package/@univerjs/sheets) |
+| [sheets-conditional-formatting](./packages/sheets-conditional-formatting) | It implements conditional formatting in Univer Spreadsheets. | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-conditional-formatting)](https://npmjs.org/package/@univerjs/sheets-conditional-formatting) |
+| [sheets-find-replace](./packages/sheets-find-replace) | It implements find and replace features in Univer Spreadsheets. | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-find-replace)](https://npmjs.org/package/@univerjs/sheets-find-replace) |
+| [sheets-formula](./packages/sheets-formula) | It implements formula in spreadsheets. | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-formula)](https://npmjs.org/package/@univerjs/sheets-formula) |
+| [sheets-numfmt](./packages/sheets-numfmt) | It implements number format in spreadsheets. | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-numfmt)](https://npmjs.org/package/@univerjs/sheets-numfmt) |
+| [sheets-zen-editor](./packages/sheets-zen-editor) | It implements Zen editing mode in spreadsheets. | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-zen-editor)](https://npmjs.org/package/@univerjs/sheets-zen-editor) |
+| [sheets-ui](./packages/sheets-ui) | Provides user interface of Univer Spreadsheets | [![npm version](https://img.shields.io/npm/v/@univerjs/sheets-ui)](https://npmjs.org/package/@univerjs/sheets-ui) |
+| [ui](./packages/ui) | Implements basic user interactions with Univer and workbench layout based on React. | [![npm version](https://img.shields.io/npm/v/@univerjs/ui)](https://npmjs.org/package/@univerjs/ui) |
+| [uniscript](./packages/uniscript) (experimental) | Implements a DSL based on Typescript that empowers users to accomplish more sophisticated tasks | [![npm version](https://img.shields.io/npm/v/@univerjs/uniscript)](https://npmjs.org/package/@univerjs/uniscript) |
## Contribution
@@ -154,4 +155,4 @@ Univer is distributed under the terms of the Apache-2.0 license.
---
-Copyright DreamNum Inc. 2023-present
+Copyright © 2019-2024 Shanghai DreamNum Technology Co., Ltd. All rights reserved
diff --git a/common/shared/package.json b/common/shared/package.json
index a52248f43b..f9a276ec15 100644
--- a/common/shared/package.json
+++ b/common/shared/package.json
@@ -22,7 +22,7 @@
"@vitest/coverage-istanbul": "^1.4.0",
"happy-dom": "^13.3.8",
"vite": "^5.2.6",
- "vite-plugin-dts": "^3.7.3",
+ "vite-plugin-dts": "^3.8.1",
"vitest": "^1.4.0"
}
}
diff --git a/docs/architecture.md b/docs/architecture.md
index d9a3b800a8..d2c65307b2 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -18,7 +18,7 @@ Some of these design requirements come from the product planning of Univer, and
### Plugin
-Univer's modules should be considered from the perspective of **business type (Sheet / Doc / Slide), concern (configuration management / UI / shortcut keys / canvas rendering), function (Sheet basic operation / Sheet conditional format / Sheet filter, operating environment (desktop / mobile / Node.js, etc.)** and other factors, divided into various plugins (plugin), combined into a Univer application.
+Univer's modules should be considered from the perspective of **business type (Sheet / Doc / Slide), concern (configuration management / UI / shortcut keys / canvas rendering), function (Sheet basic operation / Sheet conditional formatting / Sheet filter, operating environment (desktop / mobile / Node.js, etc.)** and other factors, divided into various plugins (plugin), combined into a Univer application.
For example, you could create a standard Spreadsheet application like this:
diff --git a/examples/package.json b/examples/package.json
index b832346ae7..134ea9585a 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -21,7 +21,7 @@
"@univerjs/icons": "^0.1.42",
"@univerjs/rpc": "workspace:*",
"@univerjs/sheets": "workspace:*",
- "@univerjs/sheets-conditional-format": "workspace:*",
+ "@univerjs/sheets-conditional-formatting": "workspace:*",
"@univerjs/sheets-find-replace": "workspace:*",
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-numfmt": "workspace:*",
diff --git a/examples/src/sheets/main.ts b/examples/src/sheets/main.ts
index 41816009dd..c0022d15ca 100644
--- a/examples/src/sheets/main.ts
+++ b/examples/src/sheets/main.ts
@@ -30,7 +30,7 @@ import { UniverSheetsNumfmtPlugin } from '@univerjs/sheets-numfmt';
import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui';
import { UniverSheetsZenEditorPlugin } from '@univerjs/sheets-zen-editor';
import { UniverUIPlugin } from '@univerjs/ui';
-import { SheetsConditionalFormatPlugin } from '@univerjs/sheets-conditional-format';
+import { SheetsConditionalFormattingPlugin } from '@univerjs/sheets-conditional-formatting';
import { DebuggerPlugin } from '../plugins/debugger';
import { DEFAULT_WORKBOOK_DATA_DEMO } from '../data/sheets/demo/default-workbook-data-demo';
import { locales } from './locales';
@@ -82,8 +82,8 @@ univer.registerPlugin(UniverSheetsFindReplacePlugin);
// create univer sheet instance
univer.createUniverSheet(DEFAULT_WORKBOOK_DATA_DEMO);
-// sheet condition format
-univer.registerPlugin(SheetsConditionalFormatPlugin);
+// sheet condition formatting
+univer.registerPlugin(SheetsConditionalFormattingPlugin);
declare global {
interface Window {
diff --git a/packages/core/package.json b/packages/core/package.json
index ecee1f64f4..27f5b30c61 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -78,7 +78,7 @@
"@wendellhu/redi": "^0.13.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/core/src/types/enum/interpolation-point-type.ts b/packages/core/src/types/enum/interpolation-point-type.ts
index e2807f3fa6..cd3a3e912a 100644
--- a/packages/core/src/types/enum/interpolation-point-type.ts
+++ b/packages/core/src/types/enum/interpolation-point-type.ts
@@ -16,9 +16,9 @@
export enum InterpolationPointType {
INTERPOLATION_POINT_TYPE_UNSPECIFIED, // The default value, do not use.
- MIN, // The interpolation point uses the minimum value in the cells over the range of the conditional format.
- MAX, // The interpolation point uses the maximum value in the cells over the range of the conditional format.
+ MIN, // The interpolation point uses the minimum value in the cells over the range of the conditional formatting.
+ MAX, // The interpolation point uses the maximum value in the cells over the range of the conditional formatting.
NUMBER, // The interpolation point uses exactly the value in InterpolationPoint.value
- PERCENT, // The interpolation point is the given percentage over all the cells in the range of the conditional format. This is equivalent to NUMBER if the value was: =(MAX(FLATTEN(range)) * (value / 100)) + (MIN(FLATTEN(range)) * (1 - (value / 100))) (where errors in the range are ignored when flattening).
- PERCENTILE, // The interpolation point is the given percentile over all the cells in the range of the conditional format. This is equivalent to NUMBER if the value was: =PERCENTILE(FLATTEN(range), value / 100) (where errors in the range are ignored when flattening).
+ PERCENT, // The interpolation point is the given percentage over all the cells in the range of the conditional formatting. This is equivalent to NUMBER if the value was: =(MAX(FLATTEN(range)) * (value / 100)) + (MIN(FLATTEN(range)) * (1 - (value / 100))) (where errors in the range are ignored when flattening).
+ PERCENTILE, // The interpolation point is the given percentile over all the cells in the range of the conditional formatting. This is equivalent to NUMBER if the value was: =PERCENTILE(FLATTEN(range), value / 100) (where errors in the range are ignored when flattening).
}
diff --git a/packages/design/package.json b/packages/design/package.json
index 85356a2883..5a14d99f7d 100644
--- a/packages/design/package.json
+++ b/packages/design/package.json
@@ -99,7 +99,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/docs-ui/package.json b/packages/docs-ui/package.json
index 5cce37d349..1017d9e866 100644
--- a/packages/docs-ui/package.json
+++ b/packages/docs-ui/package.json
@@ -88,7 +88,7 @@
"react": "^18.2.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/docs/package.json b/packages/docs/package.json
index fa56bdcbb9..a45a271ab8 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -76,7 +76,7 @@
"@wendellhu/redi": "^0.13.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/engine-formula/package.json b/packages/engine-formula/package.json
index 24144fe2fb..bbab6c3892 100644
--- a/packages/engine-formula/package.json
+++ b/packages/engine-formula/package.json
@@ -78,7 +78,7 @@
"@wendellhu/redi": "^0.13.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/engine-numfmt/package.json b/packages/engine-numfmt/package.json
index c9831426ed..e45762bb05 100644
--- a/packages/engine-numfmt/package.json
+++ b/packages/engine-numfmt/package.json
@@ -69,7 +69,7 @@
"devDependencies": {
"@univerjs/shared": "workspace:*",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/engine-render/package.json b/packages/engine-render/package.json
index c046a03ddb..f9fd7b924a 100644
--- a/packages/engine-render/package.json
+++ b/packages/engine-render/package.json
@@ -77,7 +77,7 @@
"@wendellhu/redi": "^0.13.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/facade/package.json b/packages/facade/package.json
index 5aff859331..2b435e7b23 100644
--- a/packages/facade/package.json
+++ b/packages/facade/package.json
@@ -89,7 +89,7 @@
"jsdom": "^24.0.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0",
"vitest-canvas-mock": "^0.3.3"
}
diff --git a/packages/find-replace/package.json b/packages/find-replace/package.json
index 8241dd9268..fece569cd7 100644
--- a/packages/find-replace/package.json
+++ b/packages/find-replace/package.json
@@ -90,7 +90,7 @@
"react": "^18.2.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/network/package.json b/packages/network/package.json
index c4b5d2d3c0..b16c654e85 100644
--- a/packages/network/package.json
+++ b/packages/network/package.json
@@ -73,7 +73,7 @@
"@wendellhu/redi": "^0.13.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/rpc/package.json b/packages/rpc/package.json
index 59e5037090..f6414e1ad1 100644
--- a/packages/rpc/package.json
+++ b/packages/rpc/package.json
@@ -70,7 +70,7 @@
"@wendellhu/redi": "^0.13.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/sheets-conditional-format/README.md b/packages/sheets-conditional-format/README.md
deleted file mode 100644
index 752e776cb3..0000000000
--- a/packages/sheets-conditional-format/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# @univerjs/sheets-conditional-format
-
-[![npm version](https://img.shields.io/npm/v/@univerjs/sheets-conditional-format)](https://npmjs.org/packages/@univerjs/sheets-conditional-format)
-[![license](https://img.shields.io/npm/l/@univerjs/sheets-conditional-format)](https://img.shields.io/npm/l/@univerjs/sheets-conditional-format)
-
-## Introduction
-
-> TODO: Introduction
-
-## Usage
-
-### Installation
-
-```shell
-npm i @univerjs/sheets-conditional-format
-```
diff --git a/packages/sheets-conditional-format/vite.config.ts b/packages/sheets-conditional-format/vite.config.ts
deleted file mode 100644
index 8e4292cd0a..0000000000
--- a/packages/sheets-conditional-format/vite.config.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import createViteConfig from '@univerjs/shared/vite';
-import pkg from './package.json';
-
-export default ({ mode }) => createViteConfig({
- build: {
- rollupOptions: {
- external: [
- '@univerjs/core',
- '@univerjs/design',
- '@univerjs/engine-formula',
- '@univerjs/engine-render',
- '@univerjs/sheets',
- '@univerjs/sheets-ui',
- '@univerjs/ui',
- '@wendellhu/redi',
- '@wendellhu/redi/react-bindings',
- 'react',
- 'rxjs',
- 'rxjs/operators',
- ],
- output: {
- assetFileNames: 'index.css',
- globals: {
- '@univerjs/core': 'UniverCore',
- '@univerjs/design': 'UniverDesign',
- '@univerjs/engine-formula': 'UniverEngineFormula',
- '@univerjs/engine-render': 'UniverEngineRender',
- '@univerjs/sheets': 'UniverSheets',
- '@univerjs/sheets-ui': 'UniverSheetsUi',
- '@univerjs/ui': 'UniverUi',
- '@wendellhu/redi': '@wendellhu/redi',
- '@wendellhu/redi/react-bindings': '@wendellhu/redi/react-bindings',
- react: 'React',
- rxjs: 'rxjs',
- 'rxjs/operators': 'rxjs.operators',
- },
- },
- },
- },
-}, {
- mode,
- pkg,
- features: {
- react: true,
- css: true,
- dom: true,
- },
-});
diff --git a/packages/sheets-conditional-format/.gitignore b/packages/sheets-conditional-formatting/.gitignore
similarity index 100%
rename from packages/sheets-conditional-format/.gitignore
rename to packages/sheets-conditional-formatting/.gitignore
diff --git a/packages/sheets-conditional-formatting/README-zh.md b/packages/sheets-conditional-formatting/README-zh.md
new file mode 100644
index 0000000000..3cc928079c
--- /dev/null
+++ b/packages/sheets-conditional-formatting/README-zh.md
@@ -0,0 +1,30 @@
+# @univerjs/sheets-conditional-formatting
+
+[![npm version](https://img.shields.io/npm/v/@univerjs/sheets-conditional-formatting)](https://npmjs.org/packages/@univerjs/sheets-conditional-formatting)
+[![license](https://img.shields.io/npm/l/@univerjs/sheets-conditional-formatting)](https://img.shields.io/npm/l/@univerjs/sheets-conditional-formatting)
+![CSS Included](https://img.shields.io/badge/CSS_Included-blue?logo=CSS3)
+![i18n](https://img.shields.io/badge/zh--CN%20%7C%20en--US-cornflowerblue?label=i18n)
+
+## 简介
+
+`@univerjs/sheets-conditional-formatting` 为 Univer Sheet 的每个 cell 提供了条件格式化的功能。
+
+## 使用指南
+
+### 安装
+
+```shell
+# 使用 npm
+npm install @univerjs/sheets-conditional-formatting
+
+# 使用 pnpm
+pnpm add @univerjs/sheets-conditional-formatting
+```
+
+### 注册插件
+
+```typescript
+import { SheetsConditionalFormattingPlugin } from '@univerjs/sheets-conditional-formatting';
+
+univer.registerPlugin(SheetsConditionalFormattingPlugin);
+```
diff --git a/packages/sheets-conditional-formatting/README.md b/packages/sheets-conditional-formatting/README.md
new file mode 100644
index 0000000000..325b5bcee5
--- /dev/null
+++ b/packages/sheets-conditional-formatting/README.md
@@ -0,0 +1,30 @@
+# @univerjs/sheets-conditional-formatting
+
+[![npm version](https://img.shields.io/npm/v/@univerjs/sheets-conditional-formatting)](https://npmjs.org/packages/@univerjs/sheets-conditional-formatting)
+[![license](https://img.shields.io/npm/l/@univerjs/sheets-conditional-formatting)](https://img.shields.io/npm/l/@univerjs/sheets-conditional-formatting)
+![CSS Included](https://img.shields.io/badge/CSS_Included-blue?logo=CSS3)
+![i18n](https://img.shields.io/badge/zh--CN%20%7C%20en--US-cornflowerblue?label=i18n)
+
+## Introduction
+
+`@univerjs/sheets-conditional-formatting` provides conditional formatting for cells in Univer Sheet.
+
+## Usage
+
+### Installation
+
+```shell
+# Using npm
+npm install @univerjs/sheets-conditional-formatting
+
+# Using pnpm
+pnpm add @univerjs/sheets-conditional-formatting
+```
+
+### Register the plugin
+
+```typescript
+import { SheetsConditionalFormattingPlugin } from '@univerjs/sheets-conditional-formatting';
+
+univer.registerPlugin(SheetsConditionalFormattingPlugin);
+```
diff --git a/packages/sheets-conditional-format/package.json b/packages/sheets-conditional-formatting/package.json
similarity index 68%
rename from packages/sheets-conditional-format/package.json
rename to packages/sheets-conditional-formatting/package.json
index 21fdd8e025..9346a2bc63 100644
--- a/packages/sheets-conditional-format/package.json
+++ b/packages/sheets-conditional-formatting/package.json
@@ -1,16 +1,28 @@
{
- "name": "@univerjs/sheets-conditional-format",
- "version": "0.1.3",
- "private": true,
- "description": "",
+ "name": "@univerjs/sheets-conditional-formatting",
+ "version": "0.1.4",
+ "private": false,
+ "description": "Conditional formatting plugin for Univer Sheets",
"author": "DreamNum <[email protected]>",
"license": "Apache-2.0",
- "homepage": "https://github.com/dream-num/univer",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/univer"
+ },
+ "homepage": "https://univer.ai",
"repository": {
"type": "git",
"url": "https://github.com/dream-num/univer.git"
},
- "keywords": [],
+ "bugs": {
+ "url": "https://github.com/dream-num/univer/issues"
+ },
+ "keywords": [
+ "univer"
+ ],
+ "sideEffects": [
+ "**/*.css"
+ ],
"exports": {
".": "./src/index.ts",
"./*": "./src/*"
@@ -32,7 +44,8 @@
"import": "./lib/es/*",
"require": "./lib/cjs/*",
"types": "./lib/types/index.d.ts"
- }
+ },
+ "./lib/*": "./lib/*"
}
},
"directories": {
@@ -41,6 +54,10 @@
"files": [
"lib"
],
+ "engines": {
+ "node": ">=16.0.0",
+ "npm": ">=8.0.0"
+ },
"scripts": {
"postinstall": "node ./scripts/build-icons",
"test": "vitest run",
@@ -52,15 +69,27 @@
"peerDependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
+ "@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
+ "@univerjs/sheets": "workspace:*",
+ "@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": ">=0.13",
+ "@wendellhu/redi": "0.13.0",
"clsx": ">=2.0.0",
"react": ">=16.9.0",
+ "react-dom": ">=16.9.0",
"rxjs": ">=7.0.0"
},
"dependencies": {
+ "@univerjs/icons": "^0.1.42",
+ "dayjs": "^1.11.10",
+ "lodash.get": "^4.4.2",
+ "lodash.set": "^4.3.2",
+ "react-grid-layout": "^1.4.4",
+ "react-resizable": "^3.0.5"
+ },
+ "devDependencies": {
"@types/lodash.get": "^4.4.9",
"@types/lodash.set": "^4.3.9",
"@types/react-grid-layout": "^1.3.5",
@@ -68,32 +97,19 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.1.33",
- "@univerjs/icons-svg": "^0.1.33",
+ "@univerjs/icons-svg": "^0.1.42",
+ "@univerjs/shared": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/ui": "workspace:*",
- "clsx": "^2.1.0",
- "dayjs": "^1.11.10",
- "lodash.get": "^4.4.2",
- "lodash.set": "^4.3.2",
- "react": "^18.2.0",
- "react-grid-layout": "^1.4.4",
- "react-resizable": "^3.0.5",
- "rxjs": "^7.8.1"
- },
- "devDependencies": {
- "@univerjs/shared": "workspace:*",
- "@vitejs/plugin-react": "^4.2.1",
- "@vitest/coverage-istanbul": "^1.2.1",
"@wendellhu/redi": "^0.13.0",
- "happy-dom": "^13.2.1",
+ "clsx": "^2.1.0",
"less": "^4.2.0",
- "sharp": "^0.33.2",
- "typescript": "^5.4.2",
- "vite": "^5.0.12",
- "vite-plugin-dts": "^3.7.1",
- "vite-plugin-externals": "^0.6.2",
- "vitest": "^1.2.1"
+ "react": "^18.2.0",
+ "rxjs": "^7.8.1",
+ "sharp": "^0.33.3",
+ "typescript": "^5.4.3",
+ "vite": "^5.2.6",
+ "vitest": "^1.4.0"
}
}
diff --git a/packages/sheets-conditional-format/scripts/build-icons.js b/packages/sheets-conditional-formatting/scripts/build-icons.js
similarity index 100%
rename from packages/sheets-conditional-format/scripts/build-icons.js
rename to packages/sheets-conditional-formatting/scripts/build-icons.js
diff --git a/packages/sheets-conditional-format/src/base/const.ts b/packages/sheets-conditional-formatting/src/base/const.ts
similarity index 94%
rename from packages/sheets-conditional-format/src/base/const.ts
rename to packages/sheets-conditional-formatting/src/base/const.ts
index defee77feb..4dd079fe70 100644
--- a/packages/sheets-conditional-format/src/base/const.ts
+++ b/packages/sheets-conditional-formatting/src/base/const.ts
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-import type { IConditionFormatRule, ITextHighlightCell } from '../models/type';
+import type { IConditionFormattingRule, ITextHighlightCell } from '../models/type';
-export const SHEET_CONDITION_FORMAT_PLUGIN = 'SHEET_CONDITION_FORMAT_PLUGIN';
+export const SHEET_CONDITIONAL_FORMATTING_PLUGIN = 'SHEET_CONDITIONAL_FORMATTING_PLUGIN';
export enum CFTextOperator {
beginsWith = 'beginsWith',
endsWith = 'endsWith',
@@ -89,7 +89,7 @@ export const createDefaultRule = () => ({
ranges: [],
stopIfTrue: false,
rule: { type: CFRuleType.highlightCell, subType: CFSubRuleType.text, operator: CFTextOperator.containsText } as ITextHighlightCell,
-} as IConditionFormatRule);
+} as IConditionFormattingRule);
export const createDefaultValue = (subType: CFSubRuleType, operator: CFTextOperator | CFNumberOperator | CFTimePeriodOperator) => {
switch (subType) {
diff --git a/packages/sheets-conditional-format/src/commands/commands/add-average-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/add-average-cf.command.ts
similarity index 73%
rename from packages/sheets-conditional-format/src/commands/commands/add-average-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/add-average-cf.command.ts
index a90d822794..239647e4b5 100644
--- a/packages/sheets-conditional-format/src/commands/commands/add-average-cf.command.ts
+++ b/packages/sheets-conditional-formatting/src/commands/commands/add-average-cf.command.ts
@@ -20,8 +20,8 @@ import {
ICommandService,
IUniverInstanceService,
} from '@univerjs/core';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
-import type { IAverageHighlightCell, IConditionFormatRule } from '../../models/type';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
+import type { IAverageHighlightCell, IConditionFormattingRule } from '../../models/type';
import { CFRuleType, CFSubRuleType } from '../../base/const';
import type { IAddConditionalRuleMutationParams } from '../mutations/add-conditional-rule.mutation';
import { AddConditionalRuleMutation } from '../mutations/add-conditional-rule.mutation';
@@ -41,7 +41,7 @@ export const DddAverageCfCommand: ICommand<IAddAverageCfParams> = {
return false;
}
const { ranges, style, stopIfTrue, operator } = params;
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
const commandService = accessor.get(ICommandService);
const univerInstanceService = accessor.get(IUniverInstanceService);
@@ -49,14 +49,17 @@ export const DddAverageCfCommand: ICommand<IAddAverageCfParams> = {
const worksheet = workbook.getActiveSheet();
const unitId = workbook.getUnitId();
const subUnitId = worksheet.getSheetId();
- const cfId = conditionalFormatRuleModel.createCfId(unitId, subUnitId);
- const rule: IConditionFormatRule = { ranges, cfId, stopIfTrue: !!stopIfTrue,
- rule: {
- type: CFRuleType.highlightCell,
- subType: CFSubRuleType.average,
- operator,
- style,
- } };
+ const cfId = conditionalFormattingRuleModel.createCfId(unitId, subUnitId);
+ const rule: IConditionFormattingRule = {
+ ranges,
+ cfId, stopIfTrue: !!stopIfTrue,
+ rule: {
+ type: CFRuleType.highlightCell,
+ subType: CFSubRuleType.average,
+ operator,
+ style,
+ },
+ };
const result = commandService.executeCommand(AddConditionalRuleMutation.id, { unitId, subUnitId, rule } as IAddConditionalRuleMutationParams);
return result;
},
diff --git a/packages/sheets-conditional-format/src/commands/commands/add-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/add-cf.command.ts
similarity index 85%
rename from packages/sheets-conditional-format/src/commands/commands/add-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/add-cf.command.ts
index ac2a747685..73e633c115 100644
--- a/packages/sheets-conditional-format/src/commands/commands/add-cf.command.ts
+++ b/packages/sheets-conditional-formatting/src/commands/commands/add-cf.command.ts
@@ -21,16 +21,16 @@ import {
IUndoRedoService,
IUniverInstanceService,
} from '@univerjs/core';
-import type { IConditionFormatRule } from '../../models/type';
+import type { IConditionFormattingRule } from '../../models/type';
import type { IAddConditionalRuleMutationParams } from '../mutations/add-conditional-rule.mutation';
import type { MakePropertyOptional } from '../../utils/type';
import { AddConditionalRuleMutation, AddConditionalRuleMutationUndoFactory } from '../mutations/add-conditional-rule.mutation';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
export interface IAddCfCommandParams {
unitId?: string;
subUnitId?: string;
- rule: MakePropertyOptional<IConditionFormatRule, 'cfId'>;
+ rule: MakePropertyOptional<IConditionFormattingRule, 'cfId'>;
};
export const AddCfCommand: ICommand<IAddCfCommandParams> = {
@@ -43,13 +43,13 @@ export const AddCfCommand: ICommand<IAddCfCommandParams> = {
const { rule } = params;
const undoRedoService = accessor.get(IUndoRedoService);
const commandService = accessor.get(ICommandService);
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
const univerInstanceService = accessor.get(IUniverInstanceService);
const workbook = univerInstanceService.getCurrentUniverSheetInstance();
const worksheet = workbook.getActiveSheet();
const unitId = params.unitId ?? workbook.getUnitId();
const subUnitId = params.subUnitId ?? worksheet.getSheetId();
- const cfId = conditionalFormatRuleModel.createCfId(unitId, subUnitId);
+ const cfId = conditionalFormattingRuleModel.createCfId(unitId, subUnitId);
const config: IAddConditionalRuleMutationParams = { unitId, subUnitId, rule: { ...rule, cfId: rule.cfId || cfId } };
const undo = AddConditionalRuleMutationUndoFactory(accessor, config);
const result = commandService.syncExecuteCommand(AddConditionalRuleMutation.id, config);
diff --git a/packages/sheets-conditional-format/src/commands/commands/add-color-scale-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/add-color-scale-cf.command.ts
similarity index 75%
rename from packages/sheets-conditional-format/src/commands/commands/add-color-scale-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/add-color-scale-cf.command.ts
index 8659506d89..3866777212 100644
--- a/packages/sheets-conditional-format/src/commands/commands/add-color-scale-cf.command.ts
+++ b/packages/sheets-conditional-formatting/src/commands/commands/add-color-scale-cf.command.ts
@@ -20,8 +20,8 @@ import {
ICommandService,
IUniverInstanceService,
} from '@univerjs/core';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
-import type { IColorScale, IConditionFormatRule } from '../../models/type';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
+import type { IColorScale, IConditionFormattingRule } from '../../models/type';
import { CFRuleType } from '../../base/const';
import type { IAddConditionalRuleMutationParams } from '../mutations/add-conditional-rule.mutation';
import { AddConditionalRuleMutation } from '../mutations/add-conditional-rule.mutation';
@@ -40,7 +40,7 @@ export const AddColorScaleConditionalRuleCommand: ICommand<IAddColorScaleConditi
return false;
}
const { ranges, config, stopIfTrue } = params;
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
const commandService = accessor.get(ICommandService);
const univerInstanceService = accessor.get(IUniverInstanceService);
@@ -48,12 +48,15 @@ export const AddColorScaleConditionalRuleCommand: ICommand<IAddColorScaleConditi
const worksheet = workbook.getActiveSheet();
const unitId = workbook.getUnitId();
const subUnitId = worksheet.getSheetId();
- const cfId = conditionalFormatRuleModel.createCfId(unitId, subUnitId);
- const rule: IConditionFormatRule = { ranges, cfId, stopIfTrue: !!stopIfTrue,
- rule: {
- type: CFRuleType.colorScale,
- config,
- } };
+ const cfId = conditionalFormattingRuleModel.createCfId(unitId, subUnitId);
+ const rule: IConditionFormattingRule = {
+ ranges, cfId,
+ stopIfTrue: !!stopIfTrue,
+ rule: {
+ type: CFRuleType.colorScale,
+ config,
+ },
+ };
return commandService.executeCommand(AddConditionalRuleMutation.id, { unitId, subUnitId, rule } as IAddConditionalRuleMutationParams);
},
};
diff --git a/packages/sheets-conditional-format/src/commands/commands/add-data-bar-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/add-data-bar-cf.command.ts
similarity index 73%
rename from packages/sheets-conditional-format/src/commands/commands/add-data-bar-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/add-data-bar-cf.command.ts
index f2eff38ad7..3bbf0580ed 100644
--- a/packages/sheets-conditional-format/src/commands/commands/add-data-bar-cf.command.ts
+++ b/packages/sheets-conditional-formatting/src/commands/commands/add-data-bar-cf.command.ts
@@ -20,8 +20,8 @@ import {
ICommandService,
IUniverInstanceService,
} from '@univerjs/core';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
-import type { IConditionFormatRule, IDataBar } from '../../models/type';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
+import type { IConditionFormattingRule, IDataBar } from '../../models/type';
import { CFRuleType } from '../../base/const';
import type { IAddConditionalRuleMutationParams } from '../mutations/add-conditional-rule.mutation';
import { AddConditionalRuleMutation } from '../mutations/add-conditional-rule.mutation';
@@ -44,7 +44,7 @@ export const AddDataBarConditionalRuleCommand: ICommand<IAddUniqueValuesConditio
return false;
}
const { ranges, min, max, nativeColor, positiveColor, isGradient, stopIfTrue } = params;
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
const univerInstanceService = accessor.get(IUniverInstanceService);
const commandService = accessor.get(ICommandService);
@@ -52,14 +52,17 @@ export const AddDataBarConditionalRuleCommand: ICommand<IAddUniqueValuesConditio
const worksheet = workbook.getActiveSheet();
const unitId = workbook.getUnitId();
const subUnitId = worksheet.getSheetId();
- const cfId = conditionalFormatRuleModel.createCfId(unitId, subUnitId);
- const rule: IConditionFormatRule = { ranges, cfId, stopIfTrue: !!stopIfTrue,
- rule: {
- type: CFRuleType.dataBar,
- config: {
- min, max, nativeColor, positiveColor, isGradient,
- },
- } };
+ const cfId = conditionalFormattingRuleModel.createCfId(unitId, subUnitId);
+ const rule: IConditionFormattingRule = {
+ ranges, cfId,
+ stopIfTrue: !!stopIfTrue,
+ rule: {
+ type: CFRuleType.dataBar,
+ config: {
+ min, max, nativeColor, positiveColor, isGradient,
+ },
+ },
+ };
return commandService.executeCommand(AddConditionalRuleMutation.id, { unitId, subUnitId, rule } as IAddConditionalRuleMutationParams);
},
};
diff --git a/packages/sheets-conditional-format/src/commands/commands/add-duplicate-values-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/add-duplicate-values-cf.command.ts
similarity index 72%
rename from packages/sheets-conditional-format/src/commands/commands/add-duplicate-values-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/add-duplicate-values-cf.command.ts
index b1864d6bf1..f417e24257 100644
--- a/packages/sheets-conditional-format/src/commands/commands/add-duplicate-values-cf.command.ts
+++ b/packages/sheets-conditional-formatting/src/commands/commands/add-duplicate-values-cf.command.ts
@@ -20,8 +20,8 @@ import {
ICommandService,
IUniverInstanceService,
} from '@univerjs/core';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
-import type { IConditionFormatRule, IHighlightCell } from '../../models/type';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
+import type { IConditionFormattingRule, IHighlightCell } from '../../models/type';
import { CFRuleType, CFSubRuleType } from '../../base/const';
import type { IAddConditionalRuleMutationParams } from '../mutations/add-conditional-rule.mutation';
import { AddConditionalRuleMutation } from '../mutations/add-conditional-rule.mutation';
@@ -39,7 +39,7 @@ export const AddDuplicateValuesCfCommand: ICommand<IAddDuplicateValuesConditiona
return false;
}
const { ranges, style, stopIfTrue } = params;
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
const commandService = accessor.get(ICommandService);
const univerInstanceService = accessor.get(IUniverInstanceService);
@@ -47,13 +47,16 @@ export const AddDuplicateValuesCfCommand: ICommand<IAddDuplicateValuesConditiona
const worksheet = workbook.getActiveSheet();
const unitId = workbook.getUnitId();
const subUnitId = worksheet.getSheetId();
- const cfId = conditionalFormatRuleModel.createCfId(unitId, subUnitId);
- const rule: IConditionFormatRule = { ranges, cfId, stopIfTrue: !!stopIfTrue,
- rule: {
- type: CFRuleType.highlightCell,
- subType: CFSubRuleType.duplicateValues,
- style,
- } };
+ const cfId = conditionalFormattingRuleModel.createCfId(unitId, subUnitId);
+ const rule: IConditionFormattingRule = {
+ ranges, cfId,
+ stopIfTrue: !!stopIfTrue,
+ rule: {
+ type: CFRuleType.highlightCell,
+ subType: CFSubRuleType.duplicateValues,
+ style,
+ },
+ };
return commandService.executeCommand(AddConditionalRuleMutation.id, { unitId, subUnitId, rule } as IAddConditionalRuleMutationParams);
},
};
diff --git a/packages/sheets-conditional-format/src/commands/commands/add-number-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/add-number-cf.command.ts
similarity index 67%
rename from packages/sheets-conditional-format/src/commands/commands/add-number-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/add-number-cf.command.ts
index a5e6ae6eae..cdf86a8b9f 100644
--- a/packages/sheets-conditional-format/src/commands/commands/add-number-cf.command.ts
+++ b/packages/sheets-conditional-formatting/src/commands/commands/add-number-cf.command.ts
@@ -20,8 +20,8 @@ import {
ICommandService,
IUniverInstanceService,
} from '@univerjs/core';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
-import type { IConditionFormatRule, INumberHighlightCell } from '../../models/type';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
+import type { IConditionFormattingRule, INumberHighlightCell } from '../../models/type';
import { CFNumberOperator, CFRuleType, CFSubRuleType } from '../../base/const';
import type { IAddConditionalRuleMutationParams } from '../mutations/add-conditional-rule.mutation';
import { AddConditionalRuleMutation } from '../mutations/add-conditional-rule.mutation';
@@ -41,41 +41,47 @@ export const AddNumberCfCommand: ICommand<IAddNumberCfParams> = {
return false;
}
const { ranges, style, stopIfTrue, operator, value } = params;
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
const commandService = accessor.get(ICommandService);
const univerInstanceService = accessor.get(IUniverInstanceService);
const workbook = univerInstanceService.getCurrentUniverSheetInstance();
const worksheet = workbook.getActiveSheet();
const unitId = workbook.getUnitId();
const subUnitId = worksheet.getSheetId();
- const cfId = conditionalFormatRuleModel.createCfId(unitId, subUnitId);
- let rule: IConditionFormatRule;
+ const cfId = conditionalFormattingRuleModel.createCfId(unitId, subUnitId);
+ let rule: IConditionFormattingRule;
if ([CFNumberOperator.between, CFNumberOperator.notBetween].includes(operator)) {
const _value = value as [number, number];
if (_value.length !== 2 || !Array.isArray(_value)) {
return false;
}
- rule = { ranges, cfId, stopIfTrue: !!stopIfTrue,
- rule: {
- type: CFRuleType.highlightCell,
- subType: CFSubRuleType.number,
- operator: operator as CFNumberOperator.between | CFNumberOperator.notBetween,
- style,
- value: _value as [number, number],
- } };
+ rule = {
+ ranges, cfId,
+ stopIfTrue: !!stopIfTrue,
+ rule: {
+ type: CFRuleType.highlightCell,
+ subType: CFSubRuleType.number,
+ operator: operator as CFNumberOperator.between | CFNumberOperator.notBetween,
+ style,
+ value: _value as [number, number],
+ },
+ };
} else {
const _value = value as number;
if (typeof _value !== 'number') {
return false;
}
- rule = { ranges, cfId, stopIfTrue: !!stopIfTrue,
- rule: {
- type: CFRuleType.highlightCell,
- subType: CFSubRuleType.number,
- operator: operator as any,
- style,
- value: _value,
- } };
+ rule = {
+ ranges, cfId,
+ stopIfTrue: !!stopIfTrue,
+ rule: {
+ type: CFRuleType.highlightCell,
+ subType: CFSubRuleType.number,
+ operator: operator as any,
+ style,
+ value: _value,
+ },
+ };
}
return commandService.executeCommand(AddConditionalRuleMutation.id, { unitId, subUnitId, rule } as IAddConditionalRuleMutationParams);
},
diff --git a/packages/sheets-conditional-format/src/commands/commands/add-rank-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/add-rank-cf.command.ts
similarity index 69%
rename from packages/sheets-conditional-format/src/commands/commands/add-rank-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/add-rank-cf.command.ts
index 4b8670e03b..a2681a6201 100644
--- a/packages/sheets-conditional-format/src/commands/commands/add-rank-cf.command.ts
+++ b/packages/sheets-conditional-formatting/src/commands/commands/add-rank-cf.command.ts
@@ -20,8 +20,8 @@ import {
ICommandService,
IUniverInstanceService,
} from '@univerjs/core';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
-import type { IConditionFormatRule, IRankHighlightCell } from '../../models/type';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
+import type { IConditionFormattingRule, IRankHighlightCell } from '../../models/type';
import { CFRuleType, CFSubRuleType } from '../../base/const';
import type { IAddConditionalRuleMutationParams } from '../mutations/add-conditional-rule.mutation';
import { AddConditionalRuleMutation } from '../mutations/add-conditional-rule.mutation';
@@ -43,7 +43,7 @@ export const AddRankCfCommand: ICommand<IAddRankCfParams> = {
return false;
}
const { ranges, style, stopIfTrue, isPercent, isBottom, value } = params;
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
const univerInstanceService = accessor.get(IUniverInstanceService);
const commandService = accessor.get(ICommandService);
@@ -51,16 +51,19 @@ export const AddRankCfCommand: ICommand<IAddRankCfParams> = {
const worksheet = workbook.getActiveSheet();
const unitId = workbook.getUnitId();
const subUnitId = worksheet.getSheetId();
- const cfId = conditionalFormatRuleModel.createCfId(unitId, subUnitId);
- const rule: IConditionFormatRule = { ranges, cfId, stopIfTrue: !!stopIfTrue,
- rule: {
- type: CFRuleType.highlightCell,
- subType: CFSubRuleType.rank,
- isPercent,
- isBottom,
- style,
- value,
- } };
+ const cfId = conditionalFormattingRuleModel.createCfId(unitId, subUnitId);
+ const rule: IConditionFormattingRule = {
+ ranges, cfId,
+ stopIfTrue: !!stopIfTrue,
+ rule: {
+ type: CFRuleType.highlightCell,
+ subType: CFSubRuleType.rank,
+ isPercent,
+ isBottom,
+ style,
+ value,
+ },
+ };
return commandService.executeCommand(AddConditionalRuleMutation.id, { unitId, subUnitId, rule } as IAddConditionalRuleMutationParams);
},
};
diff --git a/packages/sheets-conditional-format/src/commands/commands/add-text-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/add-text-cf.command.ts
similarity index 70%
rename from packages/sheets-conditional-format/src/commands/commands/add-text-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/add-text-cf.command.ts
index c00f6eca3e..6a35365868 100644
--- a/packages/sheets-conditional-format/src/commands/commands/add-text-cf.command.ts
+++ b/packages/sheets-conditional-formatting/src/commands/commands/add-text-cf.command.ts
@@ -21,8 +21,8 @@ import {
IUniverInstanceService,
} from '@univerjs/core';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
-import type { IConditionFormatRule, ITextHighlightCell } from '../../models/type';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
+import type { IConditionFormattingRule, ITextHighlightCell } from '../../models/type';
import { CFRuleType, CFSubRuleType } from '../../base/const';
import type { IAddConditionalRuleMutationParams } from '../mutations/add-conditional-rule.mutation';
import { AddConditionalRuleMutation } from '../mutations/add-conditional-rule.mutation';
@@ -42,7 +42,7 @@ export const AddTextCfCommand: ICommand<IAddAverageCfParams> = {
return false;
}
const { ranges, style, stopIfTrue, operator, value } = params;
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
const univerInstanceService = accessor.get(IUniverInstanceService);
const workbook = univerInstanceService.getCurrentUniverSheetInstance();
const commandService = accessor.get(ICommandService);
@@ -50,15 +50,18 @@ export const AddTextCfCommand: ICommand<IAddAverageCfParams> = {
const worksheet = workbook.getActiveSheet();
const unitId = workbook.getUnitId();
const subUnitId = worksheet.getSheetId();
- const cfId = conditionalFormatRuleModel.createCfId(unitId, subUnitId);
- const rule: IConditionFormatRule = { ranges, cfId, stopIfTrue: !!stopIfTrue,
- rule: {
- type: CFRuleType.highlightCell,
- subType: CFSubRuleType.text,
- operator,
- style,
- value,
- } };
+ const cfId = conditionalFormattingRuleModel.createCfId(unitId, subUnitId);
+ const rule: IConditionFormattingRule = {
+ ranges, cfId,
+ stopIfTrue: !!stopIfTrue,
+ rule: {
+ type: CFRuleType.highlightCell,
+ subType: CFSubRuleType.text,
+ operator,
+ style,
+ value,
+ },
+ };
return commandService.executeCommand(AddConditionalRuleMutation.id, { unitId, subUnitId, rule } as IAddConditionalRuleMutationParams);
},
};
diff --git a/packages/sheets-conditional-format/src/commands/commands/add-time-period-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/add-time-period-cf.command.ts
similarity index 67%
rename from packages/sheets-conditional-format/src/commands/commands/add-time-period-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/add-time-period-cf.command.ts
index 7632ac06ac..ac03e35c15 100644
--- a/packages/sheets-conditional-format/src/commands/commands/add-time-period-cf.command.ts
+++ b/packages/sheets-conditional-formatting/src/commands/commands/add-time-period-cf.command.ts
@@ -20,8 +20,8 @@ import {
ICommandService,
IUniverInstanceService,
} from '@univerjs/core';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
-import type { IConditionFormatRule, ITimePeriodHighlightCell } from '../../models/type';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
+import type { IConditionFormattingRule, ITimePeriodHighlightCell } from '../../models/type';
import { CFRuleType, CFSubRuleType } from '../../base/const';
import type { IAddConditionalRuleMutationParams } from '../mutations/add-conditional-rule.mutation';
import { AddConditionalRuleMutation } from '../mutations/add-conditional-rule.mutation';
@@ -41,7 +41,7 @@ export const AddTimePeriodCfCommand: ICommand<IAddTimePeriodCf> = {
return false;
}
const { ranges, style, stopIfTrue, operator } = params;
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
const univerInstanceService = accessor.get(IUniverInstanceService);
const commandService = accessor.get(ICommandService);
@@ -49,14 +49,17 @@ export const AddTimePeriodCfCommand: ICommand<IAddTimePeriodCf> = {
const worksheet = workbook.getActiveSheet();
const unitId = workbook.getUnitId();
const subUnitId = worksheet.getSheetId();
- const cfId = conditionalFormatRuleModel.createCfId(unitId, subUnitId);
- const rule: IConditionFormatRule<ITimePeriodHighlightCell> = { ranges, cfId, stopIfTrue: !!stopIfTrue,
- rule: {
- type: CFRuleType.highlightCell,
- subType: CFSubRuleType.timePeriod,
- operator,
- style,
- } };
+ const cfId = conditionalFormattingRuleModel.createCfId(unitId, subUnitId);
+ const rule: IConditionFormattingRule<ITimePeriodHighlightCell> = {
+ ranges, cfId,
+ stopIfTrue: !!stopIfTrue,
+ rule: {
+ type: CFRuleType.highlightCell,
+ subType: CFSubRuleType.timePeriod,
+ operator,
+ style,
+ },
+ };
return commandService.executeCommand(AddConditionalRuleMutation.id, { unitId, subUnitId, rule } as IAddConditionalRuleMutationParams);
},
};
diff --git a/packages/sheets-conditional-format/src/commands/commands/add-unique-values-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/add-unique-values-cf.command.ts
similarity index 72%
rename from packages/sheets-conditional-format/src/commands/commands/add-unique-values-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/add-unique-values-cf.command.ts
index cee9b3593e..ed3f406654 100644
--- a/packages/sheets-conditional-format/src/commands/commands/add-unique-values-cf.command.ts
+++ b/packages/sheets-conditional-formatting/src/commands/commands/add-unique-values-cf.command.ts
@@ -20,8 +20,8 @@ import {
ICommandService,
IUniverInstanceService,
} from '@univerjs/core';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
-import type { IConditionFormatRule, IHighlightCell } from '../../models/type';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
+import type { IConditionFormattingRule, IHighlightCell } from '../../models/type';
import { CFRuleType, CFSubRuleType } from '../../base/const';
import type { IAddConditionalRuleMutationParams } from '../mutations/add-conditional-rule.mutation';
import { AddConditionalRuleMutation } from '../mutations/add-conditional-rule.mutation';
@@ -39,7 +39,7 @@ export const AddUniqueValuesCfCommand: ICommand<IAddUniqueValuesConditionalRuleP
return false;
}
const { ranges, style, stopIfTrue } = params;
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
const univerInstanceService = accessor.get(IUniverInstanceService);
const commandService = accessor.get(ICommandService);
@@ -47,13 +47,16 @@ export const AddUniqueValuesCfCommand: ICommand<IAddUniqueValuesConditionalRuleP
const worksheet = workbook.getActiveSheet();
const unitId = workbook.getUnitId();
const subUnitId = worksheet.getSheetId();
- const cfId = conditionalFormatRuleModel.createCfId(unitId, subUnitId);
- const rule: IConditionFormatRule = { ranges, cfId, stopIfTrue: !!stopIfTrue,
- rule: {
- type: CFRuleType.highlightCell,
- subType: CFSubRuleType.uniqueValues,
- style,
- } };
+ const cfId = conditionalFormattingRuleModel.createCfId(unitId, subUnitId);
+ const rule: IConditionFormattingRule = {
+ ranges, cfId,
+ stopIfTrue: !!stopIfTrue,
+ rule: {
+ type: CFRuleType.highlightCell,
+ subType: CFSubRuleType.uniqueValues,
+ style,
+ },
+ };
return commandService.executeCommand(AddConditionalRuleMutation.id, { unitId, subUnitId, rule } as IAddConditionalRuleMutationParams);
},
};
diff --git a/packages/sheets-conditional-format/src/commands/commands/clear-range-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/clear-range-cf.command.ts
similarity index 90%
rename from packages/sheets-conditional-format/src/commands/commands/clear-range-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/clear-range-cf.command.ts
index 40c1732195..e8bfcfaf78 100644
--- a/packages/sheets-conditional-format/src/commands/commands/clear-range-cf.command.ts
+++ b/packages/sheets-conditional-formatting/src/commands/commands/clear-range-cf.command.ts
@@ -28,8 +28,8 @@ import {
} from '@univerjs/core';
import { createTopMatrixFromMatrix, findAllRectangle, SelectionManagerService } from '@univerjs/sheets';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
-import type { IConditionFormatRule } from '../../models/type';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
+import type { IConditionFormattingRule } from '../../models/type';
import type { ISetConditionalRuleMutationParams } from '../mutations/set-conditional-rule.mutation';
import { SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory } from '../mutations/set-conditional-rule.mutation';
import type { IDeleteConditionalRuleMutationParams } from '../mutations/delete-conditional-rule.mutation';
@@ -47,7 +47,7 @@ export const ClearRangeCfCommand: ICommand<IClearRangeCfParams> = {
if (!params) {
return false;
}
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
const univerInstanceService = accessor.get(IUniverInstanceService);
const commandService = accessor.get(ICommandService);
const workbook = univerInstanceService.getCurrentUniverSheetInstance();
@@ -58,7 +58,7 @@ export const ClearRangeCfCommand: ICommand<IClearRangeCfParams> = {
const unitId = params.unitId ?? workbook.getUnitId();
const subUnitId = params.subUnitId ?? worksheet.getSheetId();
const ranges = selectionManagerService.getSelections()?.map((selection) => selection.range) || [];
- const allRuleList = conditionalFormatRuleModel.getSubunitRules(unitId, subUnitId);
+ const allRuleList = conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId);
if (!allRuleList?.length || !ranges.length) {
return false;
}
@@ -79,7 +79,7 @@ export const ClearRangeCfCommand: ICommand<IClearRangeCfParams> = {
});
const newRanges = findAllRectangle(createTopMatrixFromMatrix(matrix));
if (newRanges.length) {
- const rule: IConditionFormatRule = { ...oldRule, ranges: newRanges };
+ const rule: IConditionFormattingRule = { ...oldRule, ranges: newRanges };
const params = { unitId, subUnitId, rule } as ISetConditionalRuleMutationParams;
const undo = setConditionalRuleMutationUndoFactory(accessor, params);
redos.push({ id: SetConditionalRuleMutation.id, params });
diff --git a/packages/sheets-conditional-format/src/commands/commands/clear-worksheet-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/clear-worksheet-cf.command.ts
similarity index 90%
rename from packages/sheets-conditional-format/src/commands/commands/clear-worksheet-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/clear-worksheet-cf.command.ts
index 53fa0719cd..318cf039c6 100644
--- a/packages/sheets-conditional-format/src/commands/commands/clear-worksheet-cf.command.ts
+++ b/packages/sheets-conditional-formatting/src/commands/commands/clear-worksheet-cf.command.ts
@@ -22,7 +22,7 @@ import {
IUniverInstanceService,
sequenceExecute,
} from '@univerjs/core';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
import type { IDeleteConditionalRuleMutationParams } from '../mutations/delete-conditional-rule.mutation';
import { DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory } from '../mutations/delete-conditional-rule.mutation';
@@ -35,7 +35,7 @@ export const ClearWorksheetCfCommand: ICommand<IClearWorksheetCfParams> = {
type: CommandType.COMMAND,
id: 'sheet.command.clear-worksheet-conditional-rule',
handler(accessor, params) {
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
const univerInstanceService = accessor.get(IUniverInstanceService);
const commandService = accessor.get(ICommandService);
const workbook = univerInstanceService.getCurrentUniverSheetInstance();
@@ -44,7 +44,7 @@ export const ClearWorksheetCfCommand: ICommand<IClearWorksheetCfParams> = {
const worksheet = workbook.getActiveSheet();
const unitId = params?.unitId ?? workbook.getUnitId();
const subUnitId = params?.subUnitId ?? worksheet.getSheetId();
- const ruleList = conditionalFormatRuleModel.getSubunitRules(unitId, subUnitId);
+ const ruleList = conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId);
if (!ruleList?.length) {
return false;
}
diff --git a/packages/sheets-conditional-format/src/commands/commands/delete-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/delete-cf.command.ts
similarity index 100%
rename from packages/sheets-conditional-format/src/commands/commands/delete-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/delete-cf.command.ts
diff --git a/packages/sheets-conditional-format/src/commands/commands/move-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/move-cf.command.ts
similarity index 100%
rename from packages/sheets-conditional-format/src/commands/commands/move-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/move-cf.command.ts
diff --git a/packages/sheets-conditional-format/src/commands/commands/set-cf.command.ts b/packages/sheets-conditional-formatting/src/commands/commands/set-cf.command.ts
similarity index 95%
rename from packages/sheets-conditional-format/src/commands/commands/set-cf.command.ts
rename to packages/sheets-conditional-formatting/src/commands/commands/set-cf.command.ts
index 9390bc2b86..9bed9ccfde 100644
--- a/packages/sheets-conditional-format/src/commands/commands/set-cf.command.ts
+++ b/packages/sheets-conditional-formatting/src/commands/commands/set-cf.command.ts
@@ -21,14 +21,14 @@ import {
IUndoRedoService,
IUniverInstanceService,
} from '@univerjs/core';
-import type { IConditionFormatRule } from '../../models/type';
+import type { IConditionFormattingRule } from '../../models/type';
import type { ISetConditionalRuleMutationParams } from '../mutations/set-conditional-rule.mutation';
import { SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory } from '../mutations/set-conditional-rule.mutation';
export interface ISetCfCommandParams {
unitId?: string;
subUnitId?: string;
- rule: IConditionFormatRule;
+ rule: IConditionFormattingRule;
};
export const SetCfCommand: ICommand<ISetCfCommandParams> = {
type: CommandType.COMMAND,
diff --git a/packages/sheets-conditional-format/src/commands/mutations/add-conditional-rule.mutation.ts b/packages/sheets-conditional-formatting/src/commands/mutations/add-conditional-rule.mutation.ts
similarity index 82%
rename from packages/sheets-conditional-format/src/commands/mutations/add-conditional-rule.mutation.ts
rename to packages/sheets-conditional-formatting/src/commands/mutations/add-conditional-rule.mutation.ts
index 3a0e02d402..519a5c394e 100644
--- a/packages/sheets-conditional-format/src/commands/mutations/add-conditional-rule.mutation.ts
+++ b/packages/sheets-conditional-formatting/src/commands/mutations/add-conditional-rule.mutation.ts
@@ -19,15 +19,15 @@ import {
CommandType,
} from '@univerjs/core';
import type { IAccessor } from '@wendellhu/redi';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
-import type { IConditionFormatRule } from '../../models/type';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
+import type { IConditionFormattingRule } from '../../models/type';
import type { IDeleteConditionalRuleMutationParams } from './delete-conditional-rule.mutation';
import { DeleteConditionalRuleMutation } from './delete-conditional-rule.mutation';
export interface IAddConditionalRuleMutationParams {
unitId: string;
subUnitId: string;
- rule: IConditionFormatRule;
+ rule: IConditionFormattingRule;
}
export const AddConditionalRuleMutationUndoFactory = (accessor: IAccessor, param: IAddConditionalRuleMutationParams) => {
return { id: DeleteConditionalRuleMutation.id, params: { unitId: param.unitId, subUnitId: param.subUnitId, cfId: param.rule.cfId } as IDeleteConditionalRuleMutationParams };
@@ -40,8 +40,8 @@ export const AddConditionalRuleMutation: IMutation<IAddConditionalRuleMutationPa
return false;
}
const { unitId, subUnitId, rule } = params;
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
- conditionalFormatRuleModel.addRule(unitId, subUnitId, rule);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
+ conditionalFormattingRuleModel.addRule(unitId, subUnitId, rule);
return true;
},
};
diff --git a/packages/sheets-conditional-format/src/commands/mutations/delete-conditional-rule.mutation.ts b/packages/sheets-conditional-formatting/src/commands/mutations/delete-conditional-rule.mutation.ts
similarity index 82%
rename from packages/sheets-conditional-format/src/commands/mutations/delete-conditional-rule.mutation.ts
rename to packages/sheets-conditional-formatting/src/commands/mutations/delete-conditional-rule.mutation.ts
index a8ebb2ab12..6da73f37a3 100644
--- a/packages/sheets-conditional-format/src/commands/mutations/delete-conditional-rule.mutation.ts
+++ b/packages/sheets-conditional-formatting/src/commands/mutations/delete-conditional-rule.mutation.ts
@@ -20,7 +20,7 @@ import {
Tools,
} from '@univerjs/core';
import type { IAccessor } from '@wendellhu/redi';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
import type { IAddConditionalRuleMutationParams } from './add-conditional-rule.mutation';
import { AddConditionalRuleMutation } from './add-conditional-rule.mutation';
import type { IMoveConditionalRuleMutationParams } from './move-conditional-rule.mutation';
@@ -32,10 +32,10 @@ export interface IDeleteConditionalRuleMutationParams {
cfId: string;
}
export const DeleteConditionalRuleMutationUndoFactory = (accessor: IAccessor, param: IDeleteConditionalRuleMutationParams) => {
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
const { unitId, subUnitId, cfId } = param;
- const rule = conditionalFormatRuleModel.getRule(unitId, subUnitId, cfId);
- const ruleList = conditionalFormatRuleModel.getSubunitRules(unitId, subUnitId);
+ const rule = conditionalFormattingRuleModel.getRule(unitId, subUnitId, cfId);
+ const ruleList = conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId);
if (rule) {
const index = ruleList!.findIndex((rule) => rule.cfId === cfId);
const nextRule = ruleList![index - 1];
@@ -59,8 +59,8 @@ export const DeleteConditionalRuleMutation: IMutation<IDeleteConditionalRuleMuta
return false;
}
const { unitId, subUnitId, cfId } = params;
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
- conditionalFormatRuleModel.deleteRule(unitId, subUnitId, cfId);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
+ conditionalFormattingRuleModel.deleteRule(unitId, subUnitId, cfId);
return true;
},
};
diff --git a/packages/sheets-conditional-format/src/commands/mutations/formula-mark-dirty.mutation.ts b/packages/sheets-conditional-formatting/src/commands/mutations/formula-mark-dirty.mutation.ts
similarity index 70%
rename from packages/sheets-conditional-format/src/commands/mutations/formula-mark-dirty.mutation.ts
rename to packages/sheets-conditional-formatting/src/commands/mutations/formula-mark-dirty.mutation.ts
index 63bf6e11d6..73d89eda03 100644
--- a/packages/sheets-conditional-format/src/commands/mutations/formula-mark-dirty.mutation.ts
+++ b/packages/sheets-conditional-formatting/src/commands/mutations/formula-mark-dirty.mutation.ts
@@ -17,10 +17,10 @@
import type { IMutation } from '@univerjs/core';
import { CommandType } from '@univerjs/core';
-export interface IConditionalFormatFormulaMarkDirtyParams { [unitId: string]: { [sunUnitId: string]: { [formulaId: string]: boolean } } }
-export const ConditionalFormatFormulaMarkDirty: IMutation<IConditionalFormatFormulaMarkDirtyParams> = {
+export interface IConditionalFormattingFormulaMarkDirtyParams { [unitId: string]: { [sunUnitId: string]: { [formulaId: string]: boolean } } }
+export const ConditionalFormattingFormulaMarkDirty: IMutation<IConditionalFormattingFormulaMarkDirtyParams> = {
type: CommandType.MUTATION,
- id: 'sheet.mutation.conditional-format-formula-mark-dirty',
+ id: 'sheet.mutation.conditional-formatting-formula-mark-dirty',
handler() {
return true;
},
diff --git a/packages/sheets-conditional-format/src/commands/mutations/move-conditional-rule.mutation.ts b/packages/sheets-conditional-formatting/src/commands/mutations/move-conditional-rule.mutation.ts
similarity index 79%
rename from packages/sheets-conditional-format/src/commands/mutations/move-conditional-rule.mutation.ts
rename to packages/sheets-conditional-formatting/src/commands/mutations/move-conditional-rule.mutation.ts
index 06253a6d14..9ae0994a20 100644
--- a/packages/sheets-conditional-format/src/commands/mutations/move-conditional-rule.mutation.ts
+++ b/packages/sheets-conditional-formatting/src/commands/mutations/move-conditional-rule.mutation.ts
@@ -20,7 +20,7 @@ import type { IAccessor } from '@wendellhu/redi';
import {
CommandType,
} from '@univerjs/core';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
export interface IMoveConditionalRuleMutationParams {
unitId: string;
@@ -37,15 +37,15 @@ export const MoveConditionalRuleMutation: IMutation<IMoveConditionalRuleMutation
return false;
}
const { unitId, subUnitId, cfId, targetCfId } = params;
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
- conditionalFormatRuleModel.moveRulePriority(unitId, subUnitId, cfId, targetCfId);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
+ conditionalFormattingRuleModel.moveRulePriority(unitId, subUnitId, cfId, targetCfId);
return true;
},
};
export const MoveConditionalRuleMutationUndoFactory = (accessor: IAccessor, param: IMoveConditionalRuleMutationParams) => {
const { unitId, subUnitId, cfId } = param;
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
- const ruleList = conditionalFormatRuleModel.getSubunitRules(unitId, subUnitId);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
+ const ruleList = conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId);
if (!ruleList) {
return [];
}
diff --git a/packages/sheets-conditional-format/src/commands/mutations/set-conditional-rule.mutation.ts b/packages/sheets-conditional-formatting/src/commands/mutations/set-conditional-rule.mutation.ts
similarity index 65%
rename from packages/sheets-conditional-format/src/commands/mutations/set-conditional-rule.mutation.ts
rename to packages/sheets-conditional-formatting/src/commands/mutations/set-conditional-rule.mutation.ts
index 2f0958da7f..a737107826 100644
--- a/packages/sheets-conditional-format/src/commands/mutations/set-conditional-rule.mutation.ts
+++ b/packages/sheets-conditional-formatting/src/commands/mutations/set-conditional-rule.mutation.ts
@@ -19,13 +19,13 @@ import {
CommandType, Tools,
} from '@univerjs/core';
import type { IAccessor } from '@wendellhu/redi';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
-import type { IConditionFormatRule } from '../../models/type';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
+import type { IConditionFormattingRule } from '../../models/type';
export interface ISetConditionalRuleMutationParams {
unitId: string;
subUnitId: string;
- rule: IConditionFormatRule;
+ rule: IConditionFormattingRule;
}
export const SetConditionalRuleMutation: IMutation<ISetConditionalRuleMutationParams> = {
@@ -36,19 +36,25 @@ export const SetConditionalRuleMutation: IMutation<ISetConditionalRuleMutationPa
return false;
}
const { unitId, subUnitId, rule } = params;
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
- conditionalFormatRuleModel.setRule(unitId, subUnitId, rule);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
+ conditionalFormattingRuleModel.setRule(unitId, subUnitId, rule);
return true;
},
};
+
export const setConditionalRuleMutationUndoFactory = (accessor: IAccessor, param: ISetConditionalRuleMutationParams) => {
- const conditionalFormatRuleModel = accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
const { unitId, subUnitId } = param;
const cfId = param.rule.cfId;
- const rule = conditionalFormatRuleModel.getRule(unitId, subUnitId, cfId);
+ const rule = conditionalFormattingRuleModel.getRule(unitId, subUnitId, cfId);
if (rule) {
- return [{ id: SetConditionalRuleMutation.id,
- params: { unitId, subUnitId, rule: Tools.deepClone(rule) } as ISetConditionalRuleMutationParams },
+ return [{
+ id: SetConditionalRuleMutation.id,
+ params: {
+ unitId,
+ subUnitId,
+ rule: Tools.deepClone(rule),
+ } as ISetConditionalRuleMutationParams },
];
}
return [];
diff --git a/packages/sheets-conditional-format/src/commands/operations/open-conditional-format-panel.ts b/packages/sheets-conditional-formatting/src/commands/operations/open-conditional-formatting-panel.ts
similarity index 73%
rename from packages/sheets-conditional-format/src/commands/operations/open-conditional-format-panel.ts
rename to packages/sheets-conditional-formatting/src/commands/operations/open-conditional-formatting-panel.ts
index f74c1ac72f..c5e9b9f05d 100644
--- a/packages/sheets-conditional-format/src/commands/operations/open-conditional-format-panel.ts
+++ b/packages/sheets-conditional-formatting/src/commands/operations/open-conditional-formatting-panel.ts
@@ -18,14 +18,14 @@ import type { ICommand } from '@univerjs/core';
import { CommandType, ICommandService } from '@univerjs/core';
import type { IAccessor } from '@wendellhu/redi';
import { SelectionManagerService } from '@univerjs/sheets';
-import { ConditionalFormatMenuController } from '../../controllers/cf.menu.controller';
+import { ConditionalFormattingMenuController } from '../../controllers/cf.menu.controller';
import { CFRuleType, CFSubRuleType, createDefaultRule } from '../../base/const';
-import type { IColorScale, IConditionFormatRule, IDataBar, IFormulaHighlightCell, IIconSet, IRankHighlightCell } from '../../models/type';
+import type { IColorScale, IConditionFormattingRule, IDataBar, IFormulaHighlightCell, IIconSet, IRankHighlightCell } from '../../models/type';
import type { IClearRangeCfParams } from '../commands/clear-range-cf.command';
import { ClearRangeCfCommand } from '../commands/clear-range-cf.command';
import { ClearWorksheetCfCommand } from '../commands/clear-worksheet-cf.command';
-interface IOpenConditionalFormatOperatorParams {
+interface IOpenConditionalFormattingOperatorParams {
value: number;
}
@@ -41,11 +41,11 @@ export enum CF_MENU_OPERATION {
clearRangeRules,
clearWorkSheetRules,
}
-export const OpenConditionalFormatOperator: ICommand = {
- id: 'sheet.operation.open.conditional.format.panel',
+export const OpenConditionalFormattingOperator: ICommand = {
+ id: 'sheet.operation.open.conditional.formatting.panel',
type: CommandType.OPERATION,
- handler: (accessor: IAccessor, params: IOpenConditionalFormatOperatorParams) => {
- const conditionalFormatMenuController = accessor.get(ConditionalFormatMenuController);
+ handler: (accessor: IAccessor, params: IOpenConditionalFormattingOperatorParams) => {
+ const conditionalFormattingMenuController = accessor.get(ConditionalFormattingMenuController);
const selectionManagerService = accessor.get(SelectionManagerService);
const commandService = accessor.get(ICommandService);
@@ -54,7 +54,7 @@ export const OpenConditionalFormatOperator: ICommand = {
const type = params.value;
switch (type) {
case CF_MENU_OPERATION.highlightCell:{
- conditionalFormatMenuController.openPanel({ ...createDefaultRule(), ranges });
+ conditionalFormattingMenuController.openPanel({ ...createDefaultRule(), ranges });
break;
}
case CF_MENU_OPERATION.rank:{
@@ -65,8 +65,8 @@ export const OpenConditionalFormatOperator: ICommand = {
type: CFRuleType.highlightCell,
subType: CFSubRuleType.rank,
},
- } as IConditionFormatRule<IRankHighlightCell>;
- conditionalFormatMenuController.openPanel(rule);
+ } as IConditionFormattingRule<IRankHighlightCell>;
+ conditionalFormattingMenuController.openPanel(rule);
break;
}
case CF_MENU_OPERATION.formula:{
@@ -78,8 +78,8 @@ export const OpenConditionalFormatOperator: ICommand = {
subType: CFSubRuleType.formula,
value: '=',
},
- } as IConditionFormatRule<IFormulaHighlightCell>;
- conditionalFormatMenuController.openPanel(rule);
+ } as IConditionFormattingRule<IFormulaHighlightCell>;
+ conditionalFormattingMenuController.openPanel(rule);
break;
}
case CF_MENU_OPERATION.colorScale:{
@@ -90,8 +90,8 @@ export const OpenConditionalFormatOperator: ICommand = {
type: CFRuleType.colorScale,
config: [],
},
- } as unknown as IConditionFormatRule<IColorScale>;
- conditionalFormatMenuController.openPanel(rule);
+ } as unknown as IConditionFormattingRule<IColorScale>;
+ conditionalFormattingMenuController.openPanel(rule);
break;
}
case CF_MENU_OPERATION.dataBar:{
@@ -101,8 +101,8 @@ export const OpenConditionalFormatOperator: ICommand = {
rule: {
type: CFRuleType.dataBar,
},
- } as unknown as IConditionFormatRule<IDataBar>;
- conditionalFormatMenuController.openPanel(rule);
+ } as unknown as IConditionFormattingRule<IDataBar>;
+ conditionalFormattingMenuController.openPanel(rule);
break;
}
case CF_MENU_OPERATION.icon:{
@@ -114,16 +114,16 @@ export const OpenConditionalFormatOperator: ICommand = {
config: [],
isShowValue: true,
},
- } as unknown as IConditionFormatRule<IIconSet>;
- conditionalFormatMenuController.openPanel(rule);
+ } as unknown as IConditionFormattingRule<IIconSet>;
+ conditionalFormattingMenuController.openPanel(rule);
break;
}
case CF_MENU_OPERATION.viewRule:{
- conditionalFormatMenuController.openPanel();
+ conditionalFormattingMenuController.openPanel();
break;
}
case CF_MENU_OPERATION.createRule:{
- conditionalFormatMenuController.openPanel({ ...createDefaultRule(), ranges });
+ conditionalFormattingMenuController.openPanel({ ...createDefaultRule(), ranges });
break;
}
case CF_MENU_OPERATION.clearRangeRules:{
diff --git a/packages/sheets-conditional-format/src/components/color-picker/index.module.less b/packages/sheets-conditional-formatting/src/components/color-picker/index.module.less
similarity index 100%
rename from packages/sheets-conditional-format/src/components/color-picker/index.module.less
rename to packages/sheets-conditional-formatting/src/components/color-picker/index.module.less
diff --git a/packages/sheets-conditional-format/src/components/color-picker/index.tsx b/packages/sheets-conditional-formatting/src/components/color-picker/index.tsx
similarity index 100%
rename from packages/sheets-conditional-format/src/components/color-picker/index.tsx
rename to packages/sheets-conditional-formatting/src/components/color-picker/index.tsx
diff --git a/packages/sheets-conditional-format/src/components/conditional-style-editor/index.module.less b/packages/sheets-conditional-formatting/src/components/conditional-style-editor/index.module.less
similarity index 100%
rename from packages/sheets-conditional-format/src/components/conditional-style-editor/index.module.less
rename to packages/sheets-conditional-formatting/src/components/conditional-style-editor/index.module.less
diff --git a/packages/sheets-conditional-format/src/components/conditional-style-editor/index.tsx b/packages/sheets-conditional-formatting/src/components/conditional-style-editor/index.tsx
similarity index 100%
rename from packages/sheets-conditional-format/src/components/conditional-style-editor/index.tsx
rename to packages/sheets-conditional-formatting/src/components/conditional-style-editor/index.tsx
diff --git a/packages/sheets-conditional-format/src/components/panel/index.module.less b/packages/sheets-conditional-formatting/src/components/panel/index.module.less
similarity index 98%
rename from packages/sheets-conditional-format/src/components/panel/index.module.less
rename to packages/sheets-conditional-formatting/src/components/panel/index.module.less
index 6c7ea37cf2..3901392501 100644
--- a/packages/sheets-conditional-format/src/components/panel/index.module.less
+++ b/packages/sheets-conditional-formatting/src/components/panel/index.module.less
@@ -1,4 +1,4 @@
-.conditional-format-wrap {
+.conditional-formatting-wrap {
height: 100%;
display: flex;
flex-direction: column;
diff --git a/packages/sheets-conditional-format/src/components/panel/index.tsx b/packages/sheets-conditional-formatting/src/components/panel/index.tsx
similarity index 78%
rename from packages/sheets-conditional-format/src/components/panel/index.tsx
rename to packages/sheets-conditional-formatting/src/components/panel/index.tsx
index 1f3ea7e0c3..9d5160e16c 100644
--- a/packages/sheets-conditional-format/src/components/panel/index.tsx
+++ b/packages/sheets-conditional-formatting/src/components/panel/index.tsx
@@ -15,15 +15,15 @@
*/
import React, { useState } from 'react';
-import type { IConditionFormatRule } from '../../models/type';
+import type { IConditionFormattingRule } from '../../models/type';
import styles from './index.module.less';
import { RuleList } from './rule-list';
import { RuleEdit } from './rule-edit';
-interface IConditionFormatPanelProps { rule?: IConditionFormatRule };
+interface IConditionFormattingPanelProps { rule?: IConditionFormattingRule };
-export const ConditionFormatPanel = (props: IConditionFormatPanelProps) => {
- const [currentEditRule, currentEditRuleSet] = useState<IConditionFormatRule | undefined>(props.rule);
+export const ConditionFormattingPanel = (props: IConditionFormattingPanelProps) => {
+ const [currentEditRule, currentEditRuleSet] = useState<IConditionFormattingRule | undefined>(props.rule);
const [isShowRuleEditor, isShowRuleEditorSet] = useState(!!props.rule);
const createCfRule = () => {
@@ -35,13 +35,13 @@ export const ConditionFormatPanel = (props: IConditionFormatPanelProps) => {
currentEditRuleSet(undefined);
};
- const handleRuleClick = (rule: IConditionFormatRule) => {
+ const handleRuleClick = (rule: IConditionFormattingRule) => {
currentEditRuleSet(rule);
isShowRuleEditorSet(true);
};
return (
- <div className={styles.conditionalFormatWrap}>
+ <div className={styles.conditionalFormattingWrap}>
{isShowRuleEditor
? (
<RuleEdit onCancel={handleCancel} rule={currentEditRule} />
@@ -49,7 +49,6 @@ export const ConditionFormatPanel = (props: IConditionFormatPanelProps) => {
: (
<RuleList onClick={handleRuleClick} onCreate={createCfRule} />
)}
-
</div>
);
};
diff --git a/packages/sheets-conditional-format/src/components/panel/rule-edit/colorScale.tsx b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/colorScale.tsx
similarity index 97%
rename from packages/sheets-conditional-format/src/components/panel/rule-edit/colorScale.tsx
rename to packages/sheets-conditional-formatting/src/components/panel/rule-edit/colorScale.tsx
index 2e6b02ef5e..5ba84b3847 100644
--- a/packages/sheets-conditional-format/src/components/panel/rule-edit/colorScale.tsx
+++ b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/colorScale.tsx
@@ -19,9 +19,9 @@ import { useDependency } from '@wendellhu/redi/react-bindings';
import { IUniverInstanceService, LocaleService } from '@univerjs/core';
import { InputNumber, Select } from '@univerjs/design';
import { TextEditor } from '@univerjs/ui';
-import { CFRuleType, CFValueType, createDefaultValueByValueType, SHEET_CONDITION_FORMAT_PLUGIN } from '../../../base/const';
+import { CFRuleType, CFValueType, createDefaultValueByValueType, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '../../../base/const';
import { ColorPicker } from '../../color-picker';
-import type { IColorScale, IConditionalFormatRuleConfig } from '../../../models/type';
+import type { IColorScale, IConditionalFormattingRuleConfig } from '../../../models/type';
import stylesBase from '../index.module.less';
import { Preview } from '../../preview';
import styles from './index.module.less';
@@ -55,7 +55,7 @@ const TextInput = (props: { id: string; type: CFValueType | 'none';value: number
<TextEditor
openForSheetSubUnitId={subUnitId}
openForSheetUnitId={unitId}
- id={`${SHEET_CONDITION_FORMAT_PLUGIN}_colo_scale_${id}`}
+ id={`${SHEET_CONDITIONAL_FORMATTING_PLUGIN}_colo_scale_${id}`}
value={formulaInitValue}
style={{ maxWidth: '50%', marginLeft: 4 }}
canvasStyle={{ fontSize: 10 }}
@@ -212,7 +212,7 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
<div>
<div className={stylesBase.title}>{localeService.t('sheet.cf.panel.styleRule')}</div>
<div className={`${styles.cfPreviewWrap}`}>
- <Preview rule={getResult({ minType, medianType, maxType, minValue, medianValue, maxValue, minColor, medianColor, maxColor }) as IConditionalFormatRuleConfig} />
+ <Preview rule={getResult({ minType, medianType, maxType, minValue, medianValue, maxValue, minColor, medianColor, maxColor }) as IConditionalFormattingRuleConfig} />
</div>
<div className={stylesBase.label}>{localeService.t('sheet.cf.valueType.min')}</div>
<div className={`${stylesBase.labelContainer} ${stylesBase.mTSm}`}>
diff --git a/packages/sheets-conditional-format/src/components/panel/rule-edit/dataBar.tsx b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/dataBar.tsx
similarity index 97%
rename from packages/sheets-conditional-format/src/components/panel/rule-edit/dataBar.tsx
rename to packages/sheets-conditional-formatting/src/components/panel/rule-edit/dataBar.tsx
index 374cfde66b..456ae531bf 100644
--- a/packages/sheets-conditional-format/src/components/panel/rule-edit/dataBar.tsx
+++ b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/dataBar.tsx
@@ -19,8 +19,8 @@ import { InputNumber, Radio, RadioGroup, Select } from '@univerjs/design';
import { useDependency } from '@wendellhu/redi/react-bindings';
import { IUniverInstanceService, LocaleService } from '@univerjs/core';
import { TextEditor } from '@univerjs/ui';
-import { CFRuleType, CFValueType, createDefaultValueByValueType, SHEET_CONDITION_FORMAT_PLUGIN } from '../../../base/const';
-import type { IConditionalFormatRuleConfig, IValueConfig } from '../../../models/type';
+import { CFRuleType, CFValueType, createDefaultValueByValueType, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '../../../base/const';
+import type { IConditionalFormattingRuleConfig, IValueConfig } from '../../../models/type';
import { ColorPicker } from '../../color-picker';
import stylesBase from '../index.module.less';
import { Preview } from '../../preview';
@@ -50,7 +50,7 @@ const InputText = (props: { disabled?: boolean; id: string; className: string; t
const v = String(_value.current).startsWith('=') ? String(_value.current) || '' : '=';
return (
<TextEditor
- id={`${SHEET_CONDITION_FORMAT_PLUGIN}_data_bar_${id}`}
+ id={`${SHEET_CONDITIONAL_FORMATTING_PLUGIN}_data_bar_${id}`}
value={v}
openForSheetSubUnitId={subUnitId}
openForSheetUnitId={unitId}
@@ -201,7 +201,7 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
{localeService.t('sheet.cf.panel.styleRule')}
</div>
<div className={`${styles.cfPreviewWrap}`}>
- <Preview rule={getResult({ isGradient, minValue, minValueType, maxValue, maxValueType, positiveColor, nativeColor }) as IConditionalFormatRuleConfig} />
+ <Preview rule={getResult({ isGradient, minValue, minValueType, maxValue, maxValueType, positiveColor, nativeColor }) as IConditionalFormattingRuleConfig} />
</div>
<div>
<div className={stylesBase.label}>
diff --git a/packages/sheets-conditional-format/src/components/panel/rule-edit/formula.tsx b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/formula.tsx
similarity index 91%
rename from packages/sheets-conditional-format/src/components/panel/rule-edit/formula.tsx
rename to packages/sheets-conditional-formatting/src/components/panel/rule-edit/formula.tsx
index 1aa7d7dae2..e450935c5f 100644
--- a/packages/sheets-conditional-format/src/components/panel/rule-edit/formula.tsx
+++ b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/formula.tsx
@@ -18,9 +18,9 @@ import React, { useEffect, useState } from 'react';
import { useDependency } from '@wendellhu/redi/react-bindings';
import { IUniverInstanceService, LocaleService } from '@univerjs/core';
import { TextEditor } from '@univerjs/ui';
-import { CFRuleType, CFSubRuleType, SHEET_CONDITION_FORMAT_PLUGIN } from '../../../base/const';
+import { CFRuleType, CFSubRuleType, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '../../../base/const';
import { ConditionalStyleEditor } from '../../conditional-style-editor';
-import type { IAverageHighlightCell, IConditionalFormatRuleConfig, IHighlightCell, IRankHighlightCell } from '../../../models/type';
+import type { IAverageHighlightCell, IConditionalFormattingRuleConfig, IHighlightCell, IRankHighlightCell } from '../../../models/type';
import stylesBase from '../index.module.less';
import { Preview } from '../../preview';
import styles from './index.module.less';
@@ -72,7 +72,7 @@ export const FormulaStyleEditor = (props: IStyleEditorProps) => {
<div className={`${stylesBase.title} ${stylesBase.mTBase}`}>{localeService.t('sheet.cf.panel.styleRule')}</div>
<div className={`${stylesBase.mTSm}`}>
<TextEditor
- id={`${SHEET_CONDITION_FORMAT_PLUGIN}_formula`}
+ id={`${SHEET_CONDITIONAL_FORMATTING_PLUGIN}_formula`}
openForSheetSubUnitId={worksheet.getSheetId()}
openForSheetUnitId={workbook.getUnitId()}
value={formula}
@@ -87,7 +87,7 @@ export const FormulaStyleEditor = (props: IStyleEditorProps) => {
</div>
<div className={`${styles.cfPreviewWrap} `}>
- <Preview rule={getResult({ style, formula }) as IConditionalFormatRuleConfig} />
+ <Preview rule={getResult({ style, formula }) as IConditionalFormattingRuleConfig} />
</div>
<ConditionalStyleEditor
style={rule?.style}
diff --git a/packages/sheets-conditional-format/src/components/panel/rule-edit/highlightCell.tsx b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/highlightCell.tsx
similarity index 99%
rename from packages/sheets-conditional-format/src/components/panel/rule-edit/highlightCell.tsx
rename to packages/sheets-conditional-formatting/src/components/panel/rule-edit/highlightCell.tsx
index 62e95c99f4..822dde31da 100644
--- a/packages/sheets-conditional-format/src/components/panel/rule-edit/highlightCell.tsx
+++ b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/highlightCell.tsx
@@ -25,7 +25,7 @@ import { CFNumberOperator,
CFTimePeriodOperator,
createDefaultValue } from '../../../base/const';
import type {
- IConditionalFormatRuleConfig,
+ IConditionalFormattingRuleConfig,
IHighlightCell,
INumberHighlightCell,
ITextHighlightCell,
@@ -315,7 +315,7 @@ export const HighlightCellStyleEditor = (props: IStyleEditorProps<any, ITextHigh
{operatorOptions?.length && <Select className={`${stylesBase.mTSm} ${styles.width100}`} onChange={onOperatorChange} value={operator || ''} options={operatorOptions} />}
<HighlightCellInput key={inputRenderKey} value={value} interceptorManager={interceptorManager} type={subType} operator={operator} rule={rule} onChange={onInputChange} />
<div className={`${styles.cfPreviewWrap}`}>
- <Preview rule={getResult({}) as IConditionalFormatRuleConfig} />
+ <Preview rule={getResult({}) as IConditionalFormattingRuleConfig} />
</div>
<ConditionalStyleEditor
style={rule?.style}
diff --git a/packages/sheets-conditional-format/src/components/panel/rule-edit/iconSet.tsx b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/iconSet.tsx
similarity index 98%
rename from packages/sheets-conditional-format/src/components/panel/rule-edit/iconSet.tsx
rename to packages/sheets-conditional-formatting/src/components/panel/rule-edit/iconSet.tsx
index fa9976fd17..eb8aebd1df 100644
--- a/packages/sheets-conditional-format/src/components/panel/rule-edit/iconSet.tsx
+++ b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/iconSet.tsx
@@ -27,7 +27,7 @@ import { TextEditor } from '@univerjs/ui';
import type { IIconType } from '../../../models/icon-map';
import { EMPTY_ICON_TYPE, iconGroup, iconMap } from '../../../models/icon-map';
import type { IIconSet } from '../../../models/type';
-import { CFNumberOperator, CFRuleType, CFSubRuleType, CFValueType, createDefaultValue, SHEET_CONDITION_FORMAT_PLUGIN } from '../../../base/const';
+import { CFNumberOperator, CFRuleType, CFSubRuleType, CFValueType, createDefaultValue, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '../../../base/const';
import { compareWithNumber, getOppositeOperator } from '../../../services/calculate-unit/utils';
import stylesBase from '../index.module.less';
import type { IStyleEditorProps } from './type';
@@ -64,7 +64,7 @@ const TextInput = (props: { id: number; type: CFValueType; value: number | strin
)
: (
<TextEditor
- id={`${SHEET_CONDITION_FORMAT_PLUGIN}_icon_set_${props.id}`}
+ id={`${SHEET_CONDITIONAL_FORMATTING_PLUGIN}_icon_set_${props.id}`}
value={String(props.value).startsWith('=') ? String(props.value) : '='}
openForSheetSubUnitId={subUnitId}
openForSheetUnitId={unitId}
@@ -307,7 +307,7 @@ export const IconSet = (props: IStyleEditorProps<unknown, IIconSet>) => {
return new Array(list.length).fill('').map((_e, index, list) => {
if (index === list.length - 1) {
// The last condition is actually the complement of the above conditions,
- // packages/sheets-conditional-format/src/services/calculate-unit/icon-set.ts
+ // packages/sheets-conditional-formatting/src/services/calculate-unit/icon-set.ts
return { operator: CFNumberOperator.lessThanOrEqual,
value: { type: CFValueType.num, value: Number.MAX_SAFE_INTEGER },
iconType: currentIconType,
diff --git a/packages/sheets-conditional-format/src/components/panel/rule-edit/index.module.less b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/index.module.less
similarity index 100%
rename from packages/sheets-conditional-format/src/components/panel/rule-edit/index.module.less
rename to packages/sheets-conditional-formatting/src/components/panel/rule-edit/index.module.less
diff --git a/packages/sheets-conditional-format/src/components/panel/rule-edit/index.tsx b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/index.tsx
similarity index 93%
rename from packages/sheets-conditional-format/src/components/panel/rule-edit/index.tsx
rename to packages/sheets-conditional-formatting/src/components/panel/rule-edit/index.tsx
index ac29c49842..4667ed6660 100644
--- a/packages/sheets-conditional-format/src/components/panel/rule-edit/index.tsx
+++ b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/index.tsx
@@ -24,9 +24,9 @@ import { Button, Select } from '@univerjs/design';
import { RangeSelector } from '@univerjs/ui';
import type { IRemoveSheetMutationParams } from '@univerjs/sheets';
import { RemoveSheetMutation, SelectionManagerService, SetWorksheetActiveOperation } from '@univerjs/sheets';
-import type { IConditionFormatRule } from '../../../models/type';
-import { ConditionalFormatRuleModel } from '../../../models/conditional-format-rule-model';
-import { CFRuleType, CFSubRuleType, SHEET_CONDITION_FORMAT_PLUGIN } from '../../../base/const';
+import type { IConditionFormattingRule } from '../../../models/type';
+import { ConditionalFormattingRuleModel } from '../../../models/conditional-formatting-rule-model';
+import { CFRuleType, CFSubRuleType, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '../../../base/const';
import type { IAddCfCommandParams } from '../../../commands/commands/add-cf.command';
import { AddCfCommand } from '../../../commands/commands/add-cf.command';
import type { ISetCfCommandParams } from '../../../commands/commands/set-cf.command';
@@ -44,7 +44,7 @@ import styles from './index.module.less';
import { IconSet } from './iconSet';
interface IRuleEditProps {
- rule?: IConditionFormatRule;
+ rule?: IConditionFormattingRule;
onCancel: () => void;
}
@@ -55,7 +55,7 @@ export const RuleEdit = (props: IRuleEditProps) => {
const localeService = useDependency(LocaleService);
const commandService = useDependency(ICommandService);
const univerInstanceService = useDependency(IUniverInstanceService);
- const conditionalFormatRuleModel = useDependency(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = useDependency(ConditionalFormattingRuleModel);
const selectionManagerService = useDependency(SelectionManagerService);
const unitId = getUnitId(univerInstanceService);
const subUnitId = getSubUnitId(univerInstanceService);
@@ -195,13 +195,13 @@ export const RuleEdit = (props: IRuleEditProps) => {
// When you switch the child table, you need to fetch it again here, instead of using the
const unitId = getUnitId(univerInstanceService);
const subUnitId = getSubUnitId(univerInstanceService);
- let rule = {} as IConditionFormatRule;
+ let rule = {} as IConditionFormattingRule;
if (props.rule && props.rule.cfId) {
rule = { ...props.rule, ranges, rule: result };
commandService.executeCommand(SetCfCommand.id, { unitId, subUnitId, rule } as ISetCfCommandParams);
props.onCancel();
} else {
- const cfId = conditionalFormatRuleModel.createCfId(unitId, subUnitId);
+ const cfId = conditionalFormattingRuleModel.createCfId(unitId, subUnitId);
rule = { cfId, ranges, rule: result, stopIfTrue: false };
commandService.executeCommand(AddCfCommand.id, { unitId, subUnitId, rule } as IAddCfCommandParams);
props.onCancel();
@@ -216,7 +216,7 @@ export const RuleEdit = (props: IRuleEditProps) => {
<div className={styles.cfRuleStyleEditor}>
<div className={styleBase.title}>{localeService.t('sheet.cf.panel.range')}</div>
<div className={`${styleBase.mTBase}`}>
- <RangeSelector placeholder={localeService.t('sheet.cf.form.rangeSelector')} width={'100%' as unknown as number} openForSheetSubUnitId={subUnitId} openForSheetUnitId={unitId} value={rangeString} id={`${SHEET_CONDITION_FORMAT_PLUGIN}_rangeSelector`} onChange={onRangeSelectorChange} />
+ <RangeSelector placeholder={localeService.t('sheet.cf.form.rangeSelector')} width={'100%' as unknown as number} openForSheetSubUnitId={subUnitId} openForSheetUnitId={unitId} value={rangeString} id={`${SHEET_CONDITIONAL_FORMATTING_PLUGIN}_rangeSelector`} onChange={onRangeSelectorChange} />
</div>
<div className={styleBase.title}>{localeService.t('sheet.cf.panel.styleType')}</div>
<div className={styleBase.mTBase}>
diff --git a/packages/sheets-conditional-format/src/components/panel/rule-edit/rank.tsx b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/rank.tsx
similarity index 97%
rename from packages/sheets-conditional-format/src/components/panel/rule-edit/rank.tsx
rename to packages/sheets-conditional-formatting/src/components/panel/rule-edit/rank.tsx
index 7324b6552b..123aafaf96 100644
--- a/packages/sheets-conditional-format/src/components/panel/rule-edit/rank.tsx
+++ b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/rank.tsx
@@ -20,7 +20,7 @@ import { LocaleService } from '@univerjs/core';
import { Checkbox, InputNumber, Select } from '@univerjs/design';
import { CFNumberOperator, CFRuleType, CFSubRuleType } from '../../../base/const';
import { ConditionalStyleEditor } from '../../conditional-style-editor';
-import type { IAverageHighlightCell, IConditionalFormatRuleConfig, IHighlightCell, IRankHighlightCell } from '../../../models/type';
+import type { IAverageHighlightCell, IConditionalFormattingRuleConfig, IHighlightCell, IRankHighlightCell } from '../../../models/type';
import stylesBase from '../index.module.less';
import { Preview } from '../../preview';
import styles from './index.module.less';
@@ -179,7 +179,7 @@ export const RankStyleEditor = (props: IStyleEditorProps) => {
</div>
)}
<div className={`${styles.cfPreviewWrap} `}>
- <Preview rule={getResult({ type, isPercent, value, style }) as IConditionalFormatRuleConfig} />
+ <Preview rule={getResult({ type, isPercent, value, style }) as IConditionalFormattingRuleConfig} />
</div>
<ConditionalStyleEditor
style={rule?.style}
diff --git a/packages/sheets-conditional-format/src/components/panel/rule-edit/type.ts b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/type.ts
similarity index 91%
rename from packages/sheets-conditional-format/src/components/panel/rule-edit/type.ts
rename to packages/sheets-conditional-formatting/src/components/panel/rule-edit/type.ts
index 0d57363453..e8272fe06c 100644
--- a/packages/sheets-conditional-format/src/components/panel/rule-edit/type.ts
+++ b/packages/sheets-conditional-formatting/src/components/panel/rule-edit/type.ts
@@ -16,12 +16,12 @@
import { createInterceptorKey } from '@univerjs/core';
import type { InterceptorManager } from '@univerjs/core';
-import type { IConditionalFormatRuleConfig } from '../../../models/type';
+import type { IConditionalFormattingRuleConfig } from '../../../models/type';
export const beforeSubmit = createInterceptorKey<boolean, null>('beforeSubmit');
export const submit = createInterceptorKey<any, null>('submit');
-export interface IStyleEditorProps<S = any, R = IConditionalFormatRuleConfig> {
+export interface IStyleEditorProps<S = any, R = IConditionalFormattingRuleConfig> {
onChange: (style: S) => void;
rule?: R;
interceptorManager: InterceptorManager<{ beforeSubmit: typeof beforeSubmit; submit: typeof submit }>;
diff --git a/packages/sheets-conditional-format/src/components/panel/rule-list/index.module.less b/packages/sheets-conditional-formatting/src/components/panel/rule-list/index.module.less
similarity index 100%
rename from packages/sheets-conditional-format/src/components/panel/rule-list/index.module.less
rename to packages/sheets-conditional-formatting/src/components/panel/rule-list/index.module.less
diff --git a/packages/sheets-conditional-format/src/components/panel/rule-list/index.tsx b/packages/sheets-conditional-formatting/src/components/panel/rule-list/index.tsx
similarity index 94%
rename from packages/sheets-conditional-format/src/components/panel/rule-list/index.tsx
rename to packages/sheets-conditional-formatting/src/components/panel/rule-list/index.tsx
index cc59884057..3e433229e8 100644
--- a/packages/sheets-conditional-format/src/components/panel/rule-list/index.tsx
+++ b/packages/sheets-conditional-formatting/src/components/panel/rule-list/index.tsx
@@ -28,26 +28,26 @@ import { AddConditionalRuleMutation } from '../../../commands/mutations/add-cond
import { SetConditionalRuleMutation } from '../../../commands/mutations/set-conditional-rule.mutation';
import { DeleteConditionalRuleMutation } from '../../../commands/mutations/delete-conditional-rule.mutation';
import { MoveConditionalRuleMutation } from '../../../commands/mutations/move-conditional-rule.mutation';
-import { ConditionalFormatRuleModel } from '../../../models/conditional-format-rule-model';
+import { ConditionalFormattingRuleModel } from '../../../models/conditional-formatting-rule-model';
import type { IDeleteCfCommandParams } from '../../../commands/commands/delete-cf.command';
import { DeleteCfCommand } from '../../../commands/commands/delete-cf.command';
import type { IMoveCfCommand } from '../../../commands/commands/move-cf.command';
import { moveCfCommand } from '../../../commands/commands/move-cf.command';
-import type { IConditionFormatRule } from '../../../models/type';
+import type { IConditionFormattingRule } from '../../../models/type';
import { CFRuleType, CFSubRuleType } from '../../../base/const';
import 'react-grid-layout/css/styles.css';
import 'react-resizable/css/styles.css';
import { Preview } from '../../preview';
-import { ConditionalFormatI18nController } from '../../../controllers/cf.i18n.controller';
+import { ConditionalFormattingI18nController } from '../../../controllers/cf.i18n.controller';
import { ClearWorksheetCfCommand } from '../../../commands/commands/clear-worksheet-cf.command';
import styles from './index.module.less';
interface IRuleListProps {
- onClick: (rule: IConditionFormatRule) => void;
+ onClick: (rule: IConditionFormattingRule) => void;
onCreate: () => void;
};
-const getRuleDescribe = (rule: IConditionFormatRule, localeService: LocaleService) => {
+const getRuleDescribe = (rule: IConditionFormattingRule, localeService: LocaleService) => {
const ruleConfig = rule.rule;
switch (ruleConfig.type) {
case CFRuleType.colorScale:{
@@ -109,12 +109,12 @@ const getRuleDescribe = (rule: IConditionFormatRule, localeService: LocaleServic
let defaultWidth = 0;
export const RuleList = (props: IRuleListProps) => {
const { onClick } = props;
- const conditionalFormatRuleModel = useDependency(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = useDependency(ConditionalFormattingRuleModel);
const univerInstanceService = useDependency(IUniverInstanceService);
const selectionManagerService = useDependency(SelectionManagerService);
const commandService = useDependency(ICommandService);
const localeService = useDependency(LocaleService);
- const conditionalFormatI18nController = useDependency(ConditionalFormatI18nController);
+ const conditionalFormattingI18nController = useDependency(ConditionalFormattingI18nController);
const workbook = univerInstanceService.getCurrentUniverSheetInstance();
const unitId = workbook.getUnitId();
@@ -130,7 +130,7 @@ export const RuleList = (props: IRuleListProps) => {
{ label: localeService.t('sheet.cf.panel.selectedRange'), value: '1' },
];
const getRuleList = () => {
- const ruleList = conditionalFormatRuleModel.getSubunitRules(unitId, subUnitId);
+ const ruleList = conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId);
if (!ruleList || !ruleList.length) {
return [];
}
@@ -189,11 +189,11 @@ export const RuleList = (props: IRuleListProps) => {
}, [univerInstanceService, selectValue, unitId, subUnitId]);
useEffect(() => {
- const dispose = conditionalFormatRuleModel.$ruleChange.subscribe(() => {
+ const dispose = conditionalFormattingRuleModel.$ruleChange.subscribe(() => {
fetchRuleListIdSet(Math.random());
});
return () => dispose.unsubscribe();
- }, [conditionalFormatRuleModel]);
+ }, [conditionalFormattingRuleModel]);
useEffect(() => {
// Because univer-sidebar contains animations, accurate width values can not be obtained in real time。
@@ -235,7 +235,7 @@ export const RuleList = (props: IRuleListProps) => {
};
}, []);
- const handleDelete = (rule: IConditionFormatRule) => {
+ const handleDelete = (rule: IConditionFormattingRule) => {
const unitId = univerInstanceService.getCurrentUniverSheetInstance().getUnitId();
const subUnitId = univerInstanceService.getCurrentUniverSheetInstance().getActiveSheet().getSheetId();
commandService.executeCommand(DeleteCfCommand.id, { unitId, subUnitId, cfId: rule.cfId } as IDeleteCfCommandParams);
@@ -279,7 +279,7 @@ export const RuleList = (props: IRuleListProps) => {
<div className={styles.cfRuleList}>
<div className={styles.ruleSelector}>
<div>
- {conditionalFormatI18nController.tWithReactNode('sheet.cf.panel.managerRuleSelect',
+ {conditionalFormattingI18nController.tWithReactNode('sheet.cf.panel.managerRuleSelect',
<Select className={styles.select} options={selectOption} value={selectValue} onChange={(v) => { selectValueSet(v); }} />
)
.map((ele, index) => <span key={index}>{ele}</span>)}
diff --git a/packages/sheets-conditional-format/src/components/preview/index.module.less b/packages/sheets-conditional-formatting/src/components/preview/index.module.less
similarity index 100%
rename from packages/sheets-conditional-format/src/components/preview/index.module.less
rename to packages/sheets-conditional-formatting/src/components/preview/index.module.less
diff --git a/packages/sheets-conditional-format/src/components/preview/index.tsx b/packages/sheets-conditional-formatting/src/components/preview/index.tsx
similarity index 96%
rename from packages/sheets-conditional-format/src/components/preview/index.tsx
rename to packages/sheets-conditional-formatting/src/components/preview/index.tsx
index a94fd1bdeb..f0c6aa4045 100644
--- a/packages/sheets-conditional-format/src/components/preview/index.tsx
+++ b/packages/sheets-conditional-formatting/src/components/preview/index.tsx
@@ -17,13 +17,13 @@
import React, { useMemo } from 'react';
import { BooleanNumber, ColorKit } from '@univerjs/core';
import { SlashSingle } from '@univerjs/icons';
-import type { IConditionalFormatRuleConfig } from '../../models/type';
+import type { IConditionalFormattingRuleConfig } from '../../models/type';
import { CFRuleType, DEFAULT_BG_COLOR, DEFAULT_FONT_COLOR } from '../../base/const';
import { getColorScaleFromValue } from '../../services/calculate-unit/utils';
import { iconMap } from '../../models/icon-map';
import styles from './index.module.less';
-export const Preview = (props: { rule?: IConditionalFormatRuleConfig }) => {
+export const Preview = (props: { rule?: IConditionalFormattingRuleConfig }) => {
const rule = props.rule;
if (!rule) {
return null;
diff --git a/packages/sheets-conditional-format/src/controllers/cf.auto-fill.controller.ts b/packages/sheets-conditional-formatting/src/controllers/cf.auto-fill.controller.ts
similarity index 87%
rename from packages/sheets-conditional-format/src/controllers/cf.auto-fill.controller.ts
rename to packages/sheets-conditional-formatting/src/controllers/cf.auto-fill.controller.ts
index 98ecad3db4..87fba6fdf1 100644
--- a/packages/sheets-conditional-format/src/controllers/cf.auto-fill.controller.ts
+++ b/packages/sheets-conditional-formatting/src/controllers/cf.auto-fill.controller.ts
@@ -23,20 +23,20 @@ import { APPLY_TYPE, getAutoFillRepeatRange, IAutoFillService } from '@univerjs/
import { Inject, Injector } from '@wendellhu/redi';
import { SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory } from '../commands/mutations/set-conditional-rule.mutation';
import type { ISetConditionalRuleMutationParams } from '../commands/mutations/set-conditional-rule.mutation';
-import { ConditionalFormatViewModel } from '../models/conditional-format-view-model';
-import { ConditionalFormatRuleModel } from '../models/conditional-format-rule-model';
+import { ConditionalFormattingViewModel } from '../models/conditional-formatting-view-model';
+import { ConditionalFormattingRuleModel } from '../models/conditional-formatting-rule-model';
-import { SHEET_CONDITION_FORMAT_PLUGIN } from '../base/const';
+import { SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '../base/const';
-@OnLifecycle(LifecycleStages.Rendered, ConditionalFormatAutoFillController)
-export class ConditionalFormatAutoFillController extends Disposable {
+@OnLifecycle(LifecycleStages.Rendered, ConditionalFormattingAutoFillController)
+export class ConditionalFormattingAutoFillController extends Disposable {
constructor(
@Inject(Injector) private _injector: Injector,
@Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,
@Inject(IAutoFillService) private _autoFillService: IAutoFillService,
- @Inject(ConditionalFormatRuleModel) private _conditionalFormatRuleModel: ConditionalFormatRuleModel,
+ @Inject(ConditionalFormattingRuleModel) private _conditionalFormattingRuleModel: ConditionalFormattingRuleModel,
- @Inject(ConditionalFormatViewModel) private _conditionalFormatViewModel: ConditionalFormatViewModel
+ @Inject(ConditionalFormattingViewModel) private _conditionalFormattingViewModel: ConditionalFormattingViewModel
) {
super();
@@ -86,14 +86,14 @@ export class ConditionalFormatAutoFillController extends Disposable {
},
targetRange
);
- const sourceCellCf = this._conditionalFormatViewModel.getCellCf(
+ const sourceCellCf = this._conditionalFormattingViewModel.getCellCf(
unitId,
subUnitId,
sourcePositionRange.startRow,
sourcePositionRange.startColumn
);
- const targetCellCf = this._conditionalFormatViewModel.getCellCf(
+ const targetCellCf = this._conditionalFormattingViewModel.getCellCf(
unitId,
subUnitId,
targetPositionRange.startRow,
@@ -103,7 +103,7 @@ export class ConditionalFormatAutoFillController extends Disposable {
targetCellCf.cfList.forEach((cf) => {
let matrix = matrixMap.get(cf.cfId);
if (!matrixMap.get(cf.cfId)) {
- const rule = this._conditionalFormatRuleModel.getRule(unitId, subUnitId, cf.cfId);
+ const rule = this._conditionalFormattingRuleModel.getRule(unitId, subUnitId, cf.cfId);
if (!rule) {
return;
}
@@ -123,7 +123,7 @@ export class ConditionalFormatAutoFillController extends Disposable {
sourceCellCf.cfList.forEach((cf) => {
let matrix = matrixMap.get(cf.cfId);
if (!matrixMap.get(cf.cfId)) {
- const rule = this._conditionalFormatRuleModel.getRule(unitId, subUnitId, cf.cfId);
+ const rule = this._conditionalFormattingRuleModel.getRule(unitId, subUnitId, cf.cfId);
if (!rule) {
return;
}
@@ -157,7 +157,7 @@ export class ConditionalFormatAutoFillController extends Disposable {
loopFunc(sourceStartCell, repeat.repeatStartCell, repeat.relativeRange, matrixMap);
});
matrixMap.forEach((item, cfId) => {
- const rule = this._conditionalFormatRuleModel.getRule(unitId, subUnitId, cfId);
+ const rule = this._conditionalFormattingRuleModel.getRule(unitId, subUnitId, cfId);
if (!rule) {
return;
}
@@ -174,7 +174,7 @@ export class ConditionalFormatAutoFillController extends Disposable {
};
};
const hook: ISheetAutoFillHook = {
- id: SHEET_CONDITION_FORMAT_PLUGIN,
+ id: SHEET_CONDITIONAL_FORMATTING_PLUGIN,
onFillData: (location, direction, applyType) => {
if (
applyType === APPLY_TYPE.COPY ||
diff --git a/packages/sheets-conditional-format/src/controllers/cf.clear.controller.ts b/packages/sheets-conditional-formatting/src/controllers/cf.clear.controller.ts
similarity index 90%
rename from packages/sheets-conditional-format/src/controllers/cf.clear.controller.ts
rename to packages/sheets-conditional-formatting/src/controllers/cf.clear.controller.ts
index 1dfa1c20e6..9849e2893d 100644
--- a/packages/sheets-conditional-format/src/controllers/cf.clear.controller.ts
+++ b/packages/sheets-conditional-formatting/src/controllers/cf.clear.controller.ts
@@ -18,20 +18,20 @@ import type { IMutationInfo } from '@univerjs/core';
import { Disposable, IUniverInstanceService, LifecycleStages, OnLifecycle, Rectangle } from '@univerjs/core';
import { ClearSelectionAllCommand, ClearSelectionFormatCommand, RangeMergeUtil, SelectionManagerService, SheetInterceptorService } from '@univerjs/sheets';
import { Inject, Injector } from '@wendellhu/redi';
-import { ConditionalFormatRuleModel } from '../models/conditional-format-rule-model';
+import { ConditionalFormattingRuleModel } from '../models/conditional-formatting-rule-model';
import type { ISetConditionalRuleMutationParams } from '../commands/mutations/set-conditional-rule.mutation';
import { SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory } from '../commands/mutations/set-conditional-rule.mutation';
import type { IDeleteConditionalRuleMutationParams } from '../commands/mutations/delete-conditional-rule.mutation';
import { DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory } from '../commands/mutations/delete-conditional-rule.mutation';
-@OnLifecycle(LifecycleStages.Rendered, ConditionalFormatClearController)
-export class ConditionalFormatClearController extends Disposable {
+@OnLifecycle(LifecycleStages.Rendered, ConditionalFormattingClearController)
+export class ConditionalFormattingClearController extends Disposable {
constructor(
@Inject(Injector) private _injector: Injector,
@Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,
@Inject(SheetInterceptorService) private _sheetInterceptorService: SheetInterceptorService,
@Inject(SelectionManagerService) private _selectionManagerService: SelectionManagerService,
- @Inject(ConditionalFormatRuleModel) private _conditionalFormatRuleModel: ConditionalFormatRuleModel
+ @Inject(ConditionalFormattingRuleModel) private _conditionalFormattingRuleModel: ConditionalFormattingRuleModel
) {
super();
@@ -51,7 +51,7 @@ export class ConditionalFormatClearController extends Disposable {
}
const workbook = this._univerInstanceService.getCurrentUniverSheetInstance();
const worksheet = workbook.getActiveSheet();
- const allRules = this._conditionalFormatRuleModel.getSubunitRules(workbook.getUnitId(), worksheet.getSheetId());
+ const allRules = this._conditionalFormattingRuleModel.getSubunitRules(workbook.getUnitId(), worksheet.getSheetId());
if (!allRules || !allRules.length) {
return defaultV;
}
diff --git a/packages/sheets-conditional-format/src/controllers/cf.copy-paste.controller.ts b/packages/sheets-conditional-formatting/src/controllers/cf.copy-paste.controller.ts
similarity index 75%
rename from packages/sheets-conditional-format/src/controllers/cf.copy-paste.controller.ts
rename to packages/sheets-conditional-formatting/src/controllers/cf.copy-paste.controller.ts
index 63c1af196e..898ad3d145 100644
--- a/packages/sheets-conditional-format/src/controllers/cf.copy-paste.controller.ts
+++ b/packages/sheets-conditional-formatting/src/controllers/cf.copy-paste.controller.ts
@@ -30,10 +30,10 @@ import {
} from '@univerjs/sheets';
import { COPY_TYPE, getRepeatRange, ISheetClipboardService, PREDEFINED_HOOK_NAME } from '@univerjs/sheets-ui';
import { Inject, Injector } from '@wendellhu/redi';
-import { SHEET_CONDITION_FORMAT_PLUGIN } from '../base/const';
-import { ConditionalFormatViewModel } from '../models/conditional-format-view-model';
-import { ConditionalFormatRuleModel } from '../models/conditional-format-rule-model';
-import type { IConditionalFormatRuleConfig, IConditionFormatRule } from '../models/type';
+import { SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '../base/const';
+import { ConditionalFormattingViewModel } from '../models/conditional-formatting-view-model';
+import { ConditionalFormattingRuleModel } from '../models/conditional-formatting-rule-model';
+import type { IConditionalFormattingRuleConfig, IConditionFormattingRule } from '../models/type';
import type { IAddConditionalRuleMutationParams } from '../commands/mutations/add-conditional-rule.mutation';
import { AddConditionalRuleMutation, AddConditionalRuleMutationUndoFactory } from '../commands/mutations/add-conditional-rule.mutation';
import type { IDeleteConditionalRuleMutationParams } from '../commands/mutations/delete-conditional-rule.mutation';
@@ -41,22 +41,22 @@ import { DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory
import type { ISetConditionalRuleMutationParams } from '../commands/mutations/set-conditional-rule.mutation';
import { SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory } from '../commands/mutations/set-conditional-rule.mutation';
-@OnLifecycle(LifecycleStages.Rendered, ConditionalFormatCopyPasteController)
-export class ConditionalFormatCopyPasteController extends Disposable {
+@OnLifecycle(LifecycleStages.Rendered, ConditionalFormattingCopyPasteController)
+export class ConditionalFormattingCopyPasteController extends Disposable {
private _copyInfo: Nullable<{
matrix: ObjectMatrix<string[]>;
info: {
unitId: string;
subUnitId: string;
- cfMap: Record<string, IConditionalFormatRuleConfig>;
+ cfMap: Record<string, IConditionalFormattingRuleConfig>;
};
}>;
constructor(
@Inject(ISheetClipboardService) private _sheetClipboardService: ISheetClipboardService,
- @Inject(ConditionalFormatRuleModel) private _conditionalFormatRuleModel: ConditionalFormatRuleModel,
+ @Inject(ConditionalFormattingRuleModel) private _conditionalFormattingRuleModel: ConditionalFormattingRuleModel,
@Inject(Injector) private _injector: Injector,
- @Inject(ConditionalFormatViewModel) private _conditionalFormatViewModel: ConditionalFormatViewModel,
+ @Inject(ConditionalFormattingViewModel) private _conditionalFormattingViewModel: ConditionalFormattingViewModel,
@Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService
) {
@@ -67,13 +67,13 @@ export class ConditionalFormatCopyPasteController extends Disposable {
private _initClipboardHook() {
this.disposeWithMe(
this._sheetClipboardService.addClipboardHook({
- id: SHEET_CONDITION_FORMAT_PLUGIN,
+ id: SHEET_CONDITIONAL_FORMATTING_PLUGIN,
onBeforeCopy: (unitId, subUnitId, range) => this._collectConditionalRule(unitId, subUnitId, range),
onPasteCells: (pasteFrom, pasteTo, data, payload) => {
const { copyType = COPY_TYPE.COPY, pasteType } = payload;
const { range: copyRange } = pasteFrom || {};
const { range: pastedRange } = pasteTo;
- return this._generateConditionalFormatMutations(pastedRange, { copyType, pasteType, copyRange });
+ return this._generateConditionalFormattingMutations(pastedRange, { copyType, pasteType, copyRange });
},
})
);
@@ -81,7 +81,7 @@ export class ConditionalFormatCopyPasteController extends Disposable {
private _collectConditionalRule(unitId: string, subUnitId: string, range: IRange) {
const matrix = new ObjectMatrix<string[]>();
- const cfMap: Record<string, IConditionalFormatRuleConfig> = {};
+ const cfMap: Record<string, IConditionalFormattingRuleConfig> = {};
this._copyInfo = {
matrix,
info: {
@@ -90,13 +90,13 @@ export class ConditionalFormatCopyPasteController extends Disposable {
cfMap,
},
};
- const model = this._conditionalFormatViewModel.getMatrix(unitId, subUnitId);
+ const model = this._conditionalFormattingViewModel.getMatrix(unitId, subUnitId);
if (!model) {
return;
}
const cfIdSet: Set<string> = new Set();
Range.foreach(range, (row, col) => {
- const cellCfList = this._conditionalFormatViewModel.getCellCf(unitId, subUnitId, row, col, model);
+ const cellCfList = this._conditionalFormattingViewModel.getCellCf(unitId, subUnitId, row, col, model);
if (!cellCfList) {
return;
}
@@ -113,14 +113,14 @@ export class ConditionalFormatCopyPasteController extends Disposable {
matrix.setValue(relativeRange.startRow, relativeRange.startColumn, cellCfList.cfList.map((item) => item.cfId));
});
cfIdSet.forEach((cfId) => {
- const rule = this._conditionalFormatRuleModel.getRule(unitId, subUnitId, cfId);
+ const rule = this._conditionalFormattingRuleModel.getRule(unitId, subUnitId, cfId);
if (rule) {
cfMap[cfId] = rule.rule;
}
});
}
- private _generateConditionalFormatMutations(
+ private _generateConditionalFormattingMutations(
pastedRange: IRange,
copyInfo: {
copyType: COPY_TYPE;
@@ -151,33 +151,33 @@ export class ConditionalFormatCopyPasteController extends Disposable {
return { redos: [], undos: [] };
}
const repeatRange = getRepeatRange(copyInfo.copyRange, pastedRange, true);
- const model = this._conditionalFormatViewModel.getMatrix(unitId, subUnitId);
- const effectedConditionalFormatRuleMatrix: Record<string, ObjectMatrix<1>> = {};
+ const model = this._conditionalFormattingViewModel.getMatrix(unitId, subUnitId);
+ const effectedConditionalFormattingRuleMatrix: Record<string, ObjectMatrix<1>> = {};
Range.foreach(pastedRange, (row, col) => {
- const cellCfList = this._conditionalFormatViewModel.getCellCf(unitId, subUnitId, row, col, model!);
+ const cellCfList = this._conditionalFormattingViewModel.getCellCf(unitId, subUnitId, row, col, model!);
if (cellCfList) {
cellCfList.cfList.forEach((item) => {
- if (!effectedConditionalFormatRuleMatrix[item.cfId]) {
+ if (!effectedConditionalFormattingRuleMatrix[item.cfId]) {
const ruleMatrix = new ObjectMatrix<1>();
- effectedConditionalFormatRuleMatrix[item.cfId] = ruleMatrix;
- const rule = this._conditionalFormatRuleModel.getRule(unitId, subUnitId, item.cfId);
+ effectedConditionalFormattingRuleMatrix[item.cfId] = ruleMatrix;
+ const rule = this._conditionalFormattingRuleModel.getRule(unitId, subUnitId, item.cfId);
rule?.ranges.forEach((range) => {
Range.foreach(range, (row, col) => {
ruleMatrix.setValue(row, col, 1);
});
});
}
- effectedConditionalFormatRuleMatrix[item.cfId].realDeleteValue(row, col);
+ effectedConditionalFormattingRuleMatrix[item.cfId].realDeleteValue(row, col);
});
}
});
const { matrix, info } = this._copyInfo;
- const waitAddRule: IConditionFormatRule[] = [];
- let nextCfId = this._conditionalFormatRuleModel.createCfId(unitId, subUnitId);
- const cacheCfIdMap: Record<string, IConditionFormatRule> = {};
+ const waitAddRule: IConditionFormattingRule[] = [];
+ let nextCfId = this._conditionalFormattingRuleModel.createCfId(unitId, subUnitId);
+ const cacheCfIdMap: Record<string, IConditionFormattingRule> = {};
/**
- used to match the conditional format in the current worksheet with the same conditional format
+ used to match the conditional formatting in the current worksheet with the same conditional formatting
configuration in the copy range, and if this worksheet does not exist,
a new cf is created based on the current worksheet.
*/
@@ -186,14 +186,14 @@ export class ConditionalFormatCopyPasteController extends Disposable {
return cacheCfIdMap[copyRangeCfId];
}
const oldRule = info?.cfMap[copyRangeCfId];
- const targetRule = [...(this._conditionalFormatRuleModel.getSubunitRules(unitId, subUnitId) || []), ...waitAddRule].find((rule) => {
+ const targetRule = [...(this._conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId) || []), ...waitAddRule].find((rule) => {
return Tools.diffValue(rule.rule, oldRule);
});
if (targetRule) {
cacheCfIdMap[copyRangeCfId] = targetRule;
return targetRule;
} else {
- const rule: IConditionFormatRule = {
+ const rule: IConditionFormattingRule = {
rule: oldRule,
cfId: nextCfId,
ranges: [],
@@ -222,24 +222,24 @@ export class ConditionalFormatCopyPasteController extends Disposable {
const _row = range.startRow;
const _col = range.startColumn;
copyRangeCfIdList.forEach((cfId) => {
- if (!effectedConditionalFormatRuleMatrix[cfId]) {
+ if (!effectedConditionalFormattingRuleMatrix[cfId]) {
const rule = getCurrentSheetCfRule(cfId);
const ruleMatrix = new ObjectMatrix<1>();
- effectedConditionalFormatRuleMatrix[cfId] = ruleMatrix;
+ effectedConditionalFormattingRuleMatrix[cfId] = ruleMatrix;
rule.ranges.forEach((range) => {
Range.foreach(range, (row, col) => {
ruleMatrix.setValue(row, col, 1);
});
});
}
- effectedConditionalFormatRuleMatrix[cfId].setValue(_row, _col, 1);
+ effectedConditionalFormattingRuleMatrix[cfId].setValue(_row, _col, 1);
});
});
});
const redos = [];
const undos = [];
- for (const cfId in effectedConditionalFormatRuleMatrix) {
- const matrix = effectedConditionalFormatRuleMatrix[cfId];
+ for (const cfId in effectedConditionalFormattingRuleMatrix) {
+ const matrix = effectedConditionalFormattingRuleMatrix[cfId];
const ranges = findAllRectangle(createTopMatrixFromMatrix(matrix));
if (!ranges.length) {
const deleteParams: IDeleteConditionalRuleMutationParams = {
@@ -256,7 +256,7 @@ export class ConditionalFormatCopyPasteController extends Disposable {
redos.push({ id: AddConditionalRuleMutation.id, params: addParams });
undos.push(AddConditionalRuleMutationUndoFactory(this._injector, addParams));
} else {
- const rule = this._conditionalFormatRuleModel.getRule(unitId, subUnitId, cfId);
+ const rule = this._conditionalFormattingRuleModel.getRule(unitId, subUnitId, cfId);
if (!rule) {
continue;
}
diff --git a/packages/sheets-conditional-format/src/controllers/cf.editor.controller.ts b/packages/sheets-conditional-formatting/src/controllers/cf.editor.controller.ts
similarity index 85%
rename from packages/sheets-conditional-format/src/controllers/cf.editor.controller.ts
rename to packages/sheets-conditional-formatting/src/controllers/cf.editor.controller.ts
index b3a0236b70..613eb41994 100644
--- a/packages/sheets-conditional-format/src/controllers/cf.editor.controller.ts
+++ b/packages/sheets-conditional-formatting/src/controllers/cf.editor.controller.ts
@@ -23,14 +23,14 @@ import {
import { IEditorBridgeService } from '@univerjs/sheets-ui';
import { Inject } from '@wendellhu/redi';
-import { ConditionalFormatService } from '../services/conditional-format.service';
+import { ConditionalFormattingService } from '../services/conditional-formatting.service';
import { getStringFromDataStream } from '../utils/getStringFromDataStream';
-@OnLifecycle(LifecycleStages.Rendered, ConditionalFormatEditorController)
-export class ConditionalFormatEditorController extends Disposable {
+@OnLifecycle(LifecycleStages.Rendered, ConditionalFormattingEditorController)
+export class ConditionalFormattingEditorController extends Disposable {
constructor(
@Inject(IEditorBridgeService) private _editorBridgeService: IEditorBridgeService,
- @Inject(ConditionalFormatService) private _conditionalFormatService: ConditionalFormatService
+ @Inject(ConditionalFormattingService) private _conditionalFormattingService: ConditionalFormattingService
) {
super();
@@ -49,7 +49,7 @@ export class ConditionalFormatEditorController extends Disposable {
this._editorBridgeService.interceptor.getInterceptPoints().AFTER_CELL_EDIT,
{
handler: (value, context, next) => {
- const result = this._conditionalFormatService.composeStyle(context.unitId, context.subUnitId, context.row, context.col);
+ const result = this._conditionalFormattingService.composeStyle(context.unitId, context.subUnitId, context.row, context.col);
if (result?.style && value?.p) {
const keys = Object.keys(result?.style);
if (keys.length > 0) {
diff --git a/packages/sheets-conditional-format/src/controllers/cf.i18n.controller.ts b/packages/sheets-conditional-formatting/src/controllers/cf.i18n.controller.ts
similarity index 94%
rename from packages/sheets-conditional-format/src/controllers/cf.i18n.controller.ts
rename to packages/sheets-conditional-formatting/src/controllers/cf.i18n.controller.ts
index 9d0794a558..55a6c7375f 100644
--- a/packages/sheets-conditional-format/src/controllers/cf.i18n.controller.ts
+++ b/packages/sheets-conditional-formatting/src/controllers/cf.i18n.controller.ts
@@ -20,8 +20,8 @@ import { Inject } from '@wendellhu/redi';
import type { ReactNode } from 'react';
import { zhCN } from '../locale';
-@OnLifecycle(LifecycleStages.Rendered, ConditionalFormatI18nController)
-export class ConditionalFormatI18nController extends Disposable {
+@OnLifecycle(LifecycleStages.Rendered, ConditionalFormattingI18nController)
+export class ConditionalFormattingI18nController extends Disposable {
constructor(@Inject(LocaleService) private _localeService: LocaleService) {
super();
this._initLocal();
diff --git a/packages/sheets-conditional-format/src/controllers/cf.menu.controller.ts b/packages/sheets-conditional-formatting/src/controllers/cf.menu.controller.ts
similarity index 76%
rename from packages/sheets-conditional-format/src/controllers/cf.menu.controller.ts
rename to packages/sheets-conditional-formatting/src/controllers/cf.menu.controller.ts
index 00a505dc2a..960a30db64 100644
--- a/packages/sheets-conditional-format/src/controllers/cf.menu.controller.ts
+++ b/packages/sheets-conditional-formatting/src/controllers/cf.menu.controller.ts
@@ -17,13 +17,13 @@
import { Inject, Injector } from '@wendellhu/redi';
import { Disposable, LifecycleStages, LocaleService, OnLifecycle } from '@univerjs/core';
import { ComponentManager, IMenuService, ISidebarService } from '@univerjs/ui';
-import { FactoryManageConditionalFormatRule } from '../menu/manage-rule';
-import type { IConditionFormatRule } from '../models/type';
-import { ConditionFormatPanel } from '../components/panel';
+import { FactoryManageConditionalFormattingRule } from '../menu/manage-rule';
+import type { IConditionFormattingRule } from '../models/type';
+import { ConditionFormattingPanel } from '../components/panel';
-const CF_PANEL_KEY = 'sheet.conditional.format.panel';
-@OnLifecycle(LifecycleStages.Ready, ConditionalFormatMenuController)
-export class ConditionalFormatMenuController extends Disposable {
+const CF_PANEL_KEY = 'sheet.conditional.formatting.panel';
+@OnLifecycle(LifecycleStages.Ready, ConditionalFormattingMenuController)
+export class ConditionalFormattingMenuController extends Disposable {
constructor(
@Inject(Injector) private _injector: Injector,
@Inject(ComponentManager) private _componentManager: ComponentManager,
@@ -37,7 +37,7 @@ export class ConditionalFormatMenuController extends Disposable {
this._initPanel();
}
- openPanel(rule?: IConditionFormatRule) {
+ openPanel(rule?: IConditionFormattingRule) {
const props = {
header: { title: this._localeService.t('sheet.cf.title') },
children: {
@@ -49,10 +49,10 @@ export class ConditionalFormatMenuController extends Disposable {
}
private _initMenu() {
- this._menuService.addMenuItem(FactoryManageConditionalFormatRule(this._componentManager)(this._injector));
+ this._menuService.addMenuItem(FactoryManageConditionalFormattingRule(this._componentManager)(this._injector));
}
private _initPanel() {
- this._componentManager.register(CF_PANEL_KEY, ConditionFormatPanel);
+ this._componentManager.register(CF_PANEL_KEY, ConditionFormattingPanel);
}
}
diff --git a/packages/sheets-conditional-format/src/controllers/cf.ref-range.controller.ts b/packages/sheets-conditional-formatting/src/controllers/cf.ref-range.controller.ts
similarity index 94%
rename from packages/sheets-conditional-format/src/controllers/cf.ref-range.controller.ts
rename to packages/sheets-conditional-formatting/src/controllers/cf.ref-range.controller.ts
index 040d75f706..e195b56b4e 100644
--- a/packages/sheets-conditional-format/src/controllers/cf.ref-range.controller.ts
+++ b/packages/sheets-conditional-formatting/src/controllers/cf.ref-range.controller.ts
@@ -22,8 +22,8 @@ import { handleDefaultRangeChangeWithEffectRefCommands, RefRangeService } from '
import { Inject, Injector } from '@wendellhu/redi';
import { merge, Observable } from 'rxjs';
import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
-import { ConditionalFormatRuleModel } from '../models/conditional-format-rule-model';
-import type { IConditionFormatRule } from '../models/type';
+import { ConditionalFormattingRuleModel } from '../models/conditional-formatting-rule-model';
+import type { IConditionFormattingRule } from '../models/type';
import type { ISetConditionalRuleMutationParams } from '../commands/mutations/set-conditional-rule.mutation';
import type { IDeleteConditionalRuleMutationParams } from '../commands/mutations/delete-conditional-rule.mutation';
import { DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory } from '../commands/mutations/delete-conditional-rule.mutation';
@@ -33,7 +33,7 @@ import { isRangesEqual } from '../utils/isRangesEqual';
@OnLifecycle(LifecycleStages.Rendered, RefRangeController)
export class RefRangeController extends Disposable {
constructor(
- @Inject(ConditionalFormatRuleModel) private _conditionalFormatRuleModel: ConditionalFormatRuleModel,
+ @Inject(ConditionalFormattingRuleModel) private _conditionalFormattingRuleModel: ConditionalFormattingRuleModel,
@Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,
@Inject(Injector) private _injector: Injector,
@Inject(SheetSkeletonManagerService) private _sheetSkeletonManagerService: SheetSkeletonManagerService,
@@ -46,7 +46,7 @@ export class RefRangeController extends Disposable {
private _initRefRange() {
const disposableMap: Map<string, () => void> = new Map();
const getCfIdWithUnitId = (unitID: string, subUnitId: string, cfId: string) => `${unitID}_${subUnitId}_${cfId}`;
- const register = (unitId: string, subUnitId: string, rule: IConditionFormatRule) => {
+ const register = (unitId: string, subUnitId: string, rule: IConditionFormattingRule) => {
const handleRangeChange = (commandInfo: EffectRefRangeParams) => {
const oldRanges = [...rule.ranges];
const resultRanges = oldRanges.map((range) => {
@@ -97,7 +97,7 @@ export class RefRangeController extends Disposable {
).subscribe((disposableCollection) => {
disposableCollection.add(
toDisposable(
- this._conditionalFormatRuleModel.$ruleChange.subscribe((option) => {
+ this._conditionalFormattingRuleModel.$ruleChange.subscribe((option) => {
const { unitId, subUnitId, rule } = option;
const workbook = this._univerInstanceService.getCurrentUniverSheetInstance();
const worksheet = workbook.getActiveSheet();
diff --git a/packages/sheets-conditional-format/src/controllers/cf.render.controller.ts b/packages/sheets-conditional-formatting/src/controllers/cf.render.controller.ts
similarity index 76%
rename from packages/sheets-conditional-format/src/controllers/cf.render.controller.ts
rename to packages/sheets-conditional-formatting/src/controllers/cf.render.controller.ts
index 6043a91875..3acbe3560a 100644
--- a/packages/sheets-conditional-format/src/controllers/cf.render.controller.ts
+++ b/packages/sheets-conditional-formatting/src/controllers/cf.render.controller.ts
@@ -22,22 +22,22 @@ import { bufferTime, filter } from 'rxjs/operators';
import type { ISheetFontRenderExtension, Spreadsheet } from '@univerjs/engine-render';
import { IRenderManagerService } from '@univerjs/engine-render';
-import { ConditionalFormatService } from '../services/conditional-format.service';
-import { ConditionalFormatViewModel } from '../models/conditional-format-view-model';
-import { ConditionalFormatRuleModel } from '../models/conditional-format-rule-model';
+import { ConditionalFormattingService } from '../services/conditional-formatting.service';
+import { ConditionalFormattingViewModel } from '../models/conditional-formatting-view-model';
+import { ConditionalFormattingRuleModel } from '../models/conditional-formatting-rule-model';
import { DataBar, dataBarUKey } from '../render/data-bar.render';
-import { ConditionalFormatIcon, DEFAULT_PADDING, DEFAULT_WIDTH, IconUKey } from '../render/icon.render';
-import type { IConditionalFormatCellData } from '../render/type';
+import { ConditionalFormattingIcon, DEFAULT_PADDING, DEFAULT_WIDTH, IconUKey } from '../render/icon.render';
+import type { IConditionalFormattingCellData } from '../render/type';
@OnLifecycle(LifecycleStages.Rendered, RenderController)
export class RenderController extends Disposable {
constructor(@Inject(SheetInterceptorService) private _sheetInterceptorService: SheetInterceptorService,
- @Inject(ConditionalFormatService) private _conditionalFormatService: ConditionalFormatService,
+ @Inject(ConditionalFormattingService) private _conditionalFormattingService: ConditionalFormattingService,
@Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,
@Inject(IRenderManagerService) private _renderManagerService: IRenderManagerService,
- @Inject(ConditionalFormatViewModel) private _conditionalFormatViewModel: ConditionalFormatViewModel,
- @Inject(ConditionalFormatRuleModel) private _conditionalFormatRuleModel: ConditionalFormatRuleModel,
+ @Inject(ConditionalFormattingViewModel) private _conditionalFormattingViewModel: ConditionalFormattingViewModel,
+ @Inject(ConditionalFormattingRuleModel) private _conditionalFormattingRuleModel: ConditionalFormattingRuleModel,
@Inject(SheetSkeletonManagerService) private _sheetSkeletonManagerService: SheetSkeletonManagerService) {
super();
this._initViewModelInterceptor();
@@ -46,7 +46,7 @@ export class RenderController extends Disposable {
}
_initRender() {
- const list: [string, new () => any][] = [[dataBarUKey, DataBar], [IconUKey, ConditionalFormatIcon]];
+ const list: [string, new () => any][] = [[dataBarUKey, DataBar], [IconUKey, ConditionalFormattingIcon]];
const register = (renderId: string) => {
const render = renderId && this._renderManagerService.getRenderById(renderId);
const spreadsheetRender = render && render.mainComponent as Spreadsheet;
@@ -74,23 +74,23 @@ export class RenderController extends Disposable {
this._renderManagerService.getRenderById(unitId)?.mainComponent?.makeDirty();
};
- // After the conditional format is marked dirty to drive a rendering, to trigger the window within the conditional format recalculation
- this.disposeWithMe(this._conditionalFormatViewModel.markDirty$.pipe(bufferTime(16), filter((v) => {
+ // After the conditional formatting is marked dirty to drive a rendering, to trigger the window within the conditional formatting recalculation
+ this.disposeWithMe(this._conditionalFormattingViewModel.markDirty$.pipe(bufferTime(16), filter((v) => {
const workbook = this._univerInstanceService.getCurrentUniverSheetInstance();
const worksheet = workbook.getActiveSheet();
return v.filter((item) => item.unitId === workbook.getUnitId() && item.subUnitId === worksheet.getSheetId()).length > 0;
})).subscribe(markDirtySkeleton));
// Sort and delete does not mark dirty.
- this.disposeWithMe(this._conditionalFormatRuleModel.$ruleChange.pipe(bufferTime(16), filter((v) => {
+ this.disposeWithMe(this._conditionalFormattingRuleModel.$ruleChange.pipe(bufferTime(16), filter((v) => {
const workbook = this._univerInstanceService.getCurrentUniverSheetInstance();
const worksheet = workbook.getActiveSheet();
return v.filter((item) => ['sort', 'delete'].includes(item.type) && item.unitId === workbook.getUnitId() && item.subUnitId === worksheet.getSheetId()).length > 0;
})).subscribe(markDirtySkeleton));
// Once the calculation is complete, a view update is triggered
- // This rendering does not trigger conditional format recalculation,because the rule is not mark dirty
- this.disposeWithMe(this._conditionalFormatService.ruleComputeStatus$.pipe(bufferTime(16), filter((v) => {
+ // This rendering does not trigger conditional formatting recalculation,because the rule is not mark dirty
+ this.disposeWithMe(this._conditionalFormattingService.ruleComputeStatus$.pipe(bufferTime(16), filter((v) => {
const workbook = this._univerInstanceService.getCurrentUniverSheetInstance();
const worksheet = workbook.getActiveSheet();
return v.filter((item) => item.unitId === workbook.getUnitId() && item.subUnitId === worksheet.getSheetId()).length > 0;
@@ -99,14 +99,14 @@ export class RenderController extends Disposable {
_initViewModelInterceptor() {
this.disposeWithMe(this._sheetInterceptorService.intercept(INTERCEPTOR_POINT.CELL_CONTENT, { handler: (cell, context, next) => {
- const result = this._conditionalFormatService.composeStyle(context.unitId, context.subUnitId, context.row, context.col);
+ const result = this._conditionalFormattingService.composeStyle(context.unitId, context.subUnitId, context.row, context.col);
if (!result) {
return next(cell);
}
const styleMap = context.workbook.getStyles();
const defaultStyle = (typeof cell?.s === 'string' ? styleMap.get(cell?.s) : cell?.s) || {};
const s = { ...defaultStyle };
- const cloneCell = { ...cell, s } as IConditionalFormatCellData & ISheetFontRenderExtension;
+ const cloneCell = { ...cell, s } as IConditionalFormattingCellData & ISheetFontRenderExtension;
if (result.style) {
Object.assign(s, result.style);
}
diff --git a/packages/sheets-conditional-format/src/index.ts b/packages/sheets-conditional-formatting/src/index.ts
similarity index 85%
rename from packages/sheets-conditional-format/src/index.ts
rename to packages/sheets-conditional-formatting/src/index.ts
index 8eab700c88..090a9d3021 100644
--- a/packages/sheets-conditional-format/src/index.ts
+++ b/packages/sheets-conditional-formatting/src/index.ts
@@ -14,4 +14,5 @@
* limitations under the License.
*/
-export { SheetsConditionalFormatPlugin } from './plugin';
+export { SheetsConditionalFormattingPlugin } from './plugin';
+export { enUS, zhCN } from './locale';
diff --git a/packages/sheets-conditional-formatting/src/locale/en-US.ts b/packages/sheets-conditional-formatting/src/locale/en-US.ts
new file mode 100644
index 0000000000..809849ee19
--- /dev/null
+++ b/packages/sheets-conditional-formatting/src/locale/en-US.ts
@@ -0,0 +1,176 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type zhCN from './zh-CN';
+
+// TODO: @Gggpound To be translated
+const locale: typeof zhCN = {
+ sheet: {
+ cf: {
+ title: '条件格式',
+ menu: {
+ manageConditionalFormatting: '管理条件格式',
+ createConditionalFormatting: '新建条件格式',
+ clearRangeRules: '清除所选区域的规则',
+ clearWorkSheetRules: '清除整个工作表的规则',
+
+ },
+ form: {
+ lessThan: '该值必须小于 {0}',
+ lessThanOrEqual: '该值必须小于等于 {0}',
+ greaterThan: '该值必大于 {0}',
+ greaterThanOrEqual: '该值必大于等于 {0}',
+ rangeSelector: '选择范围或者输入值',
+ },
+ iconSet: {
+ direction: '方向',
+ shape: '形状',
+ mark: '标记',
+ rank: '等级',
+ rule: '规则',
+ icon: '图标',
+ type: '类型',
+ value: '值',
+ reverseIconOrder: '反转图标次序',
+ and: '且',
+ when: '当值',
+ onlyShowIcon: '仅显示图标',
+ },
+ symbol: {
+ greaterThan: '>',
+ greaterThanOrEqual: '>=',
+ lessThan: '<',
+ lessThanOrEqual: '<=',
+ },
+ panel: {
+ createRule: '新增规则',
+ clear: '清空所有规则',
+ range: '应用范围',
+ styleType: '样式类型',
+ submit: '确认',
+ cancel: '取消',
+ rankAndAverage: '最前/最后/平均值',
+ styleRule: '样式规则',
+ isNotBottom: '最前',
+ isBottom: '最后',
+ greaterThanAverage: '大于平均值',
+ lessThanAverage: '小于平均值',
+ medianValue: '中间值',
+ fillType: '填充方式',
+ pureColor: '纯色',
+ gradient: '渐变',
+ colorSet: '颜色设置',
+ positive: '正值',
+ native: '负值',
+ workSheet: '整张工作表',
+ selectedRange: '所选单元格',
+ managerRuleSelect: '管理 {0} 的规则',
+ },
+ preview: {
+ describe: {
+ beginsWith: '开头为{0}',
+ endsWith: '结尾为{0}',
+ containsText: '文本包含{0}',
+ notContainsText: '文本不包含{0}',
+ equal: '等于{0}',
+ notEqual: '不等于{0}',
+ containsBlanks: '为空',
+ notContainsBlanks: '不为空',
+ containsErrors: '错误',
+ notContainsErrors: '非错误',
+ greaterThan: '大于{0}',
+ greaterThanOrEqual: '大于等于{0}',
+ lessThan: '小于{0}',
+ lessThanOrEqual: '小于等于{0}',
+ notBetween: '不介于{0}和{1}之间',
+ between: '介于{0}和{1}之间',
+ yesterday: '昨日',
+ tomorrow: '明日',
+ last7Days: '最近7天',
+ thisMonth: '本月',
+ lastMonth: '上个月',
+ nextMonth: '下个月',
+ thisWeek: '本周',
+ lastWeek: '上周',
+ nextWeek: '下周',
+ today: '今日',
+ topN: '前{0}项',
+ bottomN: '后{0}项',
+ topNPercent: '前{0}%',
+ bottomNPercent: '后{0}%',
+ },
+ },
+ operator: {
+ beginsWith: '开头为',
+ endsWith: '结尾为',
+ containsText: '文本包含',
+ notContainsText: '文本不包含',
+ equal: '等于',
+ notEqual: '不等于',
+ containsBlanks: '为空',
+ notContainsBlanks: '不为空',
+ containsErrors: '错误',
+ notContainsErrors: '非错误',
+ greaterThan: '大于',
+ greaterThanOrEqual: '大于等于',
+ lessThan: '小于',
+ lessThanOrEqual: '小于等于',
+ notBetween: '不介于',
+ between: '介于',
+ yesterday: '昨日',
+ tomorrow: '明日',
+ last7Days: '最近 7 天',
+ thisMonth: '本月',
+ lastMonth: '上个月',
+ nextMonth: '下个月',
+ thisWeek: '本周',
+ lastWeek: '上周',
+ nextWeek: '下周',
+ today: '今日',
+ },
+ ruleType: {
+ highlightCell: '突出显示单元格',
+ dataBar: '数据条',
+ colorScale: '色阶',
+ formula: '自定义公式',
+ iconSet: '图标集',
+ duplicateValues: '重复值',
+ uniqueValues: '唯一值',
+
+ },
+ subRuleType: {
+ uniqueValues: '唯一值',
+ duplicateValues: '重复值',
+ rank: '最前最后',
+ text: '文本',
+ timePeriod: '时间日期',
+ number: '数值',
+ average: '平均值',
+ },
+ valueType: {
+ num: '数值',
+ min: '最小值',
+ max: '最大值',
+ percent: '百分比',
+ percentile: '百分点',
+ formula: '公式',
+ none: '无',
+ },
+ },
+ },
+};
+
+export default locale;
diff --git a/packages/sheets-conditional-format/src/locale/index.ts b/packages/sheets-conditional-formatting/src/locale/index.ts
similarity index 87%
rename from packages/sheets-conditional-format/src/locale/index.ts
rename to packages/sheets-conditional-formatting/src/locale/index.ts
index e0c0d934cd..1eff5fc204 100644
--- a/packages/sheets-conditional-format/src/locale/index.ts
+++ b/packages/sheets-conditional-formatting/src/locale/index.ts
@@ -14,6 +14,5 @@
* limitations under the License.
*/
-import zhCN from './zh-ch';
-
-export { zhCN };
+export { default as enUS } from './en-US';
+export { default as zhCN } from './zh-CN';
diff --git a/packages/sheets-conditional-format/src/locale/zh-ch.ts b/packages/sheets-conditional-formatting/src/locale/zh-CN.ts
similarity index 97%
rename from packages/sheets-conditional-format/src/locale/zh-ch.ts
rename to packages/sheets-conditional-formatting/src/locale/zh-CN.ts
index ec4a719b97..aa5d66675f 100644
--- a/packages/sheets-conditional-format/src/locale/zh-ch.ts
+++ b/packages/sheets-conditional-formatting/src/locale/zh-CN.ts
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-export default {
+const locale = {
sheet: {
cf: {
title: '条件格式',
menu: {
- manageConditionalFormat: '管理条件格式',
- createConditionalFormat: '新建条件格式',
+ manageConditionalFormatting: '管理条件格式',
+ createConditionalFormatting: '新建条件格式',
clearRangeRules: '清除所选区域的规则',
clearWorkSheetRules: '清除整个工作表的规则',
@@ -169,3 +169,5 @@ export default {
},
},
};
+
+export default locale;
diff --git a/packages/sheets-conditional-format/src/menu/manage-rule.ts b/packages/sheets-conditional-formatting/src/menu/manage-rule.ts
similarity index 90%
rename from packages/sheets-conditional-format/src/menu/manage-rule.ts
rename to packages/sheets-conditional-formatting/src/menu/manage-rule.ts
index dbb81fa2ea..12a97c796c 100644
--- a/packages/sheets-conditional-format/src/menu/manage-rule.ts
+++ b/packages/sheets-conditional-formatting/src/menu/manage-rule.ts
@@ -27,19 +27,19 @@ import { AddConditionalRuleMutation } from '../commands/mutations/add-conditiona
import { SetConditionalRuleMutation } from '../commands/mutations/set-conditional-rule.mutation';
import { DeleteConditionalRuleMutation } from '../commands/mutations/delete-conditional-rule.mutation';
import { MoveConditionalRuleMutation } from '../commands/mutations/move-conditional-rule.mutation';
-import { ConditionalFormatRuleModel } from '../models/conditional-format-rule-model';
+import { ConditionalFormattingRuleModel } from '../models/conditional-formatting-rule-model';
-import { CF_MENU_OPERATION, OpenConditionalFormatOperator } from '../commands/operations/open-conditional-format-panel';
+import { CF_MENU_OPERATION, OpenConditionalFormattingOperator } from '../commands/operations/open-conditional-formatting-panel';
-export const FactoryManageConditionalFormatRule = (componentManager: ComponentManager) => {
- const key = 'conditional-format-menu-icon';
+export const FactoryManageConditionalFormattingRule = (componentManager: ComponentManager) => {
+ const key = 'conditional-formatting-menu-icon';
componentManager.register(key, Conditions);
return (_accessor: IAccessor) => {
const localeService = _accessor.get(LocaleService);
const selectionManagerService = _accessor.get(SelectionManagerService);
const commandService = _accessor.get(ICommandService);
const univerInstanceService = _accessor.get(IUniverInstanceService);
- const conditionalFormatRuleModel = _accessor.get(ConditionalFormatRuleModel);
+ const conditionalFormattingRuleModel = _accessor.get(ConditionalFormattingRuleModel);
const zenZoneService = _accessor.get(IZenZoneService);
const commandList = [SetWorksheetActiveOperation.id, AddConditionalRuleMutation.id, SetConditionalRuleMutation.id, DeleteConditionalRuleMutation.id, MoveConditionalRuleMutation.id];
@@ -61,7 +61,7 @@ export const FactoryManageConditionalFormatRule = (componentManager: ComponentMa
const ranges = selectionManagerService.getSelections()?.map((selection) => selection.range) || [];
const unitId = univerInstanceService.getCurrentUniverSheetInstance().getUnitId();
const subUnitId = univerInstanceService.getCurrentUniverSheetInstance().getActiveSheet().getSheetId();
- const allRule = conditionalFormatRuleModel.getSubunitRules(unitId, subUnitId) || [];
+ const allRule = conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId) || [];
const ruleList = allRule.filter((rule) => rule.ranges.some((ruleRange) => ranges.some((range) => Rectangle.intersects(range, ruleRange))));
subscriber.next(!!ruleList.length);
})
@@ -82,7 +82,7 @@ export const FactoryManageConditionalFormatRule = (componentManager: ComponentMa
).pipe(debounceTime(16)).subscribe(() => {
const unitId = univerInstanceService.getCurrentUniverSheetInstance().getUnitId();
const subUnitId = univerInstanceService.getCurrentUniverSheetInstance().getActiveSheet().getSheetId();
- const allRule = conditionalFormatRuleModel.getSubunitRules(unitId, subUnitId) || [];
+ const allRule = conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId) || [];
subscriber.next(!!allRule.length);
})
);
@@ -112,10 +112,10 @@ export const FactoryManageConditionalFormatRule = (componentManager: ComponentMa
value: CF_MENU_OPERATION.icon,
},
{
- label: localeService.t('sheet.cf.menu.manageConditionalFormat'),
+ label: localeService.t('sheet.cf.menu.manageConditionalFormatting'),
value: CF_MENU_OPERATION.viewRule,
}, {
- label: localeService.t('sheet.cf.menu.createConditionalFormat'),
+ label: localeService.t('sheet.cf.menu.createConditionalFormatting'),
value: CF_MENU_OPERATION.createRule,
},
{
@@ -152,7 +152,7 @@ export const FactoryManageConditionalFormatRule = (componentManager: ComponentMa
};
});
return {
- id: OpenConditionalFormatOperator.id,
+ id: OpenConditionalFormattingOperator.id,
type: MenuItemType.SELECTOR,
group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
positions: [MenuPosition.TOOLBAR_START],
diff --git a/packages/sheets-conditional-format/src/models/conditional-format-rule-model.ts b/packages/sheets-conditional-formatting/src/models/conditional-formatting-rule-model.ts
similarity index 74%
rename from packages/sheets-conditional-format/src/models/conditional-format-rule-model.ts
rename to packages/sheets-conditional-formatting/src/models/conditional-formatting-rule-model.ts
index e26a168367..6b6d3ce5ce 100644
--- a/packages/sheets-conditional-format/src/models/conditional-format-rule-model.ts
+++ b/packages/sheets-conditional-formatting/src/models/conditional-formatting-rule-model.ts
@@ -17,18 +17,18 @@
import { Inject, Injector } from '@wendellhu/redi';
import { Range } from '@univerjs/core';
import { Subject } from 'rxjs';
-import { ConditionalFormatService } from '../services/conditional-format.service';
-import type { IConditionFormatRule, IRuleModel } from './type';
-import { ConditionalFormatViewModel } from './conditional-format-view-model';
+import { ConditionalFormattingService } from '../services/conditional-formatting.service';
+import type { IConditionFormattingRule, IRuleModel } from './type';
+import { ConditionalFormattingViewModel } from './conditional-formatting-view-model';
type RuleOperatorType = 'delete' | 'set' | 'add' | 'sort';
-export class ConditionalFormatRuleModel {
- // Map<unitID ,<sheetId ,IConditionFormatRule[]>>
+export class ConditionalFormattingRuleModel {
+ // Map<unitID ,<sheetId ,IConditionFormattingRule[]>>
private _model: IRuleModel = new Map();
- private _ruleChange$ = new Subject<{ rule: IConditionFormatRule;unitId: string;subUnitId: string; type: RuleOperatorType }>();
+ private _ruleChange$ = new Subject<{ rule: IConditionFormattingRule;unitId: string;subUnitId: string; type: RuleOperatorType }>();
$ruleChange = this._ruleChange$.asObservable();
- constructor(@Inject(ConditionalFormatViewModel) private _conditionalFormatViewModel: ConditionalFormatViewModel,
+ constructor(@Inject(ConditionalFormattingViewModel) private _conditionalFormattingViewModel: ConditionalFormattingViewModel,
@Inject(Injector) private _injector: Injector
) {
@@ -41,7 +41,7 @@ export class ConditionalFormatRuleModel {
list = [];
let unitMap = this._model.get(unitId);
if (!unitMap) {
- unitMap = new Map<string, IConditionFormatRule[]>();
+ unitMap = new Map<string, IConditionFormattingRule[]>();
this._model.set(unitId, unitMap);
}
unitMap.set(subUnitId, list);
@@ -76,7 +76,7 @@ export class ConditionalFormatRuleModel {
list.splice(index, 1);
rule.ranges.forEach((range) => {
Range.foreach(range, (row, col) => {
- this._conditionalFormatViewModel.deleteCellCf(unitId, subUnitId, row, col, rule.cfId);
+ this._conditionalFormattingViewModel.deleteCellCf(unitId, subUnitId, row, col, rule.cfId);
});
});
this._ruleChange$.next({ rule, subUnitId, unitId, type: 'delete' });
@@ -84,7 +84,7 @@ export class ConditionalFormatRuleModel {
}
}
- setRule(unitId: string, subUnitId: string, rule: IConditionFormatRule) {
+ setRule(unitId: string, subUnitId: string, rule: IConditionFormattingRule) {
const list = this._ensureList(unitId, subUnitId);
const oldRule = list.find((item) => item.cfId === rule.cfId);
if (oldRule) {
@@ -96,19 +96,19 @@ export class ConditionalFormatRuleModel {
// and this cleanup is deferred until the end of the calculation.
// Otherwise the render will flash once
const cloneRange = [...oldRule.ranges];
- const conditionalFormatService = this._injector.get(ConditionalFormatService);
- const dispose = conditionalFormatService.interceptorManager.intercept(conditionalFormatService.interceptorManager.getInterceptPoints().beforeUpdateRuleResult, {
+ const conditionalFormattingService = this._injector.get(ConditionalFormattingService);
+ const dispose = conditionalFormattingService.interceptorManager.intercept(conditionalFormattingService.interceptorManager.getInterceptPoints().beforeUpdateRuleResult, {
handler: (config) => {
if (unitId === config?.unitId && subUnitId === config.subUnitId && rule.cfId === config.cfId) {
cloneRange.forEach((range) => {
Range.foreach(range, (row, col) => {
- this._conditionalFormatViewModel.deleteCellCf(unitId, subUnitId, row, col, oldRule.cfId);
+ this._conditionalFormattingViewModel.deleteCellCf(unitId, subUnitId, row, col, oldRule.cfId);
});
});
rule.ranges.forEach((range) => {
Range.foreach(range, (row, col) => {
- this._conditionalFormatViewModel.pushCellCf(unitId, subUnitId, row, col, rule.cfId);
- this._conditionalFormatViewModel.sortCellCf(unitId, subUnitId, row, col, cfPriorityMap);
+ this._conditionalFormattingViewModel.pushCellCf(unitId, subUnitId, row, col, rule.cfId);
+ this._conditionalFormattingViewModel.sortCellCf(unitId, subUnitId, row, col, cfPriorityMap);
});
});
dispose();
@@ -117,20 +117,20 @@ export class ConditionalFormatRuleModel {
});
rule.ranges.forEach((range) => {
Range.foreach(range, (row, col) => {
- this._conditionalFormatViewModel.pushCellCf(unitId, subUnitId, row, col, rule.cfId);
+ this._conditionalFormattingViewModel.pushCellCf(unitId, subUnitId, row, col, rule.cfId);
});
});
Object.assign(oldRule, rule);
- this._conditionalFormatViewModel.markRuleDirty(unitId, subUnitId, rule);
+ this._conditionalFormattingViewModel.markRuleDirty(unitId, subUnitId, rule);
this._ruleChange$.next({ rule, subUnitId, unitId, type: 'set' });
}
}
- addRule(unitId: string, subUnitId: string, rule: IConditionFormatRule) {
+ addRule(unitId: string, subUnitId: string, rule: IConditionFormattingRule) {
const list = this._ensureList(unitId, subUnitId);
const item = list.find((item) => item.cfId === rule.cfId);
if (!item) {
- // The new conditional format has a higher priority
+ // The new conditional formatting has a higher priority
list.unshift(rule);
}
const cfPriorityMap = list.map((item) => item.cfId).reduce((map, cur, index) => {
@@ -139,11 +139,11 @@ export class ConditionalFormatRuleModel {
}, new Map<string, number>());
rule.ranges.forEach((range) => {
Range.foreach(range, (row, col) => {
- this._conditionalFormatViewModel.pushCellCf(unitId, subUnitId, row, col, rule.cfId);
- this._conditionalFormatViewModel.sortCellCf(unitId, subUnitId, row, col, cfPriorityMap);
+ this._conditionalFormattingViewModel.pushCellCf(unitId, subUnitId, row, col, rule.cfId);
+ this._conditionalFormattingViewModel.sortCellCf(unitId, subUnitId, row, col, cfPriorityMap);
});
});
- this._conditionalFormatViewModel.markRuleDirty(unitId, subUnitId, rule);
+ this._conditionalFormattingViewModel.markRuleDirty(unitId, subUnitId, rule);
this._ruleChange$.next({ rule, subUnitId, unitId, type: 'add' });
}
@@ -168,7 +168,7 @@ export class ConditionalFormatRuleModel {
}, new Map<string, number>());
rule.ranges.forEach((range) => {
Range.foreach(range, (row, col) => {
- this._conditionalFormatViewModel.sortCellCf(unitId, subUnitId, row, col, cfPriorityMap);
+ this._conditionalFormattingViewModel.sortCellCf(unitId, subUnitId, row, col, cfPriorityMap);
});
});
this._ruleChange$.next({ rule, subUnitId, unitId, type: 'sort' });
diff --git a/packages/sheets-conditional-format/src/models/conditional-format-view-model.ts b/packages/sheets-conditional-formatting/src/models/conditional-formatting-view-model.ts
similarity index 95%
rename from packages/sheets-conditional-format/src/models/conditional-format-view-model.ts
rename to packages/sheets-conditional-formatting/src/models/conditional-formatting-view-model.ts
index 142046c3fc..8d6a3c6b87 100644
--- a/packages/sheets-conditional-format/src/models/conditional-format-view-model.ts
+++ b/packages/sheets-conditional-formatting/src/models/conditional-formatting-view-model.ts
@@ -33,17 +33,17 @@
import { ObjectMatrix, Range } from '@univerjs/core';
import { Subject } from 'rxjs';
import type { IDataBarRenderParams } from '../render/type';
-import type { IConditionFormatRule, IHighlightCell } from './type';
+import type { IConditionFormattingRule, IHighlightCell } from './type';
interface ICellItem {
cfList: { cfId: string; ruleCache?: IHighlightCell['style'] | IDataBarRenderParams ;isDirty: boolean }[];
}
-export class ConditionalFormatViewModel {
+export class ConditionalFormattingViewModel {
// Map<unitID ,<sheetId ,ObjectMatrix>>
private _model: Map<string, Map<string, ObjectMatrix<ICellItem>>> = new Map();
- private _markDirty$ = new Subject<{ rule: IConditionFormatRule;unitId: string;subUnitId: string }>();
+ private _markDirty$ = new Subject<{ rule: IConditionFormattingRule;unitId: string;subUnitId: string }>();
public markDirty$ = this._markDirty$.asObservable();
private _ensureMatrix(unitId: string, subUnitId: string) {
@@ -153,7 +153,7 @@ export class ConditionalFormatViewModel {
public markRuleDirty(
unitId: string,
subUnitId: string,
- rule: IConditionFormatRule,
+ rule: IConditionFormattingRule,
row?: number,
col?: number
) {
diff --git a/packages/sheets-conditional-format/src/models/icon-map.ts b/packages/sheets-conditional-formatting/src/models/icon-map.ts
similarity index 100%
rename from packages/sheets-conditional-format/src/models/icon-map.ts
rename to packages/sheets-conditional-formatting/src/models/icon-map.ts
diff --git a/packages/sheets-conditional-format/src/models/type.ts b/packages/sheets-conditional-formatting/src/models/type.ts
similarity index 94%
rename from packages/sheets-conditional-format/src/models/type.ts
rename to packages/sheets-conditional-formatting/src/models/type.ts
index cd81c9d7f8..1762ad868f 100644
--- a/packages/sheets-conditional-format/src/models/type.ts
+++ b/packages/sheets-conditional-formatting/src/models/type.ts
@@ -98,14 +98,14 @@ export interface IIconSet extends IBaseCfRule {
config: { operator: CFNumberOperator;value: IValueConfig;iconType: IIconType; iconId: string }[];
}
-export type IConditionalFormatRuleConfig = IColorScale | IDataBar | IUniqueValuesHighlightCell |
+export type IConditionalFormattingRuleConfig = IColorScale | IDataBar | IUniqueValuesHighlightCell |
IDuplicateValuesHighlightCell | IRankHighlightCell | ITextHighlightCell |
ITimePeriodHighlightCell | INumberHighlightCell | IAverageHighlightCell | IFormulaHighlightCell | IIconSet;
-export interface IConditionFormatRule<C = IConditionalFormatRuleConfig> {
+export interface IConditionFormattingRule<C = IConditionalFormattingRuleConfig> {
ranges: IRange [];
cfId: string;
stopIfTrue: boolean;
rule: C;
}
-export type IRuleModel = Map<string, Map<string, IConditionFormatRule[]>>;
-export type IRuleModelJson = Record<string, Record<string, IConditionFormatRule[]>>;
+export type IRuleModel = Map<string, Map<string, IConditionFormattingRule[]>>;
+export type IRuleModelJson = Record<string, Record<string, IConditionFormattingRule[]>>;
diff --git a/packages/sheets-conditional-format/src/plugin.ts b/packages/sheets-conditional-formatting/src/plugin.ts
similarity index 62%
rename from packages/sheets-conditional-format/src/plugin.ts
rename to packages/sheets-conditional-formatting/src/plugin.ts
index 52fd90f7cb..61d7205998 100644
--- a/packages/sheets-conditional-format/src/plugin.ts
+++ b/packages/sheets-conditional-formatting/src/plugin.ts
@@ -16,10 +16,10 @@
import { ICommandService, Plugin, PluginType } from '@univerjs/core';
import { Inject, Injector } from '@wendellhu/redi';
-import { SHEET_CONDITION_FORMAT_PLUGIN } from './base/const';
-import { ConditionalFormatService } from './services/conditional-format.service';
-import { ConditionalFormatRuleModel } from './models/conditional-format-rule-model';
-import { ConditionalFormatViewModel } from './models/conditional-format-view-model';
+import { SHEET_CONDITIONAL_FORMATTING_PLUGIN } from './base/const';
+import { ConditionalFormattingService } from './services/conditional-formatting.service';
+import { ConditionalFormattingRuleModel } from './models/conditional-formatting-rule-model';
+import { ConditionalFormattingViewModel } from './models/conditional-formatting-view-model';
import { RenderController } from './controllers/cf.render.controller';
import { DddAverageCfCommand } from './commands/commands/add-average-cf.command';
import { AddColorScaleConditionalRuleCommand } from './commands/commands/add-color-scale-cf.command';
@@ -34,25 +34,25 @@ import { AddConditionalRuleMutation } from './commands/mutations/add-conditional
import { DeleteConditionalRuleMutation } from './commands/mutations/delete-conditional-rule.mutation';
import { RefRangeController } from './controllers/cf.ref-range.controller';
import { SetConditionalRuleMutation } from './commands/mutations/set-conditional-rule.mutation';
-import { ConditionalFormatCopyPasteController } from './controllers/cf.copy-paste.controller';
-import { ConditionalFormatAutoFillController } from './controllers/cf.auto-fill.controller';
-import { ConditionalFormatMenuController } from './controllers/cf.menu.controller';
-import { ConditionalFormatI18nController } from './controllers/cf.i18n.controller';
+import { ConditionalFormattingCopyPasteController } from './controllers/cf.copy-paste.controller';
+import { ConditionalFormattingAutoFillController } from './controllers/cf.auto-fill.controller';
+import { ConditionalFormattingMenuController } from './controllers/cf.menu.controller';
+import { ConditionalFormattingI18nController } from './controllers/cf.i18n.controller';
import { ClearRangeCfCommand } from './commands/commands/clear-range-cf.command';
import { ClearWorksheetCfCommand } from './commands/commands/clear-worksheet-cf.command';
-import { OpenConditionalFormatOperator } from './commands/operations/open-conditional-format-panel';
+import { OpenConditionalFormattingOperator } from './commands/operations/open-conditional-formatting-panel';
import { DeleteCfCommand } from './commands/commands/delete-cf.command';
import { SetCfCommand } from './commands/commands/set-cf.command';
import { moveCfCommand } from './commands/commands/move-cf.command';
import { AddCfCommand } from './commands/commands/add-cf.command';
import { MoveConditionalRuleMutation } from './commands/mutations/move-conditional-rule.mutation';
-import { ConditionalFormatFormulaService } from './services/conditional-format-formula.service';
-import { ConditionalFormatFormulaMarkDirty } from './commands/mutations/formula-mark-dirty.mutation';
-import { ConditionalFormatEditorController } from './controllers/cf.editor.controller';
-import { ConditionalFormatClearController } from './controllers/cf.clear.controller';
+import { ConditionalFormattingFormulaService } from './services/conditional-formatting-formula.service';
+import { ConditionalFormattingFormulaMarkDirty } from './commands/mutations/formula-mark-dirty.mutation';
+import { ConditionalFormattingEditorController } from './controllers/cf.editor.controller';
+import { ConditionalFormattingClearController } from './controllers/cf.clear.controller';
-export class SheetsConditionalFormatPlugin extends Plugin {
+export class SheetsConditionalFormattingPlugin extends Plugin {
static override type = PluginType.Sheet;
static commandList = [DddAverageCfCommand,
AddColorScaleConditionalRuleCommand,
@@ -63,7 +63,7 @@ export class SheetsConditionalFormatPlugin extends Plugin {
AddTextCfCommand,
AddTimePeriodCfCommand,
AddUniqueValuesCfCommand,
- OpenConditionalFormatOperator,
+ OpenConditionalFormattingOperator,
DeleteCfCommand,
SetCfCommand,
moveCfCommand,
@@ -72,38 +72,38 @@ export class SheetsConditionalFormatPlugin extends Plugin {
ClearWorksheetCfCommand,
];
- static mutationList = [AddConditionalRuleMutation, DeleteConditionalRuleMutation, SetConditionalRuleMutation, MoveConditionalRuleMutation, ConditionalFormatFormulaMarkDirty];
+ static mutationList = [AddConditionalRuleMutation, DeleteConditionalRuleMutation, SetConditionalRuleMutation, MoveConditionalRuleMutation, ConditionalFormattingFormulaMarkDirty];
constructor(
_config: unknown,
@Inject(Injector) override readonly _injector: Injector,
@Inject(ICommandService) private _commandService: ICommandService
) {
- super(SHEET_CONDITION_FORMAT_PLUGIN);
+ super(SHEET_CONDITIONAL_FORMATTING_PLUGIN);
this._initCommand();
}
override onStarting(): void {
- this._injector.add([ConditionalFormatService]);
- this._injector.add([ConditionalFormatFormulaService]);
+ this._injector.add([ConditionalFormattingService]);
+ this._injector.add([ConditionalFormattingFormulaService]);
- this._injector.add([ConditionalFormatRuleModel]);
- this._injector.add([ConditionalFormatViewModel]);
+ this._injector.add([ConditionalFormattingRuleModel]);
+ this._injector.add([ConditionalFormattingViewModel]);
this._injector.add([RenderController]);
this._injector.add([RefRangeController]);
- this._injector.add([ConditionalFormatCopyPasteController]);
- this._injector.add([ConditionalFormatAutoFillController]);
- this._injector.add([ConditionalFormatMenuController]);
- this._injector.add([ConditionalFormatI18nController]);
- this._injector.add([ConditionalFormatEditorController]);
- this._injector.add([ConditionalFormatClearController]);
+ this._injector.add([ConditionalFormattingCopyPasteController]);
+ this._injector.add([ConditionalFormattingAutoFillController]);
+ this._injector.add([ConditionalFormattingMenuController]);
+ this._injector.add([ConditionalFormattingI18nController]);
+ this._injector.add([ConditionalFormattingEditorController]);
+ this._injector.add([ConditionalFormattingClearController]);
}
_initCommand() {
- SheetsConditionalFormatPlugin.commandList.forEach((m) => {
+ SheetsConditionalFormattingPlugin.commandList.forEach((m) => {
this._commandService.registerCommand(m);
});
- SheetsConditionalFormatPlugin.mutationList.forEach((m) => {
+ SheetsConditionalFormattingPlugin.mutationList.forEach((m) => {
this._commandService.registerCommand(m);
});
}
diff --git a/packages/sheets-conditional-format/src/render/data-bar.render.ts b/packages/sheets-conditional-formatting/src/render/data-bar.render.ts
similarity index 100%
rename from packages/sheets-conditional-format/src/render/data-bar.render.ts
rename to packages/sheets-conditional-formatting/src/render/data-bar.render.ts
diff --git a/packages/sheets-conditional-format/src/render/icon.render.ts b/packages/sheets-conditional-formatting/src/render/icon.render.ts
similarity index 98%
rename from packages/sheets-conditional-format/src/render/icon.render.ts
rename to packages/sheets-conditional-formatting/src/render/icon.render.ts
index 5b3b2f53cc..d9a389826a 100644
--- a/packages/sheets-conditional-format/src/render/icon.render.ts
+++ b/packages/sheets-conditional-formatting/src/render/icon.render.ts
@@ -27,7 +27,7 @@ const EXTENSION_Z_INDEX = 34;
export const DEFAULT_WIDTH = 15;
export const DEFAULT_PADDING = 2;
-export class ConditionalFormatIcon extends SheetExtension {
+export class ConditionalFormattingIcon extends SheetExtension {
private _paddingRightAndLeft = DEFAULT_PADDING;
private _width = DEFAULT_WIDTH;
diff --git a/packages/sheets-conditional-format/src/render/type.ts b/packages/sheets-conditional-formatting/src/render/type.ts
similarity index 93%
rename from packages/sheets-conditional-format/src/render/type.ts
rename to packages/sheets-conditional-formatting/src/render/type.ts
index ec90b0c0f0..9e72f22be3 100644
--- a/packages/sheets-conditional-format/src/render/type.ts
+++ b/packages/sheets-conditional-formatting/src/render/type.ts
@@ -37,4 +37,4 @@ export interface IIconSetCellData extends ICellData {
iconSet?: IIconSetRenderParams;
_originV?: ICellData['v'];
}
-export type IConditionalFormatCellData = IDataBarCellData & IIconSetCellData;
+export type IConditionalFormattingCellData = IDataBarCellData & IIconSetCellData;
diff --git a/packages/sheets-conditional-format/src/services/__test__/cf.service.spec.ts b/packages/sheets-conditional-formatting/src/services/__test__/cf.service.spec.ts
similarity index 55%
rename from packages/sheets-conditional-format/src/services/__test__/cf.service.spec.ts
rename to packages/sheets-conditional-formatting/src/services/__test__/cf.service.spec.ts
index 6ec9a7e07b..8a024bfbc0 100644
--- a/packages/sheets-conditional-format/src/services/__test__/cf.service.spec.ts
+++ b/packages/sheets-conditional-formatting/src/services/__test__/cf.service.spec.ts
@@ -15,12 +15,12 @@
*/
import { beforeEach, describe, expect, it } from 'vitest';
-import type { IAverageHighlightCell, IColorScale, IConditionFormatRule, IDataBar, INumberHighlightCell, IRankHighlightCell, ITextHighlightCell } from '../../models/type';
+import type { IAverageHighlightCell, IColorScale, IConditionFormattingRule, IDataBar, INumberHighlightCell, IRankHighlightCell, ITextHighlightCell } from '../../models/type';
import { CFNumberOperator, CFRuleType, CFSubRuleType, CFTextOperator, CFValueType } from '../../base/const';
import { EMPTY_STYLE } from '../calculate-unit/type';
import { createTestBed } from './test.util';
-describe('Test conditional format service', () => {
+describe('Test conditional formatting service', () => {
let testBed: ReturnType<typeof createTestBed>;
beforeEach(() => {
testBed && testBed.univer.dispose();
@@ -30,9 +30,9 @@ describe('Test conditional format service', () => {
describe('Test highlight', () => {
describe('Test Number', () => {
it(`Is ${CFNumberOperator.between}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -42,18 +42,18 @@ describe('Test conditional format service', () => {
value: [0, 10],
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`Is not ${CFNumberOperator.between}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -63,18 +63,18 @@ describe('Test conditional format service', () => {
value: [5, 10],
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: EMPTY_STYLE });
});
});
it(`Is ${CFNumberOperator.equal}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -84,18 +84,18 @@ describe('Test conditional format service', () => {
value: 2,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`Is not ${CFNumberOperator.equal}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -105,18 +105,18 @@ describe('Test conditional format service', () => {
value: 2,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 2);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 2);
expect(result).toEqual({ style: EMPTY_STYLE });
});
});
it(`Is ${CFNumberOperator.greaterThan}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -126,18 +126,18 @@ describe('Test conditional format service', () => {
value: 0,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`Is not ${CFNumberOperator.greaterThan}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -147,18 +147,18 @@ describe('Test conditional format service', () => {
value: 2,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: EMPTY_STYLE });
});
});
it(`Is ${CFNumberOperator.greaterThanOrEqual}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -168,18 +168,18 @@ describe('Test conditional format service', () => {
value: 0,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`Is not ${CFNumberOperator.greaterThanOrEqual}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -189,18 +189,18 @@ describe('Test conditional format service', () => {
value: 3,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: EMPTY_STYLE });
});
});
it(`Is ${CFNumberOperator.lessThan}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -210,18 +210,18 @@ describe('Test conditional format service', () => {
value: 3,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`Is not ${CFNumberOperator.lessThan}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -231,18 +231,18 @@ describe('Test conditional format service', () => {
value: 0,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: EMPTY_STYLE });
});
});
it(`Is ${CFNumberOperator.lessThanOrEqual}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -252,18 +252,18 @@ describe('Test conditional format service', () => {
value: 3,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`Is not ${CFNumberOperator.lessThanOrEqual}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -273,18 +273,18 @@ describe('Test conditional format service', () => {
value: 0,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: EMPTY_STYLE });
});
});
it(`Is ${CFNumberOperator.notBetween}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -294,18 +294,18 @@ describe('Test conditional format service', () => {
value: [5, 7],
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`Is not ${CFNumberOperator.notBetween}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -315,18 +315,18 @@ describe('Test conditional format service', () => {
value: [0, 3],
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: EMPTY_STYLE });
});
});
it(`Is ${CFNumberOperator.notEqual}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -336,18 +336,18 @@ describe('Test conditional format service', () => {
value: 11,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`Is not ${CFNumberOperator.notEqual}`, () => {
- const params: IConditionFormatRule<INumberHighlightCell> = {
+ const params: IConditionFormattingRule<INumberHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -357,20 +357,20 @@ describe('Test conditional format service', () => {
value: 2,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: EMPTY_STYLE });
});
});
});
describe('Test Text', () => {
it(`is ${CFTextOperator.beginsWith}`, () => {
- const params: IConditionFormatRule<ITextHighlightCell> = {
+ const params: IConditionFormattingRule<ITextHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -380,18 +380,18 @@ describe('Test conditional format service', () => {
value: '2',
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`is not ${CFTextOperator.beginsWith}`, () => {
- const params: IConditionFormatRule<ITextHighlightCell> = {
+ const params: IConditionFormattingRule<ITextHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -401,19 +401,19 @@ describe('Test conditional format service', () => {
value: '11',
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: EMPTY_STYLE });
});
});
it(`is ${CFTextOperator.endsWith}`, () => {
- const params: IConditionFormatRule<ITextHighlightCell> = {
+ const params: IConditionFormattingRule<ITextHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -423,18 +423,18 @@ describe('Test conditional format service', () => {
value: '2',
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`is not ${CFTextOperator.endsWith}`, () => {
- const params: IConditionFormatRule<ITextHighlightCell> = {
+ const params: IConditionFormattingRule<ITextHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -444,19 +444,19 @@ describe('Test conditional format service', () => {
value: '11',
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: EMPTY_STYLE });
});
});
it(`is ${CFTextOperator.containsText}`, () => {
- const params: IConditionFormatRule<ITextHighlightCell> = {
+ const params: IConditionFormattingRule<ITextHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -466,18 +466,18 @@ describe('Test conditional format service', () => {
value: '2',
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`is not ${CFTextOperator.containsText}`, () => {
- const params: IConditionFormatRule<ITextHighlightCell> = {
+ const params: IConditionFormattingRule<ITextHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -487,18 +487,18 @@ describe('Test conditional format service', () => {
value: '11',
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: EMPTY_STYLE });
});
});
it(`is ${CFTextOperator.equal}`, () => {
- const params: IConditionFormatRule<ITextHighlightCell> = {
+ const params: IConditionFormattingRule<ITextHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -508,18 +508,18 @@ describe('Test conditional format service', () => {
value: '2',
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`is not ${CFTextOperator.equal}`, () => {
- const params: IConditionFormatRule<ITextHighlightCell> = {
+ const params: IConditionFormattingRule<ITextHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -529,18 +529,18 @@ describe('Test conditional format service', () => {
value: '11',
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: EMPTY_STYLE });
});
});
it(`is ${CFTextOperator.notEqual}`, () => {
- const params: IConditionFormatRule<ITextHighlightCell> = {
+ const params: IConditionFormattingRule<ITextHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -550,18 +550,18 @@ describe('Test conditional format service', () => {
value: '22',
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`is not ${CFTextOperator.notEqual}`, () => {
- const params: IConditionFormatRule<ITextHighlightCell> = {
+ const params: IConditionFormattingRule<ITextHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -571,18 +571,18 @@ describe('Test conditional format service', () => {
value: '2',
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: EMPTY_STYLE });
});
});
it(`is ${CFTextOperator.notContainsText}`, () => {
- const params: IConditionFormatRule<ITextHighlightCell> = {
+ const params: IConditionFormattingRule<ITextHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -592,18 +592,18 @@ describe('Test conditional format service', () => {
value: '11',
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`is not ${CFTextOperator.notContainsText}`, () => {
- const params: IConditionFormatRule<ITextHighlightCell> = {
+ const params: IConditionFormattingRule<ITextHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -613,20 +613,20 @@ describe('Test conditional format service', () => {
value: '2',
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: EMPTY_STYLE });
});
});
});
describe('Test average', () => {
it(`is ${CFNumberOperator.greaterThanOrEqual} average`, () => {
- const params: IConditionFormatRule<IAverageHighlightCell> = {
+ const params: IConditionFormattingRule<IAverageHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -635,18 +635,18 @@ describe('Test conditional format service', () => {
operator: CFNumberOperator.greaterThanOrEqual,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it(`is ${CFNumberOperator.lessThanOrEqual} average`, () => {
- const params: IConditionFormatRule<IAverageHighlightCell> = {
+ const params: IConditionFormattingRule<IAverageHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 2, endColumn: 2 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -655,20 +655,20 @@ describe('Test conditional format service', () => {
operator: CFNumberOperator.lessThanOrEqual,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
});
describe('Test rank', () => {
it('is bottom 2', () => {
- const params: IConditionFormatRule<IRankHighlightCell> = {
+ const params: IConditionFormattingRule<IRankHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 4, endColumn: 4 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -679,18 +679,18 @@ describe('Test conditional format service', () => {
value: 2,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
it('is bottom 6', () => {
- const params: IConditionFormatRule<IRankHighlightCell> = {
+ const params: IConditionFormattingRule<IRankHighlightCell> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 4, endColumn: 4 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
style: { bg: { rgb: '#2AEAEA' } },
@@ -701,11 +701,11 @@ describe('Test conditional format service', () => {
value: 6,
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const result = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const result = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
expect(result).toEqual({ style: { bg: { rgb: '#2AEAEA' } } });
});
});
@@ -715,9 +715,9 @@ describe('Test conditional format service', () => {
// });
describe('Test dataBar', () => {
it('dataBar', () => {
- const params: IConditionFormatRule<IDataBar> = {
+ const params: IConditionFormattingRule<IDataBar> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 5, endColumn: 6 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
type: CFRuleType.dataBar,
@@ -731,15 +731,15 @@ describe('Test conditional format service', () => {
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const one = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
- const two = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const three = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 2);
- const four = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 3);
- const five = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 4);
+ const one = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
+ const two = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const three = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 2);
+ const four = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 3);
+ const five = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 4);
expect(one).toEqual(EMPTY_STYLE);
expect(two).toEqual({
dataBar: {
@@ -779,9 +779,9 @@ describe('Test conditional format service', () => {
});
describe('Test colorScale', () => {
it('colorScale', () => {
- const params: IConditionFormatRule<IColorScale> = {
+ const params: IConditionFormattingRule<IColorScale> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 5, endColumn: 6 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
type: CFRuleType.colorScale,
@@ -802,15 +802,15 @@ describe('Test conditional format service', () => {
},
};
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
dispose.unsubscribe();
- const one = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
- const two = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
- const three = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 2);
- const four = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 3);
- const five = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 4);
+ const one = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
+ const two = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1);
+ const three = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 2);
+ const four = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 3);
+ const five = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 4);
expect(one).toEqual({
style: {
bg: {
@@ -849,9 +849,9 @@ describe('Test conditional format service', () => {
});
});
it('Need to filter if the set value is wrong', () => {
- const params: IConditionFormatRule<IColorScale> = {
+ const params: IConditionFormattingRule<IColorScale> = {
ranges: [{ startRow: 0, startColumn: 0, endRow: 5, endColumn: 6 }],
- cfId: testBed.getConditionalFormatRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
+ cfId: testBed.getConditionalFormattingRuleModel().createCfId(testBed.unitId, testBed.subUnitId),
stopIfTrue: false,
rule: {
type: CFRuleType.colorScale,
@@ -902,15 +902,15 @@ describe('Test conditional format service', () => {
},
]
*/
- testBed.getConditionalFormatRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
- testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
- const dispose = testBed.getConditionalFormatService().ruleComputeStatus$.subscribe(() => {
- dispose.unsubscribe();
- const one = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0); // 1
- const two = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1); // 2
- const three = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 2);// 3
- const four = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 3); // 4
- const five = testBed.getConditionalFormatService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 6); // is same as 3
+ testBed.getConditionalFormattingRuleModel().addRule(testBed.unitId, testBed.subUnitId, params);
+ testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0);
+ const dispose = testBed.getConditionalFormattingService().ruleComputeStatus$.subscribe(() => {
+ dispose.unsubscribe();
+ const one = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 0); // 1
+ const two = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 1); // 2
+ const three = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 2);// 3
+ const four = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 3); // 4
+ const five = testBed.getConditionalFormattingService().composeStyle(testBed.unitId, testBed.subUnitId, 1, 6); // is same as 3
expect(one).toEqual({
style: {
bg: {
diff --git a/packages/sheets-conditional-format/src/services/__test__/test.util.ts b/packages/sheets-conditional-formatting/src/services/__test__/test.util.ts
similarity index 75%
rename from packages/sheets-conditional-format/src/services/__test__/test.util.ts
rename to packages/sheets-conditional-formatting/src/services/__test__/test.util.ts
index e2b960b81a..0584fbe688 100644
--- a/packages/sheets-conditional-format/src/services/__test__/test.util.ts
+++ b/packages/sheets-conditional-formatting/src/services/__test__/test.util.ts
@@ -23,11 +23,11 @@ import { IActiveDirtyManagerService } from '@univerjs/sheets-formula';
import type { Dependency } from '@wendellhu/redi';
import { Inject, Injector } from '@wendellhu/redi';
-import { ConditionalFormatService } from '../conditional-format.service';
-import { ConditionalFormatFormulaService } from '../conditional-format-formula.service';
-import { SheetsConditionalFormatPlugin } from '../../plugin';
-import { ConditionalFormatRuleModel } from '../../models/conditional-format-rule-model';
-import { ConditionalFormatViewModel } from '../../models/conditional-format-view-model';
+import { ConditionalFormattingService } from '../conditional-formatting.service';
+import { ConditionalFormattingFormulaService } from '../conditional-formatting-formula.service';
+import { SheetsConditionalFormattingPlugin } from '../../plugin';
+import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
+import { ConditionalFormattingViewModel } from '../../models/conditional-formatting-view-model';
const TEST_WORKBOOK_DATA_DEMO: () => IWorkbookData = () => ({
id: 'test',
@@ -43,7 +43,6 @@ const TEST_WORKBOOK_DATA_DEMO: () => IWorkbookData = () => ({
4: { 0: { v: 1, t: 2 }, 1: { v: 2, t: 2 }, 2: { v: 3, t: 2 }, 3: { v: 4, t: 2 }, 4: { v: 5, t: 2 }, 5: { v: 6, t: 2 }, 6: { v: 7, t: 2 } },
5: { 0: { v: 1, t: 2 }, 1: { v: 2, t: 2 }, 2: { v: 3, t: 2 }, 3: { v: 4, t: 2 }, 4: { v: 5, t: 2 }, 5: { v: 6, t: 2 }, 6: { v: 7, t: 2 } },
},
-
},
},
locale: LocaleType.ZH_CN,
@@ -56,7 +55,7 @@ const TEST_WORKBOOK_DATA_DEMO: () => IWorkbookData = () => ({
data: '{"model":{},"refModel":[]}',
},
{
- name: 'SHEET_CONDITION_FORMAT_PLUGIN',
+ name: 'SHEET_CONDITIONAL_FORMATTING_PLUGIN',
data: '{"sheet1":[{"cfId":"1","ranges":[{"startRow":0,"startColumn":0,"endRow":5,"endColumn":6,"startAbsoluteRefType":0,"endAbsoluteRefType":0,"rangeType":0}],"rule":{"config":[{"color":"#ff0000","value":{"type":"min","value":10},"index":0},{"color":"#0000ff","value":{"type":"max","value":90},"index":1}],"type":"colorScale"},"stopIfTrue":false}]}',
},
],
@@ -82,12 +81,12 @@ export const createTestBed = (dependencies?: Dependency[]) => {
}
override onReady(): void {
- this._injector.add([ConditionalFormatService]);
- this._injector.add([ConditionalFormatFormulaService]);
- this._injector.add([ConditionalFormatRuleModel]);
- this._injector.add([ConditionalFormatViewModel]);
+ this._injector.add([ConditionalFormattingService]);
+ this._injector.add([ConditionalFormattingFormulaService]);
+ this._injector.add([ConditionalFormattingRuleModel]);
+ this._injector.add([ConditionalFormattingViewModel]);
this._injector.add([IActiveDirtyManagerService, { useFactory: () => ({ register: () => {} } as any) }]);
- this._injector.get(ConditionalFormatService);
+ this._injector.get(ConditionalFormattingService);
}
}
@@ -98,16 +97,16 @@ export const createTestBed = (dependencies?: Dependency[]) => {
const univerInstanceService = injector.get(IUniverInstanceService);
const commandService = injector.get(ICommandService);
- [...SheetsConditionalFormatPlugin.commandList, ...SheetsConditionalFormatPlugin.mutationList].forEach((commandInfo) => {
+ [...SheetsConditionalFormattingPlugin.commandList, ...SheetsConditionalFormattingPlugin.mutationList].forEach((commandInfo) => {
commandService.registerCommand(commandInfo);
});
const unitId = workbookJson.id;
const subUnitId = workbookJson.sheets.sheet1.id!;
univerInstanceService.focusUniverInstance('test');
univerInstanceService.setCurrentUniverSheetInstance(subUnitId);
- const getConditionalFormatRuleModel = () => injector.get(ConditionalFormatRuleModel);
- const getConditionalFormatViewModel = () => injector.get(ConditionalFormatViewModel);
- const getConditionalFormatService = () => injector.get(ConditionalFormatService);
+ const getConditionalFormattingRuleModel = () => injector.get(ConditionalFormattingRuleModel);
+ const getConditionalFormattingViewModel = () => injector.get(ConditionalFormattingViewModel);
+ const getConditionalFormattingService = () => injector.get(ConditionalFormattingService);
return {
univer,
get,
@@ -115,8 +114,8 @@ export const createTestBed = (dependencies?: Dependency[]) => {
unitId,
subUnitId,
commandService,
- getConditionalFormatRuleModel,
- getConditionalFormatViewModel,
- getConditionalFormatService,
+ getConditionalFormattingRuleModel,
+ getConditionalFormattingViewModel,
+ getConditionalFormattingService,
};
};
diff --git a/packages/sheets-conditional-format/src/services/calculate-unit/color-scale.ts b/packages/sheets-conditional-formatting/src/services/calculate-unit/color-scale.ts
similarity index 86%
rename from packages/sheets-conditional-format/src/services/calculate-unit/color-scale.ts
rename to packages/sheets-conditional-formatting/src/services/calculate-unit/color-scale.ts
index d74b41458c..86ca6d372e 100644
--- a/packages/sheets-conditional-format/src/services/calculate-unit/color-scale.ts
+++ b/packages/sheets-conditional-formatting/src/services/calculate-unit/color-scale.ts
@@ -17,17 +17,17 @@
import { CellValueType, ColorKit, ObjectMatrix, Range } from '@univerjs/core';
import { isObject } from '@univerjs/engine-render';
import { CFRuleType } from '../../base/const';
-import type { IColorScale, IConditionFormatRule } from '../../models/type';
-import { ConditionalFormatFormulaService, FormulaResultStatus } from '../conditional-format-formula.service';
+import type { IColorScale, IConditionFormattingRule } from '../../models/type';
+import { ConditionalFormattingFormulaService, FormulaResultStatus } from '../conditional-formatting-formula.service';
import { getColorScaleFromValue, getValueByType, isNullable } from './utils';
import type { ICalculateUnit } from './type';
const emptyStyle = '';
export const colorScaleCellCalculateUnit: ICalculateUnit = {
type: CFRuleType.colorScale,
- handle: async (rule: IConditionFormatRule, context) => {
+ handle: async (rule: IConditionFormattingRule, context) => {
const ruleConfig = rule.rule as IColorScale;
- const conditionalFormatFormulaService = context.accessor.get(ConditionalFormatFormulaService);
+ const conditionalFormattingFormulaService = context.accessor.get(ConditionalFormattingFormulaService);
const { worksheet } = context;
const matrix = new ObjectMatrix< number>();
rule.ranges.forEach((range) => {
@@ -57,7 +57,7 @@ export const colorScaleCellCalculateUnit: ICalculateUnit = {
// and use the previous style cache until the result comes out
const isFormulaWithoutSuccess = _colorList.some((item) => isObject(item.value) ? item.value.status !== FormulaResultStatus.SUCCESS : false);
if (isFormulaWithoutSuccess) {
- return conditionalFormatFormulaService.getCache(context.unitId, context.subUnitId, rule.cfId) ?? computeResult;
+ return conditionalFormattingFormulaService.getCache(context.unitId, context.subUnitId, rule.cfId) ?? computeResult;
}
const colorList = _colorList.map((item) => {
diff --git a/packages/sheets-conditional-format/src/services/calculate-unit/data-bar.ts b/packages/sheets-conditional-formatting/src/services/calculate-unit/data-bar.ts
similarity index 88%
rename from packages/sheets-conditional-format/src/services/calculate-unit/data-bar.ts
rename to packages/sheets-conditional-formatting/src/services/calculate-unit/data-bar.ts
index 20be96c04f..22af5c15e8 100644
--- a/packages/sheets-conditional-format/src/services/calculate-unit/data-bar.ts
+++ b/packages/sheets-conditional-formatting/src/services/calculate-unit/data-bar.ts
@@ -17,17 +17,17 @@
import { CellValueType, ObjectMatrix, Range } from '@univerjs/core';
import { CFRuleType } from '../../base/const';
import type { IDataBarRenderParams } from '../../render/type';
-import type { IConditionFormatRule, IDataBar } from '../../models/type';
-import { ConditionalFormatFormulaService, FormulaResultStatus } from '../conditional-format-formula.service';
+import type { IConditionFormattingRule, IDataBar } from '../../models/type';
+import { ConditionalFormattingFormulaService, FormulaResultStatus } from '../conditional-formatting-formula.service';
import { getValueByType, isNullable } from './utils';
import type { ICalculateUnit } from './type';
import { EMPTY_STYLE } from './type';
export const dataBarCellCalculateUnit: ICalculateUnit = {
type: CFRuleType.dataBar,
- handle: async (rule: IConditionFormatRule, context) => {
+ handle: async (rule: IConditionFormattingRule, context) => {
const ruleConfig = rule.rule as IDataBar;
- const conditionalFormatFormulaService = context.accessor.get(ConditionalFormatFormulaService);
+ const conditionalFormattingFormulaService = context.accessor.get(ConditionalFormattingFormulaService);
const { worksheet } = context;
const matrix = new ObjectMatrix< number>();
@@ -58,7 +58,7 @@ export const dataBarCellCalculateUnit: ICalculateUnit = {
// If the formula triggers the calculation, wait for the result,
// and use the previous style cache until the result comes out。
if (_min.status === FormulaResultStatus.WAIT) {
- return conditionalFormatFormulaService.getCache(context.unitId, context.subUnitId, rule.cfId) || computeResult;
+ return conditionalFormattingFormulaService.getCache(context.unitId, context.subUnitId, rule.cfId) || computeResult;
} else if (_min.status === FormulaResultStatus.SUCCESS) {
const v = Number(_min.result);
min = Number.isNaN(v) ? 0 : v;
@@ -66,7 +66,7 @@ export const dataBarCellCalculateUnit: ICalculateUnit = {
return computeResult;
}
if (_max.status === FormulaResultStatus.WAIT) {
- return conditionalFormatFormulaService.getCache(context.unitId, context.subUnitId, rule.cfId) || computeResult;
+ return conditionalFormattingFormulaService.getCache(context.unitId, context.subUnitId, rule.cfId) || computeResult;
} else if (_max.status === FormulaResultStatus.SUCCESS) {
const v = Number(_max.result);
max = Number.isNaN(v) ? 0 : v;
diff --git a/packages/sheets-conditional-format/src/services/calculate-unit/highlight-cell.ts b/packages/sheets-conditional-formatting/src/services/calculate-unit/highlight-cell.ts
similarity index 95%
rename from packages/sheets-conditional-format/src/services/calculate-unit/highlight-cell.ts
rename to packages/sheets-conditional-formatting/src/services/calculate-unit/highlight-cell.ts
index 1c3f6ce0eb..33dc1e85b1 100644
--- a/packages/sheets-conditional-format/src/services/calculate-unit/highlight-cell.ts
+++ b/packages/sheets-conditional-formatting/src/services/calculate-unit/highlight-cell.ts
@@ -19,15 +19,15 @@ import { CellValueType, ObjectMatrix, Range, Rectangle, Tools } from '@univerjs/
import dayjs from 'dayjs';
import { deserializeRangeWithSheet, generateStringWithSequence, LexerTreeBuilder, sequenceNodeType, serializeRange } from '@univerjs/engine-formula';
import { CFNumberOperator, CFRuleType, CFSubRuleType, CFTextOperator, CFTimePeriodOperator } from '../../base/const';
-import type { IAverageHighlightCell, IConditionFormatRule, IFormulaHighlightCell, IHighlightCell, INumberHighlightCell, IRankHighlightCell, ITextHighlightCell, ITimePeriodHighlightCell } from '../../models/type';
-import { ConditionalFormatFormulaService, FormulaResultStatus } from '../conditional-format-formula.service';
+import type { IAverageHighlightCell, IConditionFormattingRule, IFormulaHighlightCell, IHighlightCell, INumberHighlightCell, IRankHighlightCell, ITextHighlightCell, ITimePeriodHighlightCell } from '../../models/type';
+import { ConditionalFormattingFormulaService, FormulaResultStatus } from '../conditional-formatting-formula.service';
import { compareWithNumber, getCellValue, isFloatsEqual, isNullable, serialTimeToTimestamp } from './utils';
import type { ICalculateUnit } from './type';
import { EMPTY_STYLE } from './type';
export const highlightCellCalculateUnit: ICalculateUnit = {
type: CFRuleType.highlightCell,
- handle: async (rule: IConditionFormatRule, context) => {
+ handle: async (rule: IConditionFormattingRule, context) => {
const ruleConfig = rule.rule as IHighlightCell;
const { worksheet } = context;
@@ -298,7 +298,7 @@ export const highlightCellCalculateUnit: ICalculateUnit = {
return false;
}
const { unitId, subUnitId } = context;
- const conditionalFormatFormulaService = context.accessor.get(ConditionalFormatFormulaService);
+ const conditionalFormattingFormulaService = context.accessor.get(ConditionalFormattingFormulaService);
const getRangeFromCell = (row: number, col: number) => ({ startRow: row, endRow: row, startColumn: col, endColumn: col });
const originRange = getRangeFromCell(rule.ranges[0].startRow, rule.ranges[0].startColumn);
@@ -320,14 +320,14 @@ export const highlightCellCalculateUnit: ICalculateUnit = {
let formulaString = transformSequenceNodes && generateStringWithSequence(transformSequenceNodes);
if (formulaString) {
formulaString = `=${formulaString}`;
- conditionalFormatFormulaService.registerFormula(unitId, subUnitId, rule.cfId, formulaString);
- const formulaItem = conditionalFormatFormulaService.getFormulaResult(unitId, subUnitId, formulaString);
+ conditionalFormattingFormulaService.registerFormula(unitId, subUnitId, rule.cfId, formulaString);
+ const formulaItem = conditionalFormattingFormulaService.getFormulaResult(unitId, subUnitId, formulaString);
if (formulaItem && formulaItem.status === FormulaResultStatus.SUCCESS) {
return formulaItem.result === true;
} else {
// If the formula triggers the calculation, wait for the result,
// and use the previous style cache until the result comes out
- const cache = conditionalFormatFormulaService.getCache(unitId, subUnitId, rule.cfId);
+ const cache = conditionalFormattingFormulaService.getCache(unitId, subUnitId, rule.cfId);
const style = cache?.getValue(row, col);
return style && style !== EMPTY_STYLE;
}
diff --git a/packages/sheets-conditional-format/src/services/calculate-unit/icon-set.ts b/packages/sheets-conditional-formatting/src/services/calculate-unit/icon-set.ts
similarity index 89%
rename from packages/sheets-conditional-format/src/services/calculate-unit/icon-set.ts
rename to packages/sheets-conditional-formatting/src/services/calculate-unit/icon-set.ts
index 94656302f5..7a6da1fc92 100644
--- a/packages/sheets-conditional-format/src/services/calculate-unit/icon-set.ts
+++ b/packages/sheets-conditional-formatting/src/services/calculate-unit/icon-set.ts
@@ -19,17 +19,17 @@ import type { CFNumberOperator } from '../../base/const';
import { CFRuleType } from '../../base/const';
import type { IIconSetRenderParams } from '../../render/type';
-import type { IConditionFormatRule, IIconSet } from '../../models/type';
-import { ConditionalFormatFormulaService, FormulaResultStatus } from '../conditional-format-formula.service';
+import type { IConditionFormattingRule, IIconSet } from '../../models/type';
+import { ConditionalFormattingFormulaService, FormulaResultStatus } from '../conditional-formatting-formula.service';
import { compareWithNumber, getOppositeOperator, getValueByType, isNullable } from './utils';
import type { ICalculateUnit } from './type';
import { EMPTY_STYLE } from './type';
export const iconSetCalculateUnit: ICalculateUnit = {
type: CFRuleType.iconSet,
- handle: async (rule: IConditionFormatRule, context) => {
+ handle: async (rule: IConditionFormattingRule, context) => {
const ruleConfig = rule.rule as IIconSet;
- const conditionalFormatFormulaService = context.accessor.get(ConditionalFormatFormulaService);
+ const conditionalFormattingFormulaService = context.accessor.get(ConditionalFormattingFormulaService);
const { worksheet } = context;
const matrix = new ObjectMatrix<number>();
@@ -56,7 +56,7 @@ export const iconSetCalculateUnit: ICalculateUnit = {
const isFormulaWithoutSuccess = splitValueResult.some((item) => item.status !== FormulaResultStatus.SUCCESS);
if (isFormulaWithoutSuccess) {
- return conditionalFormatFormulaService.getCache(context.unitId, context.subUnitId, rule.cfId) ?? computeResult;
+ return conditionalFormattingFormulaService.getCache(context.unitId, context.subUnitId, rule.cfId) ?? computeResult;
}
const splitValue = splitValueResult.map((item, index) => ({
diff --git a/packages/sheets-conditional-format/src/services/calculate-unit/type.ts b/packages/sheets-conditional-formatting/src/services/calculate-unit/type.ts
similarity index 86%
rename from packages/sheets-conditional-format/src/services/calculate-unit/type.ts
rename to packages/sheets-conditional-formatting/src/services/calculate-unit/type.ts
index e56cb164c6..5ecbea3ad7 100644
--- a/packages/sheets-conditional-format/src/services/calculate-unit/type.ts
+++ b/packages/sheets-conditional-formatting/src/services/calculate-unit/type.ts
@@ -17,7 +17,7 @@
import type { IAccessor } from '@wendellhu/redi';
import type { ObjectMatrix, Workbook, Worksheet } from '@univerjs/core';
import type { CFRuleType } from '../../base/const';
-import type { IConditionFormatRule } from '../../models/type';
+import type { IConditionFormattingRule } from '../../models/type';
export interface IContext {
accessor: IAccessor;
@@ -28,7 +28,7 @@ export interface IContext {
};
export interface ICalculateUnit<R = any> {
type: CFRuleType;
- handle: (rule: IConditionFormatRule, context: IContext) => Promise<ObjectMatrix<R>>;
+ handle: (rule: IConditionFormattingRule, context: IContext) => Promise<ObjectMatrix<R>>;
}
export const EMPTY_STYLE = {} as unknown;
diff --git a/packages/sheets-conditional-format/src/services/calculate-unit/utils.ts b/packages/sheets-conditional-formatting/src/services/calculate-unit/utils.ts
similarity index 92%
rename from packages/sheets-conditional-format/src/services/calculate-unit/utils.ts
rename to packages/sheets-conditional-formatting/src/services/calculate-unit/utils.ts
index b3c099e7da..69d775b267 100644
--- a/packages/sheets-conditional-format/src/services/calculate-unit/utils.ts
+++ b/packages/sheets-conditional-formatting/src/services/calculate-unit/utils.ts
@@ -17,10 +17,10 @@
import type { ICellData } from '@univerjs/core';
import { BooleanNumber, CellValueType, ColorKit, ObjectMatrix, Range } from '@univerjs/core';
import { BooleanValue } from '@univerjs/engine-formula';
-import type { IConditionFormatRule, IValueConfig } from '../../models/type';
+import type { IConditionFormattingRule, IValueConfig } from '../../models/type';
import { CFNumberOperator, CFValueType } from '../../base/const';
-import { ConditionalFormatFormulaService, FormulaResultStatus } from '../conditional-format-formula.service';
-import { ConditionalFormatViewModel } from '../../models/conditional-format-view-model';
+import { ConditionalFormattingFormulaService, FormulaResultStatus } from '../conditional-formatting-formula.service';
+import { ConditionalFormattingViewModel } from '../../models/conditional-formatting-view-model';
import type { IContext } from './type';
export function isFloatsEqual(a: number, b: number) {
@@ -156,9 +156,9 @@ export const getValueByType = (value: IValueConfig, matrix: ObjectMatrix< number
case CFValueType.formula:{
const { accessor, unitId, subUnitId, cfId } = context;
const formulaText = String(value.value);
- const conditionalFormatFormulaService = accessor.get(ConditionalFormatFormulaService);
- conditionalFormatFormulaService.registerFormula(unitId, subUnitId, cfId, formulaText);
- const result = conditionalFormatFormulaService.getFormulaResult(unitId, subUnitId, formulaText);
+ const conditionalFormattingFormulaService = accessor.get(ConditionalFormattingFormulaService);
+ conditionalFormattingFormulaService.registerFormula(unitId, subUnitId, cfId, formulaText);
+ const result = conditionalFormattingFormulaService.getFormulaResult(unitId, subUnitId, formulaText);
return result;
}
case CFValueType.num:{
@@ -171,13 +171,13 @@ export const getValueByType = (value: IValueConfig, matrix: ObjectMatrix< number
}
};
-export const getCacheStyleMatrix = <S = any>(unitId: string, subUnitId: string, rule: IConditionFormatRule, context: IContext) => {
+export const getCacheStyleMatrix = <S = any>(unitId: string, subUnitId: string, rule: IConditionFormattingRule, context: IContext) => {
const { accessor } = context;
- const conditionalFormatViewModel = accessor.get(ConditionalFormatViewModel);
+ const conditionalFormattingViewModel = accessor.get(ConditionalFormattingViewModel);
const matrix = new ObjectMatrix<S>();
rule.ranges.forEach((range) => {
Range.foreach(range, (row, col) => {
- const cellCfItem = conditionalFormatViewModel.getCellCf(unitId, subUnitId, row, col);
+ const cellCfItem = conditionalFormattingViewModel.getCellCf(unitId, subUnitId, row, col);
if (cellCfItem) {
const item = cellCfItem.cfList.find((item) => item.cfId === rule.cfId);
item?.ruleCache && matrix.setValue(row, col, item.ruleCache as any);
diff --git a/packages/sheets-conditional-format/src/services/conditional-format-formula.service.ts b/packages/sheets-conditional-formatting/src/services/conditional-formatting-formula.service.ts
similarity index 87%
rename from packages/sheets-conditional-format/src/services/conditional-format-formula.service.ts
rename to packages/sheets-conditional-formatting/src/services/conditional-formatting-formula.service.ts
index 6452080501..04edc9ba58 100644
--- a/packages/sheets-conditional-format/src/services/conditional-format-formula.service.ts
+++ b/packages/sheets-conditional-formatting/src/services/conditional-formatting-formula.service.ts
@@ -24,11 +24,11 @@ import { RemoveOtherFormulaMutation,
SetOtherFormulaMutation } from '@univerjs/engine-formula';
import { Subject } from 'rxjs';
import { bufferTime, filter, map } from 'rxjs/operators';
-import type { IConditionalFormatFormulaMarkDirtyParams } from '../commands/mutations/formula-mark-dirty.mutation';
-import { ConditionalFormatFormulaMarkDirty } from '../commands/mutations/formula-mark-dirty.mutation';
-import { ConditionalFormatViewModel } from '../models/conditional-format-view-model';
-import { ConditionalFormatRuleModel } from '../models/conditional-format-rule-model';
-import { ConditionalFormatService } from './conditional-format.service';
+import type { IConditionalFormattingFormulaMarkDirtyParams } from '../commands/mutations/formula-mark-dirty.mutation';
+import { ConditionalFormattingFormulaMarkDirty } from '../commands/mutations/formula-mark-dirty.mutation';
+import { ConditionalFormattingViewModel } from '../models/conditional-formatting-view-model';
+import { ConditionalFormattingRuleModel } from '../models/conditional-formatting-rule-model';
+import { ConditionalFormattingService } from './conditional-formatting.service';
// eslint-disable-next-line ts/consistent-type-definitions
type IFormulaItem = {
@@ -47,7 +47,7 @@ const getResultFromFormula = (formulaResult: Nullable<ICellData>[][]) => {
};
// TODO: @Gggpound
// It may be possible later to abstract a service that manages the results of an asynchronous calculation to handle the use of the last calculation before waiting for the result to return.
-export class ConditionalFormatFormulaService extends Disposable {
+export class ConditionalFormattingFormulaService extends Disposable {
private _formulaMap: Map<string, Map<string, RefAlias<IFormulaItem, 'formulaId' | 'formulaText'>>> = new Map();
private _cache: Map<string, Map<string, Map<string, ObjectMatrix<unknown>>>> = new Map();
@@ -62,8 +62,8 @@ export class ConditionalFormatFormulaService extends Disposable {
@Inject(ICommandService) private _commandService: ICommandService,
@Inject(Injector) private _injector: Injector,
@Inject(IActiveDirtyManagerService) private _activeDirtyManagerService: IActiveDirtyManagerService,
- @Inject(ConditionalFormatViewModel) private _conditionalFormatViewModel: ConditionalFormatViewModel,
- @Inject(ConditionalFormatRuleModel) private _conditionalFormatRuleModel: ConditionalFormatRuleModel
+ @Inject(ConditionalFormattingViewModel) private _conditionalFormattingViewModel: ConditionalFormattingViewModel,
+ @Inject(ConditionalFormattingRuleModel) private _conditionalFormattingRuleModel: ConditionalFormattingRuleModel
) {
super();
@@ -77,15 +77,15 @@ export class ConditionalFormatFormulaService extends Disposable {
}
private _initCache() {
- const _conditionalFormatService = this._injector.get(ConditionalFormatService);
- this.disposeWithMe(_conditionalFormatService.ruleComputeStatus$.subscribe((option) => {
+ const _conditionalFormattingService = this._injector.get(ConditionalFormattingService);
+ this.disposeWithMe(_conditionalFormattingService.ruleComputeStatus$.subscribe((option) => {
const { unitId, subUnitId, status, result, cfId } = option;
if (status === 'end' && result) {
const cacheMap = this._ensureCacheMap(unitId, subUnitId);
cacheMap.set(cfId, result);
}
}));
- this.disposeWithMe(this._conditionalFormatRuleModel.$ruleChange.subscribe((option) => {
+ this.disposeWithMe(this._conditionalFormattingRuleModel.$ruleChange.subscribe((option) => {
if (option.type === 'delete') {
const { unitId, subUnitId, rule } = option;
this._deleteCache(unitId, subUnitId, rule.cfId);
@@ -94,7 +94,7 @@ export class ConditionalFormatFormulaService extends Disposable {
}
private _initRuleChange() {
- this.disposeWithMe(this._conditionalFormatRuleModel.$ruleChange.subscribe((option) => {
+ this.disposeWithMe(this._conditionalFormattingRuleModel.$ruleChange.subscribe((option) => {
const { unitId, subUnitId, rule } = option;
if (option.type === 'delete') {
this._removeFormulaByCfId(unitId, subUnitId, rule.cfId);
@@ -125,8 +125,8 @@ export class ConditionalFormatFormulaService extends Disposable {
}
}
for (const cfId of cfIdSet) {
- const rule = this._conditionalFormatRuleModel.getRule(unitId, subUnitId, cfId);
- rule && this._conditionalFormatViewModel.markRuleDirty(unitId, subUnitId, rule);
+ const rule = this._conditionalFormattingRuleModel.getRule(unitId, subUnitId, cfId);
+ rule && this._conditionalFormattingViewModel.markRuleDirty(unitId, subUnitId, rule);
}
}
}
@@ -134,10 +134,10 @@ export class ConditionalFormatFormulaService extends Disposable {
}));
// Register formula with Dirty Logic
- this._activeDirtyManagerService.register(ConditionalFormatFormulaMarkDirty.id,
- { commandId: ConditionalFormatFormulaMarkDirty.id,
+ this._activeDirtyManagerService.register(ConditionalFormattingFormulaMarkDirty.id,
+ { commandId: ConditionalFormattingFormulaMarkDirty.id,
getDirtyData(commandInfo) {
- const params = commandInfo.params as IConditionalFormatFormulaMarkDirtyParams;
+ const params = commandInfo.params as IConditionalFormattingFormulaMarkDirtyParams;
return {
dirtyUnitOtherFormulaMap: params,
};
@@ -162,8 +162,8 @@ export class ConditionalFormatFormulaService extends Disposable {
const value = result[unitId][subUnitId];
const config: ISetOtherFormulaMutationParams = { unitId, subUnitId, formulaMap: value };
this._commandService.executeCommand(SetOtherFormulaMutation.id, config).then(() => {
- this._commandService.executeCommand(ConditionalFormatFormulaMarkDirty.id,
- { [unitId]: { [subUnitId]: value } } as unknown as IConditionalFormatFormulaMarkDirtyParams);
+ this._commandService.executeCommand(ConditionalFormattingFormulaMarkDirty.id,
+ { [unitId]: { [subUnitId]: value } } as unknown as IConditionalFormattingFormulaMarkDirtyParams);
});
}
}
diff --git a/packages/sheets-conditional-format/src/services/conditional-format.service.ts b/packages/sheets-conditional-formatting/src/services/conditional-formatting.service.ts
similarity index 87%
rename from packages/sheets-conditional-format/src/services/conditional-format.service.ts
rename to packages/sheets-conditional-formatting/src/services/conditional-formatting.service.ts
index d680c9019a..50c8c9cc82 100644
--- a/packages/sheets-conditional-format/src/services/conditional-format.service.ts
+++ b/packages/sheets-conditional-formatting/src/services/conditional-formatting.service.ts
@@ -23,10 +23,10 @@ import { Subject } from 'rxjs';
import { filter } from 'rxjs/operators';
import type { IDeleteConditionalRuleMutationParams } from '../commands/mutations/delete-conditional-rule.mutation';
import { DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory } from '../commands/mutations/delete-conditional-rule.mutation';
-import { ConditionalFormatRuleModel } from '../models/conditional-format-rule-model';
-import { ConditionalFormatViewModel } from '../models/conditional-format-view-model';
-import { CFRuleType, SHEET_CONDITION_FORMAT_PLUGIN } from '../base/const';
-import type { IConditionFormatRule, IHighlightCell, IRuleModelJson } from '../models/type';
+import { ConditionalFormattingRuleModel } from '../models/conditional-formatting-rule-model';
+import { ConditionalFormattingViewModel } from '../models/conditional-formatting-view-model';
+import { CFRuleType, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '../base/const';
+import type { IConditionFormattingRule, IHighlightCell, IRuleModelJson } from '../models/type';
import type { IDataBarCellData, IDataBarRenderParams, IIconSetCellData, IIconSetRenderParams } from '../render/type';
import { dataBarCellCalculateUnit } from './calculate-unit/data-bar';
import { highlightCellCalculateUnit } from './calculate-unit/highlight-cell';
@@ -39,9 +39,9 @@ type ComputeStatus = 'computing' | 'end' | 'error';
interface IComputeCache { status: ComputeStatus };
-const beforeUpdateRuleResult = createInterceptorKey< { subUnitId: string; unitId: string; cfId: string }>('conditional-format-before-update-rule-result');
-@OnLifecycle(LifecycleStages.Starting, ConditionalFormatService)
-export class ConditionalFormatService extends Disposable {
+const beforeUpdateRuleResult = createInterceptorKey< { subUnitId: string; unitId: string; cfId: string }>('conditional-formatting-before-update-rule-result');
+@OnLifecycle(LifecycleStages.Starting, ConditionalFormattingService)
+export class ConditionalFormattingService extends Disposable {
// <unitId,<subUnitId,<cfId,IComputeCache>>>
private _ruleCacheMap: Map<string, Map<string, Map<string, IComputeCache>>> = new Map();
@@ -50,12 +50,12 @@ export class ConditionalFormatService extends Disposable {
public interceptorManager = new InterceptorManager({ beforeUpdateRuleResult });
- private _calculationUnitMap: Map<IConditionFormatRule['rule']['type'], ICalculateUnit> = new Map();
+ private _calculationUnitMap: Map<IConditionFormattingRule['rule']['type'], ICalculateUnit> = new Map();
constructor(
- @Inject(ConditionalFormatRuleModel) private _conditionalFormatRuleModel: ConditionalFormatRuleModel,
+ @Inject(ConditionalFormattingRuleModel) private _conditionalFormattingRuleModel: ConditionalFormattingRuleModel,
@Inject(Injector) private _injector: Injector,
- @Inject(ConditionalFormatViewModel) private _conditionalFormatViewModel: ConditionalFormatViewModel,
+ @Inject(ConditionalFormattingViewModel) private _conditionalFormattingViewModel: ConditionalFormattingViewModel,
@Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,
@Inject(IResourceManagerService) private _resourceManagerService: IResourceManagerService,
@Inject(SheetInterceptorService) private _sheetInterceptorService: SheetInterceptorService,
@@ -74,11 +74,11 @@ export class ConditionalFormatService extends Disposable {
}
public composeStyle(unitId: string, subUnitId: string, row: number, col: number) {
- const cell = this._conditionalFormatViewModel.getCellCf(unitId, subUnitId, row, col);
+ const cell = this._conditionalFormattingViewModel.getCellCf(unitId, subUnitId, row, col);
if (cell) {
// High priority should be applied at the back, overwriting the previous results.
// reverse is a side-effect function that changes the original array.
- const ruleList = cell.cfList.map((item) => this._conditionalFormatRuleModel.getRule(unitId, subUnitId, item.cfId)!).filter((rule) => !!rule).reverse();
+ const ruleList = cell.cfList.map((item) => this._conditionalFormattingRuleModel.getRule(unitId, subUnitId, item.cfId)!).filter((rule) => !!rule).reverse();
const endIndex = ruleList.findIndex((rule) => rule?.stopIfTrue);
if (endIndex > -1) {
ruleList.splice(endIndex + 1);
@@ -116,7 +116,7 @@ export class ConditionalFormatService extends Disposable {
private _initSnapshot() {
const toJson = (unitID: string) => {
- const map = this._conditionalFormatRuleModel.getUnitRules(unitID);
+ const map = this._conditionalFormattingRuleModel.getUnitRules(unitID);
const resultMap: IRuleModelJson[keyof IRuleModelJson] = {};
if (map) {
map.forEach((v, key) => {
@@ -139,14 +139,14 @@ export class ConditionalFormatService extends Disposable {
const handleWorkbookAdd = (workbook: Workbook) => {
const unitID = workbook.getUnitId();
this.disposeWithMe(
- this._resourceManagerService.registerPluginResource<IRuleModelJson[keyof IRuleModelJson]>(unitID, SHEET_CONDITION_FORMAT_PLUGIN, {
+ this._resourceManagerService.registerPluginResource<IRuleModelJson[keyof IRuleModelJson]>(unitID, SHEET_CONDITIONAL_FORMATTING_PLUGIN, {
toJson: (unitID) => toJson(unitID),
parseJson: (json) => parseJson(json),
onChange: (unitID, value) => {
Object.keys(value).forEach((subunitId) => {
const ruleList = value[subunitId];
ruleList.forEach((rule) => {
- this._conditionalFormatRuleModel.addRule(unitID, subunitId, rule);
+ this._conditionalFormattingRuleModel.addRule(unitID, subunitId, rule);
});
});
},
@@ -158,7 +158,7 @@ export class ConditionalFormatService extends Disposable {
toDisposable(
this._univerInstanceService.sheetDisposed$.subscribe((workbook) => {
const unitID = workbook.getUnitId();
- this._resourceManagerService.disposePluginResource(unitID, SHEET_CONDITION_FORMAT_PLUGIN);
+ this._resourceManagerService.disposePluginResource(unitID, SHEET_CONDITIONAL_FORMATTING_PLUGIN);
})
)
);
@@ -174,7 +174,7 @@ export class ConditionalFormatService extends Disposable {
const params = commandInfo.params as IRemoveSheetCommandParams;
const unitId = params.unitId || getUnitId(this._univerInstanceService);
const subUnitId = params.subUnitId || getSubUnitId(this._univerInstanceService);
- const ruleList = this._conditionalFormatRuleModel.getSubunitRules(unitId, subUnitId);
+ const ruleList = this._conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId);
if (!ruleList) {
return { redos: [], undos: [] };
}
@@ -239,11 +239,11 @@ export class ConditionalFormatService extends Disposable {
}
private _initCacheManager() {
- this.disposeWithMe(this._conditionalFormatViewModel.markDirty$.subscribe((item) => {
+ this.disposeWithMe(this._conditionalFormattingViewModel.markDirty$.subscribe((item) => {
this._deleteComputeCache(item.unitId, item.subUnitId, item.rule.cfId);
}));
- this.disposeWithMe(this._conditionalFormatRuleModel.$ruleChange.pipe(filter((item) => item.type !== 'sort')).subscribe((item) => {
+ this.disposeWithMe(this._conditionalFormattingRuleModel.$ruleChange.pipe(filter((item) => item.type !== 'sort')).subscribe((item) => {
this._deleteComputeCache(item.unitId, item.subUnitId, item.rule.cfId);
}));
}
@@ -254,10 +254,10 @@ export class ConditionalFormatService extends Disposable {
const collectRule = (unitId: string, subUnitId: string, cellData: [number, number][]) => {
const ruleIds: Set<string> = new Set();
cellData.forEach(([row, col]) => {
- const ruleItem = this._conditionalFormatViewModel.getCellCf(unitId, subUnitId, row, col);
+ const ruleItem = this._conditionalFormattingViewModel.getCellCf(unitId, subUnitId, row, col);
ruleItem?.cfList.forEach((item) => ruleIds.add(item.cfId));
});
- return [...ruleIds].map((cfId) => this._conditionalFormatRuleModel.getRule(unitId, subUnitId, cfId) as IConditionFormatRule).filter((rule) => !!rule);
+ return [...ruleIds].map((cfId) => this._conditionalFormattingRuleModel.getRule(unitId, subUnitId, cfId) as IConditionFormattingRule).filter((rule) => !!rule);
};
switch (commandInfo.id) {
@@ -274,7 +274,7 @@ export class ConditionalFormatService extends Disposable {
});
const rules = collectRule(unitId, subUnitId, cellMatrix);
rules.forEach((rule) => {
- this._conditionalFormatViewModel.markRuleDirty(unitId, subUnitId, rule);
+ this._conditionalFormattingViewModel.markRuleDirty(unitId, subUnitId, rule);
this._deleteComputeCache(unitId, subUnitId, rule.cfId);
});
break;
@@ -282,12 +282,12 @@ export class ConditionalFormatService extends Disposable {
case InsertColMutation.id:
case RemoveColMutation.id:{
const { range, unitId, subUnitId } = commandInfo.params as IInsertColMutationParams;
- const allRules = this._conditionalFormatRuleModel.getSubunitRules(unitId, subUnitId);
+ const allRules = this._conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId);
const effectRange: IRange = { ...range, endColumn: Number.MAX_SAFE_INTEGER };
if (allRules) {
const effectRule = allRules.filter((rule) => rule.ranges.some((ruleRange) => Rectangle.intersects(ruleRange, effectRange)));
effectRule.forEach((rule) => {
- this._conditionalFormatViewModel.markRuleDirty(unitId, subUnitId, rule);
+ this._conditionalFormattingViewModel.markRuleDirty(unitId, subUnitId, rule);
this._deleteComputeCache(unitId, subUnitId, rule.cfId);
});
}
@@ -296,12 +296,12 @@ export class ConditionalFormatService extends Disposable {
case RemoveRowMutation.id:
case InsertRowMutation.id:{
const { range, unitId, subUnitId } = commandInfo.params as IRemoveRowsMutationParams;
- const allRules = this._conditionalFormatRuleModel.getSubunitRules(unitId, subUnitId);
+ const allRules = this._conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId);
const effectRange: IRange = { ...range, endRow: Number.MAX_SAFE_INTEGER };
if (allRules) {
const effectRule = allRules.filter((rule) => rule.ranges.some((ruleRange) => Rectangle.intersects(ruleRange, effectRange)));
effectRule.forEach((rule) => {
- this._conditionalFormatViewModel.markRuleDirty(unitId, subUnitId, rule);
+ this._conditionalFormattingViewModel.markRuleDirty(unitId, subUnitId, rule);
this._deleteComputeCache(unitId, subUnitId, rule.cfId);
});
}
@@ -309,7 +309,7 @@ export class ConditionalFormatService extends Disposable {
}
case MoveRowsMutation.id:{
const { sourceRange, targetRange, unitId, subUnitId } = commandInfo.params as IMoveRowsMutationParams;
- const allRules = this._conditionalFormatRuleModel.getSubunitRules(unitId, subUnitId);
+ const allRules = this._conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId);
const effectRange: IRange = { startRow: Math.min(sourceRange.startRow, targetRange.startRow),
endRow: Number.MAX_SAFE_INTEGER,
startColumn: 0,
@@ -317,7 +317,7 @@ export class ConditionalFormatService extends Disposable {
if (allRules) {
const effectRule = allRules.filter((rule) => rule.ranges.some((ruleRange) => Rectangle.intersects(ruleRange, effectRange)));
effectRule.forEach((rule) => {
- this._conditionalFormatViewModel.markRuleDirty(unitId, subUnitId, rule);
+ this._conditionalFormattingViewModel.markRuleDirty(unitId, subUnitId, rule);
this._deleteComputeCache(unitId, subUnitId, rule.cfId);
});
}
@@ -325,7 +325,7 @@ export class ConditionalFormatService extends Disposable {
}
case MoveColsMutation.id:{
const { sourceRange, targetRange, unitId, subUnitId } = commandInfo.params as IMoveColumnsMutationParams;
- const allRules = this._conditionalFormatRuleModel.getSubunitRules(unitId, subUnitId);
+ const allRules = this._conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId);
const effectRange: IRange = { startRow: 0,
endRow: Number.MAX_SAFE_INTEGER,
startColumn: Math.min(sourceRange.startColumn, targetRange.startColumn),
@@ -333,7 +333,7 @@ export class ConditionalFormatService extends Disposable {
if (allRules) {
const effectRule = allRules.filter((rule) => rule.ranges.some((ruleRange) => Rectangle.intersects(ruleRange, effectRange)));
effectRule.forEach((rule) => {
- this._conditionalFormatViewModel.markRuleDirty(unitId, subUnitId, rule);
+ this._conditionalFormattingViewModel.markRuleDirty(unitId, subUnitId, rule);
this._deleteComputeCache(unitId, subUnitId, rule.cfId);
});
}
@@ -348,7 +348,7 @@ export class ConditionalFormatService extends Disposable {
});
const rules = collectRule(unitId, value.subUnitId, cellMatrix);
rules.forEach((rule) => {
- this._conditionalFormatViewModel.markRuleDirty(unitId, value.subUnitId, rule);
+ this._conditionalFormattingViewModel.markRuleDirty(unitId, value.subUnitId, rule);
this._deleteComputeCache(unitId, value.subUnitId, rule.cfId);
});
};
@@ -370,14 +370,14 @@ export class ConditionalFormatService extends Disposable {
subUnitId, unitId, cfId,
}, undefined);
result.forValue((row, col, value) => {
- this._conditionalFormatViewModel.setCellCfRuleCache(unitId, subUnitId, row, col, cfId, value);
+ this._conditionalFormattingViewModel.setCellCfRuleCache(unitId, subUnitId, row, col, cfId, value);
});
this._deleteComputeCache(unitId, subUnitId, cfId);
}
}));
}
- private async _handleCalculateUnit(unitId: string, subUnitId: string, rule: IConditionFormatRule) {
+ private async _handleCalculateUnit(unitId: string, subUnitId: string, rule: IConditionFormattingRule) {
const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
const worksheet = workbook?.getSheetBySheetId(subUnitId);
let cache = this._getComputedCache(unitId, subUnitId, rule.cfId);
diff --git a/packages/sheets-conditional-format/src/utils/getStringFromDataStream.ts b/packages/sheets-conditional-formatting/src/utils/getStringFromDataStream.ts
similarity index 100%
rename from packages/sheets-conditional-format/src/utils/getStringFromDataStream.ts
rename to packages/sheets-conditional-formatting/src/utils/getStringFromDataStream.ts
diff --git a/packages/sheets-conditional-format/src/utils/isRangesEqual.ts b/packages/sheets-conditional-formatting/src/utils/isRangesEqual.ts
similarity index 100%
rename from packages/sheets-conditional-format/src/utils/isRangesEqual.ts
rename to packages/sheets-conditional-formatting/src/utils/isRangesEqual.ts
diff --git a/packages/sheets-conditional-format/src/utils/removeUndefinedAttr.ts b/packages/sheets-conditional-formatting/src/utils/removeUndefinedAttr.ts
similarity index 100%
rename from packages/sheets-conditional-format/src/utils/removeUndefinedAttr.ts
rename to packages/sheets-conditional-formatting/src/utils/removeUndefinedAttr.ts
diff --git a/packages/sheets-conditional-format/src/utils/type.ts b/packages/sheets-conditional-formatting/src/utils/type.ts
similarity index 100%
rename from packages/sheets-conditional-format/src/utils/type.ts
rename to packages/sheets-conditional-formatting/src/utils/type.ts
diff --git a/packages/sheets-conditional-format/src/vite-env.d.ts b/packages/sheets-conditional-formatting/src/vite-env.d.ts
similarity index 100%
rename from packages/sheets-conditional-format/src/vite-env.d.ts
rename to packages/sheets-conditional-formatting/src/vite-env.d.ts
diff --git a/packages/sheets-conditional-format/tsconfig.json b/packages/sheets-conditional-formatting/tsconfig.json
similarity index 100%
rename from packages/sheets-conditional-format/tsconfig.json
rename to packages/sheets-conditional-formatting/tsconfig.json
diff --git a/packages/sheets-conditional-format/tsconfig.node.json b/packages/sheets-conditional-formatting/tsconfig.node.json
similarity index 100%
rename from packages/sheets-conditional-format/tsconfig.node.json
rename to packages/sheets-conditional-formatting/tsconfig.node.json
diff --git a/packages/sheets-conditional-formatting/vite.config.ts b/packages/sheets-conditional-formatting/vite.config.ts
new file mode 100644
index 0000000000..e38cd8530b
--- /dev/null
+++ b/packages/sheets-conditional-formatting/vite.config.ts
@@ -0,0 +1,12 @@
+import createViteConfig from '@univerjs/shared/vite';
+import pkg from './package.json';
+
+export default ({ mode }) => createViteConfig({}, {
+ mode,
+ pkg,
+ features: {
+ react: true,
+ css: true,
+ dom: true,
+ },
+});
diff --git a/packages/sheets-find-replace/package.json b/packages/sheets-find-replace/package.json
index 47acd1323e..94dcece12b 100644
--- a/packages/sheets-find-replace/package.json
+++ b/packages/sheets-find-replace/package.json
@@ -82,7 +82,7 @@
"@wendellhu/redi": "^0.13.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/sheets-formula/package.json b/packages/sheets-formula/package.json
index df3d9afd9b..442285360a 100644
--- a/packages/sheets-formula/package.json
+++ b/packages/sheets-formula/package.json
@@ -93,7 +93,7 @@
"react": "^18.2.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/sheets-numfmt/package.json b/packages/sheets-numfmt/package.json
index 72bdac2200..c69c1729a3 100644
--- a/packages/sheets-numfmt/package.json
+++ b/packages/sheets-numfmt/package.json
@@ -97,7 +97,7 @@
"react": "^18.2.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/sheets-ui/package.json b/packages/sheets-ui/package.json
index 90715073f2..6e8f5c33d2 100644
--- a/packages/sheets-ui/package.json
+++ b/packages/sheets-ui/package.json
@@ -99,7 +99,7 @@
"react": "^18.2.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/sheets-ui/src/locale/en-US.ts b/packages/sheets-ui/src/locale/en-US.ts
index 476096aae5..f568666893 100644
--- a/packages/sheets-ui/src/locale/en-US.ts
+++ b/packages/sheets-ui/src/locale/en-US.ts
@@ -81,7 +81,7 @@ const locale: typeof zhCN = {
sum: 'SUM',
autoSum: 'Auto SUM',
moreFunction: 'More functions',
- conditionalalFormat: 'Conditional format',
+ conditionalFormatting: 'Conditional formatting',
comment: 'Comment',
pivotTable: 'Pivot Table',
chart: 'Chart',
diff --git a/packages/sheets-ui/src/locale/zh-CN.ts b/packages/sheets-ui/src/locale/zh-CN.ts
index fbc7e44369..4a4d2976e8 100644
--- a/packages/sheets-ui/src/locale/zh-CN.ts
+++ b/packages/sheets-ui/src/locale/zh-CN.ts
@@ -80,7 +80,7 @@ const locale = {
sum: '求和',
autoSum: '自动求和',
moreFunction: '更多函数',
- conditionalalFormat: '条件格式',
+ conditionalFormatting: '条件格式',
comment: '批注',
pivotTable: '数据透视表',
chart: '图表',
diff --git a/packages/sheets-zen-editor/package.json b/packages/sheets-zen-editor/package.json
index 964f84c321..cb141ec660 100644
--- a/packages/sheets-zen-editor/package.json
+++ b/packages/sheets-zen-editor/package.json
@@ -93,7 +93,7 @@
"react": "^18.2.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/sheets-zen-editor/src/index.ts b/packages/sheets-zen-editor/src/index.ts
index 79ba8061c5..a5f03c0ee3 100644
--- a/packages/sheets-zen-editor/src/index.ts
+++ b/packages/sheets-zen-editor/src/index.ts
@@ -14,5 +14,5 @@
* limitations under the License.
*/
-export * from './plugin';
+export { UniverSheetsZenEditorPlugin } from './plugin';
export { enUS, zhCN } from './locale';
diff --git a/packages/sheets/package.json b/packages/sheets/package.json
index cf97d5f1d2..4046b0648a 100644
--- a/packages/sheets/package.json
+++ b/packages/sheets/package.json
@@ -78,7 +78,7 @@
"@wendellhu/redi": "^0.13.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/slides-ui/package.json b/packages/slides-ui/package.json
index 6ce0cb66c6..fb2d8919b0 100644
--- a/packages/slides-ui/package.json
+++ b/packages/slides-ui/package.json
@@ -86,7 +86,7 @@
"react": "^18.2.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/slides/package.json b/packages/slides/package.json
index eb2f2d7d40..f906ad7c09 100644
--- a/packages/slides/package.json
+++ b/packages/slides/package.json
@@ -73,7 +73,7 @@
"@wendellhu/redi": "^0.13.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/packages/slides/src/model/toolbar-model.ts b/packages/slides/src/model/toolbar-model.ts
index e42d8110a2..1890910b1d 100644
--- a/packages/slides/src/model/toolbar-model.ts
+++ b/packages/slides/src/model/toolbar-model.ts
@@ -45,7 +45,7 @@
// function?: boolean; // 'formula'
// frozenMode?: boolean; // 'freeze mode'
// sortAndFilter?: boolean; // 'Sort and filter'
-// conditionalFormat?: boolean; // 'Conditional Format'
+// conditionalFormatting?: boolean; // 'Conditional Formatting'
// dataValidation?: boolean; // 'Data Validation'
// splitColumn?: boolean; // 'Split column'
// screenshot?: boolean; // 'screenshot'
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 784a202d09..902dbe5590 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -101,7 +101,7 @@
"react-dom": "^18.2.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0",
"vue": "^3.4.21"
}
diff --git a/packages/uniscript/package.json b/packages/uniscript/package.json
index b58881cf3e..5c68bbd8e4 100644
--- a/packages/uniscript/package.json
+++ b/packages/uniscript/package.json
@@ -88,7 +88,7 @@
"monaco-editor": "0.47.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.3",
- "vite": "^5.1.6",
+ "vite": "^5.2.6",
"vitest": "^1.4.0"
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c6a767d24b..cb2803b14e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -102,8 +102,8 @@ importers:
specifier: ^5.2.6
version: 5.2.6(@types/[email protected])([email protected])
vite-plugin-dts:
- specifier: ^3.7.3
+ specifier: ^3.8.1
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -216,9 +216,9 @@ importers:
'@univerjs/sheets':
specifier: workspace:*
version: link:../packages/sheets
- '@univerjs/sheets-conditional-format':
+ '@univerjs/sheets-conditional-formatting':
specifier: workspace:*
- version: link:../packages/sheets-conditional-format
+ version: link:../packages/sheets-conditional-formatting
'@univerjs/sheets-find-replace':
specifier: workspace:*
version: link:../packages/sheets-find-replace
@@ -336,8 +336,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -424,8 +424,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -451,8 +451,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -496,8 +496,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -530,8 +530,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -549,8 +549,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -580,8 +580,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -634,8 +634,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -686,8 +686,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -710,8 +710,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -734,8 +734,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -764,14 +764,39 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
- packages/sheets-conditional-format:
+ packages/sheets-conditional-formatting:
dependencies:
+ '@univerjs/icons':
+ specifier: ^0.1.42
+ '@univerjs/sheets-ui':
+ specifier: workspace:*
+ version: link:../sheets-ui
+ dayjs:
+ specifier: ^1.11.10
+ version: 1.11.10
+ lodash.get:
+ specifier: ^4.4.2
+ version: 4.4.2
+ lodash.set:
+ specifier: ^4.3.2
+ version: 4.3.2
+ react-dom:
+ specifier: '>=16.9.0'
+ version: 18.2.0([email protected])
+ react-grid-layout:
+ specifier: ^1.4.4
+ react-resizable:
+ specifier: ^3.0.5
+ devDependencies:
'@types/lodash.get':
specifier: ^4.4.9
version: 4.4.9
@@ -793,85 +818,48 @@ importers:
'@univerjs/engine-render':
specifier: workspace:*
version: link:../engine-render
- '@univerjs/icons':
- specifier: ^0.1.33
'@univerjs/icons-svg':
- specifier: ^0.1.33
- version: 0.1.33
+ specifier: ^0.1.42
+ version: 0.1.42
+ '@univerjs/shared':
+ specifier: workspace:*
+ version: link:../../common/shared
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
'@univerjs/sheets-formula':
specifier: workspace:*
version: link:../sheets-formula
- '@univerjs/sheets-ui':
- specifier: workspace:*
- version: link:../sheets-ui
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
+ '@wendellhu/redi':
+ specifier: ^0.13.0
+ version: 0.13.0
clsx:
specifier: ^2.1.0
version: 2.1.0
- dayjs:
- specifier: ^1.11.10
- version: 1.11.10
- lodash.get:
- specifier: ^4.4.2
- version: 4.4.2
- lodash.set:
- specifier: ^4.3.2
- version: 4.3.2
+ less:
+ specifier: ^4.2.0
+ version: 4.2.0
react:
specifier: ^18.2.0
version: 18.2.0
- react-grid-layout:
- specifier: ^1.4.4
- react-resizable:
- specifier: ^3.0.5
rxjs:
specifier: ^7.8.1
version: 7.8.1
- devDependencies:
- '@univerjs/shared':
- specifier: workspace:*
- version: link:../../common/shared
- '@vitejs/plugin-react':
- specifier: ^4.2.1
- version: 4.2.1([email protected])
- '@vitest/coverage-istanbul':
- specifier: ^1.2.1
- version: 1.2.1([email protected])
- '@wendellhu/redi':
- specifier: ^0.13.0
- version: 0.13.0
- happy-dom:
- specifier: ^13.2.1
- version: 13.2.1
- less:
- specifier: ^4.2.0
- version: 4.2.0
sharp:
- specifier: ^0.33.2
- version: 0.33.2
+ specifier: ^0.33.3
+ version: 0.33.3
typescript:
- specifier: ^5.4.2
- version: 5.4.2
+ specifier: ^5.4.3
+ version: 5.4.3
vite:
- specifier: ^5.0.12
- version: 5.0.12(@types/[email protected])([email protected])
- vite-plugin-dts:
- specifier: ^3.7.1
- vite-plugin-externals:
- specifier: ^0.6.2
- version: 0.6.2([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
- specifier: ^1.2.1
+ specifier: ^1.4.0
+ version: 1.4.0(@types/[email protected])([email protected])
packages/sheets-find-replace:
devDependencies:
@@ -906,8 +894,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -953,7 +941,7 @@ importers:
version: link:../ui
'@vitejs/plugin-react':
specifier: ^4.2.1
- version: 4.2.1([email protected])
+ version: 4.2.1([email protected])
'@wendellhu/redi':
specifier: ^0.13.0
version: 0.13.0
@@ -970,8 +958,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -1028,8 +1016,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -1089,8 +1077,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -1141,8 +1129,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -1168,8 +1156,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -1213,8 +1201,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -1286,8 +1274,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -1338,8 +1326,8 @@ importers:
specifier: ^5.4.3
version: 5.4.3
vite:
- specifier: ^5.1.6
- version: 5.1.6(@types/[email protected])([email protected])
+ specifier: ^5.2.6
+ version: 5.2.6(@types/[email protected])([email protected])
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
@@ -1482,6 +1470,7 @@ packages:
resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}
engines: {node: '>=6.9.0'}
+ dev: false
resolution: {integrity: sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==}
@@ -1526,6 +1515,7 @@ packages:
semver: 6.3.1
transitivePeerDependencies:
- supports-color
+ dev: false
resolution: {integrity: sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==}
@@ -1578,6 +1568,7 @@ packages:
browserslist: 4.22.2
lru-cache: 5.1.1
semver: 6.3.1
+ dev: false
resolution: {integrity: sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==}
@@ -1679,6 +1670,7 @@ packages:
'@babel/helper-simple-access': 7.22.5
'@babel/helper-split-export-declaration': 7.22.6
'@babel/helper-validator-identifier': 7.22.20
+ dev: false
resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
@@ -1749,6 +1741,7 @@ packages:
resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==}
engines: {node: '>=6.9.0'}
+ dev: false
resolution: {integrity: sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==}
@@ -1778,6 +1771,7 @@ packages:
'@babel/types': 7.24.0
transitivePeerDependencies:
- supports-color
+ dev: false
resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==}
@@ -1807,6 +1801,7 @@ packages:
hasBin: true
dependencies:
'@babel/types': 7.23.5
+ dev: false
resolution: {integrity: sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==}
@@ -2804,6 +2799,7 @@ packages:
'@babel/code-frame': 7.23.5
'@babel/parser': 7.24.0
'@babel/types': 7.24.0
+ dev: false
resolution: {integrity: sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==}
@@ -2862,6 +2858,7 @@ packages:
'@babel/helper-string-parser': 7.23.4
'@babel/helper-validator-identifier': 7.22.20
to-fast-properties: 2.0.0
+ dev: false
resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
@@ -3098,8 +3095,8 @@ packages:
resolution: {integrity: sha512-d+5GwwzztZD0QixmOBhaO6nWVLsAeYsJ1HJYNxDoDRbASFCpza9BBVshG5ctBRXCkkIHhD9BO1SnbOoRQltUQw==}
dev: true
- /@emnapi/[email protected]:
- resolution: {integrity: sha512-Txumi3td7J4A/xTTwlssKieHKTGl3j4A1tglBx72auZ49YK7ePY6XZricgIg9mnZT4xPfA+UPCUdnhRuEFDL+w==}
+ /@emnapi/[email protected]:
+ resolution: {integrity: sha512-gCGlE0fJGWalfy+wbFApjhKn6uoSVvopru77IPyxNKkjkaiSx2HxDS7eOYSmo9dcMIhmmIvoxiC3N9TM1c3EaA==}
requiresBuild: true
dependencies:
tslib: 2.6.2
@@ -3123,15 +3120,6 @@ packages:
jsdoc-type-pratt-parser: 4.0.0
dev: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-Q+mk96KJ+FZ30h9fsJl+67IjNJm3x2eX+GBWGmocAKgzp27cowCOOqSdscX80s0SpdFXZnIv/+1xD1EctFx96Q==}
- engines: {node: '>=12'}
- cpu: [ppc64]
- os: [aix]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==}
engines: {node: '>=12'}
@@ -3140,15 +3128,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-1X4CClKhDgC3by7k8aOWZeBXQX8dHT5QAMCAQDArCLaYfkppoARvh0fit3X2Qs+MXDngKcHv6XXyQCpY0hkK1Q==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [android]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==}
engines: {node: '>=12'}
@@ -3157,15 +3136,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-7W0bK7qfkw1fc2viBfrtAEkDKHatYfHzr/jKAHNr9BvkYDXPcC6bodtm8AyLJNNuqClLNaeTLuwURt4PRT9d7w==}
- engines: {node: '>=12'}
- cpu: [arm]
- os: [android]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==}
engines: {node: '>=12'}
@@ -3174,15 +3144,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-O/nO/g+/7NlitUxETkUv/IvADKuZXyH4BHf/g/7laqKC4i/7whLpB0gvpPc2zpF0q9Q6FXS3TS75QHac9MvVWw==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [android]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==}
engines: {node: '>=12'}
@@ -3191,15 +3152,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-YSRRs2zOpwypck+6GL3wGXx2gNP7DXzetmo5pHXLrY/VIMsS59yKfjPizQ4lLt5vEI80M41gjm2BxrGZ5U+VMA==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [darwin]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==}
engines: {node: '>=12'}
@@ -3208,15 +3160,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-alfGtT+IEICKtNE54hbvPg13xGBe4GkVxyGWtzr+yHO7HIiRJppPDhOKq3zstTcVf8msXb/t4eavW3jCDpMSmA==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [darwin]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==}
engines: {node: '>=12'}
@@ -3225,15 +3168,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-dMtk1wc7FSH8CCkE854GyGuNKCewlh+7heYP/sclpOG6Cectzk14qdUIY5CrKDbkA/OczXq9WesqnPl09mj5dg==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [freebsd]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==}
engines: {node: '>=12'}
@@ -3242,15 +3176,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-G5UPPspryHu1T3uX8WiOEUa6q6OlQh6gNl4CO4Iw5PS+Kg5bVggVFehzXBJY6X6RSOMS8iXDv2330VzaObm4Ag==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [freebsd]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==}
engines: {node: '>=12'}
@@ -3259,15 +3184,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-QxaouHWZ+2KWEj7cGJmvTIHVALfhpGxo3WLmlYfJ+dA5fJB6lDEIg+oe/0//FuyVHuS3l79/wyBxbHr0NgtxJQ==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==}
engines: {node: '>=12'}
@@ -3276,15 +3192,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-j6gUW5aAaPgD416Hk9FHxn27On28H4eVI9rJ4az7oCGTFW48+LcgNDBN+9f8rKZz7EEowo889CPKyeaD0iw9Kg==}
- engines: {node: '>=12'}
- cpu: [arm]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==}
engines: {node: '>=12'}
@@ -3293,15 +3200,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-4ub1YwXxYjj9h1UIZs2hYbnTZBtenPw5NfXCRgEkGb0b6OJ2gpkMvDqRDYIDRjRdWSe/TBiZltm3Y3Q8SN1xNg==}
- engines: {node: '>=12'}
- cpu: [ia32]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==}
engines: {node: '>=12'}
@@ -3319,15 +3217,6 @@ packages:
dev: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-lo3I9k+mbEKoxtoIbM0yC/MZ1i2wM0cIeOejlVdZ3D86LAcFXFRdeuZmh91QJvUTW51bOK5W2BznGNIl4+mDaA==}
- engines: {node: '>=12'}
- cpu: [loong64]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==}
engines: {node: '>=12'}
@@ -3336,15 +3225,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-J4gH3zhHNbdZN0Bcr1QUGVNkHTdpijgx5VMxeetSk6ntdt+vR1DqGmHxQYHRmNb77tP6GVvD+K0NyO4xjd7y4A==}
- engines: {node: '>=12'}
- cpu: [mips64el]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==}
engines: {node: '>=12'}
@@ -3353,15 +3233,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-tgT/7u+QhV6ge8wFMzaklOY7KqiyitgT1AUHMApau32ZlvTB/+efeCtMk4eXS+uEymYK249JsoiklZN64xt6oQ==}
- engines: {node: '>=12'}
- cpu: [ppc64]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==}
engines: {node: '>=12'}
@@ -3370,15 +3241,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-0f/spw0PfBMZBNqtKe5FLzBDGo0SKZKvMl5PHYQr3+eiSscfJ96XEknCe+JoOayybWUFQbcJTrk946i3j9uYZA==}
- engines: {node: '>=12'}
- cpu: [riscv64]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==}
engines: {node: '>=12'}
@@ -3387,15 +3249,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-pZFe0OeskMHzHa9U38g+z8Yx5FNCLFtUnJtQMpwhS+r4S566aK2ci3t4NCP4tjt6d5j5uo4h7tExZMjeKoehAA==}
- engines: {node: '>=12'}
- cpu: [s390x]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==}
engines: {node: '>=12'}
@@ -3404,15 +3257,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-SpYNEqg/6pZYoc+1zLCjVOYvxfZVZj6w0KROZ3Fje/QrM3nfvT2llI+wmKSrWuX6wmZeTapbarvuNNK/qepSgA==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==}
engines: {node: '>=12'}
@@ -3421,15 +3265,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-ACbZ0vXy9zksNArWlk2c38NdKg25+L9pr/mVaj9SUq6lHZu/35nx2xnQVRGLrC1KKQqJKRIB0q8GspiHI3J80Q==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [netbsd]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==}
engines: {node: '>=12'}
@@ -3438,15 +3273,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-PxcgvjdSjtgPMiPQrM3pwSaG4kGphP+bLSb+cihuP0LYdZv1epbAIecHVl5sD3npkfYBZ0ZnOjR878I7MdJDFg==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [openbsd]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==}
engines: {node: '>=12'}
@@ -3455,15 +3281,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-ZkIOtrRL8SEJjr+VHjmW0znkPs+oJXhlJbNwfI37rvgeMtk3sxOQevXPXjmAPZPigVTncvFqLMd+uV0IBSEzqA==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [sunos]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==}
engines: {node: '>=12'}
@@ -3472,15 +3289,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-+Sa4oTDbpBfGpl3Hn3XiUe4f8TU2JF7aX8cOfqFYMMjXp6ma6NJDztl5FDG8Ezx0OjwGikIHw+iA54YLDNNVfw==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [win32]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==}
engines: {node: '>=12'}
@@ -3489,15 +3297,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-EOGVLK1oWMBXgfttJdPHDTiivYSjX6jDNaATeNOaCOFEVcfMjtbx7WVQwPSE1eIfCp/CaSF2nSrDtzc4I9f8TQ==}
- engines: {node: '>=12'}
- cpu: [ia32]
- os: [win32]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==}
engines: {node: '>=12'}
@@ -3506,15 +3305,6 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/[email protected]:
- resolution: {integrity: sha512-whqLG6Sc70AbU73fFYvuYzaE4MNMBIlR1Y/IrUeOXFrWHxBEjjbZaQ3IXIQS8wJdAzue2GwYZCjOrgrU1oUHoA==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [win32]
- requiresBuild: true
- dev: true
- optional: true
-
/@esbuild/[email protected]:
resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==}
engines: {node: '>=12'}
@@ -3605,30 +3395,30 @@ packages:
resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==}
dev: true
- resolution: {integrity: sha512-itHBs1rPmsmGF9p4qRe++CzCgd+kFYktnsoR1sbIAfsRMrJZau0Tt1AH9KVnufc2/tU02Gf6Ibujx+15qRE03w==}
+ resolution: {integrity: sha512-FaNiGX1MrOuJ3hxuNzWgsT/mg5OHG/Izh59WW2mk1UwYHUwtfbhk5QNKYZgxf0pLOhx9ctGiGa2OykD71vOnSw==}
engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [arm64]
os: [darwin]
requiresBuild: true
optionalDependencies:
- '@img/sharp-libvips-darwin-arm64': 1.0.1
+ '@img/sharp-libvips-darwin-arm64': 1.0.2
dev: true
optional: true
- resolution: {integrity: sha512-/rK/69Rrp9x5kaWBjVN07KixZanRr+W1OiyKdXcbjQD6KbW+obaTeBBtLUAtbBsnlTTmWthw99xqoOS7SsySDg==}
+ resolution: {integrity: sha512-2QeSl7QDK9ru//YBT4sQkoq7L0EAJZA3rtV+v9p8xTKl4U1bUqTIaCnoC7Ctx2kCjQgwFXDasOtPTCT8eCTXvw==}
engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [x64]
os: [darwin]
requiresBuild: true
optionalDependencies:
- '@img/sharp-libvips-darwin-x64': 1.0.1
+ '@img/sharp-libvips-darwin-x64': 1.0.2
dev: true
optional: true
- resolution: {integrity: sha512-kQyrSNd6lmBV7O0BUiyu/OEw9yeNGFbQhbxswS1i6rMDwBBSX+e+rPzu3S+MwAiGU3HdLze3PanQ4Xkfemgzcw==}
+ resolution: {integrity: sha512-tcK/41Rq8IKlSaKRCCAuuY3lDJjQnYIW1UXU1kxcEKrfL8WR7N6+rzNoOxoQRJWTAECuKwgAHnPvqXGN8XfkHA==}
engines: {macos: '>=11', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [arm64]
os: [darwin]
@@ -3636,8 +3426,8 @@ packages:
dev: true
optional: true
- resolution: {integrity: sha512-eVU/JYLPVjhhrd8Tk6gosl5pVlvsqiFlt50wotCvdkFGf+mDNBJxMh+bvav+Wt3EBnNZWq8Sp2I7XfSjm8siog==}
+ resolution: {integrity: sha512-Ofw+7oaWa0HiiMiKWqqaZbaYV3/UGL2wAPeLuJTx+9cXpCRdvQhCLG0IH8YGwM0yGWGLpsF4Su9vM1o6aer+Fw==}
engines: {macos: '>=10.13', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [x64]
os: [darwin]
@@ -3645,8 +3435,8 @@ packages:
dev: true
optional: true
- resolution: {integrity: sha512-bnGG+MJjdX70mAQcSLxgeJco11G+MxTz+ebxlz8Y3dxyeb3Nkl7LgLI0mXupoO+u1wRNx/iRj5yHtzA4sde1yA==}
+ resolution: {integrity: sha512-x7kCt3N00ofFmmkkdshwj3vGPCnmiDh7Gwnd4nUwZln2YjqPxV1NlTyZOvoDWdKQVDL911487HOueBvrpflagw==}
engines: {glibc: '>=2.26', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [arm64]
os: [linux]
@@ -3654,8 +3444,8 @@ packages:
dev: true
optional: true
- resolution: {integrity: sha512-FtdMvR4R99FTsD53IA3LxYGghQ82t3yt0ZQ93WMZ2xV3dqrb0E8zq4VHaTOuLEAuA83oDawHV3fd+BsAPadHIQ==}
+ resolution: {integrity: sha512-iLWCvrKgeFoglQxdEwzu1eQV04o8YeYGFXtfWU26Zr2wWT3q3MTzC+QTCO3ZQfWd3doKHT4Pm2kRmLbupT+sZw==}
engines: {glibc: '>=2.28', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [arm]
os: [linux]
@@ -3663,8 +3453,8 @@ packages:
dev: true
optional: true
- resolution: {integrity: sha512-3+rzfAR1YpMOeA2zZNp+aYEzGNWK4zF3+sdMxuCS3ey9HhDbJ66w6hDSHDMoap32DueFwhhs3vwooAB2MaK4XQ==}
+ resolution: {integrity: sha512-cmhQ1J4qVhfmS6szYW7RT+gLJq9dH2i4maq+qyXayUSn9/3iY2ZeWpbAgSpSVbV2E1JUL2Gg7pwnYQ1h8rQIog==}
engines: {glibc: '>=2.28', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [s390x]
os: [linux]
@@ -3672,8 +3462,8 @@ packages:
dev: true
optional: true
- resolution: {integrity: sha512-3NR1mxFsaSgMMzz1bAnnKbSAI+lHXVTqAHgc1bgzjHuXjo4hlscpUxc0vFSAPKI3yuzdzcZOkq7nDPrP2F8Jgw==}
+ resolution: {integrity: sha512-E441q4Qdb+7yuyiADVi5J+44x8ctlrqn8XgkDTwr4qPJzWkaHwD489iZ4nGDgcuya4iMN3ULV6NwbhRZJ9Z7SQ==}
engines: {glibc: '>=2.26', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [x64]
os: [linux]
@@ -3681,8 +3471,8 @@ packages:
dev: true
optional: true
- resolution: {integrity: sha512-5aBRcjHDG/T6jwC3Edl3lP8nl9U2Yo8+oTl5drd1dh9Z1EBfzUKAJFUDTDisDjUwc7N4AjnPGfCA3jl3hY8uDg==}
+ resolution: {integrity: sha512-3CAkndNpYUrlDqkCM5qhksfE+qSIREVpyoeHIU6jd48SJZViAmznoQQLAv4hVXF7xyUB9zf+G++e2v1ABjCbEQ==}
engines: {musl: '>=1.2.2', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [arm64]
os: [linux]
@@ -3690,8 +3480,8 @@ packages:
dev: true
optional: true
- resolution: {integrity: sha512-dcT7inI9DBFK6ovfeWRe3hG30h51cBAP5JXlZfx6pzc/Mnf9HFCQDLtYf4MCBjxaaTfjCCjkBxcy3XzOAo5txw==}
+ resolution: {integrity: sha512-VI94Q6khIHqHWNOh6LLdm9s2Ry4zdjWJwH56WoiJU7NTeDwyApdZZ8c+SADC8OH98KWNQXnE01UdJ9CSfZvwZw==}
engines: {musl: '>=1.2.2', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [x64]
os: [linux]
@@ -3699,84 +3489,84 @@ packages:
dev: true
optional: true
- resolution: {integrity: sha512-pz0NNo882vVfqJ0yNInuG9YH71smP4gRSdeL09ukC2YLE6ZyZePAlWKEHgAzJGTiOh8Qkaov6mMIMlEhmLdKew==}
+ resolution: {integrity: sha512-Zf+sF1jHZJKA6Gor9hoYG2ljr4wo9cY4twaxgFDvlG0Xz9V7sinsPp8pFd1XtlhTzYo0IhDbl3rK7P6MzHpnYA==}
engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [arm64]
os: [linux]
requiresBuild: true
optionalDependencies:
- '@img/sharp-libvips-linux-arm64': 1.0.1
+ '@img/sharp-libvips-linux-arm64': 1.0.2
dev: true
optional: true
- resolution: {integrity: sha512-Fndk/4Zq3vAc4G/qyfXASbS3HBZbKrlnKZLEJzPLrXoJuipFNNwTes71+Ki1hwYW5lch26niRYoZFAtZVf3EGA==}
+ resolution: {integrity: sha512-Q7Ee3fFSC9P7vUSqVEF0zccJsZ8GiiCJYGWDdhEjdlOeS9/jdkyJ6sUSPj+bL8VuOYFSbofrW0t/86ceVhx32w==}
engines: {glibc: '>=2.28', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [arm]
os: [linux]
requiresBuild: true
optionalDependencies:
- '@img/sharp-libvips-linux-arm': 1.0.1
+ '@img/sharp-libvips-linux-arm': 1.0.2
dev: true
optional: true
- resolution: {integrity: sha512-MBoInDXDppMfhSzbMmOQtGfloVAflS2rP1qPcUIiITMi36Mm5YR7r0ASND99razjQUpHTzjrU1flO76hKvP5RA==}
+ resolution: {integrity: sha512-vFk441DKRFepjhTEH20oBlFrHcLjPfI8B0pMIxGm3+yilKyYeHEVvrZhYFdqIseSclIqbQ3SnZMwEMWonY5XFA==}
engines: {glibc: '>=2.28', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [s390x]
os: [linux]
requiresBuild: true
optionalDependencies:
- '@img/sharp-libvips-linux-s390x': 1.0.1
+ '@img/sharp-libvips-linux-s390x': 1.0.2
dev: true
optional: true
- resolution: {integrity: sha512-xUT82H5IbXewKkeF5aiooajoO1tQV4PnKfS/OZtb5DDdxS/FCI/uXTVZ35GQ97RZXsycojz/AJ0asoz6p2/H/A==}
+ resolution: {integrity: sha512-Q4I++herIJxJi+qmbySd072oDPRkCg/SClLEIDh5IL9h1zjhqjv82H0Seupd+q2m0yOfD+/fJnjSoDFtKiHu2g==}
engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [x64]
os: [linux]
requiresBuild: true
optionalDependencies:
- '@img/sharp-libvips-linux-x64': 1.0.1
+ '@img/sharp-libvips-linux-x64': 1.0.2
dev: true
optional: true
- resolution: {integrity: sha512-F+0z8JCu/UnMzg8IYW1TMeiViIWBVg7IWP6nE0p5S5EPQxlLd76c8jYemG21X99UzFwgkRo5yz2DS+zbrnxZeA==}
+ resolution: {integrity: sha512-qnDccehRDXadhM9PM5hLvcPRYqyFCBN31kq+ErBSZtZlsAc1U4Z85xf/RXv1qolkdu+ibw64fUDaRdktxTNP9A==}
engines: {musl: '>=1.2.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [arm64]
os: [linux]
requiresBuild: true
optionalDependencies:
- '@img/sharp-libvips-linuxmusl-arm64': 1.0.1
+ '@img/sharp-libvips-linuxmusl-arm64': 1.0.2
dev: true
optional: true
- resolution: {integrity: sha512-+ZLE3SQmSL+Fn1gmSaM8uFusW5Y3J9VOf+wMGNnTtJUMUxFhv+P4UPaYEYT8tqnyYVaOVGgMN/zsOxn9pSsO2A==}
+ resolution: {integrity: sha512-Jhchim8kHWIU/GZ+9poHMWRcefeaxFIs9EBqf9KtcC14Ojk6qua7ghKiPs0sbeLbLj/2IGBtDcxHyjCdYWkk2w==}
engines: {musl: '>=1.2.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [x64]
os: [linux]
requiresBuild: true
optionalDependencies:
- '@img/sharp-libvips-linuxmusl-x64': 1.0.1
+ '@img/sharp-libvips-linuxmusl-x64': 1.0.2
dev: true
optional: true
- resolution: {integrity: sha512-fLbTaESVKuQcpm8ffgBD7jLb/CQLcATju/jxtTXR1XCLwbOQt+OL5zPHSDMmp2JZIeq82e18yE0Vv7zh6+6BfQ==}
+ resolution: {integrity: sha512-68zivsdJ0koE96stdUfM+gmyaK/NcoSZK5dV5CAjES0FUXS9lchYt8LAB5rTbM7nlWtxaU/2GON0HVN6/ZYJAQ==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [wasm32]
requiresBuild: true
dependencies:
- '@emnapi/runtime': 0.45.0
+ '@emnapi/runtime': 1.1.0
dev: true
optional: true
- resolution: {integrity: sha512-okBpql96hIGuZ4lN3+nsAjGeggxKm7hIRu9zyec0lnfB8E7Z6p95BuRZzDDXZOl2e8UmR4RhYt631i7mfmKU8g==}
+ resolution: {integrity: sha512-CyimAduT2whQD8ER4Ux7exKrtfoaUiVr7HG0zZvO0XTFn2idUWljjxv58GxNTkFb8/J9Ub9AqITGkJD6ZginxQ==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [ia32]
os: [win32]
@@ -3784,8 +3574,8 @@ packages:
dev: true
optional: true
- resolution: {integrity: sha512-E4magOks77DK47FwHUIGH0RYWSgRBfGdK56kIHSVeB9uIS4pPFr4N2kIVsXdQQo4LzOsENKV5KAhRlRL7eMAdg==}
+ resolution: {integrity: sha512-viT4fUIDKnli3IfOephGnolMzhz5VaTvDRkYqtZxOMIoMQ4MrAziO7pT1nVnOt2FAm7qW5aa+CCc13aEY6Le0g==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
cpu: [x64]
os: [win32]
@@ -3807,6 +3597,7 @@ packages:
/@istanbuljs/[email protected]:
resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
engines: {node: '>=8'}
+ dev: false
resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}
@@ -3870,33 +3661,36 @@ packages:
react: 18.2.0
dev: false
- /@microsoft/[email protected](@types/[email protected]):
- resolution: {integrity: sha512-wT/kB2oDbdZXITyDh2SQLzaWwTOFbV326fP0pUwNW00WeliARs0qjmXBWmGWardEzp2U3/axkO3Lboqun6vrig==}
+ /@microsoft/[email protected](@types/[email protected]):
+ resolution: {integrity: sha512-39v/JyldX4MS9uzHcdfmjjfS6cYGAoXV+io8B5a338pkHiSt+gy2eXQ0Q7cGFJ7quSa1VqqlMdlPrB6sLR/cAw==}
dependencies:
'@microsoft/tsdoc': 0.14.2
'@microsoft/tsdoc-config': 0.16.2
- '@rushstack/node-core-library': 3.62.0(@types/[email protected])
+ '@rushstack/node-core-library': 4.0.2(@types/[email protected])
transitivePeerDependencies:
- '@types/node'
+ dev: false
- /@microsoft/[email protected](@types/[email protected]):
- resolution: {integrity: sha512-PuXxzadgnvp+wdeZFPonssRAj/EW4Gm4s75TXzPk09h3wJ8RS3x7typf95B4vwZRrPTQBGopdUl+/vHvlPdAcg==}
+ /@microsoft/[email protected](@types/[email protected]):
+ resolution: {integrity: sha512-GFhTcJpB+MI6FhvXEI9b2K0snulNLWHqC/BbcJtyNYcKUiw7l3Lgis5ApsYncJ0leALX7/of4XfmXk+maT111w==}
hasBin: true
dependencies:
- '@microsoft/api-extractor-model': 7.28.3(@types/[email protected])
+ '@microsoft/api-extractor-model': 7.28.13(@types/[email protected])
'@microsoft/tsdoc': 0.14.2
'@microsoft/tsdoc-config': 0.16.2
- '@rushstack/node-core-library': 3.62.0(@types/[email protected])
- '@rushstack/rig-package': 0.5.1
- '@rushstack/ts-command-line': 4.17.1
- colors: 1.2.5
+ '@rushstack/node-core-library': 4.0.2(@types/[email protected])
+ '@rushstack/rig-package': 0.5.2
+ '@rushstack/terminal': 0.10.0(@types/[email protected])
+ '@rushstack/ts-command-line': 4.19.1(@types/[email protected])
lodash: 4.17.21
+ minimatch: 3.0.8
resolve: 1.22.8
semver: 7.5.4
source-map: 0.6.1
- typescript: 5.3.3
+ typescript: 5.4.2
transitivePeerDependencies:
- '@types/node'
+ dev: false
/@microsoft/[email protected]:
resolution: {integrity: sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==}
@@ -3905,9 +3699,11 @@ packages:
ajv: 6.12.6
jju: 1.4.0
resolve: 1.19.0
+ dev: false
/@microsoft/[email protected]:
resolution: {integrity: sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==}
+ dev: false
/@ndelangen/[email protected]:
resolution: {integrity: sha512-9JKTEik4vq+yGosHYhZ1tiH/3WpUS0Nh0kej4Agndhox8pAdWhEx5knFVRcb/ya9knCRCs1rPxNrSXTDdfVqpA==}
@@ -4272,6 +4068,7 @@ packages:
'@types/estree': 1.0.5
estree-walker: 2.0.2
picomatch: 2.3.1
+ dev: false
resolution: {integrity: sha512-4C4UERETjXpC4WpBXDbkgNVgHyWfG3B/NKY46e7w5H134UDOFqUJKpsLm0UYmuupW+aJmRgeScrDNfvZ5WV80A==}
@@ -4280,14 +4077,6 @@ packages:
requiresBuild: true
optional: true
- /@rollup/[email protected]:
- resolution: {integrity: sha512-ee7BudTwwrglFYSc3UnqInDDjCLWHKrFmGNi4aK7jlEyg4CyPa1DCMrZfsN1O13YT76UFEqXz2CoN7BCGpUlJw==}
- cpu: [arm]
- os: [android]
- requiresBuild: true
- dev: true
- optional: true
-
resolution: {integrity: sha512-TrTaFJ9pXgfXEiJKQ3yQRelpQFqgRzVR9it8DbeRzG0RX7mKUy0bqhCFsgevwXLJepQKTnLl95TnPGf9T9AMOA==}
cpu: [arm64]
@@ -4295,14 +4084,6 @@ packages:
requiresBuild: true
optional: true
- /@rollup/[email protected]:
- resolution: {integrity: sha512-xOuhj9HHtn8128ir8veoQsBbAUBasDbHIBniYTEx02pAmu9EXL+ZjJqngnNEy6ZgZ4h1JwL33GMNu3yJL5Mzow==}
- cpu: [arm64]
- os: [android]
- requiresBuild: true
- dev: true
- optional: true
-
resolution: {integrity: sha512-fz7jN6ahTI3cKzDO2otQuybts5cyu0feymg0bjvYCBrZQ8tSgE8pc0sSNEuGvifrQJWiwx9F05BowihmLxeQKw==}
cpu: [arm64]
@@ -4310,14 +4091,6 @@ packages:
requiresBuild: true
optional: true
- /@rollup/[email protected]:
- resolution: {integrity: sha512-NTGJWoL8bKyqyWFn9/RzSv4hQ4wTbaAv0lHHRwf4OnpiiP4P8W0jiXbm8Nc5BCXKmWAwuvJY82mcIU2TayC20g==}
- cpu: [arm64]
- os: [darwin]
- requiresBuild: true
- dev: true
- optional: true
-
resolution: {integrity: sha512-WTvdz7SLMlJpektdrnWRUN9C0N2qNHwNbWpNo0a3Tod3gb9leX+yrYdCeB7VV36OtoyiPAivl7/xZ3G1z5h20g==}
cpu: [x64]
@@ -4325,14 +4098,6 @@ packages:
requiresBuild: true
optional: true
- /@rollup/[email protected]:
- resolution: {integrity: sha512-hlKqj7bpPvU15sZo4za14u185lpMzdwWLMc9raMqPK4wywt0wR23y1CaVQ4oAFXat3b5/gmRntyfpwWTKl+vvA==}
- cpu: [x64]
- os: [darwin]
- requiresBuild: true
- dev: true
- optional: true
-
resolution: {integrity: sha512-dBHQl+7wZzBYcIF6o4k2XkAfwP2ks1mYW2q/Gzv9n39uDcDiAGDqEyml08OdY0BIct0yLSPkDTqn4i6czpBLLw==}
cpu: [arm]
@@ -4340,14 +4105,6 @@ packages:
requiresBuild: true
optional: true
- /@rollup/[email protected]:
- resolution: {integrity: sha512-7ZIZx8c3u+pfI0ohQsft/GywrXez0uR6dUP0JhBuCK3sFO5TfdLn/YApnVkvPxuTv3+YKPIZend9Mt7Cz6sS3Q==}
- cpu: [arm]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
resolution: {integrity: sha512-bur4JOxvYxfrAmocRJIW0SADs3QdEYK6TQ7dTNz6Z4/lySeu3Z1H/+tl0a4qDYv0bCdBpUYM0sYa/X+9ZqgfSQ==}
cpu: [arm64]
@@ -4355,14 +4112,6 @@ packages:
requiresBuild: true
optional: true
- /@rollup/[email protected]:
- resolution: {integrity: sha512-7Pk/5mO11JW/cH+a8lL/i0ZxmRGrbpYqN0VwO2DHhU+SJWWOH2zE1RAcPaj8KqiwC8DCDIJOSxjV9+9lLb6aeA==}
- cpu: [arm64]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
resolution: {integrity: sha512-ssp77SjcDIUSoUyj7DU7/5iwM4ZEluY+N8umtCT9nBRs3u045t0KkW02LTyHouHDomnMXaXSZcCSr2bdMK63kA==}
cpu: [arm64]
@@ -4370,14 +4119,6 @@ packages:
requiresBuild: true
optional: true
- /@rollup/[email protected]:
- resolution: {integrity: sha512-KrRnuG5phJx756e62wxvWH2e+TK84MP2IVuPwfge+GBvWqIUfVzFRn09TKruuQBXzZp52Vyma7FjMDkwlA9xpg==}
- cpu: [arm64]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
resolution: {integrity: sha512-Jv1DkIvwEPAb+v25/Unrnnq9BO3F5cbFPT821n3S5litkz+O5NuXuNhqtPx5KtcwOTtaqkTsO+IVzJOsxd11aQ==}
cpu: [riscv64]
@@ -4399,14 +4140,6 @@ packages:
requiresBuild: true
optional: true
- /@rollup/[email protected]:
- resolution: {integrity: sha512-My+53GasPa2D2tU5dXiyHYwrELAUouSfkNlZ3bUKpI7btaztO5vpALEs3mvFjM7aKTvEbc7GQckuXeXIDKQ0fg==}
- cpu: [x64]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
resolution: {integrity: sha512-VTk/MveyPdMFkYJJPCkYBw07KcTkGU2hLEyqYMsU4NjiOfzoaDTW9PWGRsNwiOA3qI0k/JQPjkl/4FCK1smskQ==}
cpu: [x64]
@@ -4414,14 +4147,6 @@ packages:
requiresBuild: true
optional: true
- /@rollup/[email protected]:
- resolution: {integrity: sha512-/f0Q6Sc+Vw54Ws6N8fxaEe4R7at3b8pFyv+O/F2VaQ4hODUJcRUcCBJh6zuqtgQQt7w845VTkGLFgWZkP3tUoQ==}
- cpu: [x64]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
resolution: {integrity: sha512-L+hX8Dtibb02r/OYCsp4sQQIi3ldZkFI0EUkMTDwRfFykXBPptoz/tuuGqEd3bThBSLRWPR6wsixDSgOx/U3Zw==}
cpu: [arm64]
@@ -4429,14 +4154,6 @@ packages:
requiresBuild: true
optional: true
- /@rollup/[email protected]:
- resolution: {integrity: sha512-NCKuuZWLht6zj7s6EIFef4BxCRX1GMr83S2W4HPCA0RnJ4iHE4FS1695q6Ewoa6A9nFjJe1//yUu0kgBU07Edw==}
- cpu: [arm64]
- os: [win32]
- requiresBuild: true
- dev: true
- optional: true
-
resolution: {integrity: sha512-+dI2jVPfM5A8zme8riEoNC7UKk0Lzc7jCj/U89cQIrOjrZTCWZl/+IXUeRT2rEZ5j25lnSA9G9H1Ob9azaF/KQ==}
cpu: [ia32]
@@ -4444,14 +4161,6 @@ packages:
requiresBuild: true
optional: true
- /@rollup/[email protected]:
- resolution: {integrity: sha512-J5zL3riR4AOyU/J3M/i4k/zZ8eP1yT+nTmAKztCXJtnI36jYH0eepvob22mAQ/kLwfsK2TB6dbyVY1F8c/0H5A==}
- cpu: [ia32]
- os: [win32]
- requiresBuild: true
- dev: true
- optional: true
-
resolution: {integrity: sha512-YY1Exxo2viZ/O2dMHuwQvimJ0SqvL+OAWQLLY6rvXavgQKjhQUzn7nc1Dd29gjB5Fqi00nrBWctJBOyfVMIVxw==}
cpu: [x64]
@@ -4459,16 +4168,8 @@ packages:
requiresBuild: true
optional: true
- /@rollup/[email protected]:
- resolution: {integrity: sha512-pL0RXRHuuGLhvs7ayX/SAHph1hrDPXOM5anyYUQXWJEENxw3nfHkzv8FfVlEVcLyKPAEgDRkd6RKZq2SMqS/yg==}
- cpu: [x64]
- os: [win32]
- requiresBuild: true
- dev: true
- optional: true
-
- /@rushstack/[email protected](@types/[email protected]):
- resolution: {integrity: sha512-88aJn2h8UpSvdwuDXBv1/v1heM6GnBf3RjEy6ZPP7UnzHNCqOHA2Ut+ScYUbXcqIdfew9JlTAe3g+cnX9xQ/Aw==}
+ /@rushstack/[email protected](@types/[email protected]):
+ resolution: {integrity: sha512-hyES82QVpkfQMeBMteQUnrhASL/KHPhd7iJ8euduwNJG4mu2GSOKybf0rOEjOm1Wz7CwJEUm9y0yD7jg2C1bfg==}
peerDependencies:
'@types/node': '*'
peerDependenciesMeta:
@@ -4476,27 +4177,44 @@ packages:
optional: true
dependencies:
'@types/node': 20.11.30
- colors: 1.2.5
fs-extra: 7.0.1
import-lazy: 4.0.0
jju: 1.4.0
resolve: 1.22.8
semver: 7.5.4
z-schema: 5.0.5
+ dev: false
- /@rushstack/[email protected]:
- resolution: {integrity: sha512-pXRYSe29TjRw7rqxD4WS3HN/sRSbfr+tJs4a9uuaSIBAITbUggygdhuG0VrO0EO+QqH91GhYMN4S6KRtOEmGVA==}
+ /@rushstack/[email protected]:
+ resolution: {integrity: sha512-mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA==}
dependencies:
resolve: 1.22.8
strip-json-comments: 3.1.1
+ dev: false
- /@rushstack/[email protected]:
- resolution: {integrity: sha512-2jweO1O57BYP5qdBGl6apJLB+aRIn5ccIRTPDyULh0KMwVzFqWtw6IZWt1qtUoZD/pD2RNkIOosH6Cq45rIYeg==}
+ /@rushstack/[email protected](@types/[email protected]):
+ resolution: {integrity: sha512-UbELbXnUdc7EKwfH2sb8ChqNgapUOdqcCIdQP4NGxBpTZV2sQyeekuK3zmfQSa/MN+/7b4kBogl2wq0vpkpYGw==}
+ peerDependencies:
+ '@types/node': '*'
+ peerDependenciesMeta:
+ '@types/node':
+ optional: true
dependencies:
+ '@rushstack/node-core-library': 4.0.2(@types/[email protected])
+ '@types/node': 20.11.30
+ supports-color: 8.1.1
+ dev: false
+
+ /@rushstack/[email protected](@types/[email protected]):
+ resolution: {integrity: sha512-J7H768dgcpG60d7skZ5uSSwyCZs/S2HrWP1Ds8d1qYAyaaeJmpmmLr9BVw97RjFzmQPOYnoXcKA4GkqDCkduQg==}
+ dependencies:
+ '@rushstack/terminal': 0.10.0(@types/[email protected])
'@types/argparse': 1.0.38
argparse: 1.0.10
- colors: 1.2.5
string-argv: 0.3.2
+ transitivePeerDependencies:
+ - '@types/node'
+ dev: false
/@sinclair/[email protected]:
resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
@@ -5658,6 +5376,7 @@ packages:
resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==}
+ dev: false
resolution: {integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==}
@@ -5805,17 +5524,16 @@ packages:
resolution: {integrity: sha512-J5dvW98sxmGnamqf+/aLP87PYXyrha9xIgc2ZlHl6OHMFR2Ejdxep50QfU0abO1+CH6+ugx+8wEUN1toImAinA==}
dependencies:
'@types/lodash': 4.14.202
- dev: false
+ dev: true
resolution: {integrity: sha512-KOxyNkZpbaggVmqbpr82N2tDVTx05/3/j0f50Es1prxrWB0XYf9p3QNxqcbWb7P1Q9wlvsUSlCFnwlPCIJ46PQ==}
dependencies:
'@types/lodash': 4.14.202
- dev: false
+ dev: true
resolution: {integrity: sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==}
- dev: false
resolution: {integrity: sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==}
@@ -5881,7 +5599,7 @@ packages:
resolution: {integrity: sha512-WH/po1gcEcoR6y857yAnPGug+ZhkF4PaTUxgAbwfeSH/QOgVSakKHBXoPGad/sEznmkiaK3pqHk+etdWisoeBQ==}
dependencies:
'@types/react': 18.2.72
- dev: false
+ dev: true
resolution: {integrity: sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==}
@@ -6194,19 +5912,9 @@ packages:
resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
- /@univerjs/[email protected]:
- resolution: {integrity: sha512-0004a2voyXpXaqBvHQUzt/s1in8JylCs1l5/WwyQiikjopQlo+sEFEzSIuELZCuiv0SiqxBgcqrMumrPLXEIZA==}
- dev: false
-
- resolution: {integrity: sha512-RCRoDv2W+gjzwDL6KwXc0cmjvHaWQwCvz2W6thxSV6oeNAQco3m3pZMHrW4PMiHtJV/1r3X3cGPvkVJsXvxelw==}
- peerDependencies:
- react: '*'
- react-dom: '*'
- dependencies:
- react: 18.2.0
- react-dom: 18.2.0([email protected])
- dev: false
+ /@univerjs/[email protected]:
+ resolution: {integrity: sha512-WAUylnpHXmsbNnfyjlg8pV5Rea/1l3BwbmsIY3UY2eEelXNoTSChtCynxVGo8FvsbWjyQ5+7Iq30M5GPs2i1Gg==}
+ dev: true
resolution: {integrity: sha512-fHJKMGXGKK6W0E7xguXtHTTwR2P679sMMjh8JMHHobZzBCKoUuN3UBDRa8TJRyLWiY26jbe5xtJOhRD2sQyXKg==}
@@ -6229,38 +5937,6 @@ packages:
rxjs: 7.8.1
dev: false
- resolution: {integrity: sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==}
- engines: {node: ^14.18.0 || >=16.0.0}
- peerDependencies:
- vite: ^4.2.0 || ^5.0.0
- dependencies:
- '@babel/core': 7.23.5
- '@babel/plugin-transform-react-jsx-self': 7.23.3(@babel/[email protected])
- '@babel/plugin-transform-react-jsx-source': 7.23.3(@babel/[email protected])
- '@types/babel__core': 7.20.5
- react-refresh: 0.14.0
- vite: 5.0.12(@types/[email protected])([email protected])
- transitivePeerDependencies:
- - supports-color
- dev: true
-
- resolution: {integrity: sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==}
- engines: {node: ^14.18.0 || >=16.0.0}
- peerDependencies:
- vite: ^4.2.0 || ^5.0.0
- dependencies:
- '@babel/core': 7.23.5
- '@babel/plugin-transform-react-jsx-self': 7.23.3(@babel/[email protected])
- '@babel/plugin-transform-react-jsx-source': 7.23.3(@babel/[email protected])
- '@types/babel__core': 7.20.5
- react-refresh: 0.14.0
- vite: 5.1.6(@types/[email protected])([email protected])
- transitivePeerDependencies:
- - supports-color
- dev: true
-
resolution: {integrity: sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==}
engines: {node: ^14.18.0 || >=16.0.0}
@@ -6276,25 +5952,6 @@ packages:
transitivePeerDependencies:
- supports-color
- resolution: {integrity: sha512-j8M4R3XbQ7cmLqJd7mfxCpEc0bQ7S6o5VIEt7c0Auri2lT1hkd89Sa/mOYDnuGasTNawamW+0d9vDRK/5uhVXw==}
- peerDependencies:
- vitest: ^1.0.0
- dependencies:
- debug: 4.3.4
- istanbul-lib-coverage: 3.2.2
- istanbul-lib-instrument: 6.0.1
- istanbul-lib-report: 3.0.1
- istanbul-lib-source-maps: 4.0.1
- istanbul-reports: 3.1.6
- magicast: 0.3.3
- picocolors: 1.0.0
- test-exclude: 6.0.0
- transitivePeerDependencies:
- - supports-color
- dev: true
-
resolution: {integrity: sha512-39TjURYyAY6CLDx8M1RNYGoAuWicPWoofk+demJbAZROLCwUgGPgMRSg51GN+snbmQRTpSizuS9XC3cMSdQH2Q==}
peerDependencies:
@@ -6314,14 +5971,6 @@ packages:
- supports-color
dev: false
- /@vitest/[email protected]:
- resolution: {integrity: sha512-/bqGXcHfyKgFWYwIgFr1QYDaR9e64pRKxgBNWNXPefPFRhgm+K3+a/dS0cUGEreWngets3dlr8w8SBRw2fCfFQ==}
- dependencies:
- '@vitest/spy': 1.2.1
- '@vitest/utils': 1.2.1
- chai: 4.3.10
- dev: true
-
resolution: {integrity: sha512-xofQFwIzfdmLLlHa6ag0dPV8YsnKOCP1KdAeVVh34vSjN2dcUiXYCD9htu/9eM7t8Xln4v03U9HLxLpPlsXdZw==}
dependencies:
@@ -6337,14 +5986,6 @@ packages:
'@vitest/utils': 1.4.0
chai: 4.3.10
- /@vitest/[email protected]:
- resolution: {integrity: sha512-zc2dP5LQpzNzbpaBt7OeYAvmIsRS1KpZQw4G3WM/yqSV1cQKNKwLGmnm79GyZZjMhQGlRcSFMImLjZaUQvNVZQ==}
- dependencies:
- '@vitest/utils': 1.2.1
- p-limit: 5.0.0
- pathe: 1.1.1
- dev: true
-
resolution: {integrity: sha512-EDYVSmesqlQ4RD2VvWo3hQgTJ7ZrFQ2VSJdfiJiArkCerDAGeyF1i6dHkmySqk573jLp6d/cfqCN+7wUB5tLgg==}
dependencies:
@@ -6352,14 +5993,6 @@ packages:
p-limit: 5.0.0
pathe: 1.1.1
- /@vitest/[email protected]:
- resolution: {integrity: sha512-Tmp/IcYEemKaqAYCS08sh0vORLJkMr0NRV76Gl8sHGxXT5151cITJCET20063wk0Yr/1koQ6dnmP6eEqezmd/Q==}
- dependencies:
- magic-string: 0.30.5
- pathe: 1.1.1
- pretty-format: 29.7.0
- dev: true
-
resolution: {integrity: sha512-saAFnt5pPIA5qDGxOHxJ/XxhMFKkUSBJmVt5VgDsAqPTX6JP326r5C/c9UuCMPoXNzuudTPsYDZCoJ5ilpqG2A==}
dependencies:
@@ -6367,12 +6000,6 @@ packages:
pathe: 1.1.1
pretty-format: 29.7.0
- /@vitest/[email protected]:
- resolution: {integrity: sha512-vG3a/b7INKH7L49Lbp0IWrG6sw9j4waWAucwnksPB1r1FTJgV7nkBByd9ufzu6VWya/QTvQW4V9FShZbZIB2UQ==}
- dependencies:
- tinyspy: 2.2.0
- dev: true
-
resolution: {integrity: sha512-xAcW+S099ylC9VLU7eZfdT9myV67Nor9w9zhf0mGCYJSO+zM2839tOeROTdikOi/8Qeusffvxb/MyBSOja1Uig==}
dependencies:
@@ -6384,15 +6011,6 @@ packages:
dependencies:
tinyspy: 2.2.0
- /@vitest/[email protected]:
- resolution: {integrity: sha512-bsH6WVZYe/J2v3+81M5LDU8kW76xWObKIURpPrOXm2pjBniBu2MERI/XP60GpS4PHU3jyK50LUutOwrx4CyHUg==}
- dependencies:
- diff-sequences: 29.6.3
- estree-walker: 3.0.3
- loupe: 2.3.7
- pretty-format: 29.7.0
- dev: true
-
resolution: {integrity: sha512-d3Waie/299qqRyHTm2DjADeTaNdNSVsnwHPWrs20JMpjh6eiVq7ggggweO8rc4arhf6rRkWuHKwvxGvejUXZZQ==}
dependencies:
@@ -6414,26 +6032,20 @@ packages:
resolution: {integrity: sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==}
dependencies:
'@volar/source-map': 1.11.1
+ dev: false
resolution: {integrity: sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==}
dependencies:
muggle-string: 0.3.1
+ dev: false
resolution: {integrity: sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==}
dependencies:
'@volar/language-core': 1.11.1
path-browserify: 1.0.1
-
- resolution: {integrity: sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw==}
- dependencies:
- '@babel/parser': 7.23.6
- '@vue/shared': 3.4.15
- entities: 4.5.0
- estree-walker: 2.0.2
- source-map-js: 1.0.2
+ dev: false
resolution: {integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==}
@@ -6444,12 +6056,6 @@ packages:
estree-walker: 2.0.2
source-map-js: 1.0.2
- resolution: {integrity: sha512-wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ==}
- dependencies:
- '@vue/compiler-core': 3.4.15
- '@vue/shared': 3.4.15
-
resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==}
dependencies:
@@ -6475,26 +6081,6 @@ packages:
'@vue/compiler-dom': 3.4.21
'@vue/shared': 3.4.21
- resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==}
- peerDependencies:
- typescript: '*'
- peerDependenciesMeta:
- typescript:
- optional: true
- dependencies:
- '@volar/language-core': 1.11.1
- '@volar/source-map': 1.11.1
- '@vue/compiler-dom': 3.4.15
- '@vue/shared': 3.4.15
- computeds: 0.0.1
- minimatch: 9.0.3
- muggle-string: 0.3.1
- path-browserify: 1.0.1
- typescript: 5.4.2
- vue-template-compiler: 2.7.15
- dev: true
-
resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==}
peerDependencies:
@@ -6505,8 +6091,8 @@ packages:
dependencies:
'@volar/language-core': 1.11.1
'@volar/source-map': 1.11.1
- '@vue/compiler-dom': 3.4.15
- '@vue/shared': 3.4.15
+ '@vue/compiler-dom': 3.4.21
+ '@vue/shared': 3.4.21
computeds: 0.0.1
minimatch: 9.0.3
muggle-string: 0.3.1
@@ -6542,9 +6128,6 @@ packages:
'@vue/shared': 3.4.21
vue: 3.4.21([email protected])
- resolution: {integrity: sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==}
-
resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==}
@@ -6891,6 +6474,7 @@ packages:
resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
dependencies:
sprintf-js: 1.0.3
+ dev: false
resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
@@ -7388,7 +6972,6 @@ packages:
loupe: 2.3.7
pathval: 1.1.1
type-detect: 4.0.8
- dev: false
resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
@@ -7633,10 +7216,6 @@ packages:
resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
- resolution: {integrity: sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==}
- engines: {node: '>=0.1.90'}
-
resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
engines: {node: '>= 0.8'}
@@ -7667,6 +7246,7 @@ packages:
resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}
engines: {node: ^12.20.0 || >=14}
requiresBuild: true
+ dev: false
optional: true
@@ -7708,6 +7288,7 @@ packages:
resolution: {integrity: sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==}
+ dev: false
resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
@@ -8067,6 +7648,7 @@ packages:
resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}
+ dev: false
resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
@@ -8275,8 +7857,8 @@ packages:
resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
engines: {node: '>=8'}
- resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==}
+ resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}
engines: {node: '>=8'}
dev: true
@@ -8657,11 +8239,7 @@ packages:
has-symbols: 1.0.3
internal-slot: 1.0.7
iterator.prototype: 1.1.2
- safe-array-concat: 1.1.2
- dev: true
-
- resolution: {integrity: sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==}
+ safe-array-concat: 1.1.2
dev: true
@@ -8980,37 +8558,6 @@ packages:
esbuild-windows-arm64: 0.14.54
dev: true
- resolution: {integrity: sha512-S1Y27QGt/snkNYrRcswgRFqZjaTG5a5xM3EQo97uNBnH505pdzSNe/HLBq1v0RO7iK/ngdbhJB6mDAp0OK+iUA==}
- engines: {node: '>=12'}
- hasBin: true
- requiresBuild: true
- optionalDependencies:
- '@esbuild/aix-ppc64': 0.19.10
- '@esbuild/android-arm': 0.19.10
- '@esbuild/android-arm64': 0.19.10
- '@esbuild/android-x64': 0.19.10
- '@esbuild/darwin-arm64': 0.19.10
- '@esbuild/darwin-x64': 0.19.10
- '@esbuild/freebsd-arm64': 0.19.10
- '@esbuild/freebsd-x64': 0.19.10
- '@esbuild/linux-arm': 0.19.10
- '@esbuild/linux-arm64': 0.19.10
- '@esbuild/linux-ia32': 0.19.10
- '@esbuild/linux-loong64': 0.19.10
- '@esbuild/linux-mips64el': 0.19.10
- '@esbuild/linux-ppc64': 0.19.10
- '@esbuild/linux-riscv64': 0.19.10
- '@esbuild/linux-s390x': 0.19.10
- '@esbuild/linux-x64': 0.19.10
- '@esbuild/netbsd-x64': 0.19.10
- '@esbuild/openbsd-x64': 0.19.10
- '@esbuild/sunos-x64': 0.19.10
- '@esbuild/win32-arm64': 0.19.10
- '@esbuild/win32-ia32': 0.19.10
- '@esbuild/win32-x64': 0.19.10
- dev: true
-
resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==}
engines: {node: '>=12'}
@@ -9954,6 +9501,7 @@ packages:
graceful-fs: 4.2.11
jsonfile: 4.0.0
universalify: 0.1.2
+ dev: false
resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
@@ -10320,15 +9868,6 @@ packages:
optionalDependencies:
uglify-js: 3.17.4
- resolution: {integrity: sha512-AwSV0OPsLxOu1nsKsw+1aakYGiCgLcYed/BPLMGe4lOxAZY14UWGAw8nB7SSnHRltBPwcM6Rf+5hcMXcU7qxaQ==}
- engines: {node: '>=16.0.0'}
- dependencies:
- entities: 4.5.0
- webidl-conversions: 7.0.0
- whatwg-mimetype: 3.0.0
- dev: true
-
resolution: {integrity: sha512-RAbq4oYfJNkVan1m1F3jfA4YEyRY0/ASoNvZsNJbuX85jIypidmsz9jQZD7Tqz0VXA2MhAGfcsh5oshwmwNYSg==}
engines: {node: '>=16.0.0'}
@@ -10416,6 +9955,7 @@ packages:
resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
hasBin: true
+ dev: false
resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
@@ -10446,6 +9986,7 @@ packages:
resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
+ dev: false
resolution: {integrity: sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==}
@@ -11119,6 +10660,7 @@ packages:
resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
engines: {node: '>=8'}
+ dev: false
resolution: {integrity: sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==}
@@ -11131,6 +10673,7 @@ packages:
semver: 7.6.0
transitivePeerDependencies:
- supports-color
+ dev: false
resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
@@ -11139,17 +10682,7 @@ packages:
istanbul-lib-coverage: 3.2.2
make-dir: 4.0.0
supports-color: 7.2.0
-
- resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
- engines: {node: '>=10'}
- dependencies:
- debug: 4.3.4
- istanbul-lib-coverage: 3.2.2
- source-map: 0.6.1
- transitivePeerDependencies:
- - supports-color
- dev: true
+ dev: false
resolution: {integrity: sha512-wHOoEsNJTVltaJp8eVkm8w+GVkVNHT2YDYo53YdzQEL2gWm1hBX5cGFR9hQJtuGLebidVX7et3+dmDZrmclduw==}
@@ -11168,6 +10701,7 @@ packages:
dependencies:
html-escaper: 2.0.2
istanbul-lib-report: 3.0.1
+ dev: false
resolution: {integrity: sha512-t91HubM4ZDQ70M9wqp+pcNpu8OyJ9UAtXntT/Bcsvp5tZMnz9vRa+IunKXeI8AnfZMTv0jNuVEmGeLSMjVvfPw==}
@@ -11232,6 +10766,7 @@ packages:
resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==}
+ dev: false
resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
@@ -11385,6 +10920,7 @@ packages:
resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
optionalDependencies:
graceful-fs: 4.2.11
+ dev: false
resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
@@ -11425,6 +10961,7 @@ packages:
resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
+ dev: false
resolution: {integrity: sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==}
@@ -11613,9 +11150,11 @@ packages:
resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
+ dev: false
resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+ dev: false
resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
@@ -11744,19 +11283,6 @@ packages:
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
dev: true
- resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
- dependencies:
- sourcemap-codec: 1.4.8
- dev: true
-
- resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==}
- engines: {node: '>=12'}
- dependencies:
- '@jridgewell/sourcemap-codec': 1.4.15
- dev: true
-
resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==}
engines: {node: '>=12'}
@@ -11769,6 +11295,7 @@ packages:
'@babel/parser': 7.23.6
'@babel/types': 7.23.6
source-map-js: 1.0.2
+ dev: false
resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
@@ -11789,6 +11316,7 @@ packages:
engines: {node: '>=10'}
dependencies:
semver: 7.5.4
+ dev: false
resolution: {integrity: sha512-0aF7ZmVon1igznGI4VS30yugpduQW3y3GkcgGJOp7d8x8QrizhigUxjI/m2UojsXXto+jLAH3KSz+xOJTiORjg==}
@@ -11918,6 +11446,12 @@ packages:
resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
engines: {node: '>=4'}
+ resolution: {integrity: sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==}
+ dependencies:
+ brace-expansion: 1.1.11
+ dev: false
+
resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
dependencies:
@@ -12007,6 +11541,7 @@ packages:
resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==}
+ dev: false
resolution: {integrity: sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==}
@@ -12537,6 +12072,7 @@ packages:
resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
+ dev: false
resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
@@ -12824,15 +12360,6 @@ packages:
source-map-js: 1.0.2
dev: true
- resolution: {integrity: sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==}
- engines: {node: ^10 || ^12 || >=14}
- dependencies:
- nanoid: 3.3.7
- picocolors: 1.0.0
- source-map-js: 1.0.2
- dev: true
-
resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==}
engines: {node: ^10 || ^12 || >=14}
@@ -13884,6 +13411,7 @@ packages:
dependencies:
is-core-module: 2.13.1
path-parse: 1.0.7
+ dev: false
resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
@@ -13973,26 +13501,6 @@ packages:
'@rollup/rollup-win32-x64-msvc': 4.13.1
fsevents: 2.3.3
- resolution: {integrity: sha512-CRK1uoROBfkcqrZKyaFcqCcZWNsvJ6yVYZkqTlRocZhO2s5yER6Z3f/QaYtO8RGyloPnmhwgzuPQpNGeK210xQ==}
- engines: {node: '>=18.0.0', npm: '>=8.0.0'}
- hasBin: true
- optionalDependencies:
- '@rollup/rollup-android-arm-eabi': 4.5.2
- '@rollup/rollup-android-arm64': 4.5.2
- '@rollup/rollup-darwin-arm64': 4.5.2
- '@rollup/rollup-darwin-x64': 4.5.2
- '@rollup/rollup-linux-arm-gnueabihf': 4.5.2
- '@rollup/rollup-linux-arm64-gnu': 4.5.2
- '@rollup/rollup-linux-arm64-musl': 4.5.2
- '@rollup/rollup-linux-x64-gnu': 4.5.2
- '@rollup/rollup-linux-x64-musl': 4.5.2
- '@rollup/rollup-win32-arm64-msvc': 4.5.2
- '@rollup/rollup-win32-ia32-msvc': 4.5.2
- '@rollup/rollup-win32-x64-msvc': 4.5.2
- fsevents: 2.3.3
- dev: true
-
resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==}
dev: true
@@ -14217,34 +13725,34 @@ packages:
kind-of: 6.0.3
dev: false
- resolution: {integrity: sha512-WlYOPyyPDiiM07j/UO+E720ju6gtNtHjEGg5vovUk1Lgxyjm2LFO+37Nt/UI3MMh2l6hxTWQWi7qk3cXJTutcQ==}
- engines: {libvips: '>=8.15.1', node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ resolution: {integrity: sha512-vHUeXJU1UvlO/BNwTpT0x/r53WkLUVxrmb5JTgW92fdFCFk0ispLMAeu/jPO2vjkXM1fYUi3K7/qcLF47pwM1A==}
+ engines: {libvips: '>=8.15.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0}
requiresBuild: true
dependencies:
color: 4.2.3
- detect-libc: 2.0.2
+ detect-libc: 2.0.3
semver: 7.6.0
optionalDependencies:
- '@img/sharp-darwin-arm64': 0.33.2
- '@img/sharp-darwin-x64': 0.33.2
- '@img/sharp-libvips-darwin-arm64': 1.0.1
- '@img/sharp-libvips-darwin-x64': 1.0.1
- '@img/sharp-libvips-linux-arm': 1.0.1
- '@img/sharp-libvips-linux-arm64': 1.0.1
- '@img/sharp-libvips-linux-s390x': 1.0.1
- '@img/sharp-libvips-linux-x64': 1.0.1
- '@img/sharp-libvips-linuxmusl-arm64': 1.0.1
- '@img/sharp-libvips-linuxmusl-x64': 1.0.1
- '@img/sharp-linux-arm': 0.33.2
- '@img/sharp-linux-arm64': 0.33.2
- '@img/sharp-linux-s390x': 0.33.2
- '@img/sharp-linux-x64': 0.33.2
- '@img/sharp-linuxmusl-arm64': 0.33.2
- '@img/sharp-linuxmusl-x64': 0.33.2
- '@img/sharp-wasm32': 0.33.2
- '@img/sharp-win32-ia32': 0.33.2
- '@img/sharp-win32-x64': 0.33.2
+ '@img/sharp-darwin-arm64': 0.33.3
+ '@img/sharp-darwin-x64': 0.33.3
+ '@img/sharp-libvips-darwin-arm64': 1.0.2
+ '@img/sharp-libvips-darwin-x64': 1.0.2
+ '@img/sharp-libvips-linux-arm': 1.0.2
+ '@img/sharp-libvips-linux-arm64': 1.0.2
+ '@img/sharp-libvips-linux-s390x': 1.0.2
+ '@img/sharp-libvips-linux-x64': 1.0.2
+ '@img/sharp-libvips-linuxmusl-arm64': 1.0.2
+ '@img/sharp-libvips-linuxmusl-x64': 1.0.2
+ '@img/sharp-linux-arm': 0.33.3
+ '@img/sharp-linux-arm64': 0.33.3
+ '@img/sharp-linux-s390x': 0.33.3
+ '@img/sharp-linux-x64': 0.33.3
+ '@img/sharp-linuxmusl-arm64': 0.33.3
+ '@img/sharp-linuxmusl-x64': 0.33.3
+ '@img/sharp-wasm32': 0.33.3
+ '@img/sharp-win32-ia32': 0.33.3
+ '@img/sharp-win32-x64': 0.33.3
dev: true
@@ -14361,11 +13869,6 @@ packages:
resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
engines: {node: '>=0.10.0'}
- resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
- deprecated: Please use @jridgewell/sourcemap-codec instead
- dev: true
-
resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
dev: false
@@ -14402,6 +13905,7 @@ packages:
resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
+ dev: false
resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
@@ -14601,12 +14105,6 @@ packages:
resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
engines: {node: '>=8'}
- resolution: {integrity: sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==}
- dependencies:
- acorn: 8.11.3
- dev: true
-
resolution: {integrity: sha512-f9vHgsCWBq2ugHAkGMiiYY+AYG0D/cbloKKg0nhaaaSNsujdGIpVXCNsrJpCKr5M0f4aI31mr13UjY6GAuXCKA==}
dependencies:
@@ -14791,6 +14289,7 @@ packages:
'@istanbuljs/schema': 0.1.3
glob: 7.2.3
minimatch: 3.1.2
+ dev: false
resolution: {integrity: sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g==}
@@ -14821,11 +14320,6 @@ packages:
resolution: {integrity: sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==}
- resolution: {integrity: sha512-zBTCK0cCgRROxvs9c0CGK838sPkeokNGdQVUUwHAbynHFlmyJYj825f/oRs528HaIJ97lo0pLIlDUzwN+IorWg==}
- engines: {node: '>=14.0.0'}
- dev: true
-
resolution: {integrity: sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ==}
engines: {node: '>=14.0.0'}
@@ -15153,16 +14647,11 @@ packages:
hasBin: true
dev: true
- resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==}
- engines: {node: '>=14.17'}
- hasBin: true
-
resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==}
engines: {node: '>=14.17'}
hasBin: true
- dev: true
+ dev: false
resolution: {integrity: sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==}
@@ -15280,6 +14769,7 @@ packages:
resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
engines: {node: '>= 4.0.0'}
+ dev: false
resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
@@ -15417,33 +14907,13 @@ packages:
resolution: {integrity: sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==}
engines: {node: '>= 0.10'}
+ dev: false
resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
engines: {node: '>= 0.8'}
dev: false
- resolution: {integrity: sha512-fNzHmQUSOY+y30naohBvSW7pPn/xn3Ib/uqm+5wAJQJiqQsU0NBR78XdRJb04l4bOFKjpTWld0XAfkKlrDbySg==}
- engines: {node: ^18.0.0 || >=20.0.0}
- hasBin: true
- dependencies:
- cac: 6.7.14
- debug: 4.3.4
- pathe: 1.1.1
- picocolors: 1.0.0
- vite: 5.2.6(@types/[email protected])([email protected])
- transitivePeerDependencies:
- - '@types/node'
- - less
- - lightningcss
- - sass
- - stylus
- - sugarss
- - supports-color
- - terser
- dev: true
-
resolution: {integrity: sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==}
engines: {node: ^18.0.0 || >=20.0.0}
@@ -15464,32 +14934,8 @@ packages:
- supports-color
- terser
- resolution: {integrity: sha512-kg//1nDA01b8rufJf4TsvYN8LMkdwv0oBYpiQi6nRwpHyue+wTlhrBiqgipdFpMnW1oOYv6ywmzE5B0vg6vSEA==}
- engines: {node: ^14.18.0 || >=16.0.0}
- peerDependencies:
- typescript: '*'
- vite: '*'
- peerDependenciesMeta:
- vite:
- optional: true
- dependencies:
- '@microsoft/api-extractor': 7.39.0(@types/[email protected])
- '@rollup/pluginutils': 5.1.0
- '@vue/language-core': 1.8.27([email protected])
- debug: 4.3.4
- kolorist: 1.8.0
- typescript: 5.4.2
- vite: 5.0.12(@types/[email protected])([email protected])
- vue-tsc: 1.8.27([email protected])
- transitivePeerDependencies:
- - '@types/node'
- - rollup
- - supports-color
- dev: true
-
- resolution: {integrity: sha512-26eTlBYdpjRLWCsTJebM8vkCieE+p9gP3raf+ecDnzzK5E3FG6VE1wcy55OkRpfWWVlVvKkYFe6uvRHYWx7Nog==}
+ resolution: {integrity: sha512-zEYyQxH7lKto1VTKZHF3ZZeOPkkJgnMrePY4VxDHfDSvDjmYMMfWjZxYmNwW8QxbaItWJQhhXY+geAbyNphI7g==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
typescript: '*'
@@ -15498,11 +14944,12 @@ packages:
vite:
optional: true
dependencies:
- '@microsoft/api-extractor': 7.39.0(@types/[email protected])
+ '@microsoft/api-extractor': 7.43.0(@types/[email protected])
'@rollup/pluginutils': 5.1.0
'@vue/language-core': 1.8.27([email protected])
debug: 4.3.4
kolorist: 1.8.0
+ magic-string: 0.30.8
typescript: 5.4.3
vue-tsc: 1.8.27([email protected])
@@ -15512,93 +14959,6 @@ packages:
- supports-color
dev: false
- resolution: {integrity: sha512-R5oVY8xDJjLXLTs2XDYzvYbc/RTZuIwOx2xcFbYf+/VXB6eJuatDgt8jzQ7kZ+IrgwQhe6tU8U2fTyy72C25CQ==}
- engines: {node: ^14.18.0 || >=16.0.0}
- peerDependencies:
- vite: '>=2.0.0'
- dependencies:
- acorn: 8.11.3
- es-module-lexer: 0.4.1
- fs-extra: 10.1.0
- magic-string: 0.25.9
- vite: 5.0.12(@types/[email protected])([email protected])
- dev: true
-
- resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==}
- engines: {node: ^18.0.0 || >=20.0.0}
- hasBin: true
- peerDependencies:
- '@types/node': ^18.0.0 || >=20.0.0
- less: '*'
- lightningcss: ^1.21.0
- sass: '*'
- stylus: '*'
- sugarss: '*'
- terser: ^5.4.0
- peerDependenciesMeta:
- '@types/node':
- optional: true
- less:
- optional: true
- lightningcss:
- optional: true
- sass:
- optional: true
- stylus:
- optional: true
- sugarss:
- optional: true
- terser:
- optional: true
- dependencies:
- '@types/node': 20.11.30
- esbuild: 0.19.10
- less: 4.2.0
- postcss: 8.4.33
- rollup: 4.5.2
- optionalDependencies:
- fsevents: 2.3.3
- dev: true
-
- resolution: {integrity: sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==}
- engines: {node: ^18.0.0 || >=20.0.0}
- hasBin: true
- peerDependencies:
- '@types/node': ^18.0.0 || >=20.0.0
- less: '*'
- lightningcss: ^1.21.0
- sass: '*'
- stylus: '*'
- sugarss: '*'
- terser: ^5.4.0
- peerDependenciesMeta:
- '@types/node':
- optional: true
- less:
- optional: true
- lightningcss:
- optional: true
- sass:
- optional: true
- stylus:
- optional: true
- sugarss:
- optional: true
- terser:
- optional: true
- dependencies:
- '@types/node': 20.11.30
- esbuild: 0.19.10
- less: 4.2.0
- postcss: 8.4.35
- rollup: 4.5.2
- optionalDependencies:
- fsevents: 2.3.3
- dev: true
-
resolution: {integrity: sha512-FPtnxFlSIKYjZ2eosBQamz4CbyrTizbZ3hnGJlh/wMtCrlp1Hah6AzBLjGI5I2urTfNnpovpHdrL6YRuBOPnCA==}
engines: {node: ^18.0.0 || >=20.0.0}
@@ -15644,64 +15004,6 @@ packages:
vitest: 1.4.0(@types/[email protected])([email protected])
dev: true
- resolution: {integrity: sha512-TRph8N8rnSDa5M2wKWJCMnztCZS9cDcgVTQ6tsTFTG/odHJ4l5yNVqvbeDJYJRZ6is3uxaEpFs8LL6QM+YFSdA==}
- engines: {node: ^18.0.0 || >=20.0.0}
- hasBin: true
- peerDependencies:
- '@edge-runtime/vm': '*'
- '@types/node': ^18.0.0 || >=20.0.0
- '@vitest/browser': ^1.0.0
- '@vitest/ui': ^1.0.0
- happy-dom: '*'
- jsdom: '*'
- peerDependenciesMeta:
- '@edge-runtime/vm':
- optional: true
- '@types/node':
- optional: true
- '@vitest/browser':
- optional: true
- '@vitest/ui':
- optional: true
- happy-dom:
- optional: true
- jsdom:
- optional: true
- dependencies:
- '@types/node': 20.11.30
- '@vitest/expect': 1.2.1
- '@vitest/runner': 1.2.1
- '@vitest/snapshot': 1.2.1
- '@vitest/spy': 1.2.1
- '@vitest/utils': 1.2.1
- acorn-walk: 8.3.2
- cac: 6.7.14
- chai: 4.3.10
- debug: 4.3.4
- execa: 8.0.1
- happy-dom: 13.2.1
- local-pkg: 0.5.0
- magic-string: 0.30.5
- pathe: 1.1.1
- picocolors: 1.0.0
- std-env: 3.5.0
- strip-literal: 1.3.0
- tinybench: 2.5.1
- tinypool: 0.8.1
- vite: 5.2.6(@types/[email protected])([email protected])
- vite-node: 1.2.1(@types/[email protected])([email protected])
- why-is-node-running: 2.2.2
- transitivePeerDependencies:
- - less
- - lightningcss
- - sass
- - stylus
- - sugarss
- - supports-color
- - terser
- dev: true
-
resolution: {integrity: sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==}
engines: {node: ^18.0.0 || >=20.0.0}
@@ -15791,7 +15093,7 @@ packages:
'@vitest/spy': 1.4.0
'@vitest/utils': 1.4.0
acorn-walk: 8.3.2
- chai: 4.3.10
+ chai: 4.4.1
debug: 4.3.4
execa: 8.0.1
jsdom: 24.0.0
@@ -15848,7 +15150,7 @@ packages:
'@vitest/spy': 1.4.0
'@vitest/utils': 1.4.0
acorn-walk: 8.3.2
- chai: 4.3.10
+ chai: 4.4.1
debug: 4.3.4
execa: 8.0.1
local-pkg: 0.5.0
@@ -15895,18 +15197,7 @@ packages:
dependencies:
de-indent: 1.0.2
he: 1.2.0
-
- resolution: {integrity: sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==}
- hasBin: true
- peerDependencies:
- typescript: '*'
- dependencies:
- '@volar/typescript': 1.11.1
- '@vue/language-core': 1.8.27([email protected])
- semver: 7.5.4
- typescript: 5.4.2
- dev: true
+ dev: false
resolution: {integrity: sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==}
@@ -15916,7 +15207,7 @@ packages:
dependencies:
'@volar/typescript': 1.11.1
'@vue/language-core': 1.8.27([email protected])
- semver: 7.5.4
+ semver: 7.6.0
typescript: 5.4.3
dev: false
@@ -16065,6 +15356,7 @@ packages:
resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
engines: {node: '>=12'}
+ dev: false
resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
@@ -16329,3 +15621,4 @@ packages:
validator: 13.11.0
optionalDependencies:
commander: 9.5.0
+ dev: false