From 40d44ab3ffbbb03f7f813b787b71c08922fc0ee2 Mon Sep 17 00:00:00 2001
From: v_yfqnyang <v_yfqnyang@tencent.com>
Date: Thu, 19 Sep 2024 07:42:50 +0000
Subject: [PATCH 1/8] =?UTF-8?q?--story=3D119762027=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=87=87=E9=9B=86=E5=88=97=E8=A1=A8=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=20(merge=20request=20!2032)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Squash merge branch 'feat/log-collection-table-tips-delete' into 'master'
--story=119762027 删除日志采集列表提示

TAPD: --story=119762027
---
 .../tools/log-collector/log-collector.vue         | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/bcs-ui/frontend/src/views/plugin-manage/tools/log-collector/log-collector.vue b/bcs-ui/frontend/src/views/plugin-manage/tools/log-collector/log-collector.vue
index 2c4776a6ad..a6421fcc43 100644
--- a/bcs-ui/frontend/src/views/plugin-manage/tools/log-collector/log-collector.vue
+++ b/bcs-ui/frontend/src/views/plugin-manage/tools/log-collector/log-collector.vue
@@ -174,21 +174,6 @@
           @click="confirmUpdate">{{ $t('logCollector.action.reInstall') }}</bcs-button>
       </bcs-exception>
       <template v-else>
-        <bcs-alert type="info" closable>
-          <template #title>
-            <div class="flex items-center">
-              <span class="flex-1">
-                {{ $t('logCollector.msg.logCollector') }}
-              </span>
-              <span
-                text
-                class="text-[12px] text-[#3a84ff] cursor-pointer"
-                @click="openLink(PROJECT_CONFIG.rule)">
-                {{ $t('generic.button.learnMore') }}
-              </span>
-            </div>
-          </template>
-        </bcs-alert>
         <Row class="mt-[16px] px-[24px]">
           <template #left>
             <bcs-button

From e6a6bdfec41db55472e96235dcba00c6834e0406 Mon Sep 17 00:00:00 2001
From: v_yfqnyang <v_yfqnyang@tencent.com>
Date: Thu, 19 Sep 2024 07:44:04 +0000
Subject: [PATCH 2/8] =?UTF-8?q?--story=3D115284411=20=E3=80=90=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=88=97=E8=A1=A8=E3=80=91=E6=9A=82=E6=97=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84=E6=8F=90=E7=A4=BA=E5=BA=94=E8=AF=A5=E5=9C=A8?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=BA=E5=B1=85=E4=B8=AD=EF=BC=9F=E7=9B=AE?=
 =?UTF-8?q?=E5=89=8D=E7=9C=8B=E6=9D=A5=E6=98=AF=E8=A7=86=E4=BD=9C=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=8C=BA=E7=9A=84=E4=B8=80=E9=83=A8=E5=88=86=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E7=9A=84=E5=B1=85=E4=B8=AD=EF=BC=9F=20(merge=20reques?=
 =?UTF-8?q?t=20!2030)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Squash merge branch 'feat/table-slot-empty' into 'master'
--story=115284411 【节点列表】暂无数据的提示应该在可视区居中？目前看来是视作内容区的一部分进行的居中？

TAPD: --story=115284411
---
 .../src/components/empty-table-status.vue     | 23 ++++++++++++++++++-
 bcs-ui/frontend/src/css/app.css               |  5 ++++
 .../views/cluster-manage/node-list/node.vue   |  6 +++--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/bcs-ui/frontend/src/components/empty-table-status.vue b/bcs-ui/frontend/src/components/empty-table-status.vue
index 58d38e9eb3..58fbe9dfe8 100644
--- a/bcs-ui/frontend/src/components/empty-table-status.vue
+++ b/bcs-ui/frontend/src/components/empty-table-status.vue
@@ -15,7 +15,7 @@
   </bcs-exception>
 </template>
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import { defineComponent, onMounted, ref } from 'vue';
 
 import $i18n from '@/i18n/i18n-setup';
 
@@ -40,6 +40,27 @@ export default defineComponent({
       ctx.emit('clear');
     };
 
+    onMounted(() => {
+      const tableHeaderWrapperEl: HTMLDivElement | null = document.querySelector('.empty-center .bk-table-header-wrapper');
+      let resizeObserver;
+      if (tableHeaderWrapperEl) {
+        // 监听table的宽度变化
+        resizeObserver = new ResizeObserver(() => {
+          document.documentElement.style.setProperty('--dynamic-width', `${tableHeaderWrapperEl.offsetWidth}px`);
+        });
+        if (tableHeaderWrapperEl) {
+          resizeObserver.observe(tableHeaderWrapperEl);
+        }
+      }
+
+      // 清理观察器
+      return () => {
+        if (tableHeaderWrapperEl) {
+          resizeObserver.unobserve(tableHeaderWrapperEl);
+        }
+      };
+    });
+
     return {
       typeMap,
       handleClear,
diff --git a/bcs-ui/frontend/src/css/app.css b/bcs-ui/frontend/src/css/app.css
index 11e04b5d36..619bdb1990 100644
--- a/bcs-ui/frontend/src/css/app.css
+++ b/bcs-ui/frontend/src/css/app.css
@@ -2550,4 +2550,9 @@ div.jsoneditor {
 }
 .mw88 {
     min-width: 88px;
+}
+.bcs-table-empty-dynamic-width {
+    width: var(--dynamic-width) !important;
+    position: sticky;
+    left: 0;
 }
\ No newline at end of file
diff --git a/bcs-ui/frontend/src/views/cluster-manage/node-list/node.vue b/bcs-ui/frontend/src/views/cluster-manage/node-list/node.vue
index da0303f087..d0fdc7052f 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/node-list/node.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/node-list/node.vue
@@ -223,6 +223,8 @@
         :size="tableSetting.size"
         :data="curPageData"
         ref="tableRef"
+        ext-cls="empty-center"
+        empty-block-class-name="bcs-table-empty-dynamic-width"
         :key="tableKey"
         :pagination="pagination"
         :row-key="(row) => row.nodeName"
@@ -1914,9 +1916,9 @@ export default defineComponent({
         clusterId: localClusterId.value,
         nodes,
       }).catch(() => {});
-      for (const key in result) {
+      Object.keys(result).forEach((key) => {
         set(nodeMetric.value, key, formatMetricData(result[key]));
-      }
+      });
     };
     watch(curPageData, async () => {
       await handleGetNodeOverview();

From 469d153903baa091327be243f73f5af9ac8c4d8a Mon Sep 17 00:00:00 2001
From: v_yfqnyang <v_yfqnyang@tencent.com>
Date: Thu, 19 Sep 2024 07:51:10 +0000
Subject: [PATCH 3/8] =?UTF-8?q?--story=3D119110055=20=E9=9B=86=E7=BE=A4?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E6=94=AF=E6=8C=81=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=20(merge=20request=20!2026)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Squash merge branch 'feat/record-search-task-id-null' into 'master'
--story=119110055 集群操作记录支持搜索

TAPD: --story=119110055
---
 .../frontend/src/views/cluster-manage/detail/cluster-record.vue  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bcs-ui/frontend/src/views/cluster-manage/detail/cluster-record.vue b/bcs-ui/frontend/src/views/cluster-manage/detail/cluster-record.vue
index 6829bb3a4b..e8594051a0 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/detail/cluster-record.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/detail/cluster-record.vue
@@ -237,6 +237,7 @@ async function getOperationLogs() {
     limit: pagination.value.limit,
     page: pagination.value.current,
     v2: true,
+    taskIDNull: true,
     ...searchParams.value,
   }).catch(() => []);
   isLoading.value = false;

From ef6d1bd0153063b2faa9d29320e81cc34306fba9 Mon Sep 17 00:00:00 2001
From: yovafeng <yovafeng@tencent.com>
Date: Fri, 20 Sep 2024 08:47:14 +0000
Subject: [PATCH 4/8] =?UTF-8?q?--story=3D1070014198119023225=20=E3=80=90Gi?=
 =?UTF-8?q?tops=E3=80=91=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E7=A6=81=E6=AD=A2=E5=90=8C=E6=AD=A5=20(merge=20reques?=
 =?UTF-8?q?t=20!2027)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Squash merge branch 'feat_forbidden_sync' into 'master'
--story=1070014198119023225 【Gitops】增加对应用的禁止同步
---
 .../gitgenerator-webhook/webhook/webhook.go   | 104 +++++++++++++-----
 .../bcs-gitops-manager/pkg/common/const.go    |   3 +
 .../pkg/proxy/argocd/application.go           |  76 ++++++++++---
 .../bcs-gitops-manager/pkg/store/argocd.go    |  49 ++++++++-
 .../bcs-gitops-manager/pkg/store/store.go     |   2 +-
 .../cmd/api-server/service/config_import.go   |   2 +
 6 files changed, 184 insertions(+), 52 deletions(-)

diff --git a/bcs-scenarios/bcs-gitops-manager/cmd/gitgenerator-webhook/webhook/webhook.go b/bcs-scenarios/bcs-gitops-manager/cmd/gitgenerator-webhook/webhook/webhook.go
index b48acfac06..c488816902 100644
--- a/bcs-scenarios/bcs-gitops-manager/cmd/gitgenerator-webhook/webhook/webhook.go
+++ b/bcs-scenarios/bcs-gitops-manager/cmd/gitgenerator-webhook/webhook/webhook.go
@@ -37,6 +37,7 @@ import (
 
 	"github.com/Tencent/bk-bcs/bcs-scenarios/bcs-gitops-manager/cmd/gitgenerator-webhook/options"
 	"github.com/Tencent/bk-bcs/bcs-scenarios/bcs-gitops-manager/internal/dao"
+	"github.com/Tencent/bk-bcs/bcs-scenarios/bcs-gitops-manager/pkg/common"
 	"github.com/Tencent/bk-bcs/bcs-scenarios/bcs-gitops-manager/pkg/store"
 )
 
@@ -160,6 +161,12 @@ func (s *AdmissionWebhookServer) check(ctx *gin.Context) {
 			return
 		}
 	case v1.Update:
+		if err := s.interceptAppSyncWithForbid(ctx, req); err != nil {
+			blog.Errorf("UID: %s, intercept application sync with forbidden flag failed: %s",
+				req.UID, err.Error())
+			s.webhookAllow(ctx, false, req.UID, err.Error())
+			return
+		}
 		if err := s.interceptApplicationSync(ctx, req); err != nil {
 			blog.Errorf("UID: %s, intercept application sync failed: %s", req.UID, err.Error())
 			s.webhookAllow(ctx, false, req.UID, err.Error())
@@ -207,31 +214,8 @@ func (s *AdmissionWebhookServer) checkApplication(ctx context.Context, bs []byte
 	if argoProj == nil {
 		return errors.Errorf("project '%s' not exist", proj)
 	}
-
-	// check app whether belong to appset
-	var repoBelong bool
-	var repoProj string
-	if app.Spec.HasMultipleSources() {
-		for i := range app.Spec.Sources {
-			appSource := app.Spec.Sources[i]
-			repoUrl := appSource.RepoURL
-			repoProj, repoBelong, err = s.checkRepositoryBelongProject(ctx, repoUrl, proj)
-			if err != nil {
-				return errors.Wrapf(err, "check repo '%s' belong to project '%s' failed", repoUrl, repoProj)
-			}
-			if !repoBelong {
-				return errors.Errorf("repo '%s' project is '%s', not same as '%s'", repoUrl, repoProj, proj)
-			}
-		}
-	} else {
-		repoUrl := app.Spec.Source.RepoURL
-		repoProj, repoBelong, err = s.checkRepositoryBelongProject(ctx, repoUrl, proj)
-		if err != nil {
-			return errors.Wrapf(err, "check repo '%s' belong to project '%s' failed", repoUrl, repoProj)
-		}
-		if !repoBelong {
-			return errors.Errorf("repo '%s' project is '%s', not same as '%s'", repoUrl, repoProj, proj)
-		}
+	if err = s.checkAppRepoBelongProject(ctx, proj, app); err != nil {
+		return err
 	}
 
 	// check dest server is legal
@@ -266,6 +250,32 @@ func (s *AdmissionWebhookServer) checkApplication(ctx context.Context, bs []byte
 	return nil
 }
 
+func (s *AdmissionWebhookServer) checkAppRepoBelongProject(ctx context.Context, proj string,
+	app *v1alpha1.Application) error {
+	if !app.Spec.HasMultipleSources() {
+		repoUrl := app.Spec.Source.RepoURL
+		repoProj, repoBelong, err := s.checkRepositoryBelongProject(ctx, repoUrl, proj)
+		if err != nil {
+			return errors.Wrapf(err, "check repo '%s' belong to project '%s' failed", repoUrl, repoProj)
+		}
+		if !repoBelong {
+			return errors.Errorf("repo '%s' project is '%s', not same as '%s'", repoUrl, repoProj, proj)
+		}
+	}
+	for i := range app.Spec.Sources {
+		appSource := app.Spec.Sources[i]
+		repoUrl := appSource.RepoURL
+		repoProj, repoBelong, err := s.checkRepositoryBelongProject(ctx, repoUrl, proj)
+		if err != nil {
+			return errors.Wrapf(err, "check repo '%s' belong to project '%s' failed", repoUrl, repoProj)
+		}
+		if !repoBelong {
+			return errors.Errorf("repo '%s' project is '%s', not same as '%s'", repoUrl, repoProj, proj)
+		}
+	}
+	return nil
+}
+
 func (s *AdmissionWebhookServer) checkRepositoryBelongProject(ctx context.Context, repoUrl,
 	project string) (string, bool, error) {
 	repo, err := s.argoStore.GetRepository(ctx, repoUrl)
@@ -282,10 +292,18 @@ func (s *AdmissionWebhookServer) checkRepositoryBelongProject(ctx context.Contex
 	return repo.Project, belong, nil
 }
 
-func (s *AdmissionWebhookServer) needInterceptAppSync(req *v1.AdmissionRequest) *v1alpha1.Application {
+func (s *AdmissionWebhookServer) unmarshalAppFromReq(req *v1.AdmissionRequest) (*v1alpha1.Application, error) {
 	app := new(v1alpha1.Application)
 	if err := json.Unmarshal(req.Object.Raw, app); err != nil {
-		blog.Errorf("unmarshal application failed: %s", err.Error())
+		return nil, errors.Wrap(err, "unmarshal application failed")
+	}
+	return app, nil
+}
+
+func (s *AdmissionWebhookServer) needInterceptAppSync(req *v1.AdmissionRequest) *v1alpha1.Application {
+	app, err := s.unmarshalAppFromReq(req)
+	if err != nil {
+		blog.Errorf("not need intercept because unmarshal app error")
 		return nil
 	}
 	if len(s.cfg.InterceptSyncProjects) == 0 {
@@ -331,6 +349,38 @@ func (s *AdmissionWebhookServer) checkApplicationBelongAppSet(ctx context.Contex
 	return appSet
 }
 
+func (s *AdmissionWebhookServer) interceptAppSyncWithForbid(ctx context.Context,
+	req *v1.AdmissionRequest) error {
+	// 如果设置了禁止同步标记，就直接拒绝同步
+	reqApp, err := s.unmarshalAppFromReq(req)
+	if err != nil {
+		blog.Errorf("not need intercept with forbidden flag because unmarshal application request error")
+		return nil
+	}
+	state := reqApp.Status.OperationState
+	if state == nil || state.Phase != synccommon.OperationRunning {
+		return nil
+	}
+	app, err := s.argoStore.GetApplication(ctx, req.Name)
+	if err != nil {
+		blog.Errorf("not need intercept with forbidden flag because get application error")
+		return nil
+	}
+	// 如果要更新common.ApplicationSyncForbidden就不拒绝
+	if _, reqExistForbidden := reqApp.Annotations[common.ApplicationSyncForbidden]; !reqExistForbidden {
+		return nil
+	}
+	_, existForbidden := app.Annotations[common.ApplicationSyncForbidden]
+	if existForbidden {
+		return errors.Errorf(
+			`reject the app_sync, because current application.metadata.annotations has %s,
+			 req annotations is '%v'`,
+			common.ApplicationSyncForbidden, reqApp.Annotations)
+	}
+	return nil
+}
+
+// interceptApplicationSync 用于处理appset中使用动态targetrevision引起产生两次同步的缺陷
 func (s *AdmissionWebhookServer) interceptApplicationSync(ctx context.Context, req *v1.AdmissionRequest) error {
 	app := s.needInterceptAppSync(req)
 	if app == nil {
diff --git a/bcs-scenarios/bcs-gitops-manager/pkg/common/const.go b/bcs-scenarios/bcs-gitops-manager/pkg/common/const.go
index cf5a09860c..0e187f78ff 100644
--- a/bcs-scenarios/bcs-gitops-manager/pkg/common/const.go
+++ b/bcs-scenarios/bcs-gitops-manager/pkg/common/const.go
@@ -58,6 +58,9 @@ const (
 	// ApplicationCollectAnnotation defines the application whether collected
 	ApplicationCollectAnnotation = "bkbcs.tencent.com/application_collect"
 
+	// ApplicationSyncForbidden if this annotation exists, then the app should be disabled from synchronizing
+	ApplicationSyncForbidden = "bkbcs.tencent.com/application_sync_forbidden"
+
 	// ClusterAliaName defines the alia's name for project
 	ClusterAliaName = "bkbcs.tencent.com/clusterAliaName"
 	// ClusterEnv defines the cluster env
diff --git a/bcs-scenarios/bcs-gitops-manager/pkg/proxy/argocd/application.go b/bcs-scenarios/bcs-gitops-manager/pkg/proxy/argocd/application.go
index b477e5774a..a3413abbf1 100644
--- a/bcs-scenarios/bcs-gitops-manager/pkg/proxy/argocd/application.go
+++ b/bcs-scenarios/bcs-gitops-manager/pkg/proxy/argocd/application.go
@@ -37,6 +37,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/Tencent/bk-bcs/bcs-scenarios/bcs-gitops-manager/internal/dao"
+	"github.com/Tencent/bk-bcs/bcs-scenarios/bcs-gitops-manager/pkg/common"
 	mw "github.com/Tencent/bk-bcs/bcs-scenarios/bcs-gitops-manager/pkg/proxy/argocd/middleware"
 	"github.com/Tencent/bk-bcs/bcs-scenarios/bcs-gitops-manager/pkg/proxy/argocd/middleware/ctxutils"
 	"github.com/Tencent/bk-bcs/bcs-scenarios/bcs-gitops-manager/pkg/proxy/argocd/permitcheck"
@@ -129,6 +130,8 @@ func (plugin *AppPlugin) Init() error {
 		Handler(plugin.middleware.HttpWrapper(plugin.applicationWorkloadReplicasZero))
 	appRouter.Path("/sync_refresh").Methods("GET").
 		Handler(plugin.middleware.HttpWrapper(plugin.syncRefresh))
+	appRouter.Path("/forbid_sync").Methods("POST").
+		Handler(plugin.middleware.HttpWrapper(plugin.forbidAppSync))
 
 	appRouter.PathPrefix("").Methods("PUT", "POST", "DELETE", "PATCH").
 		Handler(plugin.middleware.HttpWrapper(plugin.applicationEditHandler))
@@ -417,13 +420,32 @@ func (plugin *AppPlugin) customRevisionsMetadata(r *http.Request) (*http.Request
 				fmt.Errorf("query parameter 'revisions' has empty value"))
 		}
 	}
+	repos, err := plugin.checkRepos(argoApp, revisions)
+	if err != nil {
+		return r, mw.ReturnErrorResponse(http.StatusBadRequest, err)
+	}
+
+	revisionsMetadata, err := plugin.storage.GetApplicationRevisionsMetadata(r.Context(), repos, revisions)
+	if err != nil {
+		return r, mw.ReturnErrorResponse(http.StatusInternalServerError,
+			fmt.Errorf("get application revisions metadata failed: %s", err.Error()))
+	}
+	return r, mw.ReturnJSONResponse(&ApplicationRevisionsMetadata{
+		Code:      0,
+		RequestID: ctxutils.RequestID(r.Context()),
+		Data:      revisionsMetadata,
+	})
+}
 
+func (plugin *AppPlugin) checkRepos(argoApp *v1alpha1.Application, revisions []string) ([]string, error) {
 	repos := make([]string, 0)
 	if argoApp.Spec.HasMultipleSources() && len(argoApp.Spec.Sources) == len(revisions) {
 		for _, source := range argoApp.Spec.Sources {
 			repos = append(repos, source.RepoURL)
 		}
-	} else if argoApp.Spec.HasMultipleSources() && len(argoApp.Spec.Sources) != len(revisions) {
+		return repos, nil
+	}
+	if argoApp.Spec.HasMultipleSources() && len(argoApp.Spec.Sources) != len(revisions) {
 		// 兼容应用从 SingleSource 与 MultipleSource 互相转换的情况
 		found := false
 		for i := range argoApp.Status.History {
@@ -449,26 +471,16 @@ func (plugin *AppPlugin) customRevisionsMetadata(r *http.Request) (*http.Request
 			}
 		}
 		if !found {
-			return r, mw.ReturnErrorResponse(http.StatusBadRequest, fmt.Errorf("application has multiple(%d) "+
-				"sources, not same as query param 'revisions'", len(argoApp.Spec.Sources)))
-		}
-	} else {
-		if len(revisions) != 1 {
-			return r, mw.ReturnErrorResponse(http.StatusBadRequest, fmt.Errorf("application has single source"))
+			return nil, fmt.Errorf("application has multiple(%d) "+"sources, not same as query param 'revisions'",
+				len(argoApp.Spec.Sources))
 		}
-		repos = append(repos, argoApp.Spec.Source.RepoURL)
+		return repos, nil
 	}
-
-	revisionsMetadata, err := plugin.storage.GetApplicationRevisionsMetadata(r.Context(), repos, revisions)
-	if err != nil {
-		return r, mw.ReturnErrorResponse(http.StatusInternalServerError,
-			fmt.Errorf("get application revisions metadata failed: %s", err.Error()))
+	if len(revisions) != 1 {
+		return nil, fmt.Errorf("application has single source")
 	}
-	return r, mw.ReturnJSONResponse(&ApplicationRevisionsMetadata{
-		Code:      0,
-		RequestID: ctxutils.RequestID(r.Context()),
-		Data:      revisionsMetadata,
-	})
+	repos = append(repos, argoApp.Spec.Source.RepoURL)
+	return repos, nil
 }
 
 type parameterAction string
@@ -813,3 +825,31 @@ func filterAppsByTargetRevision(appList *v1alpha1.ApplicationList, target string
 	}
 	appList.Items = filterApps
 }
+
+func (plugin *AppPlugin) forbidAppSync(r *http.Request) (*http.Request, *mw.HttpResponse) {
+	appName := mux.Vars(r)["name"]
+	if appName == "" {
+		return r, mw.ReturnErrorResponse(http.StatusBadRequest,
+			fmt.Errorf("request application name cannot be empty"))
+	}
+	forbid := r.URL.Query()["forbid"]
+	if len(forbid) == 0 {
+		return r, mw.ReturnErrorResponse(http.StatusBadRequest,
+			fmt.Errorf("param forbid must not empty"))
+	}
+	app, err := plugin.storage.GetApplication(r.Context(), appName)
+	if err != nil {
+		return r, mw.ReturnErrorResponse(http.StatusInternalServerError, err)
+	}
+	annotations := make(map[string]interface{})
+	if forbid[0] == "false" {
+		annotations[common.ApplicationSyncForbidden] = nil
+	} else {
+		annotations[common.ApplicationSyncForbidden] = "true"
+	}
+	if err := plugin.storage.PatchApplicationAnnotation(
+		r.Context(), app.Name, app.Namespace, annotations); err != nil {
+		return r, mw.ReturnErrorResponse(http.StatusInternalServerError, err)
+	}
+	return r, mw.ReturnJSONResponse(map[string]string{"forbid": forbid[0]})
+}
diff --git a/bcs-scenarios/bcs-gitops-manager/pkg/store/argocd.go b/bcs-scenarios/bcs-gitops-manager/pkg/store/argocd.go
index 52e990eec8..0bc4366715 100644
--- a/bcs-scenarios/bcs-gitops-manager/pkg/store/argocd.go
+++ b/bcs-scenarios/bcs-gitops-manager/pkg/store/argocd.go
@@ -51,6 +51,7 @@ import (
 	"github.com/argoproj/argo-cd/v2/util/db"
 	settings_util "github.com/argoproj/argo-cd/v2/util/settings"
 	gitopsdiff "github.com/argoproj/gitops-engine/pkg/diff"
+	"github.com/argoproj/gitops-engine/pkg/health"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"
@@ -635,6 +636,25 @@ func (cd *argo) PatchApplicationResource(ctx context.Context, appName string, re
 	return nil
 }
 
+// PatchApplicationAnnotation will update application annotations
+func (cd *argo) PatchApplicationAnnotation(ctx context.Context, appName, namespace string,
+	annotations map[string]interface{}) error {
+	patch, err := json.Marshal(map[string]interface{}{
+		"metadata": map[string]interface{}{
+			"annotations": annotations,
+		},
+	})
+	if err != nil {
+		return errors.Wrap(err, "marshal annotation error")
+	}
+	if _, err := cd.argoK8SClient.Applications(namespace).
+		Patch(ctx, appName, types.MergePatchType, patch,
+			metav1.PatchOptions{}); err != nil {
+		return errors.Wrapf(err, "patch application '%s' annotations '%v' error", appName, annotations)
+	}
+	return nil
+}
+
 // GetApplicationManifestsFromRepoServerWithMultiSources returns the manifests result of application which not
 // created. This function will direct call reposerver of argocd
 // nolint
@@ -849,24 +869,41 @@ func (cd *argo) DeleteApplicationResource(ctx context.Context, application *v1al
 }
 
 func (cd *argo) deleteApplicationResource(ctx context.Context, application *v1alpha1.Application,
+	resource *v1alpha1.ResourceStatus) error {
+	retryNum := 5
+	requestID := ctx.Value(traceconst.RequestIDHeaderKey).(string)
+	var err error
+	for i := 0; i < retryNum; i++ {
+		if err = cd.handleDeleteAppResource(ctx, application, resource); err == nil {
+			return nil
+		}
+		blog.Errorf("RequestID[%s] %s (retry: %d)", requestID, err.Error(), i)
+	}
+	return err
+}
+
+func (cd *argo) handleDeleteAppResource(ctx context.Context, application *v1alpha1.Application,
 	resource *v1alpha1.ResourceStatus) error {
 	server := application.Spec.Destination.Server
 	requestID := ctx.Value(traceconst.RequestIDHeaderKey).(string)
-	_, err := cd.appClient.DeleteResource(ctx, &appclient.ApplicationResourceDeleteRequest{
+	newCtx, cancel := context.WithTimeout(ctx, 15*time.Second)
+	defer cancel()
+	needForce := true
+	_, err := cd.appClient.DeleteResource(newCtx, &appclient.ApplicationResourceDeleteRequest{
 		Name:         &application.Name,
 		Kind:         &resource.Kind,
 		Namespace:    &resource.Namespace,
 		Group:        &resource.Group,
 		Version:      &resource.Version,
 		ResourceName: &resource.Name,
+		Force:        &needForce,
 	})
 	if err != nil {
-		if resource.Status != v1alpha1.SyncStatusCodeSynced {
+		if resource.Health.Status == health.HealthStatusMissing {
 			// nolint goconst
-			blog.Warnf("RequestID[%s], delete resource '%s/%s/%s' for cluster '%s' with application '%s' "+
-				"with status '%s', noneed care: %s",
-				requestID, resource.Group, resource.Kind, resource.Name,
-				server, application.Name, resource.Status, err.Error())
+			blog.Warnf("RequestID[%s], resource '%s/%s/%s' for cluster '%s' with application '%s' is missing, "+
+				"noneed care: %s", requestID, resource.Group, resource.Kind, resource.Name,
+				server, application.Name, err.Error())
 			return nil
 		}
 		if utils.IsArgoResourceNotFound(err) {
diff --git a/bcs-scenarios/bcs-gitops-manager/pkg/store/store.go b/bcs-scenarios/bcs-gitops-manager/pkg/store/store.go
index f4a6f55249..cd35c84d6b 100644
--- a/bcs-scenarios/bcs-gitops-manager/pkg/store/store.go
+++ b/bcs-scenarios/bcs-gitops-manager/pkg/store/store.go
@@ -94,7 +94,7 @@ type Store interface {
 		*v1alpha1.ApplicationSpec, error)
 	PatchApplicationResource(ctx context.Context, appName string, resource *v1alpha1.ResourceStatus, patch,
 		patchType string) error
-
+	PatchApplicationAnnotation(ctx context.Context, appName, namespace string, annotations map[string]interface{}) error
 	AllApplicationSets() []*v1alpha1.ApplicationSet
 	RefreshApplicationSet(namespace, name string) error
 	GetApplicationSet(ctx context.Context, name string) (*v1alpha1.ApplicationSet, error)
diff --git a/bcs-services/bcs-bscp/cmd/api-server/service/config_import.go b/bcs-services/bcs-bscp/cmd/api-server/service/config_import.go
index 18b3809da8..7326ee41b2 100644
--- a/bcs-services/bcs-bscp/cmd/api-server/service/config_import.go
+++ b/bcs-services/bcs-bscp/cmd/api-server/service/config_import.go
@@ -594,6 +594,7 @@ func (c *configImport) fileScannerHasherUploader(kt *kit.Kit, path, rootDir stri
 		return resp, fmt.Errorf("calculate SHA256 fail filename: %s; err: %s", fileInfo.Name(), err.Error())
 	}
 
+	// NOCC:ineffassign/assign(设计如此)
 	fileType := ""
 	// Check if the file size is greater than 5MB (5 * 1024 * 1024 bytes)
 	if fileInfo.Size() > constant.MaxUploadTextFileSize {
@@ -861,6 +862,7 @@ func getUploadConfig(bizID uint32) (maxUploadContentLength, maxFileSize int64) {
 		}
 	}
 
+	// NOCC:nakedret/ret(设计如此)
 	return
 }
 

From 7999cfd11a1bbac40ae73018c695d9f3ac3a59c2 Mon Sep 17 00:00:00 2001
From: pelenli <pelenli@tencent.com>
Date: Mon, 23 Sep 2024 02:16:53 +0000
Subject: [PATCH 5/8] =?UTF-8?q?--story=3D119489982=20=E3=80=90GitOps?=
 =?UTF-8?q?=E3=80=91=E8=84=8F=E5=A4=84=E7=90=86=EF=BC=9A=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=BA=94=E7=94=A8=E5=8F=8A=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E7=BB=84=E7=9A=84=E7=89=B9=E5=BE=81=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=20Git=20=E6=8F=90=E4=BA=A4=E5=9C=A8=E5=A4=9A?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=9C=BA=E6=99=AF=E4=B8=8B=E5=87=BA=E5=8F=91?=
 =?UTF-8?q?=202=20=E6=AC=A1=E5=90=8C=E6=AD=A5=20(merge=20request=20!2033)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Squash merge branch 'pelenli-gitops-fix-webhook-two-syncs' into 'master'
--task=75281050 【GitOps】脏处理：通过判断应用及应用组的特征，避免一次 Git 提交在多来源场景下出发 2 次同步





TAPD: --story=119489982
TAPD: --task=075281050
---
 .../cmd/gitgenerator-webhook/webhook/webhook.go   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/bcs-scenarios/bcs-gitops-manager/cmd/gitgenerator-webhook/webhook/webhook.go b/bcs-scenarios/bcs-gitops-manager/cmd/gitgenerator-webhook/webhook/webhook.go
index c488816902..28723e9ddc 100644
--- a/bcs-scenarios/bcs-gitops-manager/cmd/gitgenerator-webhook/webhook/webhook.go
+++ b/bcs-scenarios/bcs-gitops-manager/cmd/gitgenerator-webhook/webhook/webhook.go
@@ -312,13 +312,13 @@ func (s *AdmissionWebhookServer) needInterceptAppSync(req *v1.AdmissionRequest)
 	if !slices.Contains(s.cfg.InterceptSyncProjects, app.Spec.Project) {
 		return nil
 	}
-	blog.Infof("Received request. UID: %s, Name: %s, Operation: %s, Kind: %v.", req.UID, req.Name,
-		req.Operation, req.Kind)
 	state := app.Status.OperationState
 	// 如果应用状态非 Running, 则表示不在 Sync 进程中，直接返回
 	if state == nil || state.Phase != synccommon.OperationRunning {
 		return nil
 	}
+	blog.Infof("Received request(intercept sync). UID: %s, Name: %s, Operation: %s, Kind: %v.", req.UID, req.Name,
+		req.Operation, req.Kind)
 	return app
 }
 
@@ -404,13 +404,14 @@ func (s *AdmissionWebhookServer) interceptApplicationSync(ctx context.Context, r
 		hasDynamicRevision = true
 	}
 	if !hasDynamicRevision {
-		blog.Infof("intercept application '%s' sync, it's appset '%s' not have dynamic revision",
+		blog.Infof("skip intercept application '%s' sync, it's appset '%s' not have dynamic revision",
 			app.Name, appSet.Name)
 		return nil
 	}
+	blog.Infof("intercept application '%s' sync, it's appset '%s' has dynamic revision", app.Name, appSet.Name)
 	apps, err := s.argoStore.ApplicationSetDryRun(appSet)
 	if err != nil {
-		blog.Errorf("intercept application '%s' sync, it's appset '%s' dry-run failed: %s",
+		blog.Errorf("skip intercept application '%s' sync, it's appset '%s' dry-run failed: %s",
 			app.Name, appSet.Name, err.Error())
 		return nil
 	}
@@ -423,9 +424,11 @@ func (s *AdmissionWebhookServer) interceptApplicationSync(ctx context.Context, r
 		break
 	}
 	if foundApp == nil {
-		blog.Warnf("intercept application '%s' sync, it's appset '%s' dry-run not have app", app.Name, appSet.Name)
+		blog.Warnf("skip intercept application '%s' sync, it's appset '%s' dry-run not have app",
+			app.Name, appSet.Name)
 		return nil
 	}
+	blog.Infof("intercept application '%s' sync, found the application after appset dry-run", app.Name)
 
 	// 对比 AppSet dry-run 出来的应用和当前应用的 revision 是否一致
 	if foundApp.Spec.HasMultipleSources() {
@@ -447,7 +450,7 @@ func (s *AdmissionWebhookServer) interceptApplicationSync(ctx context.Context, r
 				foundApp.Spec.Source.TargetRevision)
 		}
 	}
-	blog.Infof("intercept application '%s' sync, the revision generate by appset is same", app.Name)
+	blog.Infof("skip intercept application '%s' sync, the revision generate by appset is same", app.Name)
 	return nil
 }
 

From 9a1a32f9ce2275a03d0feb4a7a42d49374ce53ae Mon Sep 17 00:00:00 2001
From: hitozhang <hitozhang@tencent.com>
Date: Mon, 23 Sep 2024 02:24:02 +0000
Subject: [PATCH 6/8] =?UTF-8?q?--story=3D119603556=20=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=B7=AF=E7=94=B1=20(merge=20request=20!2031?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Squash merge branch 'optimization/types' into 'master'
optimization: 优化类型提示





TAPD: --story=119709726
TAPD: --story=119603556
---
 bcs-ui/frontend/src/@types/shims-global.d.ts  |  7 ++-
 bcs-ui/frontend/src/i18n/en-US.yaml           |  4 +-
 bcs-ui/frontend/src/i18n/zh-CN.yaml           |  2 +-
 bcs-ui/frontend/src/router/resource-view.ts   |  4 +-
 bcs-ui/frontend/src/views/app/navigation.vue  |  2 +-
 .../resource-view/common/base-layout.tsx      |  3 +-
 .../views/resource-view/dashboard-view.vue    | 57 +++++++++++++++----
 .../view-manage/resource-menu.vue             |  5 +-
 .../view-manage/view-selector.vue             | 30 ++++++++--
 9 files changed, 88 insertions(+), 26 deletions(-)

diff --git a/bcs-ui/frontend/src/@types/shims-global.d.ts b/bcs-ui/frontend/src/@types/shims-global.d.ts
index 999b519917..04083f9c27 100644
--- a/bcs-ui/frontend/src/@types/shims-global.d.ts
+++ b/bcs-ui/frontend/src/@types/shims-global.d.ts
@@ -24,13 +24,14 @@ interface ILink {
   token: string // token配置文档
   uiPrefix: string // UI前缀，用于特性环境
   webConsole: string // web console文档
+  backToLegacyButtonUrl: string // 回退到旧版link
 }
 
 interface Window {
   _project_code_: string
   _project_id_: string
-  readonly bus: any
-  readonly mainComponent: any
+  bus: any
+  mainComponent: any
   readonly BCS_API_HOST: string
   readonly DEVOPS_BCS_API_URL: string
   readonly i18n: {
@@ -47,7 +48,7 @@ interface Window {
   readonly BK_USER_HOST: string
   readonly PREFERRED_DOMAINS: string
   readonly $loginModal: any
-  readonly BkTrace: any
+  BkTrace: any
   readonly BK_STATIC_URL: string
   readonly BCS_NAMESPACE_PREFIX: string
   readonly BK_LOG_HOST: string
diff --git a/bcs-ui/frontend/src/i18n/en-US.yaml b/bcs-ui/frontend/src/i18n/en-US.yaml
index 41631e266d..c8c302eeb4 100644
--- a/bcs-ui/frontend/src/i18n/en-US.yaml
+++ b/bcs-ui/frontend/src/i18n/en-US.yaml
@@ -3711,7 +3711,9 @@ templateFile:
     nextKind: Next kind
     bookmark: Bookmark folder
     unbookmark: Unbookmark
-    uploadTips: Supports .tgz and .tar.gz compressed file formats, with a maximum size of {0}MB
+    uploadTips: >-
+      Supports .tgz and .tar.gz compressed file formats, with a maximum size of
+      {0}MB
     createSpace: Create Folder
   tag:
     draft: draft
diff --git a/bcs-ui/frontend/src/i18n/zh-CN.yaml b/bcs-ui/frontend/src/i18n/zh-CN.yaml
index 4e67444ec4..e4dc4304b8 100644
--- a/bcs-ui/frontend/src/i18n/zh-CN.yaml
+++ b/bcs-ui/frontend/src/i18n/zh-CN.yaml
@@ -2986,7 +2986,7 @@ templateFile:
     nextKind: 下一个类型
     bookmark: 收藏文件夹
     unbookmark: 取消收藏
-    uploadTips: 支持.tgz, .tar.gz类型压缩包，文件小于{0}M
+    uploadTips: '支持.tgz, .tar.gz类型压缩包，文件小于{0}M'
     createSpace: 新建文件夹
   tag:
     draft: 草稿
diff --git a/bcs-ui/frontend/src/router/resource-view.ts b/bcs-ui/frontend/src/router/resource-view.ts
index 7f87e6bb9d..74e81cee83 100644
--- a/bcs-ui/frontend/src/router/resource-view.ts
+++ b/bcs-ui/frontend/src/router/resource-view.ts
@@ -1,7 +1,7 @@
 import $store from '@/store';
 // 资源视图
 const DashboardView = () => import(/* webpackChunkName: 'dashboard' */'@/views/resource-view/dashboard-view.vue');
-const ResourceView = () => import(/* webpackChunkName: 'dashboard' */'@/views/resource-view/resource-view.vue');
+// const ResourceView = () => import(/* webpackChunkName: 'dashboard' */'@/views/resource-view/resource-view.vue');
 const DashboardWorkloadDeployments = () => import(/* webpackChunkName: 'dashboard' */'@/views/resource-view/workload/deployments.vue');
 const DashboardWorkloadDaemonSets = () => import(/* webpackChunkName: 'dashboard' */'@/views/resource-view/workload/daemonsets.vue');
 const DashboardWorkloadStatefulSets = () => import(/* webpackChunkName: 'dashboard' */'@/views/resource-view/workload/statefulsets.vue');
@@ -235,7 +235,7 @@ export default [
   },
   {
     path: 'clusters/:clusterId',
-    component: ResourceView,
+    component: DashboardView,
     children: [
       // dashboard workload detail
       {
diff --git a/bcs-ui/frontend/src/views/app/navigation.vue b/bcs-ui/frontend/src/views/app/navigation.vue
index 32cb9894d2..d37d821f0b 100644
--- a/bcs-ui/frontend/src/views/app/navigation.vue
+++ b/bcs-ui/frontend/src/views/app/navigation.vue
@@ -280,7 +280,7 @@ export default defineComponent({
         params: {
           projectCode: $store.getters.curProjectCode,
           // 资源视图集群视图时切换路由不能丢失集群ID，其余菜单默认不给
-          clusterId: item.id === 'CLUSTERRESOURCE' ? $router.currentRoute?.params?.clusterId : '',
+          // clusterId: item.id === 'CLUSTERRESOURCE' ? $router.currentRoute?.params?.clusterId : '',
         },
       }).catch(err => console.warn(err));
     };
diff --git a/bcs-ui/frontend/src/views/resource-view/common/base-layout.tsx b/bcs-ui/frontend/src/views/resource-view/common/base-layout.tsx
index 0946f5a1d1..4c22f68f36 100644
--- a/bcs-ui/frontend/src/views/resource-view/common/base-layout.tsx
+++ b/bcs-ui/frontend/src/views/resource-view/common/base-layout.tsx
@@ -92,7 +92,7 @@ export default defineComponent({
     } = toRefs(props);
     const { clusterNameMap } = useCluster();
     const isViewConfigShow = computed(() => $store.state.isViewConfigShow);
-    const { curViewData, isViewEditable, isClusterMode } = useViewConfig();
+    const { curViewData, isViewEditable, isClusterMode, dashboardViewID } = useViewConfig();
     const {
       searchSelectData,
       searchSelectChange,
@@ -274,6 +274,7 @@ export default defineComponent({
         query: {
           kind: kind.value,
           crd: crd.value,
+          viewID: dashboardViewID.value,
         },
       });
     };
diff --git a/bcs-ui/frontend/src/views/resource-view/dashboard-view.vue b/bcs-ui/frontend/src/views/resource-view/dashboard-view.vue
index 665c9805fc..0faba72363 100644
--- a/bcs-ui/frontend/src/views/resource-view/dashboard-view.vue
+++ b/bcs-ui/frontend/src/views/resource-view/dashboard-view.vue
@@ -102,23 +102,35 @@ const reload = () => {
 
 const { dashboardViewID, updateViewIDStore } = useViewConfig();
 
+// 集群列表页
+const isDashboardHome = computed(() => $router.currentRoute?.matched?.some(item => item.name === 'dashboardHome'));
+
 watch(
   dashboardViewID,
-  () => {
-    if ($router.currentRoute?.name === 'dashboardCustomObjects') {
-      // 切换视图时如果在自定义视图菜单上就跳到首页(deploy)
+  (newVal, oldVal) => {
+    if (!newVal && !oldVal) return;
+
+    if ($router.currentRoute?.name === 'dashboardCustomObjects'
+      || (!isDashboardHome.value && newVal && oldVal && newVal !== oldVal)) {
+      // 切换视图时如果在customObject菜单或在二级详情界面切换视图时就跳到首页(deploy)，
       $router.replace({
         name: 'dashboardWorkloadDeployments',
         params: $router.currentRoute.params,
+        query: {
+          viewID: dashboardViewID.value,
+        },
       });
       return;
     }
-    // 处理路径上的集群参数
+
     if (dashboardViewID.value && $router.currentRoute?.params?.clusterId) {
-      // 自定义视图清空集群ID参数
+      // 自定义视图时清空集群ID参数
       $router.replace({
         name: $router.currentRoute?.name,
         params: {},
+        query: {
+          viewID: dashboardViewID.value,
+        },
       });
     } else if (!dashboardViewID.value && !$router.currentRoute?.params?.clusterId) {
       // 没有集群ID, 也没有视图ID, 就默认回显一个集群
@@ -128,21 +140,41 @@ watch(
         params: {
           clusterId: cluster?.clusterID,
         },
+        query: {
+          viewID: dashboardViewID.value,
+        },
+      });
+    } else if (dashboardViewID.value && dashboardViewID.value !== $router.currentRoute?.query?.viewID) {
+      // 替换query上的试图ID
+      $router.replace({
+        name: $router.currentRoute?.name,
+        params: $router.currentRoute.params,
+        query: {
+          viewID: dashboardViewID.value,
+        },
       });
     }
   },
 );
 
 const { clusterList, curClusterId } = useCluster();
-const initRoutePath = () => {
-  const pathClusterID = $router.currentRoute?.params?.clusterId;
+// 初始化当前集群和试图ID信息
+const initClusterAndViewID = () => {
   let cluster;
+  let viewID = $router.currentRoute?.query?.viewID || dashboardViewID.value || '';
+  const pathClusterID = $router.currentRoute?.params?.clusterId;
   if (pathClusterID) {
-    // 路径上带有集群ID，则更新全局集群缓存
+    // 路径上带有集群ID, 以路径集群ID为主
     cluster = clusterList.value.find(item => item.clusterID === pathClusterID);
-    updateViewIDStore('');// 删除视图缓存
-  } else if (!dashboardViewID.value) {
-    // 没有集群ID, 也没有视图ID, 就默认回显全局缓存的集群
+    if (isDashboardHome.value) {
+      // 在列表页时如果有集群ID，则要清空视图ID（集群模式和视图模式只能二选一）
+      viewID = '';
+    } else {
+      // 详情页视图ID根据query参数确定
+      viewID = $router.currentRoute?.query?.viewID || '';
+    }
+  } else if (!viewID) {
+    // 路径上没有集群ID, 也没有视图ID, 就默认跳转到一个集群中
     cluster = clusterList.value.find(item => item.clusterID === curClusterId.value)
       || clusterList.value.find(item => item.status === 'RUNNING');
     $router.replace({
@@ -152,6 +184,7 @@ const initRoutePath = () => {
       },
     });
   }
+  updateViewIDStore(viewID);// 更新视图ID
   $store.commit('updateCurCluster', cluster ?? clusterList.value.find(item => item.status === 'RUNNING'));
 };
 onBeforeMount(() => {
@@ -159,7 +192,7 @@ onBeforeMount(() => {
     if (isViewEditable.value) return;
     showViewConfig.value = !showViewConfig.value;
   });
-  initRoutePath();
+  initClusterAndViewID();
 });
 
 onBeforeUnmount(() => {
diff --git a/bcs-ui/frontend/src/views/resource-view/view-manage/resource-menu.vue b/bcs-ui/frontend/src/views/resource-view/view-manage/resource-menu.vue
index d3e83dd14a..8c954643eb 100644
--- a/bcs-ui/frontend/src/views/resource-view/view-manage/resource-menu.vue
+++ b/bcs-ui/frontend/src/views/resource-view/view-manage/resource-menu.vue
@@ -283,6 +283,9 @@ const handleChangeMenu = (item: IMenu) => {
       projectCode: $store.getters.curProjectCode,
       clusterId: route.value.params?.clusterId,
     },
+    query: {
+      viewID: dashboardViewID.value,
+    },
   });
 };
 
@@ -332,7 +335,7 @@ const expandMenu = () => {
 
 // 更多资源
 const { getMultiClusterCustomResourceDefinition, getMultiClusterResourcesCount } = useTableData();
-const { curViewData } = useViewConfig();
+const { curViewData, dashboardViewID } = useViewConfig();
 const isLoading = ref(false);
 const crdData = ref<Record<string, any[]>>({});
 const searchCRData = computed(() => {
diff --git a/bcs-ui/frontend/src/views/resource-view/view-manage/view-selector.vue b/bcs-ui/frontend/src/views/resource-view/view-manage/view-selector.vue
index 7ff50cf14a..6734d742f0 100644
--- a/bcs-ui/frontend/src/views/resource-view/view-manage/view-selector.vue
+++ b/bcs-ui/frontend/src/views/resource-view/view-manage/view-selector.vue
@@ -158,8 +158,21 @@ const unknownClusterID = computed(() => curViewData.value?.clusterNamespaces?.so
   return !clusterNameMap.value[clusterID];
 }));
 
+// 集群列表页
+const isDashboardHome = computed(() => $router.currentRoute?.matched?.some(item => item.name === 'dashboardHome'));
+
 // 切换自定义视图
-const changeCustomView = (id: string) => {
+const changeCustomView = async (id: string) => {
+  if (!isDashboardHome.value) {
+    // 非列表页切换时跳转到列表页
+    await $router.push({
+      name: 'dashboardWorkloadDeployments',
+      params: $router.currentRoute.params,
+      query: {
+        viewID: id,
+      },
+    });
+  }
   updateViewIDStore(id);
   popoverSelectRef.value?.hide();
 };
@@ -172,14 +185,23 @@ const editCustomView = (id: string) => {
 
 // 切换集群视图
 const changeClusterView = async (clusterID: string) => {
-  if (clusterID === $router.currentRoute?.params.clusterId) {
+  if (clusterID === $router.currentRoute?.params.clusterId && isDashboardHome.value) {
     popoverSelectRef.value?.hide();
     return;
   };
   // 集群视图设置集群ID参数
-  await $router.replace({
+  let name;
+  if ($router.currentRoute?.name === 'dashboardCustomObjects' || !isDashboardHome.value) {
     // 切换集群时如果在自定义视图菜单就跳到首页(deploy)
-    name: $router.currentRoute?.name === 'dashboardCustomObjects' ? 'dashboardWorkloadDeployments' : $router.currentRoute?.name,
+    name = 'dashboardWorkloadDeployments';
+  } else if ($router.currentRoute?.name) {
+    name = $router.currentRoute?.name;
+  } else {
+    name = '404';
+  }
+
+  await $router.replace({
+    name,
     params: {
       clusterId: clusterID,
     },

From 7dd0b53a1b3ce9887d69fdeff10ab18aabe3fcfb Mon Sep 17 00:00:00 2001
From: joeecai <joeecai@tencent.com>
Date: Mon, 23 Sep 2024 08:00:16 +0000
Subject: [PATCH 7/8] fix: import template file (merge request !2034)

Squash merge branch 'fix/cr' into 'master'
fix: import template file
---
 bcs-services/cluster-resources/cmd/http.go | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/bcs-services/cluster-resources/cmd/http.go b/bcs-services/cluster-resources/cmd/http.go
index 219d7a18a7..70f373cba4 100644
--- a/bcs-services/cluster-resources/cmd/http.go
+++ b/bcs-services/cluster-resources/cmd/http.go
@@ -28,7 +28,6 @@ import (
 
 	"github.com/Tencent/bk-bcs/bcs-common/pkg/odm/operator"
 	"github.com/gorilla/mux"
-	"gopkg.in/yaml.v2"
 
 	"github.com/Tencent/bk-bcs/bcs-services/cluster-resources/pkg/common/ctxkey"
 	"github.com/Tencent/bk-bcs/bcs-services/cluster-resources/pkg/i18n"
@@ -311,7 +310,7 @@ func packTemplateSpace(fileName string, templateContents map[string][]TemplateCo
 
 	file, err := os.Create(fileName)
 	if err != nil {
-		return fmt.Errorf("failed to create destination file: %w", err)
+		return fmt.Errorf("failed to create destination file: %s", err.Error())
 	}
 	defer file.Close() // nolint
 
@@ -333,7 +332,7 @@ func packTemplateSpace(fileName string, templateContents map[string][]TemplateCo
 		// 写入 header
 		err = tarWriter.WriteHeader(header)
 		if err != nil {
-			return fmt.Errorf("failed to write tar header: %w", err)
+			return fmt.Errorf("failed to write tar header: %s", err.Error())
 		}
 
 		for _, v := range contents {
@@ -342,7 +341,7 @@ func packTemplateSpace(fileName string, templateContents map[string][]TemplateCo
 			header.Size = int64(len(v.Content))
 			err = tarWriter.WriteHeader(header)
 			if err != nil {
-				return fmt.Errorf("failed to write tar header: %w", err)
+				return fmt.Errorf("failed to write tar header: %s", err.Error())
 			}
 
 			tarWriter.Write([]byte(v.Content)) // nolint
@@ -446,12 +445,6 @@ func parseTarContent(r *http.Request) ([]string, map[string][]TemplateContent, e
 			if n == 0 {
 				continue
 			}
-			// yaml格式校验
-			var v interface{}
-			err = yaml.Unmarshal(buf, &v)
-			if err != nil {
-				return templateSpaceNames, tarContent, fmt.Errorf("invalid yaml content: %s", header.Name)
-			}
 			tarContent[templateSpaceName] = append(tarContent[templateSpaceName], TemplateContent{
 				TemplateName: templateName,
 				Content:      string(buf),

From c213100088b17aae62e342006988272b2abb208d Mon Sep 17 00:00:00 2001
From: hitozhang <hitozhang@tencent.com>
Date: Mon, 23 Sep 2024 09:10:45 +0000
Subject: [PATCH 8/8] =?UTF-8?q?--story=3D119821235=20[=E9=9B=86=E7=BE=A4?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86]=20Azure=E7=B3=BB=E7=BB=9F=E7=9B=98=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=2050=20-=202048GB=E5=A4=A7=E5=B0=8F=20(merge=20reques?=
 =?UTF-8?q?t=20!2035)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Squash merge branch 'optimization/types' into 'master'
optimization: 优化azure系统盘大小限制





TAPD: --story=119821235
---
 .../cluster-manage/autoscaler/azure/node-config.vue  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/azure/node-config.vue b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/azure/node-config.vue
index 4ece88f6ca..3e1cd68103 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/azure/node-config.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/azure/node-config.vue
@@ -126,14 +126,14 @@
               <div class="prefix-select">
                 <span :class="['prefix', { disabled: isEdit }]">{{$t('cluster.ca.nodePool.create.instanceTypeConfig.disk.system')}}</span>
               </div>
-              <bcs-select
-                class="w-[88px] bg-[#fff] ml10"
+              <bk-input
+                class="w-[88px] ml10"
+                type="number"
                 :disabled="isEdit"
-                :clearable="false"
+                :min="50"
+                :max="2048"
                 v-model="nodePoolConfig.launchTemplate.systemDisk.diskSize">
-                <bcs-option id="50" name="50"></bcs-option>
-                <bcs-option id="100" name="100"></bcs-option>
-              </bcs-select>
+              </bk-input>
               <span :class="['company', { disabled: isEdit }]">GB</span>
             </div>
             <div class="mt20">