feat(merge): merge xyh

Next xyh

src/components/DashBoard/baseCard.tsx

@@ -7,24 +7,20 @@ import classNames from 'classnames';
 
 interface BaseCardProps extends HeaderProps, EchartsProps {
   height: number;
-  classNames?: string;
+  className?: string;
 }
 
 export default (props: BaseCardProps) => {
+  const { height, className, options, ...formProps } = props;
   return (
     <div
-      className={classNames(Style['dash-board-echarts'], props.classNames)}
+      className={classNames(Style['dash-board-echarts'], className)}
       style={{
-        height: props.height || 200,
+        height: height || 200,
       }}
     >
-      <Header
-        title={props.title}
-        onParamsChange={props.onParamsChange}
-        extraParams={props.extraParams}
-        initialValues={props.initialValues}
-      />
-      <Echarts options={props.options} />
+      <Header {...formProps} />
+      <Echarts options={options} />
     </div>
   );
 };

src/components/DashBoard/header.tsx

@@ -1,7 +1,8 @@
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import Style from './index.less';
-import { Col, DatePicker, Form, Input, Radio, Row } from 'antd';
-import moment from 'moment';
+import { Col, Form, Row } from 'antd';
+import RangePicker from './timePicker';
+import type { TimeType } from './timePicker';
 
 export interface HeaderProps {
   title: string;
@@ -15,28 +16,17 @@ export interface HeaderProps {
     Children: React.ReactNode;
   };
   initialValues?: any;
+  defaultTime?: TimeType;
 }
 
 export default (props: HeaderProps) => {
   const [form] = Form.useForm();
-  const [radioValue, setRadioValue] = useState<string | undefined>('today');
 
-  const change = async () => {
-    const data = await form.getFieldsValue();
-    data.time = [data.time[0].valueOf(), data.time[1].valueOf()];
+  const change = async (data: any) => {
     if (props.onParamsChange) {
       props.onParamsChange(data);
     }
   };
-  const setTime = (sTime: number, eTime: number) => {
-    form.setFieldsValue({ time: [moment(sTime), moment(eTime)] });
-  };
-
-  useEffect(() => {
-    setTime(moment().startOf('day').valueOf(), new Date().getTime());
-    setRadioValue('today');
-    change();
-  }, []);
 
   return (
     <div className={Style.header}>
@@ -48,8 +38,8 @@ export default (props: HeaderProps) => {
           layout={'inline'}
           preserve={false}
           initialValues={props.initialValues}
-          onValuesChange={() => {
-            change();
+          onValuesChange={(_, allValue) => {
+            change(allValue);
           }}
         >
           <Row style={{ width: '100%' }}>
@@ -59,52 +49,11 @@ export default (props: HeaderProps) => {
               </Col>
             )}
             <Col span={props.extraParams ? 18 : 24}>
-              <Form.Item noStyle>
-                <Input.Group compact>
-                  <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
-                    <Radio.Group
-                      defaultValue="day"
-                      buttonStyle="solid"
-                      value={radioValue}
-                      onChange={(e) => {
-                        let startTime: any = 0;
-                        const endTime = moment(new Date());
-                        const value = e.target.value;
-                        if (value === 'today') {
-                          startTime = moment().startOf('day').valueOf();
-                        } else if (value === 'week') {
-                          startTime = moment().subtract(6, 'days').valueOf();
-                        } else if (value === 'month') {
-                          startTime = moment().subtract(29, 'days').valueOf();
-                        } else {
-                          startTime = moment().subtract(365, 'days').valueOf();
-                        }
-                        setRadioValue(value);
-                        form.setFieldsValue({ time: [moment(startTime), moment(endTime)] });
-                        change();
-                      }}
-                    >
-                      <Radio.Button value="today">当天</Radio.Button>
-                      <Radio.Button value="week">近一周</Radio.Button>
-                      <Radio.Button value="month">近一月</Radio.Button>
-                      <Radio.Button value="year">近一年</Radio.Button>
-                    </Radio.Group>
-                    <Form.Item name={'time'} noStyle>
-                      {
-                        // @ts-ignore
-                        <DatePicker.RangePicker
-                          showTime
-                          onChange={(date: any) => {
-                            if (date) {
-                              setRadioValue(undefined);
-                            }
-                          }}
-                        />
-                      }
-                    </Form.Item>
-                  </div>
-                </Input.Group>
-              </Form.Item>
+              <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
+                <Form.Item noStyle name={'time'}>
+                  <RangePicker defaultTime={props.defaultTime} />
+                </Form.Item>
+              </div>
             </Col>
           </Row>
         </Form>

src/components/DashBoard/index.less

@@ -4,8 +4,6 @@
   width: 100%;
   padding: 24px;
   background-color: #fff;
-  border: 1px solid #f0f0f0;
-  border-radius: 2px;
 }
 .header {
   display: flex;
@@ -26,5 +24,5 @@
   flex-grow: 1;
   width: 100%;
   height: 0;
-  margin: 12px;
+  margin-top: 12px;
 }

src/components/DashBoard/timePicker.tsx

@@ -0,0 +1,95 @@
+import { Radio, DatePicker } from 'antd';
+import type { DatePickerProps } from 'antd';
+import moment from 'moment';
+import { useEffect, useState } from 'react';
+
+export enum TimeKey {
+  'today' = 'today',
+  'week' = 'week',
+  'month' = 'month',
+  'year' = 'year',
+}
+
+export type TimeType = keyof typeof TimeKey;
+
+interface ExtraTimePickerProps extends Omit<DatePickerProps, 'onChange' | 'value'> {
+  onChange?: (value: number[]) => void;
+  value?: number[];
+  defaultTime?: TimeType;
+}
+
+export const getTimeByType = (type: TimeType) => {
+  switch (type) {
+    case TimeKey.week:
+      return moment().subtract(6, 'days').valueOf();
+    case TimeKey.month:
+      return moment().startOf('month').valueOf();
+    case TimeKey.year:
+      return moment().subtract(365, 'days').valueOf();
+    default:
+      return moment().startOf('day').valueOf();
+  }
+};
+
+export default (props: ExtraTimePickerProps) => {
+  const [radioValue, setRadioValue] = useState<TimeType | undefined>(undefined);
+
+  const { value, onChange, ...extraProps } = props;
+
+  const change = (startTime: number, endTime: number) => {
+    if (onChange) {
+      onChange([startTime, endTime]);
+    }
+  };
+
+  const timeChange = (type: TimeType) => {
+    const endTime = moment(new Date()).valueOf();
+    const startTime: number = getTimeByType(type);
+    setRadioValue(type);
+    change(startTime, endTime);
+  };
+
+  useEffect(() => {
+    timeChange(props.defaultTime || TimeKey.today);
+  }, []);
+
+  return (
+    <>
+      {
+        // @ts-ignore
+        <DatePicker.RangePicker
+          {...extraProps}
+          value={
+            value && [
+              moment(value && value[0] ? value[0] : new Date()),
+              moment(value && value[1] ? value[1] : new Date()),
+            ]
+          }
+          onChange={(rangeValue) => {
+            setRadioValue(undefined);
+            if (rangeValue && rangeValue.length === 2) {
+              change(rangeValue[0]!.valueOf(), rangeValue[1]!.valueOf());
+            }
+          }}
+          renderExtraFooter={() => (
+            <div style={{ padding: '12px 0' }}>
+              <Radio.Group
+                defaultValue="day"
+                buttonStyle="solid"
+                value={radioValue}
+                onChange={(e) => {
+                  timeChange(e.target.value);
+                }}
+              >
+                <Radio.Button value={TimeKey.today}>当天</Radio.Button>
+                <Radio.Button value={TimeKey.week}>近一周</Radio.Button>
+                <Radio.Button value={TimeKey.month}>近一月</Radio.Button>
+                <Radio.Button value={TimeKey.year}>近一年</Radio.Button>
+              </Radio.Group>
+            </div>
+          )}
+        />
+      }
+    </>
+  );
+};

src/pages/link/DashBoard/index.tsx

@@ -0,0 +1,71 @@
+import { PageContainer } from '@ant-design/pro-layout';
+import DashBoard from '@/components/DashBoard';
+import { Radio } from 'antd';
+import { useState } from 'react';
+import type { EChartsOption } from 'echarts';
+
+export default () => {
+  const [options, setOptions] = useState<EChartsOption>({});
+
+  const getEcharts = async (data: any) => {
+    console.log(data);
+    setOptions({
+      xAxis: {
+        type: 'category',
+        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+      },
+      yAxis: {
+        type: 'value',
+      },
+      series: [
+        {
+          data: [150, 230, 224, 218, 135, 147, 260],
+          type: 'line',
+        },
+      ],
+    });
+  };
+
+  return (
+    <PageContainer>
+      <div>
+        <div>
+          <DashBoard
+            title={'网络流量'}
+            initialValues={{ test: false }}
+            height={400}
+            extraParams={{
+              key: 'test',
+              Children: (
+                <Radio.Group buttonStyle={'solid'}>
+                  <Radio.Button value={true}>上行</Radio.Button>
+                  <Radio.Button value={false}>下行</Radio.Button>
+                </Radio.Group>
+              ),
+            }}
+            defaultTime={'week'}
+            options={options}
+            onParamsChange={getEcharts}
+          />
+        </div>
+        <div style={{ display: 'flex' }}>
+          <DashBoard
+            title={'CPU使用率趋势'}
+            initialValues={{ test: false }}
+            height={400}
+            defaultTime={'week'}
+            options={options}
+            onParamsChange={getEcharts}
+          />
+          <DashBoard
+            title={'JVM内存使用率趋势'}
+            height={400}
+            defaultTime={'week'}
+            options={options}
+            onParamsChange={getEcharts}
+          />
+        </div>
+      </div>
+    </PageContainer>
+  );
+};

src/pages/media/DashBoard/index.less

@@ -31,4 +31,7 @@
       }
     }
   }
+  .media-dash-board-body {
+    border: 1px solid #f0f0f0;
+  }
 }

src/pages/media/DashBoard/index.tsx

@@ -6,7 +6,7 @@ import React, { useEffect, useState } from 'react';
 import Service from './service';
 import './index.less';
 import encodeQuery from '@/utils/encodeQuery';
-import { EChartsOption } from 'echarts';
+import type { EChartsOption } from 'echarts';
 
 interface TopCardProps {
   url: string;
@@ -122,6 +122,7 @@ export default () => {
           />
         </Card>
         <DashBoard
+          className={'media-dash-board-body'}
           title={'播放数量(人次)'}
           options={options}
           height={500}

src/utils/menu/router.ts

@@ -44,6 +44,7 @@ export enum MENUS_CODE {
   'link/Protocol' = 'link/Protocol',
   'link/Type' = 'link/Type',
   'link/AccessConfig' = 'link/AccessConfig',
+  'link/DashBoard' = 'link/DashBoard',
   'Log' = 'Log',
   'media/Cascade' = 'media/Cascade',
   'media/Cascade/Save' = 'media/Cascade/Save',