4.0.33 修复记住密码

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "4.0.32",
+  "version": "4.0.33",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",

src/client/Login.vue

@@ -247,13 +247,17 @@ export default {
   },
 
   watch: {
-    rememberPassword: function () {
+    rememberPassword: function (newVal) {
       var _self = this;
       if (!localStorage) {
         alert('浏览器不支持localstorage');
       } else {
         localStorage.setItem('#rememberPassword', _self.rememberPassword);
       }
+      if (newVal == false) {
+        localStorage.removeItem('#userName');
+        localStorage.removeItem('#password');
+      }
     },
   },
 
@@ -279,18 +283,23 @@ export default {
   methods: {
     initView: function () {
       var _self = this;
-
-      const restoreDate = LoginService.restoreFromLocalStorage();
-      if (restoreDate.rememberPassword === true) {
-        _self.userName = restoreDate.userName;
-        _self.password = restoreDate.password;
-        _self.rememberPassword = restoreDate.rememberPassword;
-        _self.languageSelected = restoreDate.languageSelected;
+      const languageSelected = localStorage.getItem('#languageSelected');
+      const rememberPassword = localStorage.getItem('#rememberPassword');
+      if (!languageSelected) {
+        localStorage.removeItem('#languageSelected');
+      } else {
+        _self.languageSelected = localStorage.getItem('#languageSelected');
+      }
+      if (rememberPassword === 'true') {
+        _self.rememberPassword = true;
+        _self.userName = localStorage.getItem('#userName');
+        _self.password = localStorage.getItem('#password');
       } else {
         _self.userName = null;
         _self.password = null;
         _self.rememberPassword = false;
-        _self.languageSelected = restoreDate.languageSelected;
+        localStorage.removeItem('#userName');
+        localStorage.removeItem('#password');
       }
     },
 
@@ -299,7 +308,7 @@ export default {
       queryLoginAuth().then(
         success => {
           if (success.errorCode === 0) {
-            if (success.datas !== null && success.datas !== undefined){
+            if (success.datas !== null && success.datas !== undefined) {
               this.authSetting = success.datas;
             }
           } else {
@@ -318,7 +327,9 @@ export default {
     unqiueAccountManagementDto: function () {
       var _self = this;
       $.ajax({
-        url: Common.getApiURL('AccountManagementResource/unqiueAccountManagementDto'),
+        url: Common.getApiURL(
+          'AccountManagementResource/unqiueAccountManagementDto',
+        ),
         type: 'get',
         async: true,
         success: function (response) {
@@ -337,7 +348,9 @@ export default {
     // 判断SAML服务器是否存在
     existsSAML: function (id) {
       $.ajax({
-        url: Common.getApiURL('SamlLogin/samlServiceProviderCheck?authSettingId=' + id),
+        url: Common.getApiURL(
+          'SamlLogin/samlServiceProviderCheck?authSettingId=' + id,
+        ),
         type: 'get',
         contentType: 'application/json',
         dataType: 'json',
@@ -375,7 +388,9 @@ export default {
         return;
       }
       $.ajax({
-        url: Common.getApiUrl2('authApi/UserVerificationCodeResource/sendUserVerificationCode'),
+        url: Common.getApiUrl2(
+          'authApi/UserVerificationCodeResource/sendUserVerificationCode',
+        ),
         async: true,
         type: 'post',
         data: loginData,
@@ -462,6 +477,7 @@ export default {
             LoginService.saveLocalStorage(_self);
             _self.setTokenClient();
             localStorage.setItem('allowSound', false);
+            localStorage.setItem('#languageSelected', _self.languageSelected);
           } else {
             Notify.error(
               _self.$t('lang.login.loginFailure'),

src/common/Common.js

@@ -249,7 +249,7 @@ export default {
   clearLocalStorage: function () {
     // 清理localStorage时需要保留的参数列表
     var reserveParams = ['hostPageBaseURL', 'workShopId', 'resourceInstanceId',
-      'resourceInstanceName', 'apsBaseUrl', 'cameraBaseURL'];
+      'resourceInstanceName', 'apsBaseUrl', 'cameraBaseURL','#rememberPassword','#userName','#password','#languageSelected'];
     //存放的信息
     var reserveParamValues = [];