feat: 1.14 开发 (#733)

* 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: 1.14功能开发 * feat: 修复基本信息编辑时,弹框中维护人员不显示的问题;获取全局配置 BK_APP_CODE 动态获取 # Reviewed, transaction id: 10785 * feat: 1.14版本开发 * feat: 优化全局配置相关逻辑;全局配置增加本地开发 mock 接口 # Reviewed, transaction id: 10838 * feat: 1.14版本开发 * feat: 1.14开发 * feat: 1.14功能开发 * feat: 1.14 开发 # Reviewed, transaction id: 11175 --------- Co-authored-by: lhzzforever <zly2576885332@163.com> Co-authored-by: shuzhenyang <shuzhen.yang2@gientech.com> Co-authored-by: 逍遥尊者 <46641918+lhzzforever@users.noreply.github.com> Co-authored-by: wklken <wklken@gmail.com>
TencentBlueKing · Jul 3, 2024 · 2bd7197 · 2bd7197
1 parent 7cbae34
commit 2bd7197
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/src/dashboard-front/src/language/lang.ts b/src/dashboard-front/src/language/lang.ts
@@ -1280,6 +1280,8 @@ const lang: ILANG = {
   '请输入 2-20 字符的字母、数字、连字符(-)、下划线(_)，以字母开头': ['Please enter 2-20 characters of letters, numbers, hyphens(-), and underscores(_), starting with a letter'],
   '确认发布资源?': ['Confirm resource release?'],
   '当前资源版本': ['Current resource version'],
+  '当前生效资源版本': ['The current valid resource version'],
+  '查看日志': ['View logs'],
   '发布人': ['Releaser'],
   '发布资源': ['Release resource'],
   '下架': ['Unpublish'],

diff --git a/src/dashboard-front/src/views/operate-data/access-log/index.vue b/src/dashboard-front/src/views/operate-data/access-log/index.vue
@@ -16,7 +16,7 @@
                   <bk-date-picker
                     ref="datePickerRef"
                     type="datetimerange"
-                    style="width: 300px"
+                    style="width: 250px"
                     v-model="dateTimeRange"
                     :key="dateKey"
                     :placeholder="t('选择日期时间范围')"
@@ -29,15 +29,15 @@
                 </bk-form-item>
                 <bk-form-item :label="t('环境')">
                   <bk-select
-                    style="width: 300px" v-model="searchParams.stage_id" :clearable="false" searchable
+                    style="width: 250px" v-model="searchParams.stage_id" :clearable="false" searchable
                     @change="handleStageChange">
                     <bk-option v-for="option in stageList" :key="option.id" :id="option.id" :name="option.name">
                     </bk-option>
                   </bk-select>
                 </bk-form-item>
                 <bk-form-item :label="t('资源')">
                   <bk-select
-                    style="width: 300px"
+                    style="width: 250px; margin-right: 8px;"
                     class="top-resource-select"
                     :popover-width="180"
                     ext-popover-cls="resource-dropdown-content"
@@ -279,9 +279,9 @@ const isShowChart = computed(() => {
   return chartData.value?.series?.length > 0;
 });
 
-const localLanguage = computed(() => {
-  return 'zh-cn';
-});
+// const localLanguage = computed(() => {
+//   return 'zh-cn';
+// });
 
 const formatterValue = (params: Record<string, any>) => {
   return `${params.value.toLocaleString()}次`;
@@ -754,6 +754,8 @@ onBeforeUnmount(() => {
 
       .ag-form-item-inline {
         margin-top: 0px !important;
+        margin-left: 0px !important;
+        margin-right: 8px;
 
         .bk-form-content {
           display: flex !important;
@@ -766,7 +768,7 @@ onBeforeUnmount(() => {
       }
 
       .top-search-input {
-        width: 586px;
+        width: 400px;
       }
     }
   }

diff --git a/src/dashboard-front/src/views/stage/overview/comps/stage-card-list.vue b/src/dashboard-front/src/views/stage/overview/comps/stage-card-list.vue
@@ -72,17 +72,17 @@
           </div>
         </div>
         <div class="apigw-form-item">
-          <div class="label" :class="locale === 'en' ? 'en' : ''">{{ `${t('当前资源版本')}：` }}</div>
+          <div class="label" :class="locale === 'en' ? 'en' : ''">{{ `${t('当前生效资源版本')}：` }}</div>
           <div class="value">
             <span class="unrelease" v-if="stageData.release.status === 'unreleased'">--</span>
             <span v-else>{{ stageData.resource_version.version || '--' }}</span>
             <template v-if="getStatus(stageData) === 'doing'">
-              <bk-tag theme="info">发布中</bk-tag>,
+              <bk-tag theme="info" class="ml10">{{ stageData.publish_version }} {{ t('发布中') }} </bk-tag>
               <bk-button
                 text
                 theme="primary"
                 @click.stop="showLogs(stageData.publish_id)">
-                查看日志
+                {{ t('查看日志') }}
               </bk-button>
             </template>
           </div>
@@ -344,7 +344,7 @@ onUnmounted(() => {
 
       .label {
         padding-right: 8px;
-        width: 100px;
+        width: 120px;
         text-align: right;
         &.en {
           width: 158px;