diff --git a/src/components/Common/BoxDesignCompontent/index.js b/src/components/Common/BoxDesignCompontent/index.js index 19dd750..487be66 100644 --- a/src/components/Common/BoxDesignCompontent/index.js +++ b/src/components/Common/BoxDesignCompontent/index.js @@ -1,6 +1,6 @@ /* eslint-disable */ import React, { useRef, useState, useEffect } from "react"; -import { Select, Button, message, Input, Spin } from "antd"; +import { Select, Button, message, Input, Spin } from "antd-v4"; import { CompressOutlined, ExpandOutlined } from "@ant-design/icons"; import * as commonUtils from "@/utils/utils"; import * as commonFunc from "@/components/Common/commonFunc"; diff --git a/src/components/Common/CommonInstructSet.js b/src/components/Common/CommonInstructSet.js index f587470..c7c4e41 100644 --- a/src/components/Common/CommonInstructSet.js +++ b/src/components/Common/CommonInstructSet.js @@ -2,7 +2,7 @@ import lodash from "lodash"; import moment from "moment"; -import { Modal, notification } from "antd"; +import { Modal, notification } from "antd-v4"; import { message } from "@/utils/common/message"; import * as commonUtils from "@/utils/utils"; import * as commonFunc from "@/components/Common/commonFunc"; diff --git a/src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx b/src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx index d2309b7..d82a502 100644 --- a/src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx +++ b/src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx @@ -2,7 +2,7 @@ import React, { PureComponent } from "react"; import { Form } from "@ant-design/compatible"; import "@ant-design/compatible/assets/index.css"; -import { Layout, Spin, Button, Row, Col } from "antd"; +import { Layout, Spin, Button, Row, Col } from "antd-v4"; import * as commonFunc from "@/components/Common/commonFunc"; /* 通用单据方法 */ /* 通用单据方法 */ import StaticEditTable from "@/components/Common//CommonTable"; /* 可编辑表格 */ import StaticEditTree from "@/components/Common/Tree/StaticTree"; diff --git a/src/components/Common/CommonPartsInfo/index.js b/src/components/Common/CommonPartsInfo/index.js index bc374de..971cc5f 100644 --- a/src/components/Common/CommonPartsInfo/index.js +++ b/src/components/Common/CommonPartsInfo/index.js @@ -6,7 +6,7 @@ import React, { useState, useEffect } from "react"; -import { Tree, Divider, Tabs, Button, Tooltip } from "antd"; +import { Tree, Divider, Tabs, Button, Tooltip } from "antd-v4"; import { ProfileOutlined, FileTextOutlined, diff --git a/src/components/Common/CommonViewDragable/index.js b/src/components/Common/CommonViewDragable/index.js index 9f29f27..78dd322 100644 --- a/src/components/Common/CommonViewDragable/index.js +++ b/src/components/Common/CommonViewDragable/index.js @@ -7,7 +7,7 @@ import React, { useState } from "react"; import "@ant-design/compatible/assets/index.css"; -import { Tabs, Tooltip, message } from "antd"; +import { Tabs, Tooltip, message } from "antd-v4"; import ShowType from "@/components/Common/CommonComponent"; import * as commonBusiness from "@/components/Common/commonBusiness"; import StaticEditTable from "@/components/Common/CommonTable"; diff --git a/src/components/Common/FileImposition/index.js b/src/components/Common/FileImposition/index.js index 33e7209..065307f 100644 --- a/src/components/Common/FileImposition/index.js +++ b/src/components/Common/FileImposition/index.js @@ -8,7 +8,7 @@ import { Modal, notification, Spin -} from "antd"; +} from "antd-v4"; import { UploadOutlined } from "@ant-design/icons"; import AntdDraggableModal from "@/components/Common/AntdDraggableModal"; import * as commonBusiness from "@/components/Common/commonBusiness"; diff --git a/src/components/Common/OfficePreview/index.js b/src/components/Common/OfficePreview/index.js index e505618..24862d5 100644 --- a/src/components/Common/OfficePreview/index.js +++ b/src/components/Common/OfficePreview/index.js @@ -1,5 +1,5 @@ /* eslint-disable */ -import { Modal } from "antd"; +import { Modal } from "antd-v4"; import React, { useEffect, useRef } from "react"; import commonConfig from "@/utils/config"; import PrintPdf from "@/components/PrintPdf/PrintPdf"; diff --git a/src/components/Common/PersonCenter/MenuSearchPopovor.js b/src/components/Common/PersonCenter/MenuSearchPopovor.js index 052300d..e5e1400 100644 --- a/src/components/Common/PersonCenter/MenuSearchPopovor.js +++ b/src/components/Common/PersonCenter/MenuSearchPopovor.js @@ -1,7 +1,7 @@ /* eslint-disable */ import React, { useCallback, useMemo, useRef } from "react"; import { StarFilled } from "@ant-design/icons"; -import { AutoComplete, Input } from "antd"; +import { AutoComplete, Input } from "antd-v4"; import * as commonUtils from "@/utils/utils"; /* 通用方法 */ import config from '@/utils/config'; const MenuSearchPopovor = props => { diff --git a/src/components/Common/Typesetting/typesetting.js b/src/components/Common/Typesetting/typesetting.js index e0212c2..905eed8 100644 --- a/src/components/Common/Typesetting/typesetting.js +++ b/src/components/Common/Typesetting/typesetting.js @@ -1,6 +1,6 @@ /* eslint-disable */ import React, { useEffect, useState, useRef } from "react"; -import { Modal } from "antd"; +import { Modal } from "antd-v4"; import { VerticalRightOutlined, VerticalLeftOutlined, LeftOutlined, RightOutlined, UpOutlined, DownOutlined } from "@ant-design/icons"; import * as commonUtils from "@/utils/utils"; /* 通用方法 */ import styles from "./index.less"; diff --git a/src/components/Common/WorkCalendar/WorkCalendar.js b/src/components/Common/WorkCalendar/WorkCalendar.js index 687de69..b787bbb 100644 --- a/src/components/Common/WorkCalendar/WorkCalendar.js +++ b/src/components/Common/WorkCalendar/WorkCalendar.js @@ -14,7 +14,7 @@ import { message, Select, DatePicker -} from "antd"; +} from "antd-v4"; import { LeftOutlined, RightOutlined } from "@ant-design/icons"; import moment from "moment"; import * as commonUtils from "@/utils/utils"; /* 通用方法 */ diff --git a/src/components/Common/WorkOrderSystem/WorkOrderSystemAdd.js b/src/components/Common/WorkOrderSystem/WorkOrderSystemAdd.js index 02abf0d..108ab73 100644 --- a/src/components/Common/WorkOrderSystem/WorkOrderSystemAdd.js +++ b/src/components/Common/WorkOrderSystem/WorkOrderSystemAdd.js @@ -11,7 +11,7 @@ import { message, DatePicker, Spin -} from "antd"; +} from "antd-v4"; import { CheckOutlined, CloseOutlined } from "@ant-design/icons"; import BraftEditor from "braft-editor"; import "braft-editor/dist/index.css"; diff --git a/src/components/Common/WorkOrderSystem/WorkOrderSystemDetail.js b/src/components/Common/WorkOrderSystem/WorkOrderSystemDetail.js index dbf73a9..b2d49f9 100644 --- a/src/components/Common/WorkOrderSystem/WorkOrderSystemDetail.js +++ b/src/components/Common/WorkOrderSystem/WorkOrderSystemDetail.js @@ -13,7 +13,7 @@ import { Spin, Input, Image -} from "antd"; +} from "antd-v4"; import { CheckOutlined, CloseCircleOutlined, diff --git a/src/components/Common/WorkOrderSystem/WorkOrderSystemService/index.js b/src/components/Common/WorkOrderSystem/WorkOrderSystemService/index.js index f6f140b..408c3cd 100644 --- a/src/components/Common/WorkOrderSystem/WorkOrderSystemService/index.js +++ b/src/components/Common/WorkOrderSystem/WorkOrderSystemService/index.js @@ -1,7 +1,7 @@ /* eslint-disable */ import * as commonServices from "@/services/services"; import commonConfig from "@/utils/config"; -import { message } from "antd"; +import { message } from "antd-v4"; //获取所属客户 const getsCustomerData = async () => { diff --git a/src/components/CommonSystemSettingEvent/TabSysParamsIcon.js b/src/components/CommonSystemSettingEvent/TabSysParamsIcon.js index 9bcda2c..23dd84e 100644 --- a/src/components/CommonSystemSettingEvent/TabSysParamsIcon.js +++ b/src/components/CommonSystemSettingEvent/TabSysParamsIcon.js @@ -1,6 +1,6 @@ /* eslint-disable */ import React, { useEffect, useState } from "react"; -import { Form, Col, Upload, Image as ImageNew, message } from "antd"; +import { Form, Col, Upload, Image as ImageNew, message } from "antd-v4"; import commonConfig from "@/utils/config"; // 判断图片是否存在 diff --git a/src/components/Manufacture/CommonPackEvent.js b/src/components/Manufacture/CommonPackEvent.js index 72d928c..f359e2b 100644 --- a/src/components/Manufacture/CommonPackEvent.js +++ b/src/components/Manufacture/CommonPackEvent.js @@ -1,6 +1,6 @@ /* eslint-disable */ import React, { useEffect, useState, useRef } from "react"; -import { Button, message } from "antd"; +import { Button, message } from "antd-v4"; import * as commonBusiness from "@/components/Common/commonBusiness"; import * as commonUtils from "@/utils/utils"; import * as commonFunc from "@/components/Common/commonFunc"; diff --git a/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js b/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js index c8f705b..fe5df32 100644 --- a/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js +++ b/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js @@ -1,7 +1,7 @@ /* eslint-disable */ import React, { useEffect, useState, useMemo, useRef } from "react"; import moment from "moment"; -import { Avatar, Collapse, Radio, Row, Col, Divider, message, Modal } from "antd"; +import { Avatar, Collapse, Radio, Row, Col, Divider, message, Modal } from "antd-v4"; import { RightOutlined } from "@ant-design/icons"; import { Form } from "@ant-design/compatible"; import CommonBase from "@/components/Common/CommonBase"; diff --git a/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js b/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js index 39d77f0..d582a3c 100644 --- a/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js +++ b/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js @@ -1,7 +1,7 @@ /* eslint-disable */ import React, { useEffect, useState, useMemo, useRef } from "react"; import moment from "moment"; -import { Avatar, Collapse, Radio, Row, Col, Divider, message, Modal } from "antd"; +import { Avatar, Collapse, Radio, Row, Col, Divider, message, Modal } from "antd-v4"; import { RightOutlined } from "@ant-design/icons"; import { Form } from "@ant-design/compatible"; import CommonBase from "@/components/Common/CommonBase"; diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index ac3fc13..a02e35a 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -1,6 +1,6 @@ /* eslint-disable */ import React, { useRef, useEffect, useState, useCallback } from "react"; -import { Button, Divider, Tabs, Tree, Radio, Image, Modal, Input, message } from "antd"; +import { Button, Divider, Tabs, Tree, Radio, Image, Modal, Input, message } from "antd-v4"; import { ArrowLeftOutlined, FolderFilled, FolderOpenFilled, FileTextFilled, PlusOutlined, MinusOutlined } from "@ant-design/icons"; import { cloneDeep } from "lodash"; import commonConfig from "@/utils/config"; diff --git a/src/routes/tab/tab.js b/src/routes/tab/tab.js index 4eb28e5..ba9c8f7 100644 --- a/src/routes/tab/tab.js +++ b/src/routes/tab/tab.js @@ -1,7 +1,7 @@ import { connect } from "umi"; import { Icon as LegacyIcon } from "@ant-design/compatible"; import { ExclamationCircleOutlined } from "@ant-design/icons"; -import { Tabs, Modal } from "antd"; +import { Tabs, Modal } from 'antd-v4'; import IndexCenter from "@/routes/indexCenter/indexCenter"; /* 首页 */ import TabComponent from "@/components/Tab/TabComponent"; import CommonListEdit from "@/routes/commonList/commonListEdit"; /* 可编辑公共列表 */