Merge xyh

Merge xyh

src/components/ProTableCard/CardItems/mediaDevice.tsx

@@ -24,6 +24,7 @@ export default (props: ProductCardProps) => {
       statusNames={{
         offline: StatusColorEnum.error,
         online: StatusColorEnum.processing,
+        notActive: StatusColorEnum.processing,
       }}
     >
       <div className={'pro-table-card-item'}>

src/pages/device/Instance/Detail/Functions/AdvancedMode.tsx

@@ -117,10 +117,7 @@ export default (props: FunctionProps) => {
               setValue('');
             }}
           >
-            {intl.formatMessage({
-              id: 'pages.data.option.cancel',
-              defaultMessage: '取消',
-            })}
+            清空
           </Button>
         </div>
       </div>

src/pages/link/DashBoard/index.tsx

@@ -169,6 +169,26 @@ export default () => {
     formatResult: (res) => res.result.map((item: any) => ({ label: item.name, value: item.id })),
   });
 
+  const arrayReverse = (data: any[]): any[] => {
+    const newArray = [];
+    for (let i = data.length - 1; i >= 0; i--) {
+      newArray.push(data[i]);
+    }
+    return newArray;
+  };
+
+  const getInterval = (type: string) => {
+    switch (type) {
+      case 'year':
+        return '30d';
+      case 'week':
+      case 'month':
+        return '1d';
+      default:
+        return '1h';
+    }
+  };
+
   const handleNetworkOptions = (data: Record<string, any>, xAxis: string[]) => {
     setNetworkOptions({
       xAxis: {
@@ -194,11 +214,11 @@ export default () => {
         areaStyle: {
           color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
             {
-              offset: 0,
+              offset: 1,
               color: 'rgba(151, 154, 255, 0)',
             },
             {
-              offset: 1,
+              offset: 0,
               color: 'rgba(151, 154, 255, .24)',
             },
           ]),
@@ -211,7 +231,7 @@ export default () => {
     setJvmOptions({
       xAxis: {
         type: 'category',
-        data: xAxis,
+        data: arrayReverse(xAxis),
       },
       tooltip: {
         trigger: 'axis',
@@ -236,7 +256,7 @@ export default () => {
       ],
       color: ['#60DFC7'],
       series: Object.keys(data).map((key) => ({
-        data: data[key],
+        data: arrayReverse(data[key]),
         name: key,
         type: 'line',
         smooth: true,
@@ -260,7 +280,7 @@ export default () => {
     setCpuOptions({
       xAxis: {
         type: 'category',
-        data: xAxis,
+        data: arrayReverse(xAxis),
       },
       tooltip: {
         trigger: 'axis',
@@ -285,7 +305,7 @@ export default () => {
       ],
       color: ['#2CB6E0'],
       series: Object.keys(data).map((key) => ({
-        data: data[key],
+        data: arrayReverse(data[key]),
         name: key,
         type: 'line',
         smooth: true,
@@ -320,7 +340,7 @@ export default () => {
           group: 'network',
           params: {
             type: networkData.type,
-            interval: networkData.time.type === 'today' ? '1h' : '1d',
+            interval: getInterval(networkData.time.type),
             from: networkData.time.start,
             to: networkData.time.end,
           },
@@ -334,6 +354,7 @@ export default () => {
           params: {
             from: cpuData.time.start,
             to: cpuData.time.end,
+            interval: getInterval(cpuData.time.type),
           },
         },
         {
@@ -345,6 +366,7 @@ export default () => {
           params: {
             from: jvmData.time.start,
             to: jvmData.time.end,
+            interval: getInterval(jvmData.time.type),
           },
         },
       ])
@@ -400,6 +422,7 @@ export default () => {
 
   const getNetworkEcharts = () => {
     const data = NETWORKRef.current!.getValues();
+
     if (data) {
       service
         .queryMulti([
@@ -411,7 +434,7 @@ export default () => {
             group: 'network',
             params: {
               type: data.type,
-              interval: data.time.type === 'today' ? '1h' : '1d',
+              interval: getInterval(data.time.type),
               from: data.time.start,
               to: data.time.end,
             },
@@ -456,6 +479,7 @@ export default () => {
             params: {
               from: data.time.start,
               to: data.time.end,
+              interval: getInterval(data.time.type),
             },
           },
         ])
@@ -492,6 +516,7 @@ export default () => {
             params: {
               from: data.time.start,
               to: data.time.end,
+              interval: getInterval(data.time.type),
             },
           },
         ])

src/pages/media/Device/index.tsx

@@ -159,6 +159,13 @@ const Device = () => {
       ),
       valueType: 'select',
       valueEnum: {
+        notActive: {
+          text: intl.formatMessage({
+            id: 'pages.device.instance.status.notActive',
+            defaultMessage: '禁用',
+          }),
+          status: 'notActive',
+        },
         offline: {
           text: intl.formatMessage({
             id: 'pages.device.instance.status.offLine',
@@ -267,13 +274,17 @@ const Device = () => {
             title: '删除',
           }}
           popConfirm={{
-            title: intl.formatMessage({
-              id:
-                record.state.value !== 'offline'
-                  ? 'pages.device.instance.deleteTip'
-                  : 'page.table.isDelete',
-              defaultMessage: '是否删除?',
-            }),
+            title: (
+              <div style={{ width: 100 }}>
+                {intl.formatMessage({
+                  id:
+                    record.state.value !== 'offline'
+                      ? 'pages.device.instance.deleteTip'
+                      : 'page.table.isDelete',
+                  defaultMessage: '是否删除?',
+                })}
+              </div>
+            ),
             onConfirm: async () => {
               if (record.state.value === 'offline') {
                 await deleteItem(record.id);

src/pages/system/Platforms/Api/basePage.tsx

@@ -128,14 +128,14 @@ export default (props: TableProps) => {
               return (
                 <Button
                   type={'link'}
-                  style={{ padding: 0 }}
+                  style={{ padding: 0, width: '100%' }}
                   onClick={() => {
                     console.log(record);
                     ApiModel.swagger = record;
                     ApiModel.showTable = false;
                   }}
                 >
-                  {text}
+                  <span className={'ellipsis'}>{text}</span>
                 </Button>
               );
             },

src/pages/system/Platforms/Api/leftTree.tsx

@@ -64,7 +64,7 @@ export default (props: LeftTreeType) => {
   );
 
   const handleTreeData = (data: any) => {
-    if (data && Object.keys(data).length) {
+    if (!data || !(data && Object.keys(data).length)) {
       return [];
     }
     const newArr = data.tags.map((item: any) => ({ id: item.name, name: item.name, isLeaf: true }));
@@ -93,6 +93,7 @@ export default (props: LeftTreeType) => {
       if (resp) {
         ApiModel.components = { ...ApiModel.components, ...resp.components.schemas };
         const handleData = handleTreeData(resp);
+        console.log(handleData);
         setTreeData((origin) => {
           const data = updateTreeData(origin, key, handleData);