From 82b5c62b802ef340ed2c6be5d0be785a79eefcbb Mon Sep 17 00:00:00 2001 From: ielgnaw Date: Mon, 1 Apr 2024 09:56:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E4=BD=93=E9=AA=8C=E9=97=AE=E9=A2=98=20(#566)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3022 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3022 , # Reviewed, transaction id: 3023 * feat: 修复启用/停用成功提示弹出两次的问题 * feat: 更新前端构建脚手架 # Reviewed, transaction id: 3108 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3112 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3114 * feat: 左侧导航菜单可以同时展开,并默认展开选中节点的菜单 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3121 * feat: 修复前端部分问题 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3123 * fix: 去掉log * fix: 修复体验问题 * feat: 修复前端问题 & 增加国际化 # Reviewed, transaction id: 3318 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3320 * Merge branch 'master' of https://github.com/ielgnaw/blueking-apigateway , # Reviewed, transaction id: 3321 * feat: 导航收起后 顶部颜色不对，包括顶部的项目选择的选择框是没有边框的 @hieiwang(王磊) * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3327 * feat: 插件管理-免用户认证应用白名单定制页面开发 * Merge branch 'master' of https://github.com/ielgnaw/blueking-apigateway , # Reviewed, transaction id: 3373 * feat: 修复前端问题 # Reviewed, transaction id: 3374 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3379 * feat: 修复前端问题 * feat: 修复前端问题 # Reviewed, transaction id: 3415 * fix: bug修复 * feat: 修复前端问题 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3456 * feature: 对接登陆失效小窗登陆需求 * feat: 修复前端问题 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3487 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3487 , # Reviewed, transaction id: 3488 * feat: 调试日志 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3498 * fix: 体验问题修复 * fix: 【APIgateway1.13 】这里标签编辑离标签感觉有点远 fix: 【APIgateway1.13 】资源配置-生成版本：最新版本没有的时候直接不展示出来 fix: 【APIgateway1.13 】这个编辑图标紧跟 fix: 【APIgateway1.13 】点击Swagger说明文档无反应 fix: 【APIgateway1.13 】导入资源文档-点击模板示例及Swagger说明文档跳转地址不符合预期 * feat: 修复前端问题 * feat: 修复前端问题 # Reviewed, transaction id: 3527 * feat: 修复登录框登录后不刷新的问题 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3531 * fix: 体验问题修复 * feat: 修复前端问题 # Reviewed, transaction id: 3600 * fix: 发布版本时的标志 * fix: 增加最新版本tag * fix: 选择版本后不能关闭popover * fix: 单个格子是可以直接修改的，批量编辑时，点击后光标自动定位在输入框 * fix: 表格单项编辑失焦时计算总的超时时间 * fix: 体验问题修复 * fix: 资源配置页样式错乱 * feat: 修复前端问题 # Reviewed, transaction id: 3681 * fix: 【APIgateway1.13 】组件管理请输入系统名称、描述未按搜索为空规范 【APIgateway1.13 】组件管理请输入组件名称未按搜索结果为空规范 * fix: 【APIgateway1.13 】运行数据存在丢失的情况 * feature: 对接通知中心跑马灯组件 * fix: 体验问题修复 * fix: 【APIgateway1.13 】展开蓝鲸应用ID后无任何数据 * feat: 修复前端问题 # Reviewed, transaction id: 3763 * fix: 【APIgateway1.13 】组件同步版本未按搜索为空规范 fix: 【APIgateway1.13 】组件同步历史未按搜索为空规范 * fix: 【APIgateway1.13 】输入不存在的系统负责人点击保存后可保存成功 * fix: 【APIgateway1.13 】这里使用格子表的交互，且变量名的提示，不用直接显示，而是触发输入框之后 使用气泡提示 * feat: 修复前端问题 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3803 * fix: error图标居中 * fix: 点击变量列表编辑按钮自动聚焦最后一项 * fix: 修复体验问题 * fix: 【APIgateway1.13 】在线调试，环境、资源未发布尽量在选择的时候就灰掉，不让选，而不是选择后再弹窗一些奇怪的报错 * feat: 修复前端问题 * feat: 修复前端问题 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3823 * feat: 更新前端 icon * fix: 体验问题修复 * feat: 修复前端问题 # Reviewed, transaction id: 3888 * feat: 【APIgateway1.13 】清除cookie或者长时间未登陆未实现小窗登陆 # Reviewed, transaction id: 3928 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 3930 * fix: 体验问题修复 * feat: 修复前端问题 # Reviewed, transaction id: 3977 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 4117 * feat: esb 组件管理列表接口变更 && fix: 体验问题修复 * feat: 修复运行数据和监控告警菜单偶尔不出现的问题 # Reviewed, transaction id: 4182 * fix: 环境详情—>变量管理表格交互优化 * fix: 修复体验问题 * fix: 新增列默认不获取焦点 * fix: 优化变量管理取消按钮的交互 * fix: 去掉log * fix: 体验问题修复 * Merge branch 'master' of https://github.com/ielgnaw/blueking-apigateway , # Reviewed, transaction id: 4320 * feat: 修复前端问题 # Reviewed, transaction id: 4385 * feat: 修复前端问题 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 4417 * feat: 修复前端问题 # Reviewed, transaction id: 4424 * fix: 修复体验问题 * feat: 修复前端问题 # Reviewed, transaction id: 4460 * feat: 修复前端问题 # Reviewed, transaction id: 4462 * feat: 前端 去掉无用的全局变量 * Merge remote-tracking branch 'base/master' , # Reviewed, transaction id: 4474 * fix: 流水日志和统计报表清空搜索条件时增加loading态 * fix: 【APIgateway1.13 】鼠标hover时无法查看到全部标签 * feat: 修复前端问题 # Reviewed, transaction id: 4501 * fix: 资源文档--底部按钮吸附&编辑器高度随分辨率变化 * fix: 新建资源页面 体验问题修复 * feat: 修复前端问题 # Reviewed, transaction id: 4530 * feat: 切换语言 # Reviewed, transaction id: 4532 * fix: 【APIgateway1.13 】这里前端应该要有个校验 NIT * fix: 修复体验问题 * fix: 【APIgateway1.13 】展开蓝鲸应用ID后无任何数据 * fix: 整改权限审批模块业务交互 * 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 --------- Co-authored-by: lhzzforever Co-authored-by: shuzhenyang Co-authored-by: 逍遥尊者 <46641918+lhzzforever@users.noreply.github.com> --- src/dashboard-front/src/common/menu.ts | 24 ++++++++----- .../src/components/log-details/index.vue | 34 +++++++++++-------- .../components/resource-setting-top-bar.vue | 4 ++- src/dashboard-front/src/language/lang.ts | 5 +-- .../views/components/plugin-manage/index.vue | 4 +++ src/dashboard-front/src/views/main.vue | 17 ++++++++-- .../resource/setting/comps/back-config.vue | 15 +++----- .../resource/setting/comps/base-info.vue | 21 +++++------- .../setting/comps/version-sideslider.vue | 3 ++ .../src/views/resource/setting/detail.vue | 2 +- .../src/views/resource/setting/index.vue | 1 + .../version/components/resourceDetail.vue | 2 +- .../overview/comps/release-sideslider.vue | 2 +- .../stage/overview/detail-mode/index.vue | 2 +- 14 files changed, 80 insertions(+), 56 deletions(-) diff --git a/src/dashboard-front/src/common/menu.ts b/src/dashboard-front/src/common/menu.ts index 5c8d8404e..3d94e7f37 100644 --- a/src/dashboard-front/src/common/menu.ts +++ b/src/dashboard-front/src/common/menu.ts @@ -8,18 +8,24 @@ const { t } = i18n.global; export const createMenuData = (): IMenu[] => { const user = useUser(); return [ + // { + // name: 'apigwStageManage', + // enabled: true, + // title: t('环境管理'), + // icon: 'resource', + // children: [ + // { + // name: 'apigwStageOverview', + // enabled: true, + // title: t('环境概览'), + // }, + // ], + // }, { - name: 'apigwStageManage', + name: 'apigwStageOverview', enabled: true, - title: t('环境管理'), + title: t('环境概览'), icon: 'resource', - children: [ - { - name: 'apigwStageOverview', - enabled: true, - title: t('环境概览'), - }, - ], }, { name: 'apigwBackendService', diff --git a/src/dashboard-front/src/components/log-details/index.vue b/src/dashboard-front/src/components/log-details/index.vue index f923d21ec..f3a1c03af 100644 --- a/src/dashboard-front/src/components/log-details/index.vue +++ b/src/dashboard-front/src/components/log-details/index.vue @@ -28,7 +28,6 @@ @@ -73,18 +72,18 @@ const logBody = ref(''); let timeId: any = null; // 改变当前选中值 -const handleTimelineChange = (data: any) => { - const { tag } = data; - let detail = ''; - for (let i = 0; i < state.objectSteps?.length; i++) { - const item = state.objectSteps[i]; - if (item?.tag === tag) { - detail = item?.detail; - break; - } - } - logBody.value = detail || ''; -}; +// const handleTimelineChange = (data: any) => { +// const { tag } = data; +// let detail = ''; +// for (let i = 0; i < state.objectSteps?.length; i++) { +// const item = state.objectSteps[i]; +// if (item?.tag === tag) { +// detail = item?.detail; +// break; +// } +// } +// logBody.value = detail || ''; +// }; // 获取日志列表 const getLogsList = async () => { @@ -99,6 +98,7 @@ const getLogsList = async () => { const steps: any = []; state.totalDuration = 0; const subStep = res?.events[res?.events?.length - 1]?.step || 0; + let allDetail = ''; res?.events_template?.forEach((item: any, index: number) => { item.size = 'large'; @@ -153,9 +153,15 @@ const getLogsList = async () => { steps[index].children = children; steps[index].content = `${duration} s`; steps[index].detail = itemLogs.join('\n'); + + if (allDetail) { + allDetail = `${allDetail}\n\n${steps[index].detail}`; + } else { + allDetail = steps[index].detail; + } }); state.objectSteps = steps; - logBody.value = steps[subStep]?.detail || ''; + logBody.value = allDetail || ''; } catch (e) { clearInterval(timeId); console.log(e); diff --git a/src/dashboard-front/src/components/resource-setting-top-bar.vue b/src/dashboard-front/src/components/resource-setting-top-bar.vue index ebfd37ad0..0ecd14324 100644 --- a/src/dashboard-front/src/components/resource-setting-top-bar.vue +++ b/src/dashboard-front/src/components/resource-setting-top-bar.vue @@ -19,6 +19,7 @@ class="operate-btn" @click="handleCreateResourceVersion" :disabled="!latest" + v-bk-tooltips="{ content: '资源无更新，无需生成版本', disabled: latest }" > {{ t('生成版本') }} @@ -27,7 +28,7 @@ - + { } } :deep(.header-select){ - width: 240px; - .bk-input--text{ - background: rgb(245, 247, 250); + width: 224px; + .bk-input { + border: none; + background: #F5F7FA; + border-radius: 2px; + box-shadow: none; + .bk-input--text{ + background: #F5F7FA; + color: #63656E; + font-size: 14px; + } + } + &.is-focus { + border: 1px solid #3a84ff; } } } diff --git a/src/dashboard-front/src/views/resource/setting/comps/back-config.vue b/src/dashboard-front/src/views/resource/setting/comps/back-config.vue index a28394db4..8086c20f4 100644 --- a/src/dashboard-front/src/views/resource/setting/comps/back-config.vue +++ b/src/dashboard-front/src/views/resource/setting/comps/back-config.vue @@ -33,7 +33,7 @@ -- - +