Merge pull request #3232 from hLinx/master_local

Master local
TencentBlueKing · Sep 27, 2024 · 2e09c03 · 2e09c03
2 parents 8fde66f + 725eb9f
commit 2e09c03
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/src/frontend/package.json b/src/frontend/package.json
@@ -15,7 +15,7 @@
   "license": "ISC",
   "dependencies": {
     "@blueking/ai-blueking": "0.2.7",
-    "@blueking/ip-selector": "0.3.0-beta.33",
+    "@blueking/ip-selector": "0.3.0-beta.35",
     "@blueking/login-modal": "1.0.5",
     "@blueking/notice-component-vue2": "2.0.0-beta.2",
     "@blueking/paas-login": "0.0.11",

diff --git a/src/frontend/src/App.vue b/src/frontend/src/App.vue
@@ -277,11 +277,11 @@
        * @desc 打开产品文档
        */
       handleLocationDocument() {
-        if (!this.relatedSystemUrls.BK_DOC_CENTER_ROOT_URL) {
+        if (!this.relatedSystemUrls.BK_DOC_JOB_ROOT_URL) {
           this.messageError(I18n.t('网络错误，请刷新页面重试'));
           return;
         }
-        window.open(`${this.relatedSystemUrls.BK_DOC_CENTER_ROOT_URL}/markdown/JOB/UserGuide/Introduction/What-is-Job.md`);
+        window.open(`${this.relatedSystemUrls.BK_DOC_JOB_ROOT_URL}/UserGuide/Introduction/What-is-Job.md`);
       },
       /**
        * @desc 打开问题反馈

diff --git a/src/frontend/src/common/fully-import.js b/src/frontend/src/common/fully-import.js
@@ -112,12 +112,18 @@ const IpSelector = createIpSelector({
   functionalDependency: { // 功能依赖展示
     container: {
       title: i18n.t('暂未开启“容器执行”功能'),
-      functionDesc: i18n.t('功能开启后，即可以基于配置平台的业务容器拓扑，对容器管理平台纳管的容器实例进行脚本指令执行和文件分发'),
+      functionalDesc: i18n.t('功能开启后，即可以基于配置平台的业务容器拓扑，对容器管理平台纳管的容器实例进行脚本指令执行和文件分发'),
       guideTitle: i18n.t('如需使用该功能，须具备以下条件：'),
       guideDescList: [
         i18n.t('1_部署容器管理平台（BCS）并开启容器拓扑同步至配置平台（CC）'),
         i18n.t('2_联系作业平台管理员打开容器执行功能'),
       ],
+      gotoMore: () => {
+        QueryGlobalSettingService.fetchRelatedSystemUrls()
+          .then((data) => {
+            window.open(`${data.BK_DOC_JOB_ROOT_URL}/UserGuide/Features/container-execute.md`);
+          });
+      },
     },
   },
 });

diff --git a/src/frontend/src/components/jb-router-view/guide/script-list.vue b/src/frontend/src/components/jb-router-view/guide/script-list.vue
@@ -78,7 +78,7 @@
         <div>
           <span>{{ $t('脚本的版本管理功能有哪些？点击') }} </span>
           <a
-            :href="`${relatedSystemUrls.BK_DOC_CENTER_ROOT_URL}/markdown/JOB/UserGuide/Features/Scripts.md`"
+            :href="`${relatedSystemUrls.BK_DOC_JOB_ROOT_URL}/UserGuide/Features/Scripts.md`"
             target="_blank">
             <span>{{ $t('脚本功能介绍') }}</span>
             <icon type="link" />
@@ -88,7 +88,7 @@
         <div style="margin-top: 10px;">
           <span>{{ $t('想要 “禁用” 脚本使其他调用方无法使用怎么做？') }}</span>
           <a
-            :href="`${relatedSystemUrls.BK_DOC_CENTER_ROOT_URL}/markdown/JOB/UserGuide/Best-Practices/How-to-stop-the-spread-of-the-problem-script-immediately.md`"
+            :href="`${relatedSystemUrls.BK_DOC_JOB_ROOT_URL}/UserGuide/Best-Practices/How-to-stop-the-spread-of-the-problem-script-immediately.md`"
             target="_blank">
             <span>{{ $t('立即查看') }}</span>
             <icon type="link" />
@@ -105,7 +105,7 @@
     data() {
       return {
         relatedSystemUrls: {
-          BK_DOC_CENTER_ROOT_URL: '/',
+          BK_DOC_JOB_ROOT_URL: '/',
         },
       };
     },

diff --git a/src/frontend/src/components/jb-router-view/guide/task-list.vue b/src/frontend/src/components/jb-router-view/guide/task-list.vue
@@ -88,7 +88,7 @@
       <div class="page-link">
         <span>{{ $t('了解更多关于作业模板和执行方案的功能细节，请点击查阅') }}</span>
         <a
-          :href="`${relatedSystemUrls.BK_DOC_CENTER_ROOT_URL}/markdown/JOB/UserGuide/Features/Jobs.md`"
+          :href="`${relatedSystemUrls.BK_DOC_JOB_ROOT_URL}/UserGuide/Features/Jobs.md`"
           target="_blank">
           <span>{{ $t('产品文档') }}</span>
           <icon type="link" />
@@ -104,7 +104,7 @@
     data() {
       return {
         relatedSystemUrls: {
-          BK_DOC_CENTER_ROOT_URL: '/',
+          BK_DOC_JOB_ROOT_URL: '/',
         },
       };
     },

diff --git a/src/frontend/src/views/business-permission.vue b/src/frontend/src/views/business-permission.vue
@@ -112,7 +112,7 @@
           <span>{{ $t('第一次使用作业平台？点击查阅') }}  </span>
           <!-- eslint-disable-next-line  max-len -->
           <a
-            :href="`${relatedSystemUrls.BK_DOC_CENTER_ROOT_URL}/markdown/JOB/UserGuide/Quick-Starts/1.Create-system-account.md`"
+            :href="`${relatedSystemUrls.BK_DOC_JOB_ROOT_URL}/UserGuide/Quick-Starts/1.Create-system-account.md`"
             target="_blank">
             <span>{{ $t('快速入门技巧') }}</span>
             <icon type="link" />
@@ -121,7 +121,7 @@
         <div style="margin-top: 10px;">
           <span>{{ $t('了解更多关于作业平台产品的功能介绍，点击前往') }}</span>
           <a
-            :href="`${relatedSystemUrls.BK_DOC_JOB_ROOT_URL}/markdown/JOB/UserGuide/Introduction/What-is-Job.md`"
+            :href="`${relatedSystemUrls.BK_DOC_JOB_ROOT_URL}/UserGuide/Introduction/What-is-Job.md`"
             target="_blank">
             <span>{{ $t('产品文档') }}</span>
             <icon type="link" />
@@ -143,7 +143,6 @@
         relatedSystemUrls: {
           BK_CMDB_ROOT_URL: '',
           BK_DOC_JOB_ROOT_URL: '',
-          BK_DOC_CENTER_ROOT_URL: '/',
         },
       };
     },