fix: 登录 warning & 水印随 用户登录 改变 水印文字

src/components/Chart.vue

@@ -287,7 +287,7 @@ export const ChartComponent = defineComponent({
 				if (chartRef.value) {
 					localLoading.value = false
 					// chartRef.value.hideLoading()
-					console.log(option, 'option .................')
+					// console.log(option, 'option .................')
 					chartRef.value.setOption(option)
 				}
 			}

src/layout/components/Settings/index.vue

@@ -39,9 +39,9 @@
 					<el-switch v-model="isWatermark" inline-prompt @change="watermarkChange" />
 				</div>
 
-				<div v-show="isWatermark" class="drawer-item">
+				<div v-show="isWatermark && false" class="drawer-item">
 					<span>{{ $t('le.layout.setting.watermarkText') }}</span>
-					<el-input v-model="watermarkText" style="width: 160px" @input="wartermarkTextChange" />
+					<el-input v-model="watermarkText" style="width: 160px" @input="watermarkTextChange" />
 				</div>
 
 				<el-divider class="local-divider">

src/store/modules/user.ts

@@ -5,7 +5,9 @@ import { login, logout } from '@/api/login'
 import { userGetApi } from '@/api/system/user.ts'
 import router, { resetRouter } from '@/router'
 import md5 from 'js-md5'
-
+import { useTheme } from '@/hooks/useTheme'
+import useSettingStore from './settings'
+import { name } from '@/../package.json'
 const useUserStore = defineStore({
 	id: 'user',
 	state: (): UserState => ({
@@ -22,6 +24,9 @@ const useUserStore = defineStore({
 	}),
 	actions: {
 		async RESET_STATE() {
+			const setting = useSettingStore()
+			setting.watermarkText = name
+			useTheme().watermarkChange()
 			this.$reset()
 		},
 		/**
@@ -54,8 +59,13 @@ const useUserStore = defineStore({
 		 */
 		getUserInfo() {
 			return userGetApi(this.userInfo.userId).then(res => {
-				console.error(res, '用户信息 res.......')
+				// console.error(res, '用户信息 res.......')
 				this.cur_userInfo = res
+				const setting = useSettingStore()
+				if (setting.watermarkText !== res.username) {
+					setting.watermarkText = res.username || name
+					useTheme().watermarkChange()
+				}
 				this.isLogin = true // user/get
 			})
 			/*return new Promise(resolve => {

src/views/login/components/passwordForm.vue

@@ -15,7 +15,7 @@
 			</el-col>
 		</el-form-item>
 		<el-form-item>
-			<el-button type="primary" style="width: 100%" :loading="islogin" round @click="login">{{ $t('login.signIn') }}</el-button>
+			<el-button type="primary" style="width: 100%" :loading="loading" round @click="login">{{ $t('login.signIn') }}</el-button>
 		</el-form-item>
 		<div class="login-reg">
 			{{ $t('login.noAccount') }} <router-link to="/user_register">{{ $t('login.createAccount') }}</router-link>
@@ -50,7 +50,7 @@ export default {
 				return false
 			}
 			this.loading = true
-			console.log(this.form);
+			// console.log(this.form);
 			user.login(this.form).finally(() => {
 				this.loading = false
 				this.$message.success('Login Success 登录成功')