Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/[lang]/(home)/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export default async function Page({ params }: IProps) {
dark:bg-neutral-800
dark:hover:bg-neutral-900
`}
href="https://github.com/dream-num/univer/releases/tag/v0.15.5"
href="https://github.com/dream-num/univer/releases/tag/v0.16.1"
>
<span
className={`
Expand Down
2 changes: 1 addition & 1 deletion content/guides/sheets/features/charts.ja-JP.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ const charts = fWorksheet.getCharts()
// 3 秒後に最初のチャートを削除
setTimeout(async () => {
await fWorksheet.removeChart(charts[0])
fWorksheet.getCharts()
console.log(fWorksheet.getCharts())
}, 3000)
```

Expand Down
2 changes: 1 addition & 1 deletion content/guides/sheets/features/charts.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ const charts = fWorksheet.getCharts()
// Remove the first chart after 3 seconds.
setTimeout(async () => {
await fWorksheet.removeChart(charts[0])
fWorksheet.getCharts()
console.log(fWorksheet.getCharts())
}, 3000)
```

Expand Down
2 changes: 1 addition & 1 deletion content/guides/sheets/features/charts.zh-CN.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ const charts = fWorksheet.getCharts()
// 3 秒后删除第一个图表
setTimeout(async () => {
await fWorksheet.removeChart(charts[0])
fWorksheet.getCharts()
console.log(fWorksheet.getCharts())
}, 3000)
```

Expand Down
2 changes: 1 addition & 1 deletion content/guides/sheets/features/charts.zh-TW.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ const charts = fWorksheet.getCharts()
// 3 秒後刪除第一個圖表
setTimeout(async () => {
await fWorksheet.removeChart(charts[0])
fWorksheet.getCharts()
console.log(fWorksheet.getCharts())
}, 3000)
```

Expand Down
43 changes: 41 additions & 2 deletions content/guides/sheets/features/edit-history.ja-JP.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ import { createUniver, LocaleType, mergeLocales } from '@univerjs/presets'
import '@univerjs/preset-sheets-core/lib/index.css'
import '@univerjs/preset-sheets-drawing/lib/index.css' // [!code ++]
import '@univerjs/preset-sheets-advanced/lib/index.css' // [!code ++]
import '@univerjs/preset-sheets-collaboration/lib/index.css' // [!code ++]

const { univerAPI } = createUniver({
locale: LocaleType.JA_JP,
Expand Down Expand Up @@ -92,12 +93,31 @@ Univer の商用ライセンスをお持ちの場合は、設定方法につい

### プリセットと設定

`UniverSheetsAdvancedPreset` の設定オプション:
`UniverSheetsCollaborationPreset` の設定オプション:

```typescript
interface IUniverSheetsAdvancedPresetConfig {
interface IUniverSheetsCollaborationPresetConfig {
// Univer サーバーのエンドポイント
universerEndpoint?: string
/**
* 履歴データの読み込みに Worker を使用する必要がある場合は、このフィールドを設定できます。
* 1. historyWorkerURL が提供され、historyWorkerURL が Worker インスタンスである場合、履歴が閉じられたときに破棄されるため、履歴が開かれるたびに新しい Worker インスタンスを提供する必要があります。
* ```typescript
* import { EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, ToggleEditHistoryOperation } from '@univerjs/preset-sheets-collaboration';
*
* univerAPI.addEvent(univerAPI.Event.BeforeCommandExecute, (event) => {
* if (event.id === ToggleEditHistoryOperation.id) {
* const workerURL = new Worker(new URL('./worker.ts', import.meta.url));
* const configService = univer.__getInjector().get(IConfigService);
* configService.setConfig(EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, {
* workerURL,
* });
* }
* });
* 2.historyWorkerURL が Worker インスタンスでない場合、追加の処理は必要ありません。
* ```
*/
historyWorkerURL?: string | URL | Worker
}
```

Expand Down Expand Up @@ -143,6 +163,25 @@ interface IUniverEditHistoryLoaderConfig {
univerContainerId?: string
// 履歴一覧のサーバー URL
historyListServerUrl?: string
/**
* 履歴データの読み込みに Worker を使用する必要がある場合は、このフィールドを設定できます。
* 1. workerURL が提供され、workerURL が Worker インスタンスである場合、履歴が閉じられたときに破棄されるため、履歴が開かれるたびに新しい Worker インスタンスを提供する必要があります。
* ```typescript
* import { EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, ToggleEditHistoryOperation } from '@univerjs-pro/edit-history-loader';
*
* univerAPI.addEvent(univerAPI.Event.BeforeCommandExecute, (event) => {
* if (event.id === ToggleEditHistoryOperation.id) {
* const workerURL = new Worker(new URL('./worker.ts', import.meta.url));
* const configService = univer.__getInjector().get(IConfigService);
* configService.setConfig(EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, {
* workerURL,
* });
* }
* });
* 2.workerURL が Worker インスタンスでない場合、追加の処理は必要ありません。
* ```
*/
workerURL?: string | URL | Worker
}
```

Expand Down
42 changes: 40 additions & 2 deletions content/guides/sheets/features/edit-history.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,31 @@ If you have a commercial license for Univer, please refer to [Using License in C

### Presets and Configuration

The `UniverSheetsAdvancedPreset` configuration options:
The `UniverSheetsCollaborationPreset` configuration options:

```typescript
interface IUniverSheetsAdvancedPresetConfig {
interface IUniverSheetsCollaborationPresetConfig {
// The endpoint of the Univer Server
universerEndpoint?: string
/**
* If the data calculation in the history requires the use of Worker (such as formulas), you can configure this field.
* 1. If historyWorkerURL is provided and historyWorkerURL is a Worker instance, it will be destroyed when the history is closed, so a new Worker instance needs to be provided each time the history is opened.
* ```typescript
* import { EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, ToggleEditHistoryOperation } from '@univerjs/preset-sheets-collaboration';
*
* univerAPI.addEvent(univerAPI.Event.BeforeCommandExecute, (event) => {
* if (event.id === ToggleEditHistoryOperation.id) {
* const workerURL = new Worker(new URL('./worker.ts', import.meta.url));
* const configService = univer.__getInjector().get(IConfigService);
* configService.setConfig(EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, {
* workerURL,
* });
* }
* });
* 2.If the provided historyWorkerURL is not a Worker instance, no additional processing is required.
* ```
*/
historyWorkerURL?: string | URL | Worker
}
```

Expand Down Expand Up @@ -144,6 +163,25 @@ interface IUniverEditHistoryLoaderConfig {
univerContainerId?: string
// The server url of the history list
historyListServerUrl?: string
/**
* If the data calculation in the history requires the use of Worker (such as formulas), you can configure this field.
* 1. If workerURL is provided and workerURL is a Worker instance, it will be destroyed when the history is closed, so a new Worker instance needs to be provided each time the history is opened.
* ```typescript
* import { EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, ToggleEditHistoryOperation } from '@univerjs-pro/edit-history-loader';
*
* univerAPI.addEvent(univerAPI.Event.BeforeCommandExecute, (event) => {
* if (event.id === ToggleEditHistoryOperation.id) {
* const workerURL = new Worker(new URL('./worker.ts', import.meta.url));
* const configService = univer.__getInjector().get(IConfigService);
* configService.setConfig(EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, {
* workerURL,
* });
* }
* });
* 2.If the provided workerURL is not a Worker instance, no additional processing is required.
* ```
*/
workerURL?: string | URL | Worker
}
```

Expand Down
42 changes: 40 additions & 2 deletions content/guides/sheets/features/edit-history.zh-CN.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,31 @@ const { univerAPI } = createUniver({

### 预设与配置

`UniverSheetsAdvancedPreset` 配置项:
`UniverSheetsCollaborationPreset` 配置项:

```typescript
interface IUniverSheetsAdvancedPresetConfig {
interface IUniverSheetsCollaborationPresetConfig {
// Univer Server 的端口地址
universerEndpoint?: string
/**
* 如果历史记录里面数据计算需要使用 Worker (例如公式),可以配置此字段。
* 1.如果提供了 historyWorkerURL 且 historyWorkerURL 是一个 Worker 实例,它会在历史记录关闭时被销毁,所以需要在历史记录每次打开时都提供一个新的 Worker 实例。
* ```typescript
* import { EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, ToggleEditHistoryOperation } from '@univerjs/preset-sheets-collaboration';
*
* univerAPI.addEvent(univerAPI.Event.BeforeCommandExecute, (event) => {
* if (event.id === ToggleEditHistoryOperation.id) {
* const workerURL = new Worker(new URL('./worker.ts', import.meta.url));
* const configService = univer.__getInjector().get(IConfigService);
* configService.setConfig(EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, {
* workerURL,
* });
* }
* });
* 2.如果提供的 historyWorkerURL 不是一个 Worker 实例,则不需要额外进行处理。
* ```
*/
historyWorkerURL?: string | URL | Worker
}
```

Expand Down Expand Up @@ -144,6 +163,25 @@ interface IUniverEditHistoryLoaderConfig {
univerContainerId?: string
// 历史记录列表的服务器地址
historyListServerUrl?: string
/**
* 如果历史记录里面数据计算需要使用 Worker (例如公式),可以配置此字段。
* 1.如果提供了 workerURL 且 workerURL 是一个 Worker 实例,它会在历史记录关闭时被销毁,所以需要在历史记录每次打开时都提供一个新的 Worker 实例。
* ```typescript
* import { EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, ToggleEditHistoryOperation } from '@univerjs-pro/edit-history-loader';
*
* univerAPI.addEvent(univerAPI.Event.BeforeCommandExecute, (event) => {
* if (event.id === ToggleEditHistoryOperation.id) {
* const workerURL = new Worker(new URL('./worker.ts', import.meta.url));
* const configService = univer.__getInjector().get(IConfigService);
* configService.setConfig(EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, {
* workerURL,
* });
* }
* });
* 2.如果提供的 workerURL 不是一个 Worker 实例,则不需要额外进行处理。
* ```
*/
workerURL?: string | URL | Worker
}
```

Expand Down
42 changes: 40 additions & 2 deletions content/guides/sheets/features/edit-history.zh-TW.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,31 @@ const { univerAPI } = createUniver({

### 預設與配置

`UniverSheetsAdvancedPreset` 配置項:
`UniverSheetsCollaborationPreset` 配置項:

```typescript
interface IUniverSheetsAdvancedPresetConfig {
interface IUniverSheetsCollaborationPresetConfig {
// Univer Server 的埠地址
universerEndpoint?: string
/**
* 如果歷史記錄裡面資料計算需要使用 Worker (例如公式),可以配置此字段。
* 1.如果提供了 historyWorkerURL 且 historyWorkerURL 是一個 Worker 實例,它會在歷史記錄關閉時被銷毀,所以需要在歷史記錄每次打開時都提供一個新的 Worker 實例。
* ```typescript
* import { EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, ToggleEditHistoryOperation } from '@univerjs/preset-sheets-collaboration';
*
* univerAPI.addEvent(univerAPI.Event.BeforeCommandExecute, (event) => {
* if (event.id === ToggleEditHistoryOperation.id) {
* const workerURL = new Worker(new URL('./worker.ts', import.meta.url));
* const configService = univer.__getInjector().get(IConfigService);
* configService.setConfig(EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, {
* workerURL,
* });
* }
* });
* 2.如果提供的 historyWorkerURL 不是一個 Worker 實例,則不需要額外進行處理。
* ```
*/
historyWorkerURL?: string | URL | Worker
}
```

Expand Down Expand Up @@ -144,6 +163,25 @@ interface IUniverEditHistoryLoaderConfig {
univerContainerId?: string
// 歷史記錄列表的伺服器地址
historyListServerUrl?: string
/**
* 如果歷史記錄裡面資料計算需要使用 Worker (例如公式),可以配置此字段。
* 1.如果提供了 workerURL 且 workerURL 是一個 Worker實例,它會在歷史記錄關閉時被銷毀,所以需要在歷史記錄每次打開時都提供一個新的 Worker 實例。
* ```typescript
* import { EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, ToggleEditHistoryOperation } from '@univerjs-pro/edit-history-loader';
*
* univerAPI.addEvent(univerAPI.Event.BeforeCommandExecute, (event) => {
* if (event.id === ToggleEditHistoryOperation.id) {
* const workerURL = new Worker(new URL('./worker.ts', import.meta.url));
* const configService = univer.__getInjector().get(IConfigService);
* configService.setConfig(EDIT_HISTORY_LOADER_PLUGIN_CONFIG_KEY, {
* workerURL,
* });
* }
* });
* 2.如果提供的 workerURL 不是一個 Worker 實例,則不需要額外進行處理。
* ```
*/
workerURL?: string | URL | Worker
}
```

Expand Down
2 changes: 2 additions & 0 deletions content/guides/sheets/features/shapes.ja-JP.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ icon: '#pro/Shapes'

Univer Sheets の図形(Shapes)を使うと、ワークシート上でフローチャート、注釈、コールアウト、視覚的なガイドを作成できます。

<PlaygroundFrame lang="ja-JP" slug="sheets/shapes" clickToShow />

## Preset モード

Shapes 機能は `@univerjs/preset-sheets-advanced` プリセットに含まれています。
Expand Down
2 changes: 2 additions & 0 deletions content/guides/sheets/features/shapes.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ icon: '#pro/Shapes'

Shapes in Univer Sheets can be used to create flowcharts, annotations, callouts, and visual guides directly on worksheets.

<PlaygroundFrame lang="en-US" slug="sheets/shapes" clickToShow />

## Preset Mode

The shape feature is included in the `@univerjs/preset-sheets-advanced` preset.
Expand Down
2 changes: 2 additions & 0 deletions content/guides/sheets/features/shapes.zh-CN.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ icon: '#pro/Shapes'

在 Univer Sheets 中,形状(Shapes)可以用于绘制流程图、注释标记、提示框,以及在工作表上构建可视化说明。

<PlaygroundFrame lang="zh-CN" slug="sheets/shapes" clickToShow />

## 预设模式

形状功能包含在 `@univerjs/preset-sheets-advanced` 预设中。
Expand Down
2 changes: 2 additions & 0 deletions content/guides/sheets/features/shapes.zh-TW.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ icon: '#pro/Shapes'

在 Univer Sheets 中,形狀(Shapes)可用於建立流程圖、註解標示、提示框,以及在工作表上建立視覺化說明。

<PlaygroundFrame lang="zh-TW" slug="sheets/shapes" clickToShow />

## 預設模式

形狀功能已包含在 `@univerjs/preset-sheets-advanced` 預設中。
Expand Down
1 change: 1 addition & 0 deletions content/guides/sheets/getting-started/pro.ja-JP.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Univer Pro の一部機能は Univer サーバーとの連携が必要です。
| 印刷 | 透かし表示<br />1回の印刷につき最大3ページまで |
| チャート | 透かし表示<br />折れ線グラフ、棒グラフ、円グラフ、横棒グラフのみ対応 |
| スパークライン | 透かし表示 |
| 図形 | 透かし表示 |
| ピボットテーブル | 透かし表示<br />ドキュメントごとに1つのみ作成可能 |
| 共同編集 | 透かし表示<br />同時に共同編集できるドキュメントは最大5つまで<br />1ドキュメントあたり最大3人まで |
| 編集履歴 | 透かし表示 |
Expand Down
1 change: 1 addition & 0 deletions content/guides/sheets/getting-started/pro.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Univer Pro has some limitations on certain features when not licensed:
| Printing | Watermark<br />No more than 3 pages per print |
| Charts | Watermark<br />Only supports line charts, bar charts, pie charts, and bar charts |
| Sparklines | Watermark |
| Shapes | Watermark |
| Pivot Tables | Watermark<br />Only one pivot table can be created per document |
| Collaborative Editing | Watermark<br />No more than 5 documents can be collaboratively edited at the same time<br />No more than 3 collaborators per document |
| Edit History | Watermark |
Expand Down
1 change: 1 addition & 0 deletions content/guides/sheets/getting-started/pro.zh-CN.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Univer 为了满足更复杂的应用场景,提供了 Univer Pro 版本。Pro
| 打印 | 水印<br />每次打印不超过 3 页 |
| 图表 | 水印<br />仅支持折线图、柱状图、饼图、条形图 |
| 迷你图 | 水印 |
| 形状 | 水印 |
| 数据透视表 | 水印<br />每个文档只能创建一个数据透视表 |
| 协同编辑 | 水印<br />同时协作文档数量不超过 5 个<br />每个文档的协作者数量不超过 3 个 |
| 编辑历史 | 水印 |
Expand Down
1 change: 1 addition & 0 deletions content/guides/sheets/getting-started/pro.zh-TW.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { IconWrapper } from '@/components/icon-wrapper'
| 列印 | 浮水印<br />每次列印不超過 3 頁 |
| 圖表 | 浮水印<br />僅支援折線圖、柱狀圖、圓餅圖、條形圖 |
| 迷你圖 | 浮水印 |
| 形狀 | 浮水印 |
| 資料透視表 | 浮水印<br />每個文件僅能建立一個資料透視表 |
| 協同編輯 | 浮水印<br />同時協作的文件數不超過 5 個<br />每個文件的協作者數量不超過 3 人 |
| 編輯紀錄 | 浮水印 |
Expand Down
4 changes: 2 additions & 2 deletions examples/univer-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"@angular/compiler": "^21.1.1",
"@angular/core": "^21.1.1",
"@angular/platform-browser": "^21.1.1",
"@univerjs/preset-sheets-core": "^0.15.5",
"@univerjs/presets": "^0.15.5",
"@univerjs/preset-sheets-core": "^0.16.1",
"@univerjs/presets": "^0.16.1",
"rxjs": "^7.8.2",
"tslib": "^2.8.1",
"zone.js": "^0.16.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/univer-astro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"astro": "astro"
},
"dependencies": {
"@univerjs/preset-sheets-core": "^0.15.5",
"@univerjs/presets": "^0.15.5",
"@univerjs/preset-sheets-core": "^0.16.1",
"@univerjs/presets": "^0.16.1",
"astro": "^5.16.15"
}
}
4 changes: 2 additions & 2 deletions examples/univer-nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"start": "next start"
},
"dependencies": {
"@univerjs/preset-sheets-core": "^0.15.5",
"@univerjs/presets": "^0.15.5",
"@univerjs/preset-sheets-core": "^0.16.1",
"@univerjs/presets": "^0.16.1",
"next": "16.1.4",
"react": "19.2.3",
"react-dom": "19.2.3"
Expand Down
Loading
Loading