diff --git a/bkmonitor-timeseries-datasource/src/datasource/datasource.ts b/bkmonitor-timeseries-datasource/src/datasource/datasource.ts
index 885d140..dd19164 100644
--- a/bkmonitor-timeseries-datasource/src/datasource/datasource.ts
+++ b/bkmonitor-timeseries-datasource/src/datasource/datasource.ts
@@ -715,7 +715,7 @@ export default class DashboardDatasource extends DataSourceApi<QueryData, QueryO
     aliasData: IAliasData,
     dimensions: Record<string, string>,
   ) {
-    const regex = /\$([\w.]+)|\[\[([\s\S]+?)\]\]/g;
+    const regex = /\$([\w]+)|\[\[([\s\S]+?)\]\]/g;
     const tagRegx = /(\$(tag_|dim_)\$[\w.]+)/gm;
     let aliasNew = alias;
     aliasNew = alias.replace(tagRegx, (match: any, g1: any, g2: any) => {
@@ -746,7 +746,10 @@ export default class DashboardDatasource extends DataSourceApi<QueryData, QueryO
               newKey = newKey.replace(set, set.replace('_', '').toLocaleUpperCase());
             });
           }
-          return typeof metric?.[newKey] === 'undefined' ? match : metric[newKey];
+          if (typeof metric?.[newKey] === 'undefined') {
+            return metric?.[tag] || match;
+          }
+          return  metric?.[newKey] || match;
         }
       }
       const variables = this.buildWhereVariables([match], undefined);
diff --git a/bkmonitor-timeseries-datasource/src/sass/query.scss b/bkmonitor-timeseries-datasource/src/sass/query.scss
index 480790a..78fd735 100644
--- a/bkmonitor-timeseries-datasource/src/sass/query.scss
+++ b/bkmonitor-timeseries-datasource/src/sass/query.scss
@@ -1168,6 +1168,9 @@ body {
     .metric-dropdown-content .content-list .metric-item.is-checked {
       background-color: $monitor-metric-bg-color !important;
     }
+    .cm-content {
+      caret-color: white !important;
+    }
   }
   &.theme-light {
     background-color: #f4f5f5 !important;