feat: 大盘变量将options存入，all 需要拼接替换；

如果multi没选则隐藏allOption
n9e · Dec 13, 2021 · 2e1e35a · 2e1e35a
1 parent 4033010
commit 2e1e35a
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 15 deletions.
diff --git a/src/pages/dashboard/VariableConfig/DisplayItem.tsx b/src/pages/dashboard/VariableConfig/DisplayItem.tsx
@@ -11,7 +11,7 @@ interface Props {
   cluster: string;
   index: number;
   data: Variable[];
-  onChange: (index: number, value: string | string[]) => void;
+  onChange: (index: number, value: string | string[], options?) => void;
 }
 
 const stringToRegex = (str) => {
@@ -40,10 +40,10 @@ const DisplayItem: React.FC<Props> = ({ expression, index, data, onChange, clust
           setOptions(res);
           // 逻辑上只有导入大盘后初始化那一次 selected会为空
           if (res.length > 0 && !selected) {
-            onChange(index, multi ? [res[0]] : res[0]);
+            onChange(index, multi ? [res[0]] : res[0], res);
           }
           if (exp && newExpression && exp !== newExpression) {
-            onChange(index, multi ? [] : '');
+            onChange(index, multi ? [] : '', res);
           }
         });
       }
@@ -52,15 +52,15 @@ const DisplayItem: React.FC<Props> = ({ expression, index, data, onChange, clust
 
   const handleChange = (v) => {
     if (multi && allOption && v.includes('all')) {
-      onChange(index, ['all']);
+      onChange(index, ['all'], options);
     } else if (multi && !allOption) {
       let allIndex = v.indexOf('all');
       if (allIndex !== -1) {
         v.splice(allIndex, 1);
       }
-      onChange(index, v);
+      onChange(index, v, options);
     } else {
-      onChange(index, v);
+      onChange(index, v, options);
     }
   };
 

diff --git a/src/pages/dashboard/VariableConfig/EditItem.tsx b/src/pages/dashboard/VariableConfig/EditItem.tsx
@@ -87,8 +87,16 @@ export default function EditItem(props: Props) {
                     </Form.Item>
                   </Col>
                   <Col span={2}>
-                    <Form.Item {...restField} name={[name, 'allOption']} fieldKey={[fieldKey, 'allOption']} valuePropName='checked'>
-                      <Switch />
+                    <Form.Item shouldUpdate style={{ margin: 0 }}>
+                      {() => {
+                        return (
+                          form.getFieldValue(['var', name, 'multi']) && (
+                            <Form.Item {...restField} name={[name, 'allOption']} fieldKey={[fieldKey, 'allOption']} valuePropName='checked'>
+                              <Switch />
+                            </Form.Item>
+                          )
+                        );
+                      }}
                     </Form.Item>
                   </Col>
                   <Form.Item {...restField} name={[name, 'selected']} fieldKey={[fieldKey, 'selected']} hidden>

diff --git a/src/pages/dashboard/VariableConfig/constant.tsx b/src/pages/dashboard/VariableConfig/constant.tsx
@@ -165,14 +165,17 @@ export const convertExpressionToQuery = (expression: string) => {
 
 export const replaceExpressionVars = (expression: string, formData: FormType, limit: number) => {
   var newExpression = expression;
-
   const vars = newExpression.match(/\$[0-9a-zA-Z]+/g);
   if (vars && vars.length > 0) {
     for (let i = 0; i < limit; i++) {
-      const { selected, name } = formData.var[i];
+      const { selected, name, options } = formData.var[i];
       if (vars.includes('$' + name) && selected) {
         if (Array.isArray(selected)) {
-          newExpression = newExpression.replaceAll('$' + name, `(${(selected as string[]).join('|')})`);
+          if (selected.includes('all') && options) {
+            newExpression = newExpression.replaceAll('$' + name, `(${(options as string[]).join('|')})`);
+          } else {
+            newExpression = newExpression.replaceAll('$' + name, `(${(selected as string[]).join('|')})`);
+          }
         } else if (typeof selected === 'string') {
           newExpression = newExpression.replaceAll('$' + name, selected as string);
         }

diff --git a/src/pages/dashboard/VariableConfig/definition.ts b/src/pages/dashboard/VariableConfig/definition.ts
@@ -5,4 +5,5 @@ export interface Variable {
   selected?: string | string[];
   multi: boolean;
   allOption: boolean;
+  options?: string[]
 }
diff --git a/src/pages/dashboard/VariableConfig/index.tsx b/src/pages/dashboard/VariableConfig/index.tsx
@@ -36,9 +36,10 @@ const TagFilter: React.ForwardRefRenderFunction<any, ITagFilterProps> = ({ isOpe
     value && setData(value);
   }, [value]);
 
-  const handleVariableChange = (index: number, v: string) => {
+  const handleVariableChange = (index: number, v: string | string[], options) => {
     const newData = data ? { var: [...data.var] } : { var: [] };
     newData.var[index].selected = v;
+    options && (newData.var[index].options = options);
     setData(newData);
     onChange(newData);
   };

diff --git a/src/pages/historyEvents/index.tsx b/src/pages/historyEvents/index.tsx
@@ -136,11 +136,11 @@ const Event: React.FC = () => {
       },
     },
     {
-      title: t('触发时间'),
-      dataIndex: 'trigger_time',
+      title: t('计算时间'),
+      dataIndex: 'last_eval_time',
       width: 140,
       render(value) {
-        return moment(value * 1000).format('YYYY-MM-DD HH:mm:ss');
+        return moment((value ? value : 0) * 1000).format('YYYY-MM-DD HH:mm:ss');
       },
     },
   ];

diff --git a/src/pages/metric/explorer/index.less b/src/pages/metric/explorer/index.less
@@ -102,6 +102,7 @@
         }
         .right {
           padding-right: 4%;
+          white-space: nowrap;
         }
         .bold-text {
           color: #000;