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.

fix(watermark): fix invalid plugin configuration (#4389)

白熱e3930bbdea12
diff --git a/packages/watermark/src/plugin.ts b/packages/watermark/src/plugin.ts
index d46d60c6bf..715cac5d77 100644
--- a/packages/watermark/src/plugin.ts
+++ b/packages/watermark/src/plugin.ts
@@ -52,13 +52,32 @@ export class UniverWatermarkPlugin extends Plugin {
}
private async _initWatermarkStorage() {
- const { userWatermarkSettings, textWatermarkSettings, imageWatermarkSettings } = this._config;
+ const config = this._configService.getConfig<IUniverWatermarkConfig>(WATERMARK_PLUGIN_CONFIG_KEY);
+ if (!config) {
+ return;
+ }
+ const { userWatermarkSettings, textWatermarkSettings, imageWatermarkSettings } = config;
if (userWatermarkSettings) {
- this._localStorageService.setItem(UNIVER_WATERMARK_STORAGE_KEY, { type: IWatermarkTypeEnum.UserInfo, config: { userInfo: { ...WatermarkUserInfoBaseConfig, userWatermarkSettings } } });
+ this._localStorageService.setItem(UNIVER_WATERMARK_STORAGE_KEY, {
+ type: IWatermarkTypeEnum.UserInfo,
+ config: {
+ userInfo: merge({}, WatermarkUserInfoBaseConfig, userWatermarkSettings),
+ },
+ });
} else if (textWatermarkSettings) {
- this._localStorageService.setItem(UNIVER_WATERMARK_STORAGE_KEY, { type: IWatermarkTypeEnum.Text, config: { text: { ...WatermarkTextBaseConfig, textWatermarkSettings } } });
+ this._localStorageService.setItem(UNIVER_WATERMARK_STORAGE_KEY, {
+ type: IWatermarkTypeEnum.Text,
+ config: {
+ text: merge({}, WatermarkTextBaseConfig, textWatermarkSettings),
+ },
+ });
} else if (imageWatermarkSettings) {
- this._localStorageService.setItem(UNIVER_WATERMARK_STORAGE_KEY, { type: IWatermarkTypeEnum.Image, config: { image: { ...WatermarkImageBaseConfig, imageWatermarkSettings } } });
+ this._localStorageService.setItem(UNIVER_WATERMARK_STORAGE_KEY, {
+ type: IWatermarkTypeEnum.Image,
+ config: {
+ image: merge({}, WatermarkImageBaseConfig, imageWatermarkSettings),
+ },
+ });
} else {
const config = await this._localStorageService.getItem<IWatermarkConfigWithType>(UNIVER_WATERMARK_STORAGE_KEY);
if (config?.type === IWatermarkTypeEnum.UserInfo) {