From 1aac98478c889c2fa35f9a70a42aff6d093e80d3 Mon Sep 17 00:00:00 2001 From: ielgnaw Date: Thu, 23 May 2024 15:04:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E9=80=80=E5=87=BA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=8A=A0=E4=B8=8A=20is=5Ffrom=5Flogout=20=E5=8F=82?= =?UTF-8?q?=E6=95=B0=20(#660)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * 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 参数 --------- Co-authored-by: lhzzforever Co-authored-by: 逍遥尊者 <46641918+lhzzforever@users.noreply.github.com> Co-authored-by: shuzhenyang --- src/dashboard-front/src/common/auth.ts | 1 + src/dashboard-front/src/language/lang.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/dashboard-front/src/common/auth.ts b/src/dashboard-front/src/common/auth.ts index a69d01766..516380ae5 100644 --- a/src/dashboard-front/src/common/auth.ts +++ b/src/dashboard-front/src/common/auth.ts @@ -14,6 +14,7 @@ let checkWindowTimer = -1; const getLoginUrl = (url: string, cUrl: string, size: string) => { const loginUrl = new URL(url); loginUrl.searchParams.append('size', size); + loginUrl.searchParams.append('is_from_logout', '1'); loginUrl.searchParams.append('c_url', cUrl); return loginUrl.href; }; diff --git a/src/dashboard-front/src/language/lang.ts b/src/dashboard-front/src/language/lang.ts index 96aaf39ad..152f93dc4 100644 --- a/src/dashboard-front/src/language/lang.ts +++ b/src/dashboard-front/src/language/lang.ts @@ -12,7 +12,7 @@ const lang: ILANG = { '我的告警': ['My Alarms'], '问题反馈': ['Feedback'], '加入圈子': ['Join Us'], - '退出登录': ['Sign out'], + '退出登录': ['Logout'], '专享': ['Dedicated'], '简介': ['Introduction'], '系统管理': ['Systems'], @@ -1397,7 +1397,7 @@ const lang: ILANG = { '变量列表': ['Variable list'], '（可在资源配置中使用）': ['(Can be used in resource allocation)'], '请输入组件名称': ['Please enter the component name'], - '退出登陆': ['Log out'], + '退出登陆': ['Logout'], '编辑后端服务【{name}】': ['Edit backend service【{name}】'], '各环境的服务配置': ['Service configuration for each environment'], '服务名称': ['Service name'], From db9a2270b31402877993cca457dc5cae2b93a935 Mon Sep 17 00:00:00 2001 From: ielgnaw Date: Mon, 27 May 2024 10:52:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E9=97=AE=E9=A2=98=20(#661)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component-doc/components/searcher/index.vue | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/dashboard-front/src/views/component-doc/components/searcher/index.vue b/src/dashboard-front/src/views/component-doc/components/searcher/index.vue index 6b37f9054..9e0536916 100644 --- a/src/dashboard-front/src/views/component-doc/components/searcher/index.vue +++ b/src/dashboard-front/src/views/component-doc/components/searcher/index.vue @@ -6,8 +6,8 @@