feat: 【产品功能】监控策略目标与指标维度不对应提示 --story=121028048 (TencentBlueKing#4329)

goodGai · Dec 11, 2024 · f0b0448 · f0b0448
1 parent affed9f
commit f0b0448
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/...rc/monitor-pc/pages/strategy-config/strategy-config-set-new/monitor-data/monitor-data.tsx b/...rc/monitor-pc/pages/strategy-config/strategy-config-set-new/monitor-data/monitor-data.tsx
@@ -125,6 +125,7 @@ export default class MyComponent extends tsc<IMonitorDataProps, IMonitorDataEven
   @Prop({ default: 'auto', type: [Number, String] }) sourceStep: number | string; /* source模式下的agg_interval */
   /* 当前的数据类型，用于判断应该弹出哪种指标选择器 */
   @Prop({ default: 'time_series', type: String }) dataTypeLabel: string;
+  /* 指标类型，分为主机、服务实例、NONE */
   @Prop({ default: '', type: String }) metricTipType: string;
   /* 报错信息 */
   @Prop({ default: '', type: String }) errMsg: string;
@@ -782,7 +783,11 @@ export default class MyComponent extends tsc<IMonitorDataProps, IMonitorDataEven
                           />
                         )),
                       this.metricTipType && (
-                        <span class='ip-dimension-tip'>
+                        <span
+                          id='ip-dimension-tip'
+                          class='ip-dimension-tip'
+                          tabindex={-1}
+                        >
                           <span class='icon-monitor icon-remind' />
                           <span>{this.$t(targetMessageTemp[this.metricTipType])}</span>
                         </span>

diff --git a/...pack/src/monitor-pc/pages/strategy-config/strategy-config-set-new/strategy-config-set.tsx b/...pack/src/monitor-pc/pages/strategy-config/strategy-config-set-new/strategy-config-set.tsx
@@ -322,6 +322,7 @@ export default class StrategyConfigSet extends tsc<IStrategyConfigSetProps, IStr
   };
   /* ui 转 promql 的报错信息 */
   metricDataErrorMsg = '';
+  /* 指标类型，分为主机、服务实例、NONE */
   metricTipType = '';
   monitorDataEditMode: EditModeType = 'Edit';
   // 将切换至ui模式
@@ -1668,7 +1669,7 @@ export default class StrategyConfigSet extends tsc<IStrategyConfigSetProps, IStr
     this.metricTipType = '';
     if (!this.target.length) return false;
     // 如果 metricData 不存在或第一个元素的 metric_type 不是 TimeSeries，则不显示提示。
-    if (this.metricData?.[0]?.metric_type !== MetricType.TimeSeries) return false;
+    if (this.metricData?.[0]?.data_type_label !== MetricType.TimeSeries) return false;
     // 如果当前的编辑模式不是 'Edit'，则不显示提示。
     if (this.monitorDataEditMode !== 'Edit') return false;
     let hasRelevantDimension = false;
@@ -1694,6 +1695,11 @@ export default class StrategyConfigSet extends tsc<IStrategyConfigSetProps, IStr
   async handleValidateStrategyConfig() {
     let validate = true;
     if (this.showMerticMessageTip()) {
+      // 聚焦至tips上
+      this.$nextTick(() => {
+        const targetElement = document.getElementById('ip-dimension-tip');
+        targetElement?.focus();
+      });
       return false;
     }
     if (this.monitorDataEditMode === 'Source') {
@@ -2402,6 +2408,10 @@ export default class StrategyConfigSet extends tsc<IStrategyConfigSetProps, IStr
    * @param {EditModeType} mode
    */
   async handleEditModeChange({ mode }: { mode: EditModeType; hasError: boolean }) {
+    // 切换指标的编辑模式时，警告有则消失
+    if (this.metricTipType) {
+      this.metricTipType = '';
+    }
     if (mode === 'Source') {
       if (this.metricData.every(item => item.isNullMetric)) {
         this.sourceData.sourceCode = '';