水印单词拼写错误

Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -197,7 +197,7 @@
             开启图形验证码
             </summary>
         </member>
-        <member name="F:Admin.NET.Core.CommonConst.SysWartermark">
+        <member name="F:Admin.NET.Core.CommonConst.SysWatermark">
             <summary>
             开启水印
             </summary>

Admin.NET/Admin.NET.Core/Const/CommonConst.cs

@@ -29,7 +29,7 @@ public class CommonConst
     /// <summary>
     /// 开启水印
     /// </summary>
-    public const string SysWartermark = "sys_wartermark";
+    public const string SysWatermark = "sys_watermark";
 
     /// <summary>
     /// 开启操作日志

Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs

@@ -21,7 +21,7 @@ public class SysConfigSeedData : ISqlSugarEntitySeedData<SysConfig>
             new SysConfig{ Id=1300000000105, Name="单点登录", Code="sys_single_login", Value="True", SysFlag=YesNoEnum.Y, Remark="开启单点登录", OrderNo=5, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=1300000000106, Name="登录二次验证", Code="sys_second_ver", Value="True", SysFlag=YesNoEnum.Y, Remark="登录二次验证", OrderNo=6, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=1300000000107, Name="开启图形验证码", Code="sys_captcha", Value="False", SysFlag=YesNoEnum.Y, Remark="开启图形验证码", OrderNo=7, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysConfig{ Id=1300000000108, Name="开启水印", Code="sys_wartermark", Value="True", SysFlag=YesNoEnum.Y, Remark="开启水印", OrderNo=8, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysConfig{ Id=1300000000108, Name="开启水印", Code="sys_watermark", Value="True", SysFlag=YesNoEnum.Y, Remark="开启水印", OrderNo=8, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
         };
     }
 }

Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -183,8 +183,8 @@ public class SysAuthService : IDynamicApiController, ITransient
     {
         var secondVerEnabled = await _sysConfigService.GetConfigValue<bool>(CommonConst.SysSecondVer);
         var captchaEnabled = await _sysConfigService.GetConfigValue<bool>(CommonConst.SysCaptcha);
-        var wartermarkEnabled = await _sysConfigService.GetConfigValue<bool>(CommonConst.SysWartermark);
-        return new { SecondVerEnabled = secondVerEnabled, CaptchaEnabled = captchaEnabled, WartermarkEnabled = wartermarkEnabled };
+        var watermarkEnabled = await _sysConfigService.GetConfigValue<bool>(CommonConst.SysWatermark);
+        return new { SecondVerEnabled = secondVerEnabled, CaptchaEnabled = captchaEnabled, WatermarkEnabled = watermarkEnabled };
     }
 
     /// <summary>

Web/src/i18n/lang/en.ts

@@ -163,8 +163,8 @@ export default {
 		fourIsGrayscale: 'Grey model',
 		fourIsInvert: 'Color weak mode',
 		fourIsDark: 'Dark Mode',
-		fourIsWartermark: 'Turn on watermark',
-		fourWartermarkText: 'Watermark copy',
+		fourIsWatermark: 'Turn on watermark',
+		fourWatermarkText: 'Watermark copy',
 		fiveTitle: 'Other settings',
 		fiveTagsStyle: 'Tagsview style',
 		fiveAnimation: 'page animation',

Web/src/i18n/lang/zh-cn.ts

@@ -163,8 +163,8 @@ export default {
 		fourIsGrayscale: '灰色模式',
 		fourIsInvert: '色弱模式',
 		fourIsDark: '深色模式',
-		fourIsWartermark: '开启水印',
-		fourWartermarkText: '水印文案',
+		fourIsWatermark: '开启水印',
+		fourWatermarkText: '水印文案',
 		fiveTitle: '其它设置',
 		fiveTagsStyle: 'Tagsview 风格',
 		fiveAnimation: '主页面切换动画',

Web/src/i18n/lang/zh-tw.ts

@@ -163,8 +163,8 @@ export default {
 		fourIsGrayscale: '灰色模式',
 		fourIsInvert: '色弱模式',
 		fourIsDark: '深色模式',
-		fourIsWartermark: '開啟浮水印',
-		fourWartermarkText: '浮水印文案',
+		fourIsWatermark: '開啟浮水印',
+		fourWatermarkText: '浮水印文案',
 		fiveTitle: '其它設定',
 		fiveTagsStyle: 'Tagsview 風格',
 		fiveAnimation: '主頁面切換動畫',

Web/src/layout/navBars/breadcrumb/setings.vue

@@ -207,15 +207,15 @@
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsWartermark') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsWatermark') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isWartermark" size="small" @change="onWartermarkChange"></el-switch>
+						<el-switch v-model="getThemeConfig.isWatermark" size="small" @change="onWatermarkChange"></el-switch>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt14">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourWartermarkText') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourWatermarkText') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-input v-model="getThemeConfig.wartermarkText" size="default" style="width: 90px" @input="onWartermarkTextInput"></el-input>
+						<el-input v-model="getThemeConfig.watermarkText" size="default" style="width: 90px" @input="onWatermarkTextInput"></el-input>
 					</div>
 				</div>
 
@@ -520,15 +520,15 @@ const onAddDarkChange = () => {
 	else body.setAttribute('data-theme', '');
 };
 // 4、界面显示 --> 开启水印
-const onWartermarkChange = () => {
-	getThemeConfig.value.isWartermark ? Watermark.set(getThemeConfig.value.wartermarkText) : Watermark.del();
+const onWatermarkChange = () => {
+	getThemeConfig.value.isWatermark ? Watermark.set(getThemeConfig.value.watermarkText) : Watermark.del();
 	setLocalThemeConfig();
 };
 // 4、界面显示 --> 水印文案
-const onWartermarkTextInput = (val: string) => {
-	getThemeConfig.value.wartermarkText = verifyAndSpace(val);
-	if (getThemeConfig.value.wartermarkText === '') return false;
-	if (getThemeConfig.value.isWartermark) Watermark.set(getThemeConfig.value.wartermarkText);
+const onWatermarkTextInput = (val: string) => {
+	getThemeConfig.value.watermarkText = verifyAndSpace(val);
+	if (getThemeConfig.value.watermarkText === '') return false;
+	if (getThemeConfig.value.isWatermark) Watermark.set(getThemeConfig.value.watermarkText);
 	setLocalThemeConfig();
 };
 // 5、布局切换
@@ -621,7 +621,7 @@ onMounted(() => {
 			// 深色模式
 			if (getThemeConfig.value.isIsDark) onAddDarkChange();
 			// 开启水印
-			onWartermarkChange();
+			onWatermarkChange();
 			// 语言国际化
 			if (Local.get('themeConfig')) locale.value = Local.get('themeConfig').globalI18n;
 			// 初始化菜单样式等

Web/src/stores/themeConfig.ts

@@ -102,9 +102,9 @@ export const useThemeConfig = defineStore('themeConfig', {
 			// 是否开启色弱模式
 			isInvert: false,
 			// 是否开启水印
-			isWartermark: false,
+			isWatermark: false,
 			// 水印文案
-			wartermarkText: 'Admin.NET',
+			watermarkText: 'Admin.NET',
 
 			/**
 			 * 其它设置

Web/src/types/pinia.d.ts

@@ -75,8 +75,8 @@ declare interface ThemeConfigState {
 		isGrayscale: boolean;
 		isInvert: boolean;
 		isIsDark: boolean;
-		isWartermark: boolean;
-		wartermarkText: string;
+		isWatermark: boolean;
+		watermarkText: string;
 		tagsStyle: string;
 		animation: string;
 		columnsAsideStyle: string;

Web/src/views/login/component/account.vue

@@ -112,7 +112,7 @@ const state = reactive({
 	rotateVerifyImg: verifyImg,
 	secondVerEnabled: true,
 	captchaEnabled: true,
-	wartermarkEnabled: true,
+	watermarkEnabled: true,
 	isPassRotate: false,
 });
 onMounted(async () => {
@@ -120,7 +120,7 @@ onMounted(async () => {
 	var res1 = await getAPI(SysAuthApi).apiSysAuthLoginConfigGet();
 	state.secondVerEnabled = res1.data.result.secondVerEnabled ?? true;
 	state.captchaEnabled = res1.data.result.captchaEnabled ?? true;
-	state.wartermarkEnabled = res1.data.result.wartermarkEnabled ?? true;
+	state.watermarkEnabled = res1.data.result.watermarkEnabled ?? true;
 
 	getCaptcha();
 });
@@ -131,11 +131,11 @@ const getThemeConfig = computed(() => {
 // 存储布局配置
 const setLocalThemeConfig = () => {
 	// 是否显示水印
-	if (!state.wartermarkEnabled) return;
+	if (!state.watermarkEnabled) return;
 
-	// getThemeConfig.value.wartermarkText = state.ruleForm.account;
-	getThemeConfig.value.isWartermark = true;
-	Watermark.set(getThemeConfig.value.wartermarkText);
+	// getThemeConfig.value.watermarkText = state.ruleForm.account;
+	getThemeConfig.value.isWatermark = true;
+	Watermark.set(getThemeConfig.value.watermarkText);
 
 	Local.remove('themeConfig');
 	Local.set('themeConfig', getThemeConfig.value);