fix: 调整业务列表组件

goodGai · Jan 17, 2025 · ec840d6 · ec840d6
1 parent e942e64
commit ec840d6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 39 deletions.
diff --git a/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.tsx b/bkmonitor/webpack/src/monitor-pc/components/biz-select/list.tsx
@@ -26,10 +26,9 @@
 import { Component, Emit, Prop, Mixins } from 'vue-property-decorator';
 import { Component as tsc } from 'vue-tsx-support';
 
-import store from '../../store/store';
-
 import { SPACE_TYPE_MAP } from '../../common/constant';
 import UserConfigMixin from '../../mixins/userStoreConfig';
+import store from '../../store/store';
 
 import type { ThemeType } from './biz-select';
 
@@ -39,6 +38,7 @@ interface IProps {
   list: IListItem[];
   checked?: number;
   theme?: ThemeType;
+  canSetDefaultSpace?: boolean;
 }
 interface IEvents {
   onSelected: number;
@@ -72,6 +72,8 @@ const DEFAULT_BIZ_ID = 'DEFAULT_BIZ_ID';
 export default class List extends Mixins(UserConfigMixin, tsc<IProps, IEvents>) {
   /** 选中的id */
   @Prop({ type: Number }) checked: number;
+  /** 可设置默认空间 */
+  @Prop({ default: true, type: Boolean }) canSetDefaultSpace: boolean;
   /** 列表数据 */
   @Prop({ default: () => [], type: Array }) list: IListItem[];
   /** 主题 */
@@ -171,7 +173,7 @@ export default class List extends Mixins(UserConfigMixin, tsc<IProps, IEvents>)
                     >
                       ({child.space_type_id === ETagsType.BKCC ? `#${child.id}` : child.space_id || child.space_code})
                     </span>
-                    {this.defaultBizId && Number(this.defaultBizId) === child.id && (
+                    {this.canSetDefaultSpace && this.defaultBizId && Number(this.defaultBizId) === child.id && (
                       <span class='item-default-icon'>
                         <span class='item-default-text'>{this.$tc('默认')}</span>
                       </span>
@@ -190,23 +192,25 @@ export default class List extends Mixins(UserConfigMixin, tsc<IProps, IEvents>)
                       ))}
                     </span>
                   )}
-                  <div class='set-default-button'>
-                    {this.defaultBizId && Number(this.defaultBizId) === child.id ? (
-                      <div
-                        class={`btn-style-${this.theme} remove`}
-                        onClick={e => this.handleDefaultBizIdDialog(e, child, false)}
-                      >
-                        {this.$tc('取消默认')}
-                      </div>
-                    ) : (
-                      <div
-                        class={`btn-style-${this.theme}`}
-                        onClick={e => this.handleDefaultBizIdDialog(e, child, true)}
-                      >
-                        {this.$tc('设为默认')}
-                      </div>
-                    )}
-                  </div>
+                  {this.canSetDefaultSpace && (
+                    <div class='set-default-button'>
+                      {this.defaultBizId && Number(this.defaultBizId) === child.id ? (
+                        <div
+                          class={`btn-style-${this.theme} remove`}
+                          onClick={e => this.handleDefaultBizIdDialog(e, child, false)}
+                        >
+                          {this.$tc('取消默认')}
+                        </div>
+                      ) : (
+                        <div
+                          class={`btn-style-${this.theme}`}
+                          onClick={e => this.handleDefaultBizIdDialog(e, child, true)}
+                        >
+                          {this.$tc('设为默认')}
+                        </div>
+                      )}
+                    </div>
+                  )}
                 </div>
               ))}
             </div>

diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-biz-list.tsx b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/home-biz-list.tsx
@@ -39,19 +39,6 @@ import './home-biz-list.scss';
 
 /** 业务组件常用的业务缓存key */
 const BIZ_SELECTOR_COMMON_IDS = 'BIZ_SELECTOR_COMMON_IDS';
-/** 业务组件常用业务缓存最大个数 */
-const BIZ_SELECTOR_COMMON_MAX = 5;
-const BIZ_COLOR_LIST = [
-  '#7250A9',
-  '#3563BE',
-  '#3799BA',
-  '#4FB17F',
-  '#86AF4A',
-  '#E9AE1D',
-  '#EB9258',
-  '#D36C68',
-  '#BC4FB3',
-];
 
 interface IProps {
   zIndex?: number;
@@ -106,11 +93,11 @@ export default class HomeBizSelect extends tsc<IProps, IEvents> {
     limit: number;
     data: IListItem[];
   } = {
-    current: 1,
-    count: 0,
-    limit: 20,
-    data: [],
-  };
+      current: 1,
+      count: 0,
+      limit: 20,
+      data: [],
+    };
 
   typeWrapInfo = {
     showBtn: false,
@@ -379,7 +366,6 @@ export default class HomeBizSelect extends tsc<IProps, IEvents> {
   }
 
   render() {
-    console.log('= = = >', this.bizListFilter);
     return (
       <div class={['new-biz-select-wrap', this.theme]}>
         <bk-popover
@@ -467,6 +453,7 @@ export default class HomeBizSelect extends tsc<IProps, IEvents> {
                 onScroll={this.handleScroll}
               >
                 <List
+                  canSetDefaultSpace={false}
                   list={this.bizListFilter}
                   theme={this.theme}
                   onSelected={this.handleBizChange}

diff --git a/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-list.scss b/bkmonitor/webpack/src/monitor-pc/pages/home/new-home/components/recent-favorites-list.scss
@@ -1,3 +1,5 @@
+@import 'monitor-pc/theme/mixin.scss';
+
 .recent-content {
   display: flex;
   flex-wrap: wrap;
@@ -138,6 +140,7 @@
           color: #979BA5;
           text-align: right;
           letter-spacing: 0;
+          @include ellipsis;
         }
 
         &:last-child {