V2.4.1 FE

kafka-manager-console/src/container/alarm/add-alarm/alarm-select.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { alarm } from 'store/alarm';
 import { IMonitorGroups } from 'types/base-type';
-import { getValueFromLocalStorage, setValueToLocalStorage } from 'lib/local-storage';
+import { getValueFromLocalStorage, setValueToLocalStorage, deleteValueFromLocalStorage } from 'lib/local-storage';
 import { VirtualScrollSelect } from '../../../component/virtual-scroll-select';
 
 interface IAlarmSelectProps {
@@ -36,6 +36,10 @@ export class AlarmSelect extends React.Component<IAlarmSelectProps> {
     onChange && onChange(params);
   }
 
+  public componentWillUnmount() {
+    deleteValueFromLocalStorage('monitorGroups');
+  }
+
   public render() {
     const { value, isDisabled } = this.props;
     return (

kafka-manager-console/src/container/alarm/add-alarm/filter-form.tsx

@@ -149,9 +149,9 @@ export class DynamicSetFilter extends React.Component<IDynamicProps> {
   public handleSelectChange = (e: string, type: 'topic' | 'consumerGroup' | 'location') => {
     switch (type) {
       case 'topic':
-        if (!this.clusterId) {
-          return message.info('请选择集群');
-        }
+        // if (!this.clusterId) {
+        //   return message.info('请选择集群');
+        // }
         this.topicName = e;
         const type = this.dealMonitorType();
         if (['kafka-consumer-maxLag', 'kafka-consumer-maxDelayTime', 'kafka-consumer-lag'].indexOf(type) > -1) {

kafka-manager-console/src/container/alarm/alarm-list.tsx

@@ -9,6 +9,7 @@ import { pagination } from 'constants/table';
 import { urlPrefix } from 'constants/left-menu';
 import { alarm } from 'store/alarm';
 import 'styles/table-filter.less';
+import { Link } from 'react-router-dom';
 
 @observer
 export class AlarmList extends SearchAndFilterContainer {
@@ -24,7 +25,7 @@ export class AlarmList extends SearchAndFilterContainer {
     if (app.active !== '-1' || searchKey !== '') {
       data = origin.filter(d =>
         ((d.name !== undefined && d.name !== null) && d.name.toLowerCase().includes(searchKey as string)
-        || ((d.operator !== undefined && d.operator !== null) && d.operator.toLowerCase().includes(searchKey as string)))
+          || ((d.operator !== undefined && d.operator !== null) && d.operator.toLowerCase().includes(searchKey as string)))
         && (app.active === '-1' || d.appId === (app.active + '')),
       );
     } else {
@@ -55,9 +56,7 @@ export class AlarmList extends SearchAndFilterContainer {
         {this.renderSearch('名称：', '请输入告警规则或者操作人')}
         <li className="right-btn-1">
           <Button type="primary">
-            <a href={`${urlPrefix}/alarm/add`}>
-              新增规则
-            </a>
+            <Link to={`/alarm/add`}>新增规则</Link>
           </Button>
         </li>
       </>
@@ -68,6 +67,9 @@ export class AlarmList extends SearchAndFilterContainer {
     if (!alarm.monitorStrategies.length) {
       alarm.getMonitorStrategies();
     }
+    if (!app.data.length) {
+      app.getAppList();
+    }
   }
 
   public render() {