Support devops card checkstyle (#2702)

* Spotless Apply * support-devops-card-checkstyle * Spotless Apply --------- Co-authored-by: Zzm0809 <[email protected]>
DataLinkDC · Dec 21, 2023 · 217f60c · 217f60c
1 parent bc9e32b
commit 217f60c
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 10 deletions.
diff --git a/dinky-web/src/components/CustomEditor/CodeEdit/function.tsx b/dinky-web/src/components/CustomEditor/CodeEdit/function.tsx
@@ -19,14 +19,14 @@
 
 import { SuggestionInfo } from '@/types/Public/data';
 
+import { loader } from '@monaco-editor/react';
 import * as monaco from 'monaco-editor';
 import { editor, languages } from 'monaco-editor';
 import keyWordJsonData from './keyword.json';
 import ITextModel = editor.ITextModel;
 import ProviderResult = languages.ProviderResult;
 import CompletionList = languages.CompletionList;
 import CompletionItem = languages.CompletionItem;
-import {loader} from "@monaco-editor/react";
 // 导入 lodash
 loader.config({ monaco });
 

diff --git a/dinky-web/src/components/CustomEditor/CodeEdit/index.tsx b/dinky-web/src/components/CustomEditor/CodeEdit/index.tsx
@@ -25,7 +25,7 @@ import { handleInitEditorAndLanguageOnBeforeMount } from '@/components/CustomEdi
 import { StateType } from '@/pages/DataStudio/model';
 import { MonacoEditorOptions, SuggestionInfo } from '@/types/Public/data';
 import { convertCodeEditTheme } from '@/utils/function';
-import {Editor, loader, Monaco, OnChange} from '@monaco-editor/react';
+import { Editor, loader, Monaco, OnChange } from '@monaco-editor/react';
 import { connect } from '@umijs/max';
 import useMemoCallback from 'rc-menu/es/hooks/useMemoCallback';
 import { memo, useCallback, useRef } from 'react';

diff --git a/dinky-web/src/components/CustomEditor/CodeShow/index.tsx b/dinky-web/src/components/CustomEditor/CodeShow/index.tsx
@@ -28,13 +28,12 @@ import { EditorLanguage } from 'monaco-editor/esm/metadata';
 
 import FullscreenBtn from '@/components/CustomEditor/FullscreenBtn';
 import { handleInitEditorAndLanguageOnBeforeMount } from '@/components/CustomEditor/function';
-import {Editor, loader, Monaco} from '@monaco-editor/react';
+import { Editor, loader, Monaco } from '@monaco-editor/react';
+import * as monaco from 'monaco-editor';
 import { CSSProperties, useRef, useState } from 'react';
-import * as monaco from "monaco-editor";
 
 loader.config({ monaco });
 
-
 export type CodeShowFormProps = {
   height?: string | number;
   width?: string;

diff --git a/dinky-web/src/pages/DataStudio/MiddleContainer/StudioEditor/DiffModal.tsx b/dinky-web/src/pages/DataStudio/MiddleContainer/StudioEditor/DiffModal.tsx
@@ -24,11 +24,11 @@ import {
 } from '@/pages/DataStudio/MiddleContainer/StudioEditor/constants';
 import { convertCodeEditTheme } from '@/utils/function';
 import { l } from '@/utils/intl';
-import {DiffEditor, loader} from '@monaco-editor/react';
+import { DiffEditor, loader } from '@monaco-editor/react';
 import { Col, Modal, Row, Space, Table, Tabs, Typography } from 'antd';
+import * as monaco from 'monaco-editor';
 import React, { memo } from 'react';
 import styles from './index.less';
-import * as monaco from "monaco-editor";
 
 loader.config({ monaco });
 

diff --git a/dinky-web/src/pages/DevOps/JobList/components/Overview/StatisticsCard.tsx b/dinky-web/src/pages/DevOps/JobList/components/Overview/StatisticsCard.tsx
@@ -30,12 +30,28 @@ type StatisticsCardParams = {
   extra?: any;
   divider?: boolean;
   atClick?: () => void;
+  isChecked?: boolean; // 是否选中
 };
 const StatisticsCard = (props: StatisticsCardParams) => {
-  const { title, value, icon, extra = <></>, divider = true, link, atClick } = props;
+  const {
+    title,
+    value,
+    isChecked = false,
+    icon,
+    extra = <></>,
+    divider = true,
+    link,
+    atClick
+  } = props;
   return (
     <>
-      <ProCard layout={'center'} onClick={() => (atClick ? atClick() : {})} hoverable={true}>
+      <ProCard
+        checked={isChecked}
+        boxShadow={isChecked}
+        layout={'center'}
+        onClick={() => (atClick ? atClick() : {})}
+        hoverable={true}
+      >
         <Space size={20}>
           {icon}
           <Space direction='vertical'>

diff --git a/dinky-web/src/pages/DevOps/JobList/components/Overview/index.tsx b/dinky-web/src/pages/DevOps/JobList/components/Overview/index.tsx
@@ -63,6 +63,7 @@ const JobOverview = (props: any) => {
             atClick={() => {
               setStatusFilter(undefined);
             }}
+            isChecked={!statusFilter}
             extra={
               <Space direction='vertical'>
                 <Button type={'text'} icon={<BatchIcons size={20} />}>
@@ -85,6 +86,7 @@ const JobOverview = (props: any) => {
             atClick={() => {
               setStatusFilter(JOB_STATUS.RUNNING);
             }}
+            isChecked={statusFilter === JOB_STATUS.RUNNING}
           />
           <StatisticsCard
             title={l('devops.joblist.status.cancelled')}
@@ -93,6 +95,7 @@ const JobOverview = (props: any) => {
             atClick={() => {
               setStatusFilter(JOB_STATUS.CANCELED);
             }}
+            isChecked={statusFilter === JOB_STATUS.CANCELED}
           />
           <StatisticsCard
             title={l('devops.joblist.status.failed')}
@@ -101,6 +104,7 @@ const JobOverview = (props: any) => {
             atClick={() => {
               setStatusFilter(JOB_STATUS.FAILED);
             }}
+            isChecked={statusFilter === JOB_STATUS.FAILED}
           />
           <StatisticsCard
             title={l('devops.joblist.status.restarting')}
@@ -109,6 +113,7 @@ const JobOverview = (props: any) => {
             atClick={() => {
               setStatusFilter(JOB_STATUS.RESTARTING);
             }}
+            isChecked={statusFilter === JOB_STATUS.RESTARTING}
           />
           <StatisticsCard
             title={l('devops.joblist.status.finished')}
@@ -117,6 +122,7 @@ const JobOverview = (props: any) => {
             atClick={() => {
               setStatusFilter(JOB_STATUS.FINISHED);
             }}
+            isChecked={statusFilter === JOB_STATUS.FINISHED}
           />
           <StatisticsCard
             title={l('devops.joblist.status.unknown')}
@@ -126,6 +132,7 @@ const JobOverview = (props: any) => {
             atClick={() => {
               setStatusFilter(JOB_STATUS.UNKNOWN);
             }}
+            isChecked={statusFilter === JOB_STATUS.UNKNOWN}
           />
         </ProCard>
       </Col>

diff --git a/dinky-web/src/requestErrorConfig.ts b/dinky-web/src/requestErrorConfig.ts
@@ -87,7 +87,6 @@ export const errorConfig: RequestConfig = {
     },
     // 错误接收及处理
     errorHandler: (error: any, opts: any) => {
-
       if (opts?.skipErrorHandler) throw error;
       // 我们的 errorThrower 抛出的错误。
       if (error.name === 'BizError') {