diff --git a/bricks/jsoncall.js b/bricks/jsoncall.js index 02d1bcc..6e9e2c0 100644 --- a/bricks/jsoncall.js +++ b/bricks/jsoncall.js @@ -171,7 +171,10 @@ bricks.HttpText = class { var login_window = await bricks.widgetBuild({ "widgettype":"urlwidget", "options":{ - "url":bricks.app.login_url + "url":bricks.app.login_url, + "params":{ + "login_source":"auto" + } } }); @@ -208,7 +211,12 @@ bricks.HttpText = class { console.log('withLoginInfo: retry successful'); // Dispatch user_logined event so shell can reload menu if (bricks.app && bricks.app.dispatch) { - bricks.app.dispatch('user_logined'); + if (bricks.app._login_no_reload) { + bricks.app._login_no_reload = false; + console.log('withLoginInfo: non-user login, skip menu reload'); + } else { + bricks.app.dispatch('user_logined'); + } } return await this.get_result_data(retryResult); } diff --git a/bricks/message.js b/bricks/message.js index 5f9ee08..48acb01 100644 --- a/bricks/message.js +++ b/bricks/message.js @@ -9,6 +9,10 @@ bricks.Message = class extends bricks.PopupWindow { */ constructor(opts){ opts.auto_open = true; + // 登录消息带 refresh=false 时,标记不刷新(非用户主动登录) + if (opts.refresh === false && bricks.app){ + bricks.app._login_no_reload = true; + } super(opts); this.create_message_widget(); this.set_css('message');