feat: 1.14 开发 (#735)

* 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 * feat: 1.14 开发 (#63) * feat: 1.14 开发 # Reviewed, transaction id: 11212 --------- 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> Co-authored-by: shuzhenyang <148324706+shuzhenyang@users.noreply.github.com>
TencentBlueKing · Jul 3, 2024 · dde033c · dde033c
1 parent 2bd7197
commit dde033c
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 22 deletions.
diff --git a/src/dashboard-front/src/components/resource-setting-top-bar.vue b/src/dashboard-front/src/components/resource-setting-top-bar.vue
@@ -2,7 +2,7 @@
   <div class="resource-top-bar" :style="stage.getNotUpdatedStages?.length ? 'top: 42px' : 'top: -1px'">
     <div class="top-title-wrapper">
       <div class="title">{{ t('资源配置') }}</div>
-      <div class="is-latest" v-show="!latest">
+      <div class="is-latest" v-show="!latest && showNewTips">
         {{ t('当前最新资源') }}
       </div>
       <div class="current-resource" v-show="isDetail && currentSource?.name">
@@ -76,6 +76,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  showNewTips: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 // ref

diff --git a/src/dashboard-front/src/components/stage-top-bar.vue b/src/dashboard-front/src/components/stage-top-bar.vue
@@ -135,8 +135,6 @@ const init = async (isUpdate?: Boolean, isDelete?: Boolean) => {
 
     // 获取当前环境的详情数据
     await getStageDetailFun(curStage.value?.id);
-    // 获取当前环境的资源信息
-    await mitt.emit('update-resource', curStage.value);
   } catch (error) {
     console.error(error);
   } finally {

diff --git a/src/dashboard-front/src/language/lang.ts b/src/dashboard-front/src/language/lang.ts
@@ -1355,6 +1355,8 @@ const lang: ILANG = {
   '暂无下载地址': ['No download address available'],
   '当前环境已下架，所有内容的更新均不会生效，如需重新启用，需要重新发布': ['The current environment has been taken down, and all content updates will not take effect. To re-enable, it needs to be re-released'],
   '环境所有配置信息的变更（包含后端服务配置，插件配置，变量配置）将直接影响至线上环境，请谨慎操作': ['Changes in all configuration information of the environment (including backend service configuration, plugin configuration, variable configuration) will directly affect the online environment, please proceed with caution'],
+  '修改环境的配置信息（含后端服务配置、插件配置、变量配置）后，会': ['After modifying the environment configuration information (including back-end service configuration, plug-in configuration, and variable configuration), the system will'],
+  '立即在线上环境生效，请谨慎操作': ['The online environment takes effect immediately. Perform this operation with caution'],
   '已下架': ['Taken down'],
   '删除环境': ['Delete environment'],
   '自定义超时时间': ['Custom timeout'],

diff --git a/src/dashboard-front/src/views/resource/setting/index.vue b/src/dashboard-front/src/views/resource/setting/index.vue
@@ -3,6 +3,7 @@
     :latest="versionConfigs.needNewVersion"
     :current-source="curResource"
     :is-detail="isDetail"
+    :show-new-tips="!!tableData?.length"
   />
   <div
     :class="['resource-container',
@@ -176,12 +177,9 @@
               width="40"
               prop="plugin_count">
               <template #default="{ row }">
-                <bk-button
-                  text
-                  theme="primary"
-                  @click="handleShowInfo(row.id, 'pluginManage')">
+                <div class="plugin-num" @click="handleShowInfo(row.id, 'pluginManage')">
                   {{row?.plugin_count}}
-                </bk-button>
+                </div>
               </template>
             </bk-table-column>
             <bk-table-column
@@ -1598,6 +1596,10 @@ onBeforeMount(() => {
     overflow: hidden;
   }
 }
+.plugin-num {
+  color: #3a84ff;
+  cursor: pointer;
+}
 </style>
 <style lang="scss">
 .content-footer {

diff --git a/src/dashboard-front/src/views/stage/overview/detail-mode/index.vue b/src/dashboard-front/src/views/stage/overview/detail-mode/index.vue
@@ -134,9 +134,14 @@
       </bk-loading>
       <bk-alert
         theme="warning"
-        :title="t('环境所有配置信息的变更（包含后端服务配置，插件配置，变量配置）将直接影响至线上环境，请谨慎操作')"
         class="mt15 mb15"
-      ></bk-alert>
+      >
+        <template #title>
+          <div>
+            {{ t('修改环境的配置信息（含后端服务配置、插件配置、变量配置）后，会') }}<span class="stress">{{ t('立即在线上环境生效，请谨慎操作') }}</span>
+          </div>
+        </template>
+      </bk-alert>
       <div class="tab-wrapper">
         <bk-tab
           v-model:active="active"
@@ -222,7 +227,7 @@ const stageData: any = computed(() => {
     name: '',
     description: '',
     description_en: '',
-    status: 0,
+    status: 1,
     created_time: '',
     release: {
       status: '',
@@ -579,4 +584,7 @@ onMounted(async () => {
     font-size: 16px;
   }
 }
+.stress {
+  color: red;
+}
 </style>
diff --git a/src/dashboard-front/src/views/stage/overview/detail-mode/resource-info.vue b/src/dashboard-front/src/views/stage/overview/detail-mode/resource-info.vue
@@ -161,7 +161,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, ref, watch, onBeforeMount } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { getResourceVersionsInfo, getGatewayLabels, getStageList } from '@/http';
 import { useCommon, useStage } from '@/store';
@@ -171,7 +171,6 @@ import editStageSideslider from '../comps/edit-stage-sideslider.vue';
 import { EditLine } from 'bkui-vue/lib/icon';
 import { copy } from '@/common/util';
 import { useRoute } from 'vue-router';
-import mitt from '@/common/event-bus';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -509,20 +508,15 @@ const init = async () => {
 };
 
 // 切换环境重新获取资源信息
-watch(() => stageStore.curStageId, () => {
-  init();
+watch(() => stageStore.curStageId, (newV, oldV) => {
+  if (oldV !== -1) { // 初始化时onMounted会请求，防止重复
+    init();
+  }
 });
 
 // 切换环境重新执行
 onMounted(() => {
   init();
-  mitt.on('update-resource', (curStage: any) => {
-    getResourceVersionsData(curStage);
-  });
-});
-
-onBeforeMount(() => {
-  mitt.off('update-resource');
 });
 </script>