Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #2807

Merged
merged 26 commits into from
Sep 25, 2024
Merged

Develop #2807

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e153c1d
fix: 兼容实例视图最后一个节点且当前拓扑层级child_type为空时,不需要请求下一层拓扑数据
lhzzforever Sep 4, 2024
0356755
Merge pull request #2799 from lhzzforever/dev/develop_ci
ielgnaw Sep 6, 2024
91d428c
fix: 【权限中心测试】平台管理》我的管理空间新建管理空间时,点击返回,页面返回异常
lhzzforever Sep 10, 2024
f605e96
Merge branch 'upstream/develop' into dev/develop_ci
lhzzforever Sep 10, 2024
0606918
Merge pull request #2800 from lhzzforever/dev/develop_ci
ielgnaw Sep 11, 2024
ac2d980
fix: 更改7.1版本链接跳转
lhzzforever Sep 11, 2024
dae6338
Merge branch 'upstream/develop' into dev/develop_ci
lhzzforever Sep 11, 2024
3dc89a3
Merge pull request #2801 from lhzzforever/dev/develop_ci
ielgnaw Sep 11, 2024
1180b17
feature: 添加开源社区选项跳转
lhzzforever Sep 11, 2024
5d0a9d8
Merge branch 'upstream/develop' into dev/develop_ci
lhzzforever Sep 11, 2024
b956c0b
Merge pull request #2802 from lhzzforever/dev/develop_ci
ielgnaw Sep 11, 2024
bdfe2fa
fix: 修复资源实例详情path数量与count不一致问题
lhzzforever Sep 23, 2024
407edcd
Merge branch 'upstream/develop' into dev/develop_ci
lhzzforever Sep 23, 2024
714b9ef
fix: 统一根据displayPath去掉重复path链路数据
lhzzforever Sep 23, 2024
146b679
fix: 修复由于拓扑实例是扁平化结构无法区分实例作用域范围,会存在分级管理员授权实例范围是父级,但是选择子集自动关联操作会造成数据错乱问题
lhzzforever Sep 24, 2024
2abd1f1
fix: 修复偶发path视图层展示数量与实际授权范围实例数量不一致
lhzzforever Sep 24, 2024
8cf4692
Merge pull request #2803 from lhzzforever/dev/develop_ci
ielgnaw Sep 24, 2024
197a7e6
feature: 对接蓝盾用户组权限页面iframe传递事件需求
lhzzforever Sep 24, 2024
14d4f65
Merge branch 'upstream/develop' into dev/develop_ci
lhzzforever Sep 24, 2024
93bb05c
feature: 整理统一事件
lhzzforever Sep 24, 2024
a21f076
Merge pull request #2804 from lhzzforever/dev/develop_ci
ielgnaw Sep 25, 2024
9d17b9d
feat: support exempt notification user
nannan00 Sep 25, 2024
dbcd6df
fix: minor
nannan00 Sep 25, 2024
b800520
Merge pull request #2805 from nannan00/ft_notification_exemption_user
normal-wls Sep 25, 2024
53f7876
docs: 1.10.34 version log
nannan00 Sep 25, 2024
ea21ddd
Merge pull request #2806 from nannan00/ft_version_log_v1.10.34
nannan00 Sep 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: 更改7.1版本链接跳转
lhzzforever committed Sep 11, 2024
commit ac2d980f3b60c54470e4ae2a236ba94a750937c4
2 changes: 1 addition & 1 deletion frontend/src/components/header-nav/index.vue
Original file line number Diff line number Diff line change
@@ -170,7 +170,7 @@
};
};

const NORMAL_DOCU_LINK = '/IAM/UserGuide/Introduce/README.md';
const NORMAL_DOCU_LINK = '/IAM/1.12/UserGuide/Introduce/README.md';
// const GRADE_DOCU_LINK = '/权限中心/产品白皮书/场景案例/GradingManager.md';

const docuLinkMap = new Map([
2 changes: 1 addition & 1 deletion frontend/src/views/grading-admin/index.vue
Original file line number Diff line number Diff line change
@@ -864,7 +864,7 @@
},

handleOpenDocu () {
const GRADE_DOCU_LINK = '/IAM/UserGuide/Feature/ManagerCreate.md';
const GRADE_DOCU_LINK = '/IAM/1.12/UserGuide/Feature/ManagerCreate.md';
window.open(`${window.BK_DOCS_URL_PREFIX}${GRADE_DOCU_LINK}`);
}

2 changes: 1 addition & 1 deletion frontend/src/views/my-manage-space/index.vue
Original file line number Diff line number Diff line change
@@ -969,7 +969,7 @@
);
},
handleOpenDocu () {
const GRADE_DOCU_LINK = '/IAM/UserGuide/Feature/UserApply.md';
const GRADE_DOCU_LINK = '/IAM/1.12/UserGuide/Feature/UserApply.md';
window.open(`${window.BK_DOCS_URL_PREFIX}${GRADE_DOCU_LINK}`);
}
}