From 8e4fcedd8755a13615f2015f42aefabcf7529fb1 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 28 Mar 2025 10:50:02 +0800 Subject: [PATCH 1/7] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=8A=A8=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=88=B0=E6=8F=92=E4=BB=B6=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BootstrapBlazor.UniverSheet/wwwroot/univer.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js b/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js index db80bc9e..4d513b91 100644 --- a/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js +++ b/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js @@ -70,12 +70,12 @@ export async function createUniverSheetAsync(sheet) { ...options }); - const { data: { data } = {} } = sheet.options; + const { data } = sheet.options; if (data) { - const template = typeof data.template === 'string' ? JSON.parse(data.template) : data.template; - template && delete data.template; - univerAPI.createWorkbook(merge({}, template, { customData: data })); - delete sheet.options.data; + const { messageName, commandName, data } = data; + if (messageName === null && commandName === null && data) { + univerAPI.createWorkbook(data); + } } else { univerAPI.createUniverSheet(); From 4b2e0136dceb3fbbb081dcb5a0069e84b1fff1d7 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 28 Mar 2025 12:40:27 +0800 Subject: [PATCH 2/7] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=20WorkbookDa?= =?UTF-8?q?ta=20=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/UniverSheetData.cs | 9 ++++++++- .../BootstrapBlazor.UniverSheet/wwwroot/univer.js | 14 +++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/components/BootstrapBlazor.UniverSheet/Components/UniverSheetData.cs b/src/components/BootstrapBlazor.UniverSheet/Components/UniverSheetData.cs index 8050b024..c57cb75d 100644 --- a/src/components/BootstrapBlazor.UniverSheet/Components/UniverSheetData.cs +++ b/src/components/BootstrapBlazor.UniverSheet/Components/UniverSheetData.cs @@ -21,7 +21,14 @@ public class UniverSheetData public string? CommandName { get; set; } /// - /// 获得/设置 数据 默认 null 未设置 + /// 获得/设置 表格数据 默认 null 未设置 /// + /// 给 UniverSheet Workbook 使用 + public object? WorkbookData { get; set; } + + /// + /// 获得/设置 附加业务数据 默认 null 未设置 + /// + /// 给自定义业务使用 public object? Data { get; set; } } diff --git a/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js b/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js index 4d513b91..8eb031ec 100644 --- a/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js +++ b/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js @@ -32,7 +32,7 @@ export async function createUniverSheetAsync(sheet) { const { UniverSheetsDataValidationPlugin } = UniverSheetsDataValidation const { UniverSheetsDataValidationUIPlugin } = UniverSheetsDataValidationUi const { defaultTheme } = UniverDesign; - + const options = { theme: sheet.options.theme ?? defaultTheme, locale: sheet.options.lang ?? LocaleType.ZH_CN, @@ -70,16 +70,8 @@ export async function createUniverSheetAsync(sheet) { ...options }); - const { data } = sheet.options; - if (data) { - const { messageName, commandName, data } = data; - if (messageName === null && commandName === null && data) { - univerAPI.createWorkbook(data); - } - } - else { - univerAPI.createUniverSheet(); - } + const { workboolData } = sheet.options.data || {}; + univerAPI.createWorkbook(workboolData); sheet.univer = univer; sheet.univerAPI = univerAPI; From c861f75aa4ed5635c481a0cf39f3d9365adec678 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 29 Mar 2025 16:58:47 +0800 Subject: [PATCH 3/7] chore: bump version 9.0.1 --- .../BootstrapBlazor.UniverSheet.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BootstrapBlazor.UniverSheet/BootstrapBlazor.UniverSheet.csproj b/src/components/BootstrapBlazor.UniverSheet/BootstrapBlazor.UniverSheet.csproj index 2cb10816..659271d8 100644 --- a/src/components/BootstrapBlazor.UniverSheet/BootstrapBlazor.UniverSheet.csproj +++ b/src/components/BootstrapBlazor.UniverSheet/BootstrapBlazor.UniverSheet.csproj @@ -1,7 +1,7 @@  - 9.0.0 + 9.0.1 From 48a6d5c1e946eb84d90c7f0a60ce4d375cbb72e0 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 29 Mar 2025 17:56:02 +0800 Subject: [PATCH 4/7] =?UTF-8?q?refactor:=20=E6=92=A4=E9=94=80=20WorkbookDa?= =?UTF-8?q?ta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/UniverSheetData.cs | 9 +-------- .../BootstrapBlazor.UniverSheet/wwwroot/univer.js | 12 +++++++++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/components/BootstrapBlazor.UniverSheet/Components/UniverSheetData.cs b/src/components/BootstrapBlazor.UniverSheet/Components/UniverSheetData.cs index c57cb75d..8050b024 100644 --- a/src/components/BootstrapBlazor.UniverSheet/Components/UniverSheetData.cs +++ b/src/components/BootstrapBlazor.UniverSheet/Components/UniverSheetData.cs @@ -21,14 +21,7 @@ public class UniverSheetData public string? CommandName { get; set; } /// - /// 获得/设置 表格数据 默认 null 未设置 + /// 获得/设置 数据 默认 null 未设置 /// - /// 给 UniverSheet Workbook 使用 - public object? WorkbookData { get; set; } - - /// - /// 获得/设置 附加业务数据 默认 null 未设置 - /// - /// 给自定义业务使用 public object? Data { get; set; } } diff --git a/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js b/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js index 8eb031ec..d4a1a546 100644 --- a/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js +++ b/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js @@ -70,9 +70,15 @@ export async function createUniverSheetAsync(sheet) { ...options }); - const { workboolData } = sheet.options.data || {}; - univerAPI.createWorkbook(workboolData); - + const { data } = sheet.options.data || {}; + if (data) { + const option = typeof data === 'string' ? JSON.parse(data) : data; + univerAPI.createWorkbook(option); + } + else { + univerAPI.createWorkbook(); + } + sheet.univer = univer; sheet.univerAPI = univerAPI; sheet.dispose = () => { From ddc03043cc7b9b068bc20d94638f67bdc40beaf9 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 29 Mar 2025 17:56:10 +0800 Subject: [PATCH 5/7] =?UTF-8?q?style:=20=E6=9B=B4=E6=96=B0=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/univer/css/univer-sheet.bundle.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer/css/univer-sheet.bundle.css b/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer/css/univer-sheet.bundle.css index 635117e9..cdcb0841 100644 --- a/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer/css/univer-sheet.bundle.css +++ b/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer/css/univer-sheet.bundle.css @@ -18,6 +18,6 @@ z-index: 1200; } -.univer-toolbar > div { +.univer-theme [role="toolbar"] .univer-justify-center { justify-content: flex-start; } From 08ab6539475d13138fa256d36ade8aa221dbdf55 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 29 Mar 2025 17:58:38 +0800 Subject: [PATCH 6/7] chore: bump version 9.0.2 --- .../BootstrapBlazor.UniverSheet.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BootstrapBlazor.UniverSheet/BootstrapBlazor.UniverSheet.csproj b/src/components/BootstrapBlazor.UniverSheet/BootstrapBlazor.UniverSheet.csproj index 659271d8..3bf3a352 100644 --- a/src/components/BootstrapBlazor.UniverSheet/BootstrapBlazor.UniverSheet.csproj +++ b/src/components/BootstrapBlazor.UniverSheet/BootstrapBlazor.UniverSheet.csproj @@ -1,7 +1,7 @@  - 9.0.1 + 9.0.2 From 415e5212844752f326e5bd00eee9573bf6a19205 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 29 Mar 2025 18:02:40 +0800 Subject: [PATCH 7/7] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js b/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js index d4a1a546..81a3379d 100644 --- a/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js +++ b/src/components/BootstrapBlazor.UniverSheet/wwwroot/univer.js @@ -78,7 +78,7 @@ export async function createUniverSheetAsync(sheet) { else { univerAPI.createWorkbook(); } - + sheet.univer = univer; sheet.univerAPI = univerAPI; sheet.dispose = () => {