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.

Sign up for GitHub

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

Jump to bottom

feature: 用户/组织模块代码 #2467

Merged
merged 83 commits into from
Feb 2, 2024
Merged

feature: 用户/组织模块代码 #2467

merged 83 commits into from
Feb 2, 2024

Conversation

lhzzforever
Copy link
Contributor

feature: 提交用户/组织模块部分代码

zhu327 and others added 30 commits December 28, 2023 11:47
@zhu327
fix: update grade manager group list api filter (TencentBlueKing#2453)
612140a
@zhu327
feat: add bkpkag yaml file (TencentBlueKing#2452)
dd692d9
@zhu327
Ft subject to delete (TencentBlueKing#2451)
95b8b32 
* feat: add subject to delete task

* feat: subject to delete done
@lhzzforever
fix: 修复人员选择器编辑组件内容为空，重新添加会重置上一次的数据
b2a6583
@lhzzforever
Merge branch 'upstream/develop' into dev/develop_ci
c48b0ad
@lhzzforever
feature: 提交部分用户/组织部分代码
1152091
@huangpeng0428
Merge pull request TencentBlueKing#2456 from lhzzforever/dev/develop_ci
9cb066b 
fix: 修复人员选择器编辑组件内容为空，重新添加会重置上一次的数据
@lhzzforever
feature: 添加资源实例搜索组件自定义样式
1a12b63
@lhzzforever
Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg
c4be5c7
@lhzzforever
feature: 提交用户/组织模块部分代码
f5f3fa2
@lhzzforever
fix: 修复蓝盾内嵌页面最大授权范围选择组织后无法选择用户
a1ee0d5
@huangpeng0428
Merge pull request TencentBlueKing#2460 from lhzzforever/dev/develop_ci
9125e94 
fix: 修复蓝盾内嵌页面最大授权范围选择组织后无法选择用户
@lhzzforever
feature: 对接用户/组织—>个人用户组权限模块、用户组织列表
d168b70
@lhzzforever
feature: 添加用户类型下组织用户组权限、人员模板权限，封装处理不同权限类型业务的表格组件
0571b5a
@lhzzforever
Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg
ec47fd9
@lhzzforever
fix: 用户组先添加操作和权限模板后，再取消操作或者对权限模板数量进行删减后不显示
a2d226b
@huangpeng0428
Merge pull request TencentBlueKing#2462 from lhzzforever/dev/develop_ci
bf5d428 
fix: 用户组先添加操作和权限模板后，再取消操作或者对权限模板数量进行删减后不显示
@zhu327
feat: update manager member max count
d7b1778
@zhu327
Merge pull request TencentBlueKing#2466 from zhu327/ft_manager_member…
af16997 
…_limit

feat: update manager member max count
@lhzzforever
Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg
d07455f
@lhzzforever
feature: 提交用户列表滚动事件
253d450
@zhu327
feat: enhancement of ITSM Ticket Content Display (TencentBlueKing#2473)
f24684a
@zhu327
fix: update application content (TencentBlueKing#2474)
104dfad
@zhu327
fix: group application content (TencentBlueKing#2475)
17f2eab
@zhu327
fix: update application content (TencentBlueKing#2476)
0d6423d
@zhu327
fix: update application content (TencentBlueKing#2477)
008acf1
@zhu327
docs: v1.10.20 (TencentBlueKing#2478)
d65d643
@lhzzforever
feature: 处理组织架构人员搜索场景下的业务
ae11d3f
@lhzzforever
feature: 封装批量操作下追加用户组业务代码和单个加入用户组业务代码
8b412ee
@lhzzforever
Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg
2c1204c
zhu327 and others added 29 commits January 23, 2024 10:32
@zhu327
Merge pull request TencentBlueKing#2493 from lhzzforever/dev/develop_ci
2794928 
fix: 默认回调开关为true
@lhzzforever
fix: 修改通知api地址为绝对路径
de77888
@zhu327
Merge pull request TencentBlueKing#2494 from lhzzforever/dev/develop_ci
68bca90 
fix: 修改通知api地址为绝对路径
@lhzzforever
Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg
b5c9d2f
@lhzzforever
Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg
effd09a
@lhzzforever
feature: 提佳品批量操作
5573308
@zhu327
docs: v1.10.21 (TencentBlueKing#2495)
73dcdfb
@zhu327
fix: fix default instance approver (TencentBlueKing#2497)
bc8c716
@zhu327
feat: add management grade manager subject template list api (Tencent…
a9e2278 
…BlueKing#2498)
@zhu327
fix: update profiler start prefix (TencentBlueKing#2499)
18c7e83
@lhzzforever
feature: 对接批量操作移除用户组
42fdc9c
@lhzzforever
Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg
6e175e7
@lhzzforever
feature: 整改用户视角需求最新设计稿
00f4371
@lhzzforever
fix: 修复自定义权限申请—>编辑回显无法展示已选资源实例为无限制类型数据
2b018ba
@lhzzforever
Merge branch 'upstream/develop' into dev/develop_ci
ff484b4
@huangpeng0428
Merge pull request TencentBlueKing#2501 from lhzzforever/dev/develop_ci
eae52d8 
fix: 修复自定义权限申请—>编辑回显无法展示已选资源实例为无限制类型数据
@zhu327
fix: update managemnet group member add template (TencentBlueKing#2503)
e6f5b88
@lhzzforever
fix: 修复用户组—>添加组权限个别实例path数量不同步，导致出现提示层级链路列表不能为空
dcd3570
@lhzzforever
fix: 去掉log
4f0a675
@lhzzforever
fix: 提交漏缺代码
ff2e1c6
@huangpeng0428
Merge pull request TencentBlueKing#2504 from lhzzforever/dev/develop_ci
137dfb3 
fix: 修复用户组—>添加组权限个别实例path数量不同步，导致出现提示层级链路列表不能为空
@lhzzforever
Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg
b95a9e7
@zhu327
feat: add init grade manager bscp (TencentBlueKing#2505)
f559dc6
@lhzzforever
feature: 提交批量清空清空管理空间模块代码
e593f55
@lhzzforever
Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg
71d4402
@zhu327
docs: v1.10.22 (TencentBlueKing#2506)
e4ff6b1
@lhzzforever
Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg
b8566fc
@lhzzforever
featrure: 批量清空（退出用户组）增加个人用户组和组织权限用户组展示
0ee62a4
@lhzzforever
fix: 去掉log
654c68f
@huangpeng0428 huangpeng0428 merged commit 217b9dc into TencentBlueKing:ft_user_org_perm Feb 2, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@lhzzforever @huangpeng0428 @zhu327