fix: 修复节点下PODs删除没有带集群ID问题 (merge request !1488)

Squash merge branch 'tools' into 'master' fix: 修复节点下PODs删除没有带集群ID问题
TencentBlueKing · Nov 1, 2023 · a08645d · a08645d
1 parent dbe8e64
commit a08645d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/bcs-ui/frontend/src/components/metric.vue b/bcs-ui/frontend/src/components/metric.vue
@@ -164,7 +164,7 @@ export default defineComponent({
       const series: any[] = [];
       data.forEach((item, index) => {
         const suffix = metricSuffix.value[index];
-        const list = item?.result.map((result) => {
+        const list = item?.result?.map((result) => {
           // series 配置
           const name = result.metric?.[metricNameProp.value] || metricMap[metrics[index]];
           const defaultSeries = props.series[index] || {};

diff --git a/bcs-ui/frontend/src/composables/use-page.ts b/bcs-ui/frontend/src/composables/use-page.ts
@@ -1,5 +1,7 @@
 import { computed, ComputedRef, reactive, Ref } from 'vue';
 
+import $store from '@/store';
+
 export interface IPageConf {
   current: number;
   limit: number;
@@ -31,7 +33,7 @@ export interface IPageConfResult {
  */
 export default function usePageConf(data: Ref<any[]>, options: IOptions = {
   current: 1,
-  limit: 10,
+  limit: $store.state.globalPageSize || 10,
 }): IPageConfResult {
   const pageConf = reactive<IPageConf>({
     current: options.current,
@@ -51,6 +53,7 @@ export default function usePageConf(data: Ref<any[]>, options: IOptions = {
 
   const pageSizeChange = (pageSize = 10) => {
     pageConf.limit = pageSize;
+    $store.commit('updatePageSize', pageSize);
     pageConf.current = 1;
     const { onPageSizeChange = null } = options;
     onPageSizeChange && typeof onPageSizeChange === 'function' && onPageSizeChange(pageSize);

diff --git a/bcs-ui/frontend/src/store/index.ts b/bcs-ui/frontend/src/store/index.ts
@@ -77,6 +77,7 @@ const store = new Vuex.Store<{
   isEn: boolean
   crdInstanceList: any[]
   cluster: typeof cluster.state
+  globalPageSize: number
 }>({
   // todo 废弃模块
   modules: {
@@ -103,7 +104,7 @@ const store = new Vuex.Store<{
   plugins: [
     VuexStorage({
       key: '__bcs_vuex_stroage__',
-      paths: ['curProject.projectID', 'curProject.projectCode', 'curProject.businessID', 'curCluster.clusterID', 'openSideMenu', 'curNamespace', 'clusterViewType'],
+      paths: ['curProject.projectID', 'curProject.projectCode', 'curProject.businessID', 'curCluster.clusterID', 'openSideMenu', 'curNamespace', 'clusterViewType', 'globalPageSize'],
       mutationEffect: [
         {
           type: 'cluster/forceUpdateClusterList',
@@ -129,6 +130,7 @@ const store = new Vuex.Store<{
     clusterViewType: 'card', // 集群展示模式 card 或者 list
     isEn: lang === 'en-US', // todo 废弃
     crdInstanceList: [], // todo 放入对应的module中
+    globalPageSize: 10,
   } as any,
   // 公共 getters
   getters: {
@@ -204,6 +206,9 @@ const store = new Vuex.Store<{
     updateFeatureFlags(state, data) {
       state.featureFlags = data;
     },
+    updatePageSize(state, size = 10) {
+      state.globalPageSize = size;
+    },
   },
   actions: {
     /**

diff --git a/bcs-ui/frontend/src/views/cluster-manage/node-list/node-overview.vue b/bcs-ui/frontend/src/views/cluster-manage/node-list/node-overview.vue
@@ -377,6 +377,7 @@ export default defineComponent({
           params: {
             namespace,
             name,
+            clusterId: clusterId.value,
           },
           query: {
             type: 'workloads',
@@ -390,6 +391,7 @@ export default defineComponent({
           params: {
             namespace,
             name,
+            clusterId: clusterId.value,
           },
           query: {
             type: 'workloads',
@@ -415,6 +417,7 @@ export default defineComponent({
             $type: 'workloads',
             $category: 'pods',
             $name: name,
+            $clusterId: clusterId.value,
           });
           result && $bkMessage({
             theme: 'success',

diff --git a/bcs-ui/frontend/src/views/resource-view/sidebar.vue b/bcs-ui/frontend/src/views/resource-view/sidebar.vue
@@ -20,7 +20,7 @@
         </span>
         <template #content>
           <!-- 监听change事件会多次触发，这里监听click事件 -->
-          <ClusterSelectPopover cluster-type="all" @click="handleClusterClick" />
+          <ClusterSelectPopover cluster-type="all" :key="curCluster.clusterID" @click="handleClusterClick" />
         </template>
       </PopoverSelector>
     </div>