Merge pull request #1072 from hLinx/hotfix_3.5.x

Hotfix 3.5.x
TencentBlueKing · Jun 28, 2022 · f468409 · f468409
2 parents 0335621 + c282f6d
commit f468409
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/frontend/src/main.js b/src/frontend/src/main.js
@@ -63,6 +63,17 @@ window.IPInputScope = '';
  */
 window.routerFlashBack = false;
 
+/**
+ * fix: 兼容业务集功能上线前的任务执行详情 URL
+ *
+ * 老版 URL 格式： /${APP_ID}/execute/step/${TASK_ID}，
+ * 解析 TASK_ID 拼接 api_execute/TASK_ID 跳转
+ */
+const oldExecute = window.location.pathname.match(/^\/\d+\/execute\/step\/(\d+)/);
+if (oldExecute) {
+    window.location.href = `/api_execute/${oldExecute[1]}`;
+}
+
 /**
  * @desc 浏览器框口关闭提醒
  */

diff --git a/src/frontend/src/views/tag-manage/index/index.vue b/src/frontend/src/views/tag-manage/index/index.vue
@@ -162,7 +162,7 @@
                 :resizable="false"
                 key="action"
                 fixed="right"
-                width="200">
+                width="100">
                 <template slot-scope="{ row }">
                     <auth-button
                         theme="primary"
@@ -174,16 +174,17 @@
                         v-test="{ type: 'button', value: 'editTag' }">
                         {{ $t('tag.编辑') }}
                     </auth-button>
-                    <bk-button
+                    <!-- <bk-button
                         class="mr10"
                         theme="primary"
                         :disabled="row.isEditRelateDisabled"
                         text
                         @click="handleEditRelate(row)"
                         v-test="{ type: 'button', value: 'editTagRelate' }">
                         {{ $t('tag.批量流转关联项') }}
-                    </bk-button>
+                    </bk-button> -->
                     <jb-popover-confirm
+                        class="ml10"
                         :title="$t('tag.确认删除该标签？')"
                         :content="$t('tag.关联的作业、脚本，将同时移除本标签')"
                         :confirm-handler="() => handleDelete(row.id)">