From 574b13b26680478139ea9d87e61b641c224d4393 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 26 Apr 2024 20:38:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=86=E7=A0=81=E5=88=B0=E6=9C=9F?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=9C=A8=E5=88=B7=E6=96=B0=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E4=B9=8B=E5=90=8E=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/lang/en.js                       |  1 +
 core/frontend/src/lang/tw.js                       |  1 +
 core/frontend/src/lang/zh.js                       |  1 +
 core/frontend/src/layout/components/PwdExpTips.vue | 12 +++++++++++-
 core/frontend/src/store/modules/user.js            |  2 ++
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js
index 3720d0a2d5..50cf3bf5d3 100644
--- a/core/frontend/src/lang/en.js
+++ b/core/frontend/src/lang/en.js
@@ -173,6 +173,7 @@ export default {
     default_login: 'Normal'
   },
   commons: {
+    pwd_will_expired: 'The password will expire in %s days. To avoid any disruption to your normal use, please update it promptly!',
     component: {
       input: 'Input',
       textarea: 'Textarea',
diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js
index 7fa5fbbdbb..5e3dc56141 100644
--- a/core/frontend/src/lang/tw.js
+++ b/core/frontend/src/lang/tw.js
@@ -173,6 +173,7 @@ export default {
     default_login: '普通登錄'
   },
   commons: {
+    pwd_will_expired: '密碼將於%s天後過期，為了不影響正常使用，請及時進行修改！',
     component: {
       input: '單行輸入',
       textarea: '多行輸入',
diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js
index 39da5552e5..f6c646b599 100644
--- a/core/frontend/src/lang/zh.js
+++ b/core/frontend/src/lang/zh.js
@@ -173,6 +173,7 @@ export default {
     default_login: '普通登录'
   },
   commons: {
+    pwd_will_expired: '密码将于%s天后过期，为了不影响正常使用，请及时进行修改！',
     component: {
       input: '单行输入',
       textarea: '多行输入',
diff --git a/core/frontend/src/layout/components/PwdExpTips.vue b/core/frontend/src/layout/components/PwdExpTips.vue
index 9c70cc3fa6..ed7ae5c891 100644
--- a/core/frontend/src/layout/components/PwdExpTips.vue
+++ b/core/frontend/src/layout/components/PwdExpTips.vue
@@ -29,11 +29,21 @@ export default {
   },
   computed: {
     pwdPeriodWarn() {
+      if (localStorage.getItem('pwd-period-warn')) {
+        return true
+      }
       return this.$store.state.user.validityPeriod > 0 && this.$store.state.user.validityPeriod < 8
     },
     warnMsg() {
+      if (localStorage.getItem('pwd-period-warn')) {
+        const timeText = localStorage.getItem('pwd-period-warn')
+        const temp = this.$t('commons.pwd_will_expired')
+        return temp.replace('%s', timeText)
+      }
       if (this.$store.state.user.validityPeriod > 0 && this.$store.state.user.validityPeriod < 8) {
-        return `密码将于${this.$store.state.user.validityPeriod}后过期，为了不影响正常使用，请及时进行修改！`
+        localStorage.setItem('pwd-period-warn', this.$store.state.user.validityPeriod)
+        const temp = this.$t('commons.pwd_will_expired')
+        return temp.replace('%s', this.$store.state.user.validityPeriod)
       }
       return null
     }
diff --git a/core/frontend/src/store/modules/user.js b/core/frontend/src/store/modules/user.js
index 186699845a..5b82a7823b 100644
--- a/core/frontend/src/store/modules/user.js
+++ b/core/frontend/src/store/modules/user.js
@@ -98,6 +98,7 @@ const actions = {
         commit('SET_PASSWORD_MODIFIED', passwordModified)
         localStorage.setItem('passwordModified', passwordModified)
         commit('SET_VALIDITY_PERIOD', data.validityPeriod)
+        localStorage.removeItem('pwd-period-warn')
         resolve()
       }).catch(error => {
         error?.response?.data?.message?.startsWith('pwdValidityPeriod') && commit('SET_LOGIN_MSG', '密码已过期，请联系管理员进行密码重置！')
@@ -174,6 +175,7 @@ const actions = {
         commit('RESET_STATE')
         resolve(customLogoutUrl || res.data)
         localStorage.removeItem('passwordModified')
+        localStorage.removeItem('pwd-period-warn')
       }).catch(error => {
         reject(error)
         if (error?.response?.data?.message) {