Skip to content

Commit

Permalink
feat: 修复基本信息编辑时,弹框中维护人员不显示的问题;获取全局配置 BK_APP_CODE 动态获取 (#726)
Browse files Browse the repository at this point in the history 
* Merge branch 'master' of https://github.com/ielgnaw/blueking-apigateway
, # Reviewed, transaction id: 4651

* Merge branch 'master' of https://github.com/ielgnaw/blueking-apigateway
, # Reviewed, transaction id: 4651
, # Reviewed, transaction id: 4652

* fix: 权限审批添加漏缺的全部驳回代码

* fix: 权限审批添加类型和展开子项表格默认全选

* fix:  操作记录在1440 的屏幕下会换行

* fix: 修复体验问题

* fix: 修复环境概览详情缩小到1024像素布局混乱

* fix: 吸底样式不对

* fix: 修改路由名称

* fix: 创建资源时这里是激活输入框出现 tooltip，不是给名称添加tooltip
有间距，参照设计稿

* fix: 修复meunu菜单展开icon太小

* fix: 操作记录列表根据屏幕大小自适应

* feat: 修复前端问题

* fix: 修复体验问题

* feat: 修复前端体验问题
# Reviewed, transaction id: 4961

* fix: 提交国际化

* fix: 修复体验问题

* feat: 修复前端问题
# Reviewed, transaction id: 5017

* feat: 修复前端问题
# Reviewed, transaction id: 5018

* feat: 国际化问题
# Reviewed, transaction id: 5042

* fix: 体验问题修复

* feat: 修复前端问题
# Reviewed, transaction id: 5084

* feat: 修复前端问题
# Reviewed, transaction id: 5102

* feat: 修复前端问题
# Reviewed, transaction id: 5117

* feat: 修复前端问题
# Reviewed, transaction id: 5195

* Merge remote-tracking branch 'base/master'
, # Reviewed, transaction id: 5205

* Merge remote-tracking branch 'base/master'
, # Reviewed, transaction id: 5206

* feat: 修复前端问题
# Reviewed, transaction id: 5227

* fix: 修复体验问题

* feat: 修复前端问题
# Reviewed, transaction id: 5345

* Merge remote-tracking branch 'base/master'
, # Reviewed, transaction id: 5346

* feat: 修复前端问题
# Reviewed, transaction id: 5348

* fix: 体验问题修复

* feat: 修复前端问题
# Reviewed, transaction id: 5483

* fix: 修复体验问题

* feat: 修复前端问题
# Reviewed, transaction id: 5629

* feat: 前端版本日志
# Reviewed, transaction id: 5675

* feat: 【APIgateway1.13 】发布失败的日志点进去，时间超长
# Reviewed, transaction id: 5703

* fix: 修复体验问题

* feat: 修复前端问题

* Merge remote-tracking branch 'base/master'
, # Reviewed, transaction id: 5928

* feat: 文案修改
# Reviewed, transaction id: 5951

* feat: 修复前端问题
# Reviewed, transaction id: 6015

* fix: 修复体验问题

* feat: 修复前端问题
# Reviewed, transaction id: 6094

* feat: 修复前端问题
# Reviewed, transaction id: 6095

* feat: 修复前端问题
# Reviewed, transaction id: 6197

* Merge remote-tracking branch 'base/master'
, # Reviewed, transaction id: 6198

* Merge remote-tracking branch 'base/master'
, # Reviewed, transaction id: 6198
, # Reviewed, transaction id: 6199

* fix: 修复体验问题

* fix: 体验问题修复

* feat: 修复前端问题
# Reviewed, transaction id: 6414

* fix: 修复体验问题

* Merge remote-tracking branch 'base/master'
, # Reviewed, transaction id: 6617

* Merge remote-tracking branch 'base/master'
, # Reviewed, transaction id: 6617
, # Reviewed, transaction id: 6619

* feat: 修复无法登出的问题
# Reviewed, transaction id: 6626

* fix: 体验问题修复

* feat: 修复前端问题
# Reviewed, transaction id: 6763

* fix: 体验问题修复

* fix: 修复体验问题

* fix: 体验问题修复

* feat: 修复前端问题
# Reviewed, transaction id: 7052

* fix: 修复体验问题

* fix: 修复体验问题

* fix: 修复体验问题

* feat: 【必须】点击编辑后，光标应该落在输入框内，需要支持回车 与 鼠标失焦都能保存
# Reviewed, transaction id: 7357

* fix: 修复体验问题

* fix: 修复体验问题

* fix: 修复体验问题

* feature: 小窗登录iframe方式改为window.open

* fix: 修复体验问题

* feat: 修复前端问题
# Reviewed, transaction id: 7793

* Merge remote-tracking branch 'base/master'
, # Reviewed, transaction id: 7802

* feat: 修复 新建资源页面，环境配置中的超时时间是 30 秒，但添加资源时变成了 0 秒，数据未同步

* Merge remote-tracking branch 'base/master'
, # Reviewed, transaction id: 7804

* fix: 修复体验问题

* fix: 修复体验问题

* fix: 变量管理  编辑时才显示增加删除按钮

* feat: 国际化

* feat: 国际化

* feat: 国际化

* feat: 修复插件管理问题

* feat: 退出登录加上 is_from_logout 参数

* fix: 体验问题修复

* feat: 修复前端问题

* feat: eslint 问题

* fix: 体验问题修复

* fix: 修复体验问题

* fix: 体验问题修复

* feat: 修复基本信息编辑时,弹框中维护人员不显示的问题

* feat: 修复前端问题

* feat: 修复通知中心访问地址
# Reviewed, transaction id: 9800

* feat: 修复通知中心访问地址
# Reviewed, transaction id: 9823

* Merge remote-tracking branch 'base/master'
, # Reviewed, transaction id: 9890

* feat: 修复编辑基础信息弹框中维护人员不回显的问题
# Reviewed, transaction id: 10102

* feat: 修复编辑基础信息弹框中维护人员不回显的问题 (#703)

# Reviewed, transaction id: 10102

* feat: 修复编辑基础信息弹框中维护人员不回显的问题
# Reviewed, transaction id: 10119

* feat: 全局配置开发完成

* feat: 全局配置
# Reviewed, transaction id: 10271

* Merge remote-tracking branch 'base/master'
, # Reviewed, transaction id: 10480

* feat: 日志优化前端功能开发&&“校验并查看地址”展示的路径不全时没有tooltips&&发布记录：导航样式不对&&通过环境概览页面发布资源后，页面下方资源信息未更新

* Merge remote-tracking branch 'base/master'
, # Reviewed, transaction id: 10706

* feat: 1.14功能开发
# Reviewed, transaction id: 10707

* feat: 修复基本信息编辑时,弹框中维护人员不显示的问题;获取全局配置 BK_APP_CODE 动态获取
# Reviewed, transaction id: 10785

---------

Co-authored-by: shuzhenyang <shuzhen.yang2@gientech.com>
Co-authored-by: lhzzforever <zly2576885332@163.com>
Co-authored-by: 逍遥尊者 <46641918+lhzzforever@users.noreply.github.com>
Co-authored-by: wklken <wklken@gmail.com>
  • Loading branch information
@ielgnaw @shuzhenyang
@lhzzforever @wklken
5 people authored Jun 28, 2024
1 parent a1d893d commit 3891557
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/dashboard-front/.bk.production.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ BK_DASHBOARD_FE_URL = '\$BK_DASHBOARD_FE_URL'
BK_DASHBOARD_URL = '\$BK_DASHBOARD_URL'
BK_DASHBOARD_CSRF_COOKIE_NAME = '\$BK_DASHBOARD_CSRF_COOKIE_NAME'
BK_SHARED_RES_URL = '\$BK_SHARED_RES_URL'
BK_APP_CODE = '\$BK_APP_CODE'
2 changes: 1 addition & 1 deletion src/dashboard-front/src/app.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ const getWebsiteConfig = async () => {
if (bkSharedResUrl) {
const url = bkSharedResUrl?.endsWith('/') ? bkSharedResUrl : `${bkSharedResUrl}/`;
websiteConfig.value = await getPlatformConfig(`${url}bk_cmdb/base.js`, constantConfig.SITE_CONFIG);
websiteConfig.value = await getPlatformConfig(`${url}${window.BK_APP_CODE || 'bk_apigateway'}/base.js`, constantConfig.SITE_CONFIG);
} else {
websiteConfig.value = await getPlatformConfig(constantConfig.SITE_CONFIG);
}
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard-front/src/components/member-select/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export default defineComponent({
});
} else {
// isLoading.value = true;
staffStore.fetchStaffs();
staffStore.fetchStaffs(props.modelValue.join(','));
}
},
{ immediate: true, deep: true },
Expand Down
1 change: 1 addition & 0 deletions src/dashboard-front/types/global.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ declare interface Window {
CREATE_CHAT_API: string
SEND_CHAT_API: string
BK_SHARED_RES_URL: string
BK_APP_CODE: string
}

declare module "*.svg" {
Expand Down

0 comments on commit 3891557

Please sign in to comment.