Code

Develop#2735

Code

Merged

nannan00 merged 76 commits intomasterTencentBlueKing/bk-iam-saas:masterfrom developTencentBlueKing/bk-iam-saas:developCopy head branch name to clipboardJun 25, 2024

+2,142-3,189

Commits

Commits on May 21, 2024

• feature: 支持通过npm集成统一iframe加载模式

  lhzzforever

  committed
  8e24089

• feature: 添加iframe特免

  lhzzforever

  committed
  2e4f60f

• fix: 添加日志排查

  lhzzforever

  committed
  ee5976d

• Merge pull request #2668 from lhzzforever/dev/develop_ci_update_sub_sass

  Show description for 4d98d8c
  ielgnaw

  authored
  4d98d8c

• fix: 调整iframe嵌套页面样式

  lhzzforever

  committed
  7130096

• Merge branch 'upstream/ft_iframe_sass' into dev/develop_ci_update_sub_sass

  lhzzforever

  committed
  9e330aa

• Merge pull request #2669 from lhzzforever/dev/develop_ci_update_sub_sass

  Show description for 2092d05
  ielgnaw

  authored
  2092d05

Commits on May 22, 2024

• fix; 修改iframe样式

  lhzzforever

  committed
  ea5be96

• Merge branch 'upstream/ft_iframe_sass' into dev/develop_ci_update_sub_sass

  lhzzforever

  committed
  fe70989

• feature: iframe引入去掉footer

  lhzzforever

  committed
  12ba62a

• fix: iframe嵌套注释掉footer

  lhzzforever

  committed
  aba281c

• Merge pull request #2670 from lhzzforever/dev/develop_ci_update_sub_sass

  Show description for 219f896
  ielgnaw

  authored
  219f896

Commits on Jun 5, 2024

• fix: 申请用户组—>无权限申请权限和常用推荐权限需要过滤掉指定的操作

  lhzzforever

  committed
  5bb713a

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  facd02c

• fix: 提价漏缺代码

  lhzzforever

  committed
  5726b54

• fix: 提交漏缺代码

  lhzzforever

  committed
  7c07fe9

• fix: 兼容无权限页面和有权限申请页面样式

  lhzzforever

  committed
  f72d2f9

Commits on Jun 6, 2024

• Merge pull request #2691 from lhzzforever/dev/develop_ci

  Show description for 37dd3e0
  ielgnaw

  authored
  37dd3e0

Commits on Jun 7, 2024

• fix: 修复自定义权限切换系统未清空资源实例表格数据

  lhzzforever

  committed
  06a7610

• Merge pull request #2693 from lhzzforever/dev/develop_ci

  Show description for bb6c817
  nannan00

  authored
  bb6c817

Commits on Jun 12, 2024

• fix: 编辑用户组权限-修改资源实例内容后取消，资源实例内容没有显示为原始的数据，需要刷新页面

  lhzzforever

  committed
  f1bb7d3

Commits on Jun 13, 2024

• Merge branch 'upstream/ft_iframe_sass' into dev/develop_ci

  lhzzforever

  committed
  78f8a8f

• Merge pull request #2708 from lhzzforever/dev/develop_ci

  Show description for 3356648
  ielgnaw

  authored
  3356648

• feature: 增加function-dependcy组件处理需要功能依赖项展示的页面

  lhzzforever

  committed
  e7bd465

• fix: 补充注释说明

  lhzzforever

  committed
  114e977

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  a59c918

• fix: 提交漏缺代码

  lhzzforever

  committed
  e5c8d0f

Commits on Jun 14, 2024

• feature: 添加自定义footer

  lhzzforever

  committed
  8a0e5ea

• Merge pull request #2710 from lhzzforever/dev/develop_ci

  Show description for c6f1753
  ielgnaw

  authored
  c6f1753

• feature: 更新跳转链接为7.0以上的蓝鲸版本文档链接

  lhzzforever

  committed
  1a7a8ac

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  8974d83

• Merge pull request #2711 from lhzzforever/dev/develop_ci

  Show description for e035bda
  ielgnaw

  authored
  e035bda

Commits on Jun 18, 2024

• feature: 全平台批量聚合switch组件替换为tab组件

  Show description for 2218177
  lhzzforever

  committed
  2218177

• feature: 添加公共添加系统和操作侧边栏样式文件

  lhzzforever

  committed
  ce8987c

• fix: 去掉多余文件

  lhzzforever

  committed
  c4dff77

• Merge pull request #2713 from lhzzforever/dev/develop_ci

  Show description for 308388f
  ielgnaw

  authored
  308388f

• feature: 平台信息使用远程配置

  lhzzforever

  committed
  8a903ab

• Merge pull request #2715 from lhzzforever/dev/develop_ci

  Show description for bf9a29e
  ielgnaw

  authored
  bf9a29e

Commits on Jun 19, 2024

• feat: 支持全局配置商标&LOGO等信息 #2712 (#2716)

  Show description for c0a4063
  OrenZhang

  authored
  c0a4063

• fix:去掉多余引号

  lhzzforever

  committed
  80bfd45

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  b039aae

• Merge pull request #2717 from lhzzforever/dev/develop_ci

  Show description for 5717761
  ielgnaw

  authored
  5717761

• feature: 兼容dbm系统依赖cmdb平台个别自定义属性集需要展示人员选择器组件

  lhzzforever

  committed
  443d018

• fix: 提供默认值测试

  lhzzforever

  committed
  c22de4f

• Merge pull request #2718 from lhzzforever/dev/develop_ci

  Show description for 67a8edd
  ielgnaw

  authored
  67a8edd

• fix: http链接改为https

  lhzzforever

  committed
  32b1d51

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  c7a810c

• Merge pull request #2719 from lhzzforever/dev/develop_ci

  Show description for 199d2b3
  ielgnaw

  authored
  199d2b3

• fix: 修改列文字

  lhzzforever

  committed
  0840080

• fix: 测试数据

  lhzzforever

  committed
  0ebd3fa

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  71a8e98

• Merge pull request #2720 from lhzzforever/dev/develop_ci

  Show description for 328bf7a
  ielgnaw

  authored
  328bf7a

• fix: 修改url

  lhzzforever

  committed
  31485fa

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  bc8be97

• Merge pull request #2721 from lhzzforever/dev/develop_ci

  Show description for 001f6bd
  ielgnaw

  authored
  001f6bd

• fix: 修改url

  lhzzforever

  committed
  6c151be

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  aff0405

• Merge pull request #2722 from lhzzforever/dev/develop_ci

  Show description for f72a81b
  ielgnaw

  authored
  f72a81b

• fix: 修改appcode为固定值

  lhzzforever

  committed
  9659af5

• Merge pull request #2723 from lhzzforever/dev/develop_ci

  Show description for 4fb09db
  ielgnaw

  authored
  4fb09db

• fix: 修改兼容远程全局配置项

  lhzzforever

  committed
  f1528ad

Commits on Jun 20, 2024

• fix: 设置getters的默认配置

  lhzzforever

  committed
  d37a3fa

• Merge pull request #2724 from lhzzforever/dev/develop_ci

  Show description for a8e9c60
  ielgnaw

  authored
  a8e9c60

• fix: 统一远程配置数据格式

  lhzzforever

  committed
  fa9666e

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  8309022

• fix: 修复key值是个object异常警告

  lhzzforever

  committed
  cffe6e4

• Merge pull request #2725 from lhzzforever/dev/develop_ci

  Show description for 062d70d
  ielgnaw

  authored
  062d70d

• fix: 修改事件名称

  lhzzforever

  committed
  c18e936

• feature: 增加链接加码

  lhzzforever

  committed
  5027d21

Commits on Jun 21, 2024

• Merge pull request #2726 from lhzzforever/dev/develop_ci

  Show description for 2810fe9
  ielgnaw

  authored
  2810fe9

Commits on Jun 24, 2024

• fix: 修复添加系统和操作搜索框未铺满问题

  lhzzforever

  committed
  9adbc5a

• fix: 处理多个资源类型时，默认选中当前查看的类型

  lhzzforever

  committed
  dabc24c

• fix: 处理多个资源类型时，默认选中当前查看的类型

  lhzzforever

  committed
  2cf25f5

Commits on Jun 25, 2024

• feature: 统一平台添加系统和操作侧边栏页面排版

  lhzzforever

  committed
  602c077

• Merge pull request #2733 from lhzzforever/dev/develop_ci

  Show description for 5ccd144
  ielgnaw

  authored
  5ccd144

• docs: version log update (#2734)

  nannan00

  authored
  094c71c