From f4da4540a3b4eb8f95bf8052309ea4fc125d9727 Mon Sep 17 00:00:00 2001
From: ielgnaw <wuji0223@126.com>
Date: Thu, 28 Mar 2024 19:18:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#564)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 【APIgateway1.13 】复制分享链接使用分享链接地址后内容为空

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

* 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: 修复前端问题

---------

Co-authored-by: lhzzforever <zly2576885332@163.com>
Co-authored-by: shuzhenyang <shuzhen.yang2@gientech.com>
Co-authored-by: 逍遥尊者 <46641918+lhzzforever@users.noreply.github.com>
---
 src/dashboard-front/package.json              |  2 +-
 src/dashboard-front/src/common/menu.ts        |  2 +-
 .../components/resource-setting-top-bar.vue   |  6 ++++
 src/dashboard-front/src/language/lang.ts      |  2 +-
 src/dashboard-front/src/router/index.ts       |  2 +-
 .../views/components/plugin-manage/index.vue  | 21 ++++++++---
 .../components/plugin-manage/plugin-info.vue  | 21 ++++++++---
 src/dashboard-front/src/views/main.vue        |  4 +++
 .../src/views/operate-records/index.vue       | 36 +++++++++++--------
 .../resource/setting/comps/base-info.vue      | 19 ++++++----
 src/dashboard-front/yarn.lock                 |  8 ++---
 11 files changed, 84 insertions(+), 39 deletions(-)

diff --git a/src/dashboard-front/package.json b/src/dashboard-front/package.json
index b03fcce24..0864f181c 100644
--- a/src/dashboard-front/package.json
+++ b/src/dashboard-front/package.json
@@ -25,7 +25,7 @@
     "@blueking/bkui-form": "1.0.0-beta.5",
     "@blueking/notice-component": "^2.0.2",
     "art-template": "^4.13.2",
-    "bkui-vue": "1.0.3-beta.11",
+    "bkui-vue": "1.0.3-beta.20",
     "connect-history-api-fallback": "^2.0.0",
     "cookie": "^0.5.0",
     "cookie-parser": "^1.4.5",
diff --git a/src/dashboard-front/src/common/menu.ts b/src/dashboard-front/src/common/menu.ts
index c2a45d300..5c8d8404e 100644
--- a/src/dashboard-front/src/common/menu.ts
+++ b/src/dashboard-front/src/common/menu.ts
@@ -99,7 +99,7 @@ export const createMenuData = (): IMenu[] => {
         },
         {
           name: 'apigwMonitorAlarmHistory',
-          title: t('告警历史'),
+          title: t('告警记录'),
           enabled: true,
         },
       ],
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 5f46065ba..ebfd37ad0 100644
--- a/src/dashboard-front/src/components/resource-setting-top-bar.vue
+++ b/src/dashboard-front/src/components/resource-setting-top-bar.vue
@@ -162,6 +162,12 @@ const handleCreateResourceVersion = async () => {
       padding: 0 12px;
       i {
         font-size: 16px;
+        margin-right: 4px;
+      }
+      &.bk-button.is-disabled {
+        color: #dcdee5;
+        cursor: not-allowed;
+        border-color: #dcdee5;
       }
       &.bk-button.is-disabled {
         color: #dcdee5;
diff --git a/src/dashboard-front/src/language/lang.ts b/src/dashboard-front/src/language/lang.ts
index 2bbe8ed58..437b8496e 100644
--- a/src/dashboard-front/src/language/lang.ts
+++ b/src/dashboard-front/src/language/lang.ts
@@ -36,7 +36,7 @@ const lang: ILANG = {
   '统计报表': ['Statistics'],
   '监控告警': ['Monitoring'],
   '告警策略': ['Alarm Strategy'],
-  '告警历史': ['Alarm Histories'],
+  '告警记录': ['Alarm Records'],
   '在线调试': ['API Test'],
   '资源SDK': ['SDKs'],
   '操作审计': ['Audits'],
diff --git a/src/dashboard-front/src/router/index.ts b/src/dashboard-front/src/router/index.ts
index 6c3974df1..7b3c17cef 100644
--- a/src/dashboard-front/src/router/index.ts
+++ b/src/dashboard-front/src/router/index.ts
@@ -274,7 +274,7 @@ const routes: RouteRecordRaw[] = [
         name: 'apigwMonitorAlarmHistory',
         component: ApigwMonitorAlarmHistory,
         meta: {
-          title: t('告警历史'),
+          title: t('告警记录'),
           matchRoute: 'apigwMonitorAlarmHistory',
           topMenu: 'home',
         },
diff --git a/src/dashboard-front/src/views/components/plugin-manage/index.vue b/src/dashboard-front/src/views/components/plugin-manage/index.vue
index bdb3ef715..fb085324d 100644
--- a/src/dashboard-front/src/views/components/plugin-manage/index.vue
+++ b/src/dashboard-front/src/views/components/plugin-manage/index.vue
@@ -172,9 +172,9 @@
         </div>
       </template>
       <template #footer v-if="state.curStep === 1">
-        <div class="slider-footer pl20">
+        <div class="slider-footer">
           <div class="fist-step">
-            <bk-button theme="primary" @click="handelNext" width="50px" :disabled="!curChoosePlugin">
+            <bk-button theme="primary" @click="handelNext" :disabled="!curChoosePlugin">
               {{ t('下一步') }}
             </bk-button>
             <bk-button @click="handleCancel">{{ t('取消') }}</bk-button>
@@ -776,15 +776,26 @@ init();
 .plugin-add-slider {
   :deep(.bk-modal-content) {
     // height: calc(100vh - 106px) !important;
-    height: calc(100% - 126px) !important;
+    // height: calc(100% - 126px) !important;
     overflow-y: auto;
   }
-
+  :deep(.bk-sideslider-footer) {
+    height: 48px !important;
+  }
   .slider-footer {
     display: flex;
+    padding: 0 24px;
+    height: 32px;
 
     .fist-step {
-      margin-right: 12px;
+      font-size: 0;
+      line-height: 48px;
+      .bk-button {
+        min-width: 88px;
+        &:not(&:first-child) {
+          margin-left: 8px;
+        }
+      }
     }
   }
 }
diff --git a/src/dashboard-front/src/views/components/plugin-manage/plugin-info.vue b/src/dashboard-front/src/views/components/plugin-manage/plugin-info.vue
index 8d87e61f7..d7bb44df3 100644
--- a/src/dashboard-front/src/views/components/plugin-manage/plugin-info.vue
+++ b/src/dashboard-front/src/views/components/plugin-manage/plugin-info.vue
@@ -69,11 +69,11 @@
           @confirm="handleAdd"
           v-if="isStage"
         >
-          <bk-button theme="primary">{{ t('确定') }}</bk-button>
+          <bk-button theme="primary" class="default-btn">{{ t('确定') }}</bk-button>
         </bk-pop-confirm>
-        <bk-button v-else @click="handleAdd" theme="primary">{{ t('确定') }}</bk-button>
-        <bk-button @click="handlePre" class="ml5" v-if="isAdd">{{ t('上一步') }}</bk-button>
-        <bk-button @click="handleCancel" class="ml5">{{ t('取消') }}</bk-button>
+        <bk-button v-else @click="handleAdd" theme="primary" class="default-btn">{{ t('确定') }}</bk-button>
+        <bk-button @click="handlePre" class="prev-btn ml8" v-if="isAdd">{{ t('上一步') }}</bk-button>
+        <bk-button @click="handleCancel" class="default-btn ml8">{{ t('取消') }}</bk-button>
       </div>
     </div>
   </div>
@@ -491,4 +491,17 @@ init();
     background: #3a84ff;
   }
 }
+
+.last-step {
+  font-size: 0;
+  .default-btn {
+    min-width: 88px;
+  }
+  .prev-btn {
+    min-width: 74px;
+  }
+  .ml8 {
+    margin-left: 8px;
+  }
+}
 </style>
diff --git a/src/dashboard-front/src/views/main.vue b/src/dashboard-front/src/views/main.vue
index 43379830e..714c06d4c 100644
--- a/src/dashboard-front/src/views/main.vue
+++ b/src/dashboard-front/src/views/main.vue
@@ -303,6 +303,10 @@ const handleBack = () => {
     .submenu-header-content{
       color: rgb(99, 101, 110);
     }
+    .submenu-header-collapse {
+      width: 20px;
+      font-size: 20px;
+    }
     .bk-menu-submenu.is-opened {
       background: #fff !important;
     }
diff --git a/src/dashboard-front/src/views/operate-records/index.vue b/src/dashboard-front/src/views/operate-records/index.vue
index c575779e0..da6292359 100644
--- a/src/dashboard-front/src/views/operate-records/index.vue
+++ b/src/dashboard-front/src/views/operate-records/index.vue
@@ -22,6 +22,7 @@
         </bk-form-item>
         <bk-form-item class="ag-form-item-search">
           <bk-search-select
+            style="width: 100%"
             v-model="searchValue"
             unique-select
             class="operate-records-search"
@@ -469,7 +470,7 @@ watch(
     :deep(.search-form) {
       width: 100% !important;
       max-width: 100% !important;
-      display: inline-block;
+      display: flex;
 
       .bk-form-item {
         display: inline-flex;
@@ -485,6 +486,7 @@ watch(
           width: auto !important;
           line-height: 32px;
           display: inline-block;
+          min-width: 75px;
           padding: 0 15px 0 0;
 
           span {
@@ -512,10 +514,21 @@ watch(
         }
       }
 
-      .top-search-input {
-        width: 600px;
+      .ag-form-item-datepicker {
+        .bk-form-content {
+          max-width: 320px;
+        }
       }
 
+      .ag-form-item-search {
+        width: calc(100% - 320px);
+        .bk-form-content {
+          width: 100%;
+          .operate-records-search {
+            background: #ffffff;
+          }
+        }
+      }
     }
   }
 
@@ -535,13 +548,6 @@ watch(
     }
   }
 
-  .ag-form-item-search {
-    .operate-records-search {
-      width: calc(100vh - 20px);
-      background: #ffffff;
-    }
-  }
-
   .ag-dot {
     width: 8px;
     height: 8px;
@@ -605,11 +611,11 @@ watch(
       margin-top: 10px;
     }
 
-    .ag-form-item-search {
-      .operate-records-search {
-        width: calc(100vh - 144px);
-      }
-    }
+    // .ag-form-item-search {
+    //   .operate-records-search {
+    //     width: calc(100vh - 144px);
+    //   }
+    // }
   }
 }
 </style>
diff --git a/src/dashboard-front/src/views/resource/setting/comps/base-info.vue b/src/dashboard-front/src/views/resource/setting/comps/base-info.vue
index 5dfb70c62..681d6bcd3 100644
--- a/src/dashboard-front/src/views/resource/setting/comps/base-info.vue
+++ b/src/dashboard-front/src/views/resource/setting/comps/base-info.vue
@@ -3,16 +3,21 @@
   <bk-form ref="formRef" :model="formData" :rules="rules" class="resource-baseinfo">
     <bk-form-item
       :label="t('名称')"
-      :description="t('由小写字母、数字、连接符（-）组成，首字符必须是字母，长度大于3小于30个字符')"
       property="name"
       required
     >
-      <bk-input
-        v-model="formData.name"
-        :placeholder="t('请输入名称')"
-        class="name"
-        clearable
-      />
+      <bk-popover
+        placement="top-start"
+        trigger="click"
+        theme="light"
+        :content="t('由小写字母、数字、连接符（-）组成，首字符必须是字母，长度大于3小于30个字符')">
+        <bk-input
+          v-model="formData.name"
+          :placeholder="t('请输入')"
+          class="name"
+          clearable
+        />
+      </bk-popover>
     </bk-form-item>
     <bk-form-item
       :label="t('描述')"
diff --git a/src/dashboard-front/yarn.lock b/src/dashboard-front/yarn.lock
index 3582e0ebc..c1bb7cbb2 100644
--- a/src/dashboard-front/yarn.lock
+++ b/src/dashboard-front/yarn.lock
@@ -2677,10 +2677,10 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bkui-vue@1.0.3-beta.11:
-  version "1.0.3-beta.11"
-  resolved "https://registry.yarnpkg.com/bkui-vue/-/bkui-vue-1.0.3-beta.11.tgz#418eb02e31b0622a803208d74e9f1074ff18760d"
-  integrity sha512-6PJEXTKWqO2H4fDzvTO9mLk2OSRcaipprqMFWBh/B1abU0kAdL1sYkXVxx7pL/C9OiRJrq1CDnnNwuJ7CSNzEQ==
+bkui-vue@1.0.3-beta.20:
+  version "1.0.3-beta.20"
+  resolved "https://registry.yarnpkg.com/bkui-vue/-/bkui-vue-1.0.3-beta.20.tgz#15e0536c8c239f8e1548145e760e9df80fd39063"
+  integrity sha512-Jh8jURxtkyq3IHVPLgsZgM/4AgIIhavci+XqsxEiKfur5ZM2P2SMzBaNAOuDSjwhMJ0Fy3Ko4nspp/XvhTjUzw==
   dependencies:
     "@floating-ui/dom" "~1.5.0"
     "@popperjs/core" "~2.11.8"