Skip to content

Commit

Permalink
Merge pull request #1372 from ywywZhou/init_login_mode
Browse files Browse the repository at this point in the history
fix: 项目初始化时登录为全屏模式 && 项目标题title调整 #ignore
  • Loading branch information
luofann authored Aug 7, 2024
2 parents 3804f9b + ea8a889 commit 39676b6
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ author: 蓝鲸智云
category: 办公应用
introduction: 流程服务是蓝鲸推出的轻量级ITSM,通过可自定义设计的流程模块,覆盖IT服务中的不同管理活动或应用场景。帮助企业用户规范内部管理流程,提升沟通及管理效率。
introduction_en: bk_itsm is a lightweight ITSM created by Blueking. It covers different application scenarios in IT services through customizable workflows and help enterprise users to implement standardize IT workflow, improve communication and management efficiency.
version: 2.6.26
version: 2.6.27
language: python
is_use_celery: True
is_use_celery_with_gevent: False
Expand Down
2 changes: 1 addition & 1 deletion app_desc.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
spec_version: 2
app_version: "2.6.26"
app_version: "2.6.27"
app:
region: default
bk_app_code: bk_itsm
Expand Down
4 changes: 4 additions & 0 deletions docs/RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Changelog
## [Version: 2.6.27] - 2024-08-07
【优化】项目初始化时登录为全屏模式
【优化】项目标题title规范调整

## [Version: 2.6.26] - 2024-07-22
【修复】修复接口数值为 0 导致流程异常的问题
【修复】修复apigw初始化异常的问题
Expand Down
4 changes: 4 additions & 0 deletions docs/RELEASE_EN.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Changelog
## [Version: 2.6.27] - 2024-08-07
【Improved】Login in Full-Screen Mode during Project Initialization
【Improved】Project Title Specification Adjustment

## [Version: 2.6.26] - 2024-07-22
【Fixed】Fix the issue where an interface value of 0 causes process abnormalities.
【Fixed】Fix the initialization exception of apigw.
Expand Down
2 changes: 1 addition & 1 deletion frontend/pc/src/i18n/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -2691,5 +2691,5 @@ export const m = {
':': ':',
'单据已由processor处理,您无需操作': 'The ticket has been processed by {processor} and you do not need to operate',
我知道了: 'I See',
蓝鲸: 'BlueKing',
蓝鲸智云: 'Tencent BlueKing',
};
2 changes: 1 addition & 1 deletion frontend/pc/src/i18n/lang/zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -2763,5 +2763,5 @@ export const m = {
':': ':',
'单据已由processor处理,您无需操作': '单据已由{processor}处理,您无需操作',
我知道了: '我知道了',
蓝鲸: '蓝鲸',
蓝鲸智云: '蓝鲸智云',
};
2 changes: 1 addition & 1 deletion frontend/pc/src/store/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ export default new Vuex.Store({
platformInfo: { // 项目全局配置
favicon: `${window.SITE_URL}static/core/images/bk_itsm.png`,
name: window.log_name || i18n.t('m[\'流程服务\']'),
brandName: window.BK_PLATFORM_NAME || i18n.t('m[\'蓝鲸\']'),
brandName: window.BK_PLATFORM_NAME || i18n.t('m[\'蓝鲸智云\']'),
version: window.VERSION,
i18n: {}
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/pc/src/utils/ajax.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ instance.interceptors.response.use(
let [loginUrl] = login_url.split('?');
loginUrl = `${loginUrl}?c_url=${encodeURIComponent(successUrl)}`;

showLoginModal({ loginUrl });
window.open(loginUrl, '_self');
return;
}
if ('IS_ITSM_ADMIN' in response.data.data) {
Expand Down

0 comments on commit 39676b6

Please sign in to comment.