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

v1.10.25 #2613

Merged
merged 165 commits into from
Apr 11, 2024
Merged

v1.10.25 #2613

merged 165 commits into from
Apr 11, 2024

Commits on Dec 29, 2023

  1. feature: 提交部分用户/组织部分代码

    @lhzzforever
    lhzzforever committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    1152091 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. feature: 添加资源实例搜索组件自定义样式

    @lhzzforever
    lhzzforever committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    1a12b63 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    c4be5c7 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

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

    @lhzzforever
    lhzzforever committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    f5f3fa2 View commit details
    Browse the repository at this point in the history

  2. feature: 对接用户/组织—>个人用户组权限模块、用户组织列表

    @lhzzforever
    lhzzforever committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    d168b70 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. feature: 添加用户类型下组织用户组权限、人员模板权限，封装处理不同权限类型业务的表格组件

    @lhzzforever
    lhzzforever committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    0571b5a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    ec47fd9 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    d07455f View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. feature: 提交用户列表滚动事件

    @lhzzforever
    lhzzforever committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    253d450 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. feature: 处理组织架构人员搜索场景下的业务

    @lhzzforever
    lhzzforever committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    ae11d3f View commit details
    Browse the repository at this point in the history

  2. feature: 封装批量操作下追加用户组业务代码和单个加入用户组业务代码

    @lhzzforever
    lhzzforever committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    8b412ee View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    2c1204c View commit details
    Browse the repository at this point in the history

  2. feature: 完成用户/组织模块—>左侧列表下拉加载，批量重置用户组业务交互（待对接）

    @lhzzforever
    lhzzforever committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    b02d345 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. feature: 提交批量重置用户组代码

    @lhzzforever
    lhzzforever committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    15999e1 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    7c77c0c View commit details
    Browse the repository at this point in the history

  2. feature: 添加用户组权限移除接口

    @lhzzforever
    lhzzforever committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    10aefff View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    b5c9d2f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    effd09a View commit details
    Browse the repository at this point in the history

  3. feature: 提佳品批量操作

    @lhzzforever
    lhzzforever committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    5573308 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. feature: 对接批量操作移除用户组

    @lhzzforever
    lhzzforever committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    42fdc9c View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    6e175e7 View commit details
    Browse the repository at this point in the history

  2. feature: 整改用户视角需求最新设计稿

    @lhzzforever
    lhzzforever committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    00f4371 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    b95a9e7 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2024

  1. feature: 提交批量清空清空管理空间模块代码

    @lhzzforever
    lhzzforever committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    e593f55 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    71d4402 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2024

  1. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    b8566fc View commit details
    Browse the repository at this point in the history

  2. featrure: 批量清空（退出用户组）增加个人用户组和组织权限用户组展示

    @lhzzforever
    lhzzforever committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    0ee62a4 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. fix: 去掉log

    @lhzzforever
    lhzzforever committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    654c68f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2467 from lhzzforever/dev/develop_ci_userOrOrg 

    feature: 用户/组织模块代码
    @huangpeng0428
    huangpeng0428 committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    217b9dc View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. feature: 处理用户/组织搜索模块有搜索字段且非展开模式的业务交互

    @lhzzforever
    lhzzforever committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    1a59d7f View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. fix: 修复首次选中组织架构成员列表第一个会显示暂无数据

    @lhzzforever
    lhzzforever committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    e720328 View commit details
    Browse the repository at this point in the history

  2. feature: 处理search组件缩略图下tag标签与展开模式下级联搜索的联动关系

    @lhzzforever
    lhzzforever committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    7902b7b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ft_user_org_perm' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    91d3e51 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2024

  1. fix: 替换测试接口

    @lhzzforever
    lhzzforever committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    5e79c48 View commit details
    Browse the repository at this point in the history

  2. fix: 增加侧边栏快捷关闭规范

    @lhzzforever
    lhzzforever committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    53e77af View commit details
    Browse the repository at this point in the history

  3. fix: 修复资源权限管理无法回显勾选无限制选项

    @lhzzforever
    lhzzforever committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    8face01 View commit details
    Browse the repository at this point in the history

  4. feature: 处理快捷实例tag筛选

    @lhzzforever
    lhzzforever committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    bd9b0e5 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. fix: 修改用户/组织头部搜索交互，只支持删除系统tag且同步删除关联子项

    @lhzzforever
    lhzzforever committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    630c169 View commit details
    Browse the repository at this point in the history

  2. feature: 优化清空用户组并移除（管理空间）交互

    @lhzzforever
    lhzzforever committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    a5b96c9 View commit details
    Browse the repository at this point in the history

  3. fix: 切换操作清空资源实例和类型

    @lhzzforever
    lhzzforever committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    10c6ad2 View commit details
    Browse the repository at this point in the history

  4. feature: 用户/组织模块头部缩略Tag搜索场景提供快捷popover编辑功能

    @lhzzforever
    lhzzforever committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    81c9791 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. fix: 设置快捷编辑tag内容

    @lhzzforever
    lhzzforever committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    6f1c5b1 View commit details
    Browse the repository at this point in the history

  2. fix: interface去掉无用参数

    @lhzzforever
    lhzzforever committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    303a74d View commit details
    Browse the repository at this point in the history

  3. fix: 搜索的时候默认选择第一条数据

    @lhzzforever
    lhzzforever committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    f02db82 View commit details
    Browse the repository at this point in the history

  4. fix: 调整侧边栏底部按钮间距

    @lhzzforever
    lhzzforever committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    42ffe24 View commit details
    Browse the repository at this point in the history

  5. feature: 清空用户组并移除管理空间设计稿改版

    @lhzzforever
    lhzzforever committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    3bf14d2 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. fearture: 对接用户组批量移除、批量续期

    @lhzzforever
    lhzzforever committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    e8a933f View commit details
    Browse the repository at this point in the history

  2. fix: 对接清空用户组并移出（管理空间）、重置用户组业务接口

    @lhzzforever
    lhzzforever committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    456151c View commit details
    Browse the repository at this point in the history

  3. fix: 去掉获取已选用户组接口

    @lhzzforever
    lhzzforever committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    ef8fcdf View commit details
    Browse the repository at this point in the history

  4. fix: 去掉获取已选用户组接口

    @lhzzforever
    lhzzforever committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    37c04ea View commit details
    Browse the repository at this point in the history

  5. fix: 去除log

    @lhzzforever
    lhzzforever committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    30f6174 View commit details
    Browse the repository at this point in the history

  6. fix: 用户组权限只有一种类型数据时，默认展开

    @lhzzforever
    lhzzforever committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    12be622 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2508 from lhzzforever/dev/develop_ci_userOrOrg 

    feature: 处理用户/组织搜索模块有搜索字段且非展开模式的业务交互
    @zhu327
    zhu327 committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    0580cf7 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #2517 from TencentBlueKing/develop 

    Develop
    @zhu327
    zhu327 committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    2cd539f View commit details
    Browse the repository at this point in the history

  9. Merge pull request #2519 from TencentBlueKing/develop 

    fix: fix role group member department group api (#2518)
    @zhu327
    zhu327 committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    787f342 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #2521 from TencentBlueKing/develop 

    fix: update role group member subject group api (#2520)
    @zhu327
    zhu327 committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    efb1e27 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #2523 from TencentBlueKing/develop 

    fix: update get_user_departments (#2522)
    @zhu327
    zhu327 committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    d1e7357 View commit details
    Browse the repository at this point in the history

  12. fix: 修复人员模板模块有操作列

    @lhzzforever
    lhzzforever committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    6d9dcfc View commit details
    Browse the repository at this point in the history

  13. Merge branch 'upstream/ft_user_org_perm' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    e1b721e View commit details
    Browse the repository at this point in the history

  14. feature: 用户类型增加直接通过部门加入人员模板的接口

    @lhzzforever
    lhzzforever committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    2c481b7 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. fix: 监听最新的组架构架构人员切换

    @lhzzforever
    lhzzforever committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    3b57d1c View commit details
    Browse the repository at this point in the history

  2. fix: 修复续期时间无法同步表格最新数据

    @lhzzforever
    lhzzforever committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    eac6e70 View commit details
    Browse the repository at this point in the history

  3. fix: 用户组权限接口不需要过滤搜索字段

    @lhzzforever
    lhzzforever committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    6b67bdd View commit details
    Browse the repository at this point in the history

  4. fix: 修改移除标题

    @lhzzforever
    lhzzforever committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    4b001f5 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    bef14ae View commit details
    Browse the repository at this point in the history

  6. fix: 二级管理员隐藏用户/组织菜单

    @lhzzforever
    lhzzforever committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    82eada2 View commit details
    Browse the repository at this point in the history

  7. fix: 修复组织用户组接口调用错误

    @lhzzforever
    lhzzforever committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    483481d View commit details
    Browse the repository at this point in the history

  8. fix: 用户组权限收起后，勾选的数据清空

    @lhzzforever
    lhzzforever committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    496a6fb View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. fix: 提交产品自测的体验问题

    @lhzzforever
    lhzzforever committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    d960038 View commit details
    Browse the repository at this point in the history

  2. fix: 处理需要展示poopver的tag

    @lhzzforever
    lhzzforever committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    b79e761 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2525 from lhzzforever/dev/develop_ci_userOrOrg 

    fix: 修复人员模板模块有操作列
    @zhu327
    zhu327 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    b74503c View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    3dea3c7 View commit details
    Browse the repository at this point in the history

  2. fix: 处理如果有多项item时也支持默认展开第一项

    @lhzzforever
    lhzzforever committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    960bcd2 View commit details
    Browse the repository at this point in the history

  3. fix: 处理多个tag标签溢出不换行

    @lhzzforever
    lhzzforever committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    c9ace70 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2535 from lhzzforever/dev/develop_ci_userOrOrg 

    fix: 处理如果有多项item时也支持默认展开第一项
    @zhu327
    zhu327 committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    fb22169 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. fix: 修复设计走查问题

    @lhzzforever
    lhzzforever committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    2cb629e View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. fix: 组织架构列表添加自定义loading

    @lhzzforever
    lhzzforever committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    37a9d35 View commit details
    Browse the repository at this point in the history

  2. fix: 修复用户组权限无法跨页选择

    @lhzzforever
    lhzzforever committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    7d2409d View commit details
    Browse the repository at this point in the history

  3. fix: 设置底色为#ffff

    @lhzzforever
    lhzzforever committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    80a4752 View commit details
    Browse the repository at this point in the history

  4. fix: 修复drowdown底色为#fff

    @lhzzforever
    lhzzforever committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    2072f0d View commit details
    Browse the repository at this point in the history

  5. fix: 增加hover手柄效果

    @lhzzforever
    lhzzforever committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    735f668 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2537 from lhzzforever/dev/develop_ci_userOrOrg 

    fix: 修复设计走查问题
    @ielgnaw
    ielgnaw committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    1767ebf View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. Merge pull request #2540 from TencentBlueKing/develop 

    fix: update open api application detail api (#2539)
    @zhu327
    zhu327 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    d5e662d View commit details
    Browse the repository at this point in the history

  2. fix: 修复遗留问题

    @lhzzforever
    lhzzforever committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    6bf0f5f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upstream/ft_user_org_perm' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    6406d65 View commit details
    Browse the repository at this point in the history

  4. fix: 跑马灯组件不根据回调参数做是否展示处理

    @lhzzforever
    lhzzforever committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    995928e View commit details
    Browse the repository at this point in the history

  5. fix: 根据列表宽度自定义tooltip

    @lhzzforever
    lhzzforever committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    56760a3 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2543 from lhzzforever/dev/develop_ci_userOrOrg 

    fix: 修复遗留问题
    @ielgnaw
    ielgnaw committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    43fecbd View commit details
    Browse the repository at this point in the history

  7. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    e1d596a View commit details
    Browse the repository at this point in the history

  8. Merge pull request #2545 from TencentBlueKing/develop 

    Develop
    @zhu327
    zhu327 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    8ebac9f View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. feature: 增加批量续期、批量成员加入用户组接口

    @lhzzforever
    lhzzforever committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    d3f5a82 View commit details
    Browse the repository at this point in the history

  2. feature: 批量续期、批量加入用户成员需求整改，非过期用户组需要累加有效期时间

    @lhzzforever
    lhzzforever committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    1e08886 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upstream/ft_user_org_perm' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    2a8fad8 View commit details
    Browse the repository at this point in the history

  4. feature: 合并resource_instance分支，解决公共文件冲突

    @lhzzforever
    lhzzforever committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    2c828e6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2548 from lhzzforever/dev/develop_ci_userOrOrg 

    Dev/develop ci user or org
    @ielgnaw
    ielgnaw committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    50fc052 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Merge branch 'upstream/develop' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    5c64f80 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2551 from TencentBlueKing/develop 

    Develop
    @zhu327
    zhu327 committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    9f15582 View commit details
    Browse the repository at this point in the history

  3. fix: update group batch renew members (#2552)

    @zhu327
    zhu327 committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    4a7ed9b View commit details
    Browse the repository at this point in the history

  4. fix: 统一表格特定列才展示tooltip

    @lhzzforever
    lhzzforever committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    565c9d1 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'upstream/ft_user_org_perm' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    907046c View commit details
    Browse the repository at this point in the history

  6. fix: 修复续期时间最新的计算方式，通过向上取整且同步获取最新的当前时间

    @lhzzforever
    lhzzforever committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    10e1dfd View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2553 from lhzzforever/dev/develop_ci_userOrOrg 

    Dev/develop ci user or org
    @ielgnaw
    ielgnaw committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    c86f306 View commit details
    Browse the repository at this point in the history

  8. fix: 修改批量加入用户组成员接口

    @lhzzforever
    lhzzforever committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    eeb7870 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'upstream/ft_user_org_perm' into dev/develop_ci_userOrOrg

    @lhzzforever
    lhzzforever committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    b691e19 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #2554 from lhzzforever/dev/develop_ci_userOrOrg 

    fix: 修改批量加入用户组成员接口
    @ielgnaw
    ielgnaw committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    ba32484 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. feature: 合并用户/组织模块代码到develop

    @lhzzforever
    lhzzforever committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    9cbac4b View commit details
    Browse the repository at this point in the history

  2. feature: 升级组件库版本处理组件规范问题 

    fix: 修复用户/组织模块提测问题
    @lhzzforever
    lhzzforever committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    fe29a3d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upstream/develop' into dev/develop_ci

    @lhzzforever
    lhzzforever committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    66a96d6 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2581 from lhzzforever/dev/develop_ci 

    Dev/develop ci
    @ielgnaw
    ielgnaw committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    d2b7403 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. fix: 管理空间固定列表格无法点击指定区域编辑

    @lhzzforever
    lhzzforever committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    92518bc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/develop' into dev/develop_ci

    @lhzzforever
    lhzzforever committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    b68dda8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2582 from lhzzforever/dev/develop_ci 

    fix:  管理空间固定列表格无法点击指定区域编辑
    @ielgnaw
    ielgnaw committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    cfccdd2 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. fix: 多个不同方式加入的用户组权限点击分页会把当前已展开项收起

    @lhzzforever
    lhzzforever committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    4c7810d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/develop' into dev/develop_ci

    @lhzzforever
    lhzzforever committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    0051a86 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2584 from lhzzforever/dev/develop_ci 

    fix: 多个不同方式加入的用户组权限点击分页会把当前已展开项收起
    @ielgnaw
    ielgnaw committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    4a4736f View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. fix: 修复用户组织遗留问题 

    fix: 添加人员手动输入组件兼容staff角色的业务交互
    @lhzzforever
    lhzzforever committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    f46c796 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/develop' into dev/develop_ci

    @lhzzforever
    lhzzforever committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    1e110bd View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2585 from lhzzforever/dev/develop_ci 

    fix: 添加人员手动输入组件兼容staff角色的业务交互
    @ielgnaw
    ielgnaw committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    188dd28 View commit details
    Browse the repository at this point in the history

  4. fix: 提交漏缺的代码

    @lhzzforever
    lhzzforever committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    11da111 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'upstream/develop' into dev/develop_ci

    @lhzzforever
    lhzzforever committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    6ca43a5 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2586 from lhzzforever/dev/develop_ci 

    Dev/develop ci
    @ielgnaw
    ielgnaw committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    2f8f738 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. fix: 整改用户/组织头部搜索交互

    @lhzzforever
    lhzzforever committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    7bb22d0 View commit details
    Browse the repository at this point in the history

  2. fix: 处理资源实例搜索单选场景下隐藏全选按钮

    @lhzzforever
    lhzzforever committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    a73b5fc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upstream/develop' into dev/develop_ci

    @lhzzforever
    lhzzforever committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    a26fceb View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Merge pull request #2587 from lhzzforever/dev/develop_ci 

    Dev/develop ci
    @ielgnaw
    ielgnaw committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    00feeb0 View commit details
    Browse the repository at this point in the history

  2. fix: 修改加入用户组溢出样式展示

    @lhzzforever
    lhzzforever committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    abfb454 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upstream/develop' into dev/develop_ci

    @lhzzforever
    lhzzforever committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    efa3b4e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2589 from lhzzforever/dev/develop_ci 

    Dev/develop ci
    @ielgnaw
    ielgnaw committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    1af3258 View commit details
    Browse the repository at this point in the history

  5. feat: 更新部分依赖

    @ielgnaw
    ielgnaw committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    944a29d View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2590 from ielgnaw/develop 

    feat: 更新部分依赖
    @ielgnaw
    ielgnaw committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    2f42782 View commit details
    Browse the repository at this point in the history

  7. fix: 添加漏缺的国际化

    @lhzzforever
    lhzzforever committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    38c900e View commit details
    Browse the repository at this point in the history

  8. Merge branch 'upstream/develop' into dev/develop_ci

    @lhzzforever
    lhzzforever committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    eca800e View commit details
    Browse the repository at this point in the history

  9. feature: 平台管理—>由以前只支持超管开启变更为支持超管或者系管开启并分发不同的权限菜单

    @lhzzforever
    lhzzforever committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    2dae566 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. fix: 人员选择器手动输入跨授权范围搜索支持精确查找

    @lhzzforever
    lhzzforever committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    e4a5138 View commit details
    Browse the repository at this point in the history

  2. fix: join_type增加tooltip

    @lhzzforever
    lhzzforever committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    1700248 View commit details
    Browse the repository at this point in the history

  3. fieature: 迭代分配菜单权限整改， 查询资源有权限的成员列表支持分级管理员,

    @lhzzforever
    lhzzforever committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    cdd1816 View commit details
    Browse the repository at this point in the history

  4. fix: 去掉log

    @lhzzforever
    lhzzforever committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    ea85aa8 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Merge pull request #2591 from lhzzforever/dev/develop_ci 

    Dev/develop ci
    @ielgnaw
    ielgnaw committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    871e70e View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2024

  1. feature: 用户组成员列表添加备注原因

    @lhzzforever
    lhzzforever committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    c7568f2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/develop' into dev/develop_ci

    @lhzzforever
    lhzzforever committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    f217e9d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2592 from lhzzforever/dev/develop_ci 

    feature: 用户组成员列表添加备注原因
    @ielgnaw
    ielgnaw committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    f22745c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'upstream/master' into dev/develop_ci

    @lhzzforever
    lhzzforever committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    f6a8979 View commit details
    Browse the repository at this point in the history

  5. fix: 更新terser-webpack-plugin版本

    @lhzzforever
    lhzzforever committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    86500e7 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2594 from lhzzforever/dev/develop_ci 

    Dev/develop ci
    @ielgnaw
    ielgnaw committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    179f0e5 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. feat: query default action sensitivity from backend (#2500)

    @zhu327
    zhu327 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    35842da View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. fix: 用户组详情—>人员模板详情列表搜索场景下增加前端自定义分页

    @lhzzforever
    lhzzforever committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    d7ae290 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/develop' into dev/develop_ci

    @lhzzforever
    lhzzforever committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    f907fa6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2603 from lhzzforever/dev/develop_ci 

    fix: 用户组详情—>人员模板详情列表搜索场景下增加前端自定义分页
    @ielgnaw
    ielgnaw committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    6344356 View commit details
    Browse the repository at this point in the history

  4. feat: system manager add manger action permission (#2604)

    @zhu327
    zhu327 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    4b23630 View commit details
    Browse the repository at this point in the history

  5. feature: 根据所选管理员身份进行不同权限菜单的整改

    @lhzzforever
    lhzzforever committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    0544ffe View commit details
    Browse the repository at this point in the history

  6. feature: 处理同名路由才需要刷新

    @lhzzforever
    lhzzforever committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    f41c4d7 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'upstream/develop' into dev/develop_ci

    @lhzzforever
    lhzzforever committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    8c899a4 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #2606 from lhzzforever/dev/develop_ci 

    feature:  根据所选管理员身份进行不同权限菜单的整改
    @ielgnaw
    ielgnaw committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    a6f315e View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. fix: 文字溢出宽度不够导致tooltip换行问题

    @lhzzforever
    lhzzforever committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    b5edea3 View commit details
    Browse the repository at this point in the history

  2. feat: manager group list api add only_inherit param (#2608)

    @zhu327
    zhu327 committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    f17f47c View commit details
    Browse the repository at this point in the history

  3. fix: 修复全平台关于属性条件无法下拉加载问题

    @lhzzforever
    lhzzforever committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    769341b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into dev/develop_ci

    @ielgnaw
    ielgnaw committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    60889f5 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2609 from lhzzforever/dev/develop_ci 

    fix: 修复全平台关于属性条件无法下拉加载问题
    @ielgnaw
    ielgnaw committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    fdec61c View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. fix: 敏感等级菜单移动到设置模块下

    @lhzzforever
    lhzzforever committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    3d41e83 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2610 from lhzzforever/dev/develop_ci 

    fix: 敏感等级菜单移动到设置模块下
    @ielgnaw
    ielgnaw committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    1e3510a View commit details
    Browse the repository at this point in the history

  3. fix: 用户/组织菜单限制一级管理员身份才开放权限

    @lhzzforever
    lhzzforever committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    ab4111c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'upstream/develop' into dev/develop_ci

    @lhzzforever
    lhzzforever committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    fb481a2 View commit details
    Browse the repository at this point in the history

  5. fix: 修改批量编辑对应文字

    @lhzzforever
    lhzzforever committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    4c0d813 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2611 from lhzzforever/dev/develop_ci 

    Dev/develop ci
    @ielgnaw
    ielgnaw committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    4fa10b2 View commit details
    Browse the repository at this point in the history

  7. docs: v1.10.25 (#2612)

    @zhu327
    zhu327 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    ca0a179 View commit details
    Browse the repository at this point in the history