Merge branch 'main' of github.com:n9e/fe into main

Author: guguji5

src/components/pageLayout/PageLayoutWithTabs/index.tsx

@@ -117,11 +117,16 @@ const PageLayout: React.FC<IPageLayoutProps> = ({ icon, title, rightArea, introI
       )}
       <Menu.Item
         onClick={() => {
-          Logout().then(() => {
+          Logout().then((res) => {
             localStorage.removeItem(AccessTokenKey);
             localStorage.removeItem('refresh_token');
             localStorage.removeItem('curBusiId');
-            history.push('/login');
+            // 如果 res.dat 是一个字符串，表示重定向 URL，则直接跳转到该 URL
+            if (res.dat && typeof res.dat === 'string') {
+              window.location.href = res.dat;
+            } else {
+              history.push('/login');
+            }
           });
         }}
       >

src/pages/alertRules/Form/components/Triggers/Triggers.tsx

@@ -15,8 +15,8 @@
  *
  */
 
-import React, { useContext, useEffect } from 'react';
-import { Form, Card, Space, Switch, Button } from 'antd';
+import React, { useContext } from 'react';
+import { Form, Card, Space, Switch, Button, Alert } from 'antd';
 import { PlusOutlined, CloseCircleOutlined, CheckCircleOutlined } from '@ant-design/icons';
 import _ from 'lodash';
 import { useTranslation } from 'react-i18next';
@@ -108,6 +108,7 @@ export default function index(props: IProps) {
           {t('trigger.exp_trigger_disable')}
         </Space>
         <Inhibit triggersKey='triggers' />
+        <Alert type='info' message={t('trigger.threshold_tip')} />
         <Form.List {...prefixField} name={[...prefixName, 'triggers']} initialValue={initialValue}>
           {(fields, { add, remove }) => (
             <>

src/pages/alertRules/locale/en_US.ts

@@ -299,6 +299,7 @@ const en_US = {
       join_type_placeholder: 'Select join operation',
       on: 'Label key',
     },
+    threshold_tip: 'Please ensure that all variables have data and their labels are consistent, otherwise threshold judgment cannot be performed.',
   },
   nodata_trigger: {
     title: 'No data',

src/pages/alertRules/locale/ja_JP.ts

@@ -294,6 +294,7 @@ const ja_JP = {
       join_type_placeholder: '集合操作を選択',
       on: 'ラベル名',
     },
+    threshold_tip: 'すべての変数にデータがあり、それらのラベルが一致していることを確認してください。そうしないと、閾値判断を行うことができません。',
   },
   nodata_trigger: {
     title: 'データなしトリガー',

src/pages/alertRules/locale/ru_RU.ts

@@ -298,6 +298,7 @@ const ru_RU = {
       join_type_placeholder: 'Пожалуйста, выберите операцию над наборами',
       on: 'Имя метки',
     },
+    threshold_tip: 'Пожалуйста, убедитесь, что все переменные имеют данные и их метки совпадают, иначе пороговая проверка не будет выполнена.',
   },
   nodata_trigger: {
     title: 'Отсутствие данных',

src/pages/alertRules/locale/zh_CN.ts

@@ -295,6 +295,7 @@ const zh_CN = {
       join_type_placeholder: '请选择集合操作',
       on: '标签名',
     },
+    threshold_tip: '请确保所有变量均有数据，且它们的标签一致，否则无法进行阈值判断。',
   },
   nodata_trigger: {
     title: '数据缺失',

src/pages/alertRules/locale/zh_HK.ts

@@ -295,6 +295,7 @@ const zh_HK = {
       join_type_placeholder: '選擇集合操作',
       on: '標籤名',
     },
+    threshold_tip: '請確保所有變量均有數據，且它們的標籤一致，否則無法進行閾值判斷。',
   },
   nodata_trigger: {
     title: '無數據告警',

src/pages/dashboard/Editor/QueryEditor/Elasticsearch/GroupBy/Terms.tsx

@@ -54,7 +54,7 @@ export default function Terms({ prefixField, fieldsOptions, values }) {
               </Col>
               <Col span={6}>
                 <InputGroupWithFormItem label={t('datasource:es.terms.min_value')}>
-                  <Form.Item {...prefixField} name={[prefixField.name, 'min_value']} noStyle>
+                  <Form.Item {...prefixField} name={[prefixField.name, 'min_doc_count']} noStyle>
                     <InputNumber style={{ width: '100%' }} />
                   </Form.Item>
                 </InputGroupWithFormItem>
@@ -71,7 +71,7 @@ export default function Terms({ prefixField, fieldsOptions, values }) {
               </Col>
               <Col span={6}>
                 <InputGroupWithFormItem label='OrderBy'>
-                  <Form.Item {...prefixField} name={[prefixField.name, 'orderBy']}>
+                  <Form.Item {...prefixField} name={[prefixField.name, 'order_by']}>
                     <Select>
                       <Select.Option value='_key'>Term value</Select.Option>
                       <Select.Option value='_count'>Count</Select.Option>

src/pages/dashboard/Renderer/datasource/elasticsearch/queryBuilder.ts

@@ -122,9 +122,9 @@ export function getSeriesQuery(target: ElasticsearchQuery, intervalkey: string)
           field: aggDef.field,
           size: aggDef.size || 10,
           order: {
-            [aggDef.orderBy || '_key']: aggDef.order || 'desc',
+            [aggDef.order_by || '_key']: aggDef.order || 'desc',
           },
-          min_doc_count: aggDef.min_value || 1,
+          min_doc_count: aggDef.min_doc_count || 1,
         };
         break;
       }

src/pages/dashboard/Renderer/datasource/elasticsearch/types.ts

@@ -11,10 +11,10 @@ export interface ElasticsearchQuery {
   group_by: {
     cate: string;
     field?: string;
-    min_value?: number;
+    min_doc_count?: number;
     size?: number;
     order?: string;
-    orderBy?: string;
+    order_by?: string;
   }[];
   start: number;
   end: number;