diff --git a/back/api/env.ts b/back/api/env.ts index 77eae38c..834bdd51 100644 --- a/back/api/env.ts +++ b/back/api/env.ts @@ -1,12 +1,12 @@ -import { Router, Request, Response, NextFunction } from 'express'; -import { Container } from 'typedi'; -import EnvService from '../services/env'; -import { Logger } from 'winston'; -import { celebrate, Joi } from 'celebrate'; -import multer from 'multer'; -import config from '../config'; +import { Joi, celebrate } from 'celebrate'; +import { NextFunction, Request, Response, Router } from 'express'; import fs from 'fs'; +import multer from 'multer'; +import { Container } from 'typedi'; +import { Logger } from 'winston'; +import config from '../config'; import { safeJSONParse } from '../config/util'; +import EnvService from '../services/env'; const route = Router(); const storage = multer.diskStorage({ diff --git a/back/data/env.ts b/back/data/env.ts index a3670b41..bd24f22a 100644 --- a/back/data/env.ts +++ b/back/data/env.ts @@ -1,5 +1,5 @@ +import { DataTypes, Model } from 'sequelize'; import { sequelize } from '.'; -import { DataTypes, Model, ModelDefined } from 'sequelize'; export class Env { value?: string; diff --git a/back/services/env.ts b/back/services/env.ts index 7ea53674..0759710e 100644 --- a/back/services/env.ts +++ b/back/services/env.ts @@ -1,7 +1,8 @@ -import { Service, Inject } from 'typedi'; +import groupBy from 'lodash/groupBy'; +import { FindOptions, Op } from 'sequelize'; +import { Inject, Service } from 'typedi'; import winston from 'winston'; import config from '../config'; -import * as fs from 'fs/promises'; import { Env, EnvModel, @@ -11,8 +12,6 @@ import { minPosition, stepPosition, } from '../data/env'; -import groupBy from 'lodash/groupBy'; -import { FindOptions, Op } from 'sequelize'; import { writeFileWithLock } from '../shared/utils'; @Service() diff --git a/src/pages/env/index.tsx b/src/pages/env/index.tsx index a4c53107..fde76fda 100644 --- a/src/pages/env/index.tsx +++ b/src/pages/env/index.tsx @@ -1,49 +1,42 @@ -import intl from 'react-intl-universal'; -import React, { - useCallback, - useRef, - useState, - useEffect, - useMemo, -} from 'react'; +import useTableScrollHeight from '@/hooks/useTableScrollHeight'; +import { SharedContext } from '@/layouts'; +import config from '@/utils/config'; +import { request } from '@/utils/http'; +import { exportJson } from '@/utils/index'; import { - Button, - message, - Modal, - Table, - Tag, - Space, - Typography, - Tooltip, - Input, - UploadProps, - Upload, -} from 'antd'; -import { - EditOutlined, - DeleteOutlined, - SyncOutlined, CheckCircleOutlined, + DeleteOutlined, + EditOutlined, + PushpinFilled, + PushpinOutlined, StopOutlined, UploadOutlined, - PushpinOutlined, - PushpinFilled, } from '@ant-design/icons'; -import config from '@/utils/config'; import { PageContainer } from '@ant-design/pro-layout'; -import { request } from '@/utils/http'; -import EnvModal from './modal'; -import EditNameModal from './editNameModal'; +import { useOutletContext } from '@umijs/max'; +import { + Button, + Input, + Modal, + Space, + Table, + Tag, + Tooltip, + Typography, + Upload, + UploadProps, + message, +} from 'antd'; +import dayjs from 'dayjs'; +import React, { useCallback, useEffect, useRef, useState } from 'react'; import { DndProvider, useDrag, useDrop } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; -import './index.less'; -import { exportJson } from '@/utils/index'; -import { useOutletContext } from '@umijs/max'; -import { SharedContext } from '@/layouts'; -import useTableScrollHeight from '@/hooks/useTableScrollHeight'; -import Copy from '../../components/copy'; +import intl from 'react-intl-universal'; import { useVT } from 'virtualizedtableforantd4'; -import dayjs from 'dayjs'; +import Copy from '../../components/copy'; +import EditNameModal from './editNameModal'; +import './index.less'; +import EnvModal from './modal'; const { Paragraph } = Typography; const { Search } = Input;