Browse Source

local storage -> session storage

zhuth 7 years ago
parent
commit
79bf03131e

+ 2 - 2
frontend/saas-web/app/util/State.js

@@ -7,8 +7,8 @@ Ext.define('saas.util.State', {
     ],
 
     store: new Ext.util.LocalStorage({
-        id: 'app-state',
-        session: true
+        session: true,
+        id: 'app-state'
     }),
 
     get: function(key, defaultValue) {

+ 4 - 4
frontend/saas-web/app/view/main/Main.js

@@ -138,10 +138,10 @@ Ext.define('saas.view.main.Main', {
                         afterrender:function(b){
                             var main = b.ownerCt.ownerCt;
                             //调用
-                            var _localStorage = Ext.decode(sessionStorage.getItem('app-state-session'));
-                            var nowCompanyId = _localStorage.account.companyId;
-                            if(_localStorage.account.rolesMap){
-                                var rolesMap = _localStorage.account.rolesMap[nowCompanyId];
+                            var user = saas.util.BaseUtil.getCurrentUser();
+                            var nowCompanyId = user.companyId;
+                            if(user.rolesMap){
+                                var rolesMap = user.rolesMap[nowCompanyId];
                                 if(rolesMap&&rolesMap.length>0){
                                     for(var i = 0; i < rolesMap.length; i++) {
                                         if(rolesMap[i].type==0){

+ 17 - 17
frontend/saas-web/app/view/viewport/ViewportController.js

@@ -42,23 +42,6 @@ Ext.define('saas.view.viewport.ViewportController', {
         if(!Ext.isChrome && !Ext.isFirefox) {
             saas.util.BaseUtil.showConfirm('温馨提示', '为了更好地呈现页面效果,推荐使用Chrome浏览器或火狐浏览器');
         }
-        //读取系统参数
-        saas.util.BaseUtil.request({url:'/api/commons/configs/list'})
-        .then(function(res) {
-            if(res.success) {
-                var list = res.data.list;
-                if(list.length>0){
-                    var d = {};
-                    Ext.each(list, function(item, index){
-                        d[item.code] = item.data;
-                    });
-                    me.getViewModel().setData(d)
-                }
-            }
-        })
-        .catch(function(e) {
-            console.error(e);
-        });
     },
 
     showView: function(xtype) {
@@ -82,6 +65,23 @@ Ext.define('saas.view.viewport.ViewportController', {
 
     showMain: function() {
         var me = this;
+        //读取系统参数
+        saas.util.BaseUtil.request({url:'/api/commons/configs/list'})
+        .then(function(res) {
+            if(res.success) {
+                var list = res.data.list;
+                if(list.length>0){
+                    var d = {};
+                    Ext.each(list, function(item, index){
+                        d[item.code] = item.data;
+                    });
+                    me.getViewModel().setData(d)
+                }
+            }
+        })
+        .catch(function(e) {
+            console.error(e);
+        });
         me.showView('main');
     },