From 26c447dff38dead476edd7d186e6a60078426c4e Mon Sep 17 00:00:00 2001
From: liangling <lingliang1100@gmail.com>
Date: Sat, 9 Dec 2023 11:50:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=AA=E8=A1=A8=E7=9B=98=E7=9A=84whe?=
 =?UTF-8?q?re=E6=9D=A1=E4=BB=B6=E9=9C=80=E8=A6=81=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=A9=BA=E7=9A=84=E7=89=B9=E6=AE=8A=E5=80=BC?=
 =?UTF-8?q?=20--bug=3D115017011?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/condition-input.tsx                   | 9 +++++++++
 .../src/datasource/datasource.ts                         | 8 ++++----
 bkmonitor-timeseries-datasource/src/lang/en.json         | 3 ++-
 .../src/typings/datasource.ts                            | 2 ++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/bkmonitor-timeseries-datasource/src/components/condition-input.tsx b/bkmonitor-timeseries-datasource/src/components/condition-input.tsx
index 227c86b..23c137b 100644
--- a/bkmonitor-timeseries-datasource/src/components/condition-input.tsx
+++ b/bkmonitor-timeseries-datasource/src/components/condition-input.tsx
@@ -43,6 +43,7 @@ import CloseCircleOutlined from '@ant-design/icons/CloseCircleOutlined';
 import { LanguageContext } from '../utils/context';
 import { getEnByName } from '../utils/utils';
 import DataSource from '../datasource/datasource';
+import { DIM_NULL_ID } from '../typings/datasource';
 const { Option } = Select;
 export interface IProps {
   metric: MetricDetail; // 指标
@@ -256,6 +257,11 @@ export default class ConditionInput extends React.PureComponent<IProps, IState>
     const {
       metric: { dimensions, agg_condition },
     } = this.props;
+    const needNUll = (key: string) => {
+      const item =  dimensions?.find(item => item.id === key)
+      if(!item) return false
+      return typeof item.type === 'undefined' || item.type === 'string'
+    }
     // eslint-disable-next-line max-len
     const getMaxWidth = (list: ICommonItem[]) => Math.max(list?.reduce((max, cur) => Math.max(max, +cur?.name?.length), 1) * 10, 100);
     return (
@@ -349,6 +355,9 @@ export default class ConditionInput extends React.PureComponent<IProps, IState>
                 dropdownMatchSelectWidth={false}
                 onChange={v => this.handleValueChange(v, index)}
               >
+                {
+                  needNUll(item.key) && <Option value={DIM_NULL_ID} key={DIM_NULL_ID}>{getEnByName('- 空 -')}</Option>
+                }
                 {dimensionValueMap[item.key]?.map?.(dim => (
                   <Option value={dim.id} key={dim.id}>
                     {dim.name}
diff --git a/bkmonitor-timeseries-datasource/src/datasource/datasource.ts b/bkmonitor-timeseries-datasource/src/datasource/datasource.ts
index dd19164..5ce4ca5 100644
--- a/bkmonitor-timeseries-datasource/src/datasource/datasource.ts
+++ b/bkmonitor-timeseries-datasource/src/datasource/datasource.ts
@@ -46,7 +46,7 @@ import {
 import { getBackendSrv, BackendSrvRequest, getTemplateSrv } from '@grafana/runtime';
 import { QueryOption } from '../typings/config';
 import { IMetric, ITargetData, EditMode, IntervalType } from '../typings/metric';
-import { IQueryConfig, QueryData } from '../typings/datasource';
+import { DIM_NULL_ID, IQueryConfig, QueryData } from '../typings/datasource';
 import { K8sVariableQueryType, ScenarioType, VariableQuery, VariableQueryType } from '../typings/variable';
 import apiCacheInstance from '../utils/api-cache';
 import { handleTransformOldQuery, handleTransformOldVariableQuery } from '../utils/common';
@@ -290,11 +290,9 @@ export default class DashboardDatasource extends DataSourceApi<QueryData, QueryO
             return item;
           }),
         };
-        console.info(newList, '++++++__________+++++++');
         return newList;
       }
     }
-    console.info(list, '++++++__________+++++++');
     return list;
   }
   getValueText(responseLength: number, refId = '') {
@@ -674,7 +672,9 @@ export default class DashboardDatasource extends DataSourceApi<QueryData, QueryO
     const valList = [];
     Array.isArray(values)
       && values.forEach((val) => {
-        if (String(val).match(/^\$/)) {
+        if(val === DIM_NULL_ID) {
+          valList.push('')
+        } else if (String(val).match(/^\$/)) {
           let isArrayVal = false;
           const list = [];
           getTemplateSrv().replace(val, scopedVars, (v) => {
diff --git a/bkmonitor-timeseries-datasource/src/lang/en.json b/bkmonitor-timeseries-datasource/src/lang/en.json
index 29152fd..27f822f 100644
--- a/bkmonitor-timeseries-datasource/src/lang/en.json
+++ b/bkmonitor-timeseries-datasource/src/lang/en.json
@@ -69,5 +69,6 @@
   "生成自定义指标": "Generate custom metrics",
   "采集来源": "Collect source",
   "自动查询": "Auto query",
-  "指标选择": "Metric selection"
+  "指标选择": "Metric selection",
+  "- 空 -": "- empty -"
 }
diff --git a/bkmonitor-timeseries-datasource/src/typings/datasource.ts b/bkmonitor-timeseries-datasource/src/typings/datasource.ts
index 9139af3..48a8b0a 100644
--- a/bkmonitor-timeseries-datasource/src/typings/datasource.ts
+++ b/bkmonitor-timeseries-datasource/src/typings/datasource.ts
@@ -68,3 +68,5 @@ export interface QueryData extends DataQuery {
   expressionList?: IExpresionItem[];
   only_promql?: boolean
 }
+
+export const DIM_NULL_ID = '';
\ No newline at end of file