diff --git a/src/components/Charts/Pie/index.js b/src/components/Charts/Pie/index.js index e36067e..51b99e1 100644 --- a/src/components/Charts/Pie/index.js +++ b/src/components/Charts/Pie/index.js @@ -1,7 +1,7 @@ /* eslint-disable no-undef, jsx-a11y/no-noninteractive-element-interactions */ import React, { Component } from 'react'; import G2 from '@antv/g2'; -import { Divider } from 'antd'; +import { Divider } from 'antd-v4'; import classNames from 'classnames'; import ReactFitText from 'react-fittext'; import Debounce from 'lodash-decorators/debounce'; diff --git a/src/components/Charts/TimeLineGroup/index.js b/src/components/Charts/TimeLineGroup/index.js index 1f147b9..6d82488 100644 --- a/src/components/Charts/TimeLineGroup/index.js +++ b/src/components/Charts/TimeLineGroup/index.js @@ -1,6 +1,6 @@ /* eslint-disable object-curly-newline */ import React, { Component } from 'react'; -import { Row, Col, Tabs } from 'antd'; +import { Row, Col, Tabs } from 'antd-v4'; import TimeLineChart from '../TimelineChart'; import NumberInfo from '../../NumberInfo'; import Pie from '../Pie'; diff --git a/src/components/Common/AntdDraggableModal.js b/src/components/Common/AntdDraggableModal.js index 0d0cc4b..0b4cdc9 100644 --- a/src/components/Common/AntdDraggableModal.js +++ b/src/components/Common/AntdDraggableModal.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Modal } from 'antd'; +import { Modal } from 'antd-v4'; import './AntdDraggableModal/antDraggle.less'; diff --git a/src/components/Common/AssignmentField.js b/src/components/Common/AssignmentField.js index 2cf0aef..757e0e5 100644 --- a/src/components/Common/AssignmentField.js +++ b/src/components/Common/AssignmentField.js @@ -3,7 +3,7 @@ */ /* eslint-disable no-undef,import/first,prefer-destructuring,jsx-a11y/alt-text */ import React, { Component } from 'react'; -import { Modal } from 'antd'; +import { Modal } from 'antd-v4'; import styles from '@/index.less'; import * as commonUtils from '@/utils/utils'; import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */ 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/CommonBill/index.js b/src/components/Common/CommonBill/index.js index 083ece4..fc4a522 100644 --- a/src/components/Common/CommonBill/index.js +++ b/src/components/Common/CommonBill/index.js @@ -17,7 +17,7 @@ import { Upload, Input, Modal -} from 'antd'; +} from 'antd-v4'; import { message } from '@/utils/common/message'; import CommonSales from '@/components/Common/CommonBillEvent';/* 继承销售模块业务功能 */ import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js index 22496c2..767e6cc 100644 --- a/src/components/Common/CommonBillEvent.js +++ b/src/components/Common/CommonBillEvent.js @@ -1,7 +1,7 @@ /* eslint-disable */ /* eslint-disable prefer-destructuring,no-await-in-loop,radix,,no-loop-func */ import React, { Component } from 'react'; -import { Modal, notification, Progress } from 'antd'; +import { Modal, notification, Progress } from 'antd-v4'; import { message } from '@/utils/common/message'; import moment from 'moment'; import * as commonUtils from '@/utils/utils'; /* 通用方法 */ diff --git a/src/components/Common/CommonCheckBill/index.js b/src/components/Common/CommonCheckBill/index.js index 96d5b11..ff23f1b 100644 --- a/src/components/Common/CommonCheckBill/index.js +++ b/src/components/Common/CommonCheckBill/index.js @@ -16,7 +16,7 @@ import { Input, Divider, Collapse, -} from 'antd'; +} from 'antd-v4'; import { message } from '@/utils/common/message'; import CommonSales from '@/components/Common/CommonCheckBillEvent';/* 继承销售模块业务功能 */ import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/Common/CommonCheckBillEvent.js b/src/components/Common/CommonCheckBillEvent.js index 94f72e0..070396b 100644 --- a/src/components/Common/CommonCheckBillEvent.js +++ b/src/components/Common/CommonCheckBillEvent.js @@ -1,6 +1,6 @@ /* eslint-disable */ import React, { Component } from 'react'; -import { Modal, Progress } from 'antd'; +import { Modal, Progress } from 'antd-v4'; import { message } from '@/utils/common/message'; import moment from 'moment'; import * as commonUtils from '@/utils/utils'; /* 通用方法 */ diff --git a/src/components/Common/CommonClassifyEvent.js b/src/components/Common/CommonClassifyEvent.js index ecda1de..7468007 100644 --- a/src/components/Common/CommonClassifyEvent.js +++ b/src/components/Common/CommonClassifyEvent.js @@ -1,7 +1,7 @@ /* eslint-disable array-callback-return,no-undef,prefer-destructuring */ import React, { Component } from 'react'; import moment from 'moment'; -import { Modal, message } from 'antd'; +import { Modal, message } from 'antd-v4'; import * as commonFunc from './commonFunc'; import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */ import * as commonUtils from '../../utils/utils'; /* 通用方法 */ diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index 7d02053..51eb725 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -20,7 +20,7 @@ import { Table, Pagination, Tooltip, -} from 'antd'; +} from 'antd-v4'; import { EyeOutlined, FilePdfOutlined, diff --git a/src/components/Common/CommonComponent/index_new.js b/src/components/Common/CommonComponent/index_new.js index deceaac..cefc70e 100644 --- a/src/components/Common/CommonComponent/index_new.js +++ b/src/components/Common/CommonComponent/index_new.js @@ -14,7 +14,7 @@ import { Spin, message, Form, -} from 'antd'; +} from 'antd-v4'; import * as commonUtils from '@/utils/utils'; import styles from '@/index.less'; import Provinces from '@/assets/provinces.json'; diff --git a/src/components/Common/CommonComponentNew/index.tsx b/src/components/Common/CommonComponentNew/index.tsx index e5119c9..c9fa996 100644 --- a/src/components/Common/CommonComponentNew/index.tsx +++ b/src/components/Common/CommonComponentNew/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; -import { Form, Input, InputNumber, Select, Tooltip } from 'antd'; +import { Form, Input, InputNumber, Select, Tooltip } from 'antd-v4'; import * as commonUtils from "@/utils/utils"; -import type { SelectProps } from 'antd'; +import type { SelectProps } from 'antd-v4'; import type { PropsType, FormItemTypeKey } from './type'; const FormItemTypeEvent = (props: PropsType) => { diff --git a/src/components/Common/CommonElementEvent.js b/src/components/Common/CommonElementEvent.js index 50b312f..a278786 100644 --- a/src/components/Common/CommonElementEvent.js +++ b/src/components/Common/CommonElementEvent.js @@ -1,6 +1,6 @@ /* eslint-disable array-callback-return,no-undef,prefer-destructuring */ import React, { Component } from 'react'; -import { Modal, message } from 'antd'; +import { Modal, message } from 'antd-v4'; import commonConfig from '../../utils/config'; import * as commonFunc from './commonFunc'; import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */ diff --git a/src/components/Common/CommonExamInfo/index.js b/src/components/Common/CommonExamInfo/index.js index dc0d509..ac1fae8 100644 --- a/src/components/Common/CommonExamInfo/index.js +++ b/src/components/Common/CommonExamInfo/index.js @@ -1,7 +1,7 @@ /* eslint-disable */ import React, { Component } from 'react'; import moment from 'moment'; -import { Input, Layout, Steps, Select, Button, Modal,message, Spin } from 'antd'; +import { Input, Layout, Steps, Select, Button, Modal,message, Spin } from 'antd-v4'; import { UserOutlined } from '@ant-design/icons'; import * as commonUtils from '@/utils/utils';/* 通用方法 */ import * as commonServices from '@/services/services';/* 服务类 */ 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/CommonListA.js b/src/components/Common/CommonListA.js index a9f7f2d..090f3bd 100644 --- a/src/components/Common/CommonListA.js +++ b/src/components/Common/CommonListA.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin, Slider } from 'antd'; +import { Layout, Spin, Slider } from 'antd-v4'; import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */ import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ import Toolbar from '@/components/Common/ToolBar/ToolBarNew'; diff --git a/src/components/Common/CommonListEditEvent.js b/src/components/Common/CommonListEditEvent.js index cda276b..d7dac24 100644 --- a/src/components/Common/CommonListEditEvent.js +++ b/src/components/Common/CommonListEditEvent.js @@ -4,7 +4,7 @@ * Created by mar105 on 2019-03-27. */ import React, { Component } from 'react'; -import { Modal, message } from 'antd'; +import { Modal, message } from 'antd-v4'; import * as commonUtils from '../../utils/utils'; /* 通用方法 */ import * as commonFunc from './commonFunc'; /* 通用单据方法 */ import commonConfig from '../../utils/config'; diff --git a/src/components/Common/CommonListLeft/index.js b/src/components/Common/CommonListLeft/index.js index edc74a4..a6623cd 100644 --- a/src/components/Common/CommonListLeft/index.js +++ b/src/components/Common/CommonListLeft/index.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form, Icon } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin, Slider, Button } from 'antd'; +import { Layout, Spin, Slider, Button } from 'antd-v4'; import { MessageOutlined, MinusOutlined } from '@ant-design/icons'; import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */ import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/Common/CommonListSelect/index.js b/src/components/Common/CommonListSelect/index.js index 66351b8..26dac06 100644 --- a/src/components/Common/CommonListSelect/index.js +++ b/src/components/Common/CommonListSelect/index.js @@ -3,7 +3,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; import { UploadOutlined } from '@ant-design/icons'; -import { Layout, Spin, Button, message, Upload, Modal } from 'antd'; +import { Layout, Spin, Button, message, Upload, Modal } from 'antd-v4'; import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */ import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */ diff --git a/src/components/Common/CommonListSelectAssignment.js b/src/components/Common/CommonListSelectAssignment.js index 883ea43..4020eae 100644 --- a/src/components/Common/CommonListSelectAssignment.js +++ b/src/components/Common/CommonListSelectAssignment.js @@ -4,7 +4,7 @@ import React, { Component } 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 CommonListEvent from './CommonListEvent';/* 继承销售模块业务功能 */ // import * as commonUtils from '../../utils/utils'; /* 通用方法 */ import * as commonFunc from './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/CommonListSelectFlex/index.js b/src/components/Common/CommonListSelectFlex/index.js index 97122c5..83d1790 100644 --- a/src/components/Common/CommonListSelectFlex/index.js +++ b/src/components/Common/CommonListSelectFlex/index.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin, Button, Row, Col, message } from 'antd'; +import { Layout, Spin, Button, Row, Col, message } 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/CommonListSelectMulti/index.js b/src/components/Common/CommonListSelectMulti/index.js index 3e44c9e..bcceeaf 100644 --- a/src/components/Common/CommonListSelectMulti/index.js +++ b/src/components/Common/CommonListSelectMulti/index.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { DownOutlined } from '@ant-design/icons'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin, Button, Row, Col, message } from 'antd'; +import { Layout, Spin, Button, Row, Col, message } from 'antd-v4'; import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */ // import * as commonUtils from '../../utils/utils'; /* 通用方法 */ import * as commonFunc from '@/components/Common//commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/Common/CommonListSelectProductMaterial.js b/src/components/Common/CommonListSelectProductMaterial.js index c01913e..c1ad920 100644 --- a/src/components/Common/CommonListSelectProductMaterial.js +++ b/src/components/Common/CommonListSelectProductMaterial.js @@ -8,7 +8,7 @@ import React, { Component } 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 CommonListEvent from './CommonListEvent';/* 继承销售模块业务功能 */ import * as commonFunc from './commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ import StaticEditTable from './CommonTable';/* 可编辑表格 */ diff --git a/src/components/Common/CommonListSelectTree/index.js b/src/components/Common/CommonListSelectTree/index.js index ee4f3d2..af9d361 100644 --- a/src/components/Common/CommonListSelectTree/index.js +++ b/src/components/Common/CommonListSelectTree/index.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { DownOutlined } from '@ant-design/icons'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin, Button, Row, Col, message } from 'antd'; +import { Layout, Spin, Button, Row, Col, message } from 'antd-v4'; import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */ // import * as commonUtils from '../../utils/utils'; /* 通用方法 */ import * as commonFunc from '@/components/Common//commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/Common/CommonListTabEvent.js b/src/components/Common/CommonListTabEvent.js index 0f66f49..5f9fdad 100644 --- a/src/components/Common/CommonListTabEvent.js +++ b/src/components/Common/CommonListTabEvent.js @@ -4,7 +4,7 @@ * Created by mar105 on 2019-03-27. */ import React, { Component } from 'react'; -import { Modal, message } from 'antd'; +import { Modal, message } from 'antd-v4'; import * as commonUtils from '../../utils/utils'; /* 通用方法 */ import * as commonFunc from './commonFunc'; /* 通用单据方法 */ import commonConfig from '../../utils/config'; diff --git a/src/components/Common/CommonListTree/index.js b/src/components/Common/CommonListTree/index.js index b576146..910f5be 100644 --- a/src/components/Common/CommonListTree/index.js +++ b/src/components/Common/CommonListTree/index.js @@ -9,7 +9,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin } from 'antd'; +import { Layout, Spin } from 'antd-v4'; import CommonListTreeEvent from '../CommonListTreeEvent';/* 继承销售模块业务功能 */ import * as commonFunc from '../commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ import Toolbar from '../ToolBar/ToolBarNew'; diff --git a/src/components/Common/CommonListTreeEvent.js b/src/components/Common/CommonListTreeEvent.js index ac21120..50c8f2f 100644 --- a/src/components/Common/CommonListTreeEvent.js +++ b/src/components/Common/CommonListTreeEvent.js @@ -3,7 +3,7 @@ * Created by mar105 on 2019-03-27. */ import React, { Component } from 'react'; -import { Modal, message } from 'antd'; +import { Modal, message } from 'antd-v4'; import * as commonUtils from '../../utils/utils'; /* 通用方法 */ import * as commonFunc from './commonFunc'; /* 通用单据方法 */ import commonConfig from '../../utils/config'; diff --git a/src/components/Common/CommonListTreeSelect/index.js b/src/components/Common/CommonListTreeSelect/index.js index 3bcbd79..a1bc791 100644 --- a/src/components/Common/CommonListTreeSelect/index.js +++ b/src/components/Common/CommonListTreeSelect/index.js @@ -5,7 +5,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin, Button, message } from 'antd'; +import { Layout, Spin, Button, message } from 'antd-v4'; import CommonListTreeEvent from '@/components/Common/CommonListTreeEvent';/* 继承销售模块业务功能 */ import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */ diff --git a/src/components/Common/CommonNewBill.js b/src/components/Common/CommonNewBill.js index 92e00fc..9fde7ea 100644 --- a/src/components/Common/CommonNewBill.js +++ b/src/components/Common/CommonNewBill.js @@ -3,7 +3,7 @@ import React, { Component, useState, useRef, useEffect } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import {Row, Col, Checkbox, Layout, Spin, Tabs, Dropdown, Avatar, Button, Menu, Table, Upload} from 'antd'; +import {Row, Col, Checkbox, Layout, Spin, Tabs, Dropdown, Avatar, Button, Menu, Table, Upload} from 'antd-v4'; import { message } from '@/utils/common/message'; import {DownOutlined, UploadOutlined,} from '@ant-design/icons'; import CommonNewSales from '@/components/Common/CommonNewBillEvent';/* 继承销售模块业务功能 */ diff --git a/src/components/Common/CommonNewBillEvent.js b/src/components/Common/CommonNewBillEvent.js index eda7432..ce94333 100644 --- a/src/components/Common/CommonNewBillEvent.js +++ b/src/components/Common/CommonNewBillEvent.js @@ -1,6 +1,6 @@ /* eslint-disable */ import React, { Component } from 'react'; -import { Modal, Progress } from 'antd'; +import { Modal, Progress } from 'antd-v4'; import { message } from '@/utils/common/message'; // import moment from 'moment'; import * as commonUtils from '@/utils/utils'; /* 通用方法 */ 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/CommonSystemSettingEvent.js b/src/components/Common/CommonSystemSettingEvent.js index 91b2cec..99db9cc 100644 --- a/src/components/Common/CommonSystemSettingEvent.js +++ b/src/components/Common/CommonSystemSettingEvent.js @@ -1,7 +1,7 @@ /* eslint-disable array-callback-return,no-undef,prefer-destructuring */ import moment from 'moment'; import React, { Component } from 'react'; -import { Modal, message } from 'antd'; +import { Modal, message } from 'antd-v4'; import * as commonFunc from './commonFunc'; import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */ import * as commonUtils from '../../utils/utils'; /* 通用方法 */ diff --git a/src/components/Common/CommonTableNew/index.tsx b/src/components/Common/CommonTableNew/index.tsx index d551479..e7f6781 100644 --- a/src/components/Common/CommonTableNew/index.tsx +++ b/src/components/Common/CommonTableNew/index.tsx @@ -1,6 +1,6 @@ import React, { useContext, useEffect, useState, useRef } from 'react'; -import { Form, Table, Tooltip } from 'antd'; -import type { GetRef, InputRef, TableProps, } from 'antd'; +import { Form, Table, Tooltip } from 'antd-v4'; +import type { GetRef, InputRef, TableProps, } from 'antd-v4'; import * as commonUtils from '@/utils/utils'; import FormItemType from '@/components/Common/CommonComponentNew'; diff --git a/src/components/Common/CommonTableNew/type.ts b/src/components/Common/CommonTableNew/type.ts index 59fa111..6b5cd72 100644 --- a/src/components/Common/CommonTableNew/type.ts +++ b/src/components/Common/CommonTableNew/type.ts @@ -1,4 +1,4 @@ -import type { TableProps } from 'antd'; +import type { TableProps } from 'antd-v4'; export interface RecordType { [key: string]: any; // 根据实际需求调整类型 diff --git a/src/components/Common/CommonView/index.js b/src/components/Common/CommonView/index.js index 4a3b65c..da778bc 100644 --- a/src/components/Common/CommonView/index.js +++ b/src/components/Common/CommonView/index.js @@ -1,7 +1,7 @@ /* eslint-disable object-curly-newline,prefer-destructuring */ import React, { Component } from 'react'; import '@ant-design/compatible/assets/index.css'; -import { Row, Col, Form, Tooltip } from 'antd'; +import { Row, Col, Form, Tooltip } from 'antd-v4'; import { DoubleRightOutlined } from '@ant-design/icons'; import commonConfig from '@/utils/config'; import ShowType from '@/components/Common/CommonComponent'; 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/CommonViewFlex/index.js b/src/components/Common/CommonViewFlex/index.js index 1891d77..473ed28 100644 --- a/src/components/Common/CommonViewFlex/index.js +++ b/src/components/Common/CommonViewFlex/index.js @@ -1,7 +1,7 @@ /* eslint-disable object-curly-newline,prefer-destructuring */ import React, { Component } from 'react'; import '@ant-design/compatible/assets/index.css'; -import { Row, Col, Form } from 'antd'; +import { Row, Col, Form } from 'antd-v4'; import ShowType from '@/components/Common/CommonComponent'; import AntdDraggableModal from '@/components/Common/AntdDraggableModal'; import CommonListSelectTree from '@/components/Common/CommonListSelectTree'; diff --git a/src/components/Common/CommonViewTable/index.js b/src/components/Common/CommonViewTable/index.js index 2713889..26de3c3 100644 --- a/src/components/Common/CommonViewTable/index.js +++ b/src/components/Common/CommonViewTable/index.js @@ -2,7 +2,7 @@ /* eslint-disable object-curly-newline,prefer-destructuring */ import React, { Component } from 'react'; import '@ant-design/compatible/assets/index.css'; -import { Row, Col, Divider, Tooltip } from 'antd'; +import { Row, Col, Divider, Tooltip } from 'antd-v4'; import ShowType from '@/components/Common/CommonComponent'; import AntdDraggableModal from '@/components/Common/AntdDraggableModal'; import CommonListSelectTree from '@/components/Common/CommonListSelectTree'; diff --git a/src/components/Common/ContextMenuModal.js b/src/components/Common/ContextMenuModal.js index fb7def7..21be754 100644 --- a/src/components/Common/ContextMenuModal.js +++ b/src/components/Common/ContextMenuModal.js @@ -5,7 +5,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Row, Col, Radio } from 'antd'; +import { Row, Col, Radio } from 'antd-v4'; import * as commonUtils from '../../utils/utils'; import ShowType from './CommonComponent';/* 通用方法 */ import AntdDraggableModal from '../Common/AntdDraggableModal'; 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/Flows/CommonFlow.js b/src/components/Common/Flows/CommonFlow.js index 0cdadc2..a93d7da 100644 --- a/src/components/Common/Flows/CommonFlow.js +++ b/src/components/Common/Flows/CommonFlow.js @@ -1,7 +1,7 @@ /* eslint-disable */ /* eslint-disable prefer-destructuring,no-await-in-loop,radix,,no-loop-func */ import React, { useState, useCallback, useNodes } from 'react'; -import { Button, Modal, Input } from 'antd'; +import { Button, Modal, Input } from 'antd-v4'; import ReactFlow, { addEdge, MiniMap, diff --git a/src/components/Common/Flows/OverviewFlow.js b/src/components/Common/Flows/OverviewFlow.js index 06782f8..3991e86 100644 --- a/src/components/Common/Flows/OverviewFlow.js +++ b/src/components/Common/Flows/OverviewFlow.js @@ -1,7 +1,7 @@ /* eslint-disable */ /* eslint-disable prefer-destructuring,no-await-in-loop,radix,,no-loop-func */ import React, { useState, useCallback, useNodes } from 'react'; -import { Button, Modal, Input } from 'antd'; +import { Button, Modal, Input } from 'antd-v4'; import ReactFlow, { addEdge, MiniMap, diff --git a/src/components/Common/Gatte/CommonGatte.js b/src/components/Common/Gatte/CommonGatte.js index 962da1e..f2ff629 100644 --- a/src/components/Common/Gatte/CommonGatte.js +++ b/src/components/Common/Gatte/CommonGatte.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin } from 'antd'; +import { Layout, Spin } from 'antd-v4'; import CommonListEvent from '../CommonListEvent';/* 继承销售模块业务功能 */ import * as commonFunc from '../commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ import Toolbar from '../ToolBar/ToolBarNew'; diff --git a/src/components/Common/MaterialRequirementsPlanning.js b/src/components/Common/MaterialRequirementsPlanning.js index 688d1be..d6cf297 100644 --- a/src/components/Common/MaterialRequirementsPlanning.js +++ b/src/components/Common/MaterialRequirementsPlanning.js @@ -8,7 +8,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin } from 'antd'; +import { Layout, Spin } from 'antd-v4'; import CommonListEvent from './CommonListEvent';/* 继承销售模块业务功能 */ import * as commonFunc from './commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ import Toolbar from '../Common/ToolBar/ToolBarNew'; 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/SearchComponent/index.js b/src/components/Common/SearchComponent/index.js index 02771ca..54cb389 100644 --- a/src/components/Common/SearchComponent/index.js +++ b/src/components/Common/SearchComponent/index.js @@ -3,7 +3,7 @@ import React, { Component } from 'react'; import { MinusCircleOutlined, PlusOutlined, SettingOutlined ,SearchOutlined,CloseCircleOutlined} from '@ant-design/icons'; import { Form, Icon as LegacyIcon } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Row, Col, Button, message, Space } from 'antd'; +import { Row, Col, Button, message, Space } from 'antd-v4'; import moment from 'moment'; import commonConfig from '@/utils/config'; import * as commonUtils from '@/utils/utils'; diff --git a/src/components/Common/ShowImage/ShowImage.js b/src/components/Common/ShowImage/ShowImage.js index 8df8075..6bb4f17 100644 --- a/src/components/Common/ShowImage/ShowImage.js +++ b/src/components/Common/ShowImage/ShowImage.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { Image } from 'antd'; +import { Image } from 'antd-v4'; import './ShowImage.less'; import FullScreen from '../../../assets/quanping.svg'; diff --git a/src/components/Common/SlaveMemo copy 2.js b/src/components/Common/SlaveMemo copy 2.js index c17b539..bbeb8f0 100644 --- a/src/components/Common/SlaveMemo copy 2.js +++ b/src/components/Common/SlaveMemo copy 2.js @@ -5,7 +5,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Input, message } from 'antd'; +import { Input, message } from 'antd-v4'; import * as commonUtils from '../../utils/utils'; import ShowType from './CommonComponent';/* 通用方法 */ import AntdDraggableModal from '../Common/AntdDraggableModal'; diff --git a/src/components/Common/SlaveMemo copy.js b/src/components/Common/SlaveMemo copy.js index c17b539..bbeb8f0 100644 --- a/src/components/Common/SlaveMemo copy.js +++ b/src/components/Common/SlaveMemo copy.js @@ -5,7 +5,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Input, message } from 'antd'; +import { Input, message } from 'antd-v4'; import * as commonUtils from '../../utils/utils'; import ShowType from './CommonComponent';/* 通用方法 */ import AntdDraggableModal from '../Common/AntdDraggableModal'; diff --git a/src/components/Common/SlaveMemo.js b/src/components/Common/SlaveMemo.js index c17b539..bbeb8f0 100644 --- a/src/components/Common/SlaveMemo.js +++ b/src/components/Common/SlaveMemo.js @@ -5,7 +5,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Input, message } from 'antd'; +import { Input, message } from 'antd-v4'; import * as commonUtils from '../../utils/utils'; import ShowType from './CommonComponent';/* 通用方法 */ import AntdDraggableModal from '../Common/AntdDraggableModal'; diff --git a/src/components/Common/SlaveMemo1 copy 2.js b/src/components/Common/SlaveMemo1 copy 2.js index 37bfd51..8448be6 100644 --- a/src/components/Common/SlaveMemo1 copy 2.js +++ b/src/components/Common/SlaveMemo1 copy 2.js @@ -5,7 +5,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Input } from 'antd'; +import { Input } from 'antd-v4'; import * as commonUtils from '../../utils/utils'; import ShowType from './CommonComponent';/* 通用方法 */ import AntdDraggableModal from '../Common/AntdDraggableModal'; diff --git a/src/components/Common/SlaveMemo1 copy.js b/src/components/Common/SlaveMemo1 copy.js index 37bfd51..8448be6 100644 --- a/src/components/Common/SlaveMemo1 copy.js +++ b/src/components/Common/SlaveMemo1 copy.js @@ -5,7 +5,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Input } from 'antd'; +import { Input } from 'antd-v4'; import * as commonUtils from '../../utils/utils'; import ShowType from './CommonComponent';/* 通用方法 */ import AntdDraggableModal from '../Common/AntdDraggableModal'; diff --git a/src/components/Common/SlaveMemo1.js b/src/components/Common/SlaveMemo1.js index 37bfd51..8448be6 100644 --- a/src/components/Common/SlaveMemo1.js +++ b/src/components/Common/SlaveMemo1.js @@ -5,7 +5,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Input } from 'antd'; +import { Input } from 'antd-v4'; import * as commonUtils from '../../utils/utils'; import ShowType from './CommonComponent';/* 通用方法 */ import AntdDraggableModal from '../Common/AntdDraggableModal'; diff --git a/src/components/Common/SlavesInfo.js b/src/components/Common/SlavesInfo.js index e993bc2..eadaab1 100644 --- a/src/components/Common/SlavesInfo.js +++ b/src/components/Common/SlavesInfo.js @@ -3,7 +3,7 @@ */ /* eslint-disable no-undef,import/first,prefer-destructuring,jsx-a11y/alt-text */ import React, { Component } from 'react'; -import { Input } from 'antd'; +import { Input } from 'antd-v4'; import * as commonUtils from '../../utils/utils'; import * as commonFunc from './commonFunc'; /* 通用方法 */ import AntdDraggableModal from '../Common/AntdDraggableModal'; diff --git a/src/components/Common/Tree/StaticTree.js b/src/components/Common/Tree/StaticTree.js index 97b9537..3c64426 100644 --- a/src/components/Common/Tree/StaticTree.js +++ b/src/components/Common/Tree/StaticTree.js @@ -7,7 +7,7 @@ import file_single from '@/assets/file_single.svg'; import process from '@/assets/treeprocess.svg'; import material from '@/assets/treematerial.svg'; import '@ant-design/compatible/assets/index.css'; -import { Tree, Button, Input, Checkbox } from 'antd'; +import { Tree, Button, Input, Checkbox } from 'antd-v4'; import StaticEditTable from '../CommonTable';/* 可编辑表格 */ import * as commonUtils from '../../../utils/utils'; import styles from './Tree.css'; 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/Common/baseChar.js b/src/components/Common/baseChar.js index c20cbdb..bde9e97 100644 --- a/src/components/Common/baseChar.js +++ b/src/components/Common/baseChar.js @@ -1,6 +1,6 @@ /* eslint-disable object-curly-newline */ import React, { Component } from 'react'; -import { message } from 'antd'; +import { message } from 'antd-v4'; import commonConfig from '../../utils/config'; import * as commonUtils from '../../utils/utils'; import * as commonServices from '../../services/services'; diff --git a/src/components/Common/commonBusiness.js b/src/components/Common/commonBusiness.js index 2cd71fb..df5372c 100644 --- a/src/components/Common/commonBusiness.js +++ b/src/components/Common/commonBusiness.js @@ -2,7 +2,7 @@ * Created by mar105 on 2019-02-25. */ /* eslint-disable */ -import { Modal, message } from 'antd'; +import { Modal, message } from 'antd-v4'; // import { Modal as mobileModal } from 'antd-mobile'; // import { message } from '@/utils/common/message'; diff --git a/src/components/CommonClassifyEvent/CommonClassify.js b/src/components/CommonClassifyEvent/CommonClassify.js index 09cda15..359e814 100644 --- a/src/components/CommonClassifyEvent/CommonClassify.js +++ b/src/components/CommonClassifyEvent/CommonClassify.js @@ -3,7 +3,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; // import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin } from 'antd'; +import { Layout, Spin } from 'antd-v4'; import styles from '@/index.less'; import Toolbar from '@/components/Common/ToolBar/ToolBarNew'; import CommonBase from '@/components/Common/CommonBase'; diff --git a/src/components/CommonElementEvent/BatchNPriceUpdate.js b/src/components/CommonElementEvent/BatchNPriceUpdate.js index 34bded5..95c30d0 100644 --- a/src/components/CommonElementEvent/BatchNPriceUpdate.js +++ b/src/components/CommonElementEvent/BatchNPriceUpdate.js @@ -3,7 +3,7 @@ */ /* eslint-disable no-undef,import/first,prefer-destructuring,jsx-a11y/alt-text */ import React, { Component } from 'react'; -import { Input, message } from 'antd'; +import { Input, message } from 'antd-v4'; import styles from '../../index.less'; import * as commonBusiness from '../Common/commonBusiness'; import * as commonServices from '../../services/services'; /* 服务类 */ diff --git a/src/components/CommonElementEvent/BatchPriceUpdate.js b/src/components/CommonElementEvent/BatchPriceUpdate.js index 4fc653b..3f84ea1 100644 --- a/src/components/CommonElementEvent/BatchPriceUpdate.js +++ b/src/components/CommonElementEvent/BatchPriceUpdate.js @@ -3,7 +3,7 @@ */ /* eslint-disable no-undef,import/first,prefer-destructuring,jsx-a11y/alt-text */ import React, { Component } from 'react'; -import { Input, message } from 'antd'; +import { Input, message } from 'antd-v4'; import styles from '../../index.less'; import * as commonBusiness from '../Common/commonBusiness'; import * as commonServices from '../../services/services'; /* 服务类 */ diff --git a/src/components/CommonElementEvent/BatchWorkListPriceUpdate.js b/src/components/CommonElementEvent/BatchWorkListPriceUpdate.js index daabaf5..d68f060 100644 --- a/src/components/CommonElementEvent/BatchWorkListPriceUpdate.js +++ b/src/components/CommonElementEvent/BatchWorkListPriceUpdate.js @@ -3,7 +3,7 @@ */ /* eslint-disable no-undef,import/first,prefer-destructuring,jsx-a11y/alt-text */ import React, { Component } from 'react'; -import { Input, message, Radio } from 'antd'; +import { Input, message, Radio } from 'antd-v4'; import styles from '../../index.less'; import * as commonBusiness from '../Common/commonBusiness'; import * as commonServices from '../../services/services'; /* 服务类 */ diff --git a/src/components/CommonElementEvent/CheckModelInfo.js b/src/components/CommonElementEvent/CheckModelInfo.js index 6991c7f..7fc52a9 100644 --- a/src/components/CommonElementEvent/CheckModelInfo.js +++ b/src/components/CommonElementEvent/CheckModelInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Tabs, Spin, Avatar } from 'antd'; +import { Layout, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/CheckPhaseInfo.js b/src/components/CommonElementEvent/CheckPhaseInfo.js index 7b16a9f..658f1f5 100644 --- a/src/components/CommonElementEvent/CheckPhaseInfo.js +++ b/src/components/CommonElementEvent/CheckPhaseInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Tabs, Spin, Avatar } from 'antd'; +import { Layout, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/CustomerInfo.js b/src/components/CommonElementEvent/CustomerInfo.js index c80ce82..106d013 100644 --- a/src/components/CommonElementEvent/CustomerInfo.js +++ b/src/components/CommonElementEvent/CustomerInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Tabs, Spin, Avatar } from 'antd'; +import { Layout, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/ElemachineInfo.js b/src/components/CommonElementEvent/ElemachineInfo.js index 709b94d..6dd4412 100644 --- a/src/components/CommonElementEvent/ElemachineInfo.js +++ b/src/components/CommonElementEvent/ElemachineInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin, Tabs, Avatar } from 'antd'; +import { Layout, Spin, Tabs, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/EleteamInfo.js b/src/components/CommonElementEvent/EleteamInfo.js index 7fa6158..d4c2ede 100644 --- a/src/components/CommonElementEvent/EleteamInfo.js +++ b/src/components/CommonElementEvent/EleteamInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Tabs, Spin, Avatar } from 'antd'; +import { Layout, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/EmployeeInfo.js b/src/components/CommonElementEvent/EmployeeInfo.js index 3158bf1..5c979a4 100644 --- a/src/components/CommonElementEvent/EmployeeInfo.js +++ b/src/components/CommonElementEvent/EmployeeInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin, Avatar } from 'antd'; +import { Layout, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/FilfileManageInfo.js b/src/components/CommonElementEvent/FilfileManageInfo.js index 52db2dc..e9bcd35 100644 --- a/src/components/CommonElementEvent/FilfileManageInfo.js +++ b/src/components/CommonElementEvent/FilfileManageInfo.js @@ -5,7 +5,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Button, Layout, message, Spin } from 'antd'; +import { Button, Layout, message, Spin } from 'antd-v4'; import StaticEditTable from '../Common/CommonTable'; import * as commonBusiness from '../Common/commonBusiness'; import CommonBase from '../Common/CommonBase'; diff --git a/src/components/CommonElementEvent/KnifeMouldInfo.js b/src/components/CommonElementEvent/KnifeMouldInfo.js index fdca747..4b050fe 100644 --- a/src/components/CommonElementEvent/KnifeMouldInfo.js +++ b/src/components/CommonElementEvent/KnifeMouldInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Tabs, Spin, Avatar, message } from 'antd'; +import { Layout, Tabs, Spin, Avatar, message } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/MaterialsInfo.js b/src/components/CommonElementEvent/MaterialsInfo.js index 3238af7..9bfe32b 100644 --- a/src/components/CommonElementEvent/MaterialsInfo.js +++ b/src/components/CommonElementEvent/MaterialsInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Tabs, Spin, Avatar } from 'antd'; +import { Layout, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/MonthEndingClosing.js b/src/components/CommonElementEvent/MonthEndingClosing.js index 0d13bb7..10fddbc 100644 --- a/src/components/CommonElementEvent/MonthEndingClosing.js +++ b/src/components/CommonElementEvent/MonthEndingClosing.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin } from 'antd'; +import { Layout, Spin } from 'antd-v4'; import styles from '../../index.less'; // import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/PaymentTermsInfo.js b/src/components/CommonElementEvent/PaymentTermsInfo.js index 3e96ae2..b0293f2 100644 --- a/src/components/CommonElementEvent/PaymentTermsInfo.js +++ b/src/components/CommonElementEvent/PaymentTermsInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin } from 'antd'; +import { Layout, Spin } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/PrintInfo.js b/src/components/CommonElementEvent/PrintInfo.js index a29897c..acc7186 100644 --- a/src/components/CommonElementEvent/PrintInfo.js +++ b/src/components/CommonElementEvent/PrintInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Tabs, Spin, Avatar, message } from 'antd'; +import { Layout, Tabs, Spin, Avatar, message } from 'antd-v4'; import styles from '@/index.less'; import Toolbar from '@/components/Common/ToolBar/ToolBarNew'; import * as commonFunc from '@/components/Common/commonFunc'; diff --git a/src/components/CommonElementEvent/ProcessInfo.js b/src/components/CommonElementEvent/ProcessInfo.js index d50b610..56ae6e0 100644 --- a/src/components/CommonElementEvent/ProcessInfo.js +++ b/src/components/CommonElementEvent/ProcessInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Tabs, Spin, Avatar } from 'antd'; +import { Layout, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/ProductClassifyInfo.js b/src/components/CommonElementEvent/ProductClassifyInfo.js index 978d0ff..21bbd59 100644 --- a/src/components/CommonElementEvent/ProductClassifyInfo.js +++ b/src/components/CommonElementEvent/ProductClassifyInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Tabs, Spin, Avatar } from 'antd'; +import { Layout, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/SftLoginInfo.js b/src/components/CommonElementEvent/SftLoginInfo.js index c844b71..a994dca 100644 --- a/src/components/CommonElementEvent/SftLoginInfo.js +++ b/src/components/CommonElementEvent/SftLoginInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Tabs, Spin, Avatar } from 'antd'; +import { Layout, Tabs, Spin, Avatar } from 'antd-v4'; import * as commonUtils from '@/utils/utils';/* 通用方法 */ import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/SisCommonStyle.js b/src/components/CommonElementEvent/SisCommonStyle.js index 7851d1f..dd9c9cc 100644 --- a/src/components/CommonElementEvent/SisCommonStyle.js +++ b/src/components/CommonElementEvent/SisCommonStyle.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Tabs, Spin, Avatar } from 'antd'; +import { Layout, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/SisformulaInfo.js b/src/components/CommonElementEvent/SisformulaInfo.js index 5dafb50..b7fcf2f 100644 --- a/src/components/CommonElementEvent/SisformulaInfo.js +++ b/src/components/CommonElementEvent/SisformulaInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin, Tabs, Row, Col } from 'antd'; +import { Layout, Spin, Tabs, Row, Col } from 'antd-v4'; import styles from '@/index.less'; import * as commonUtils from '@/utils/utils'; import Toolbar from '@/components/Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/StatementInfo.js b/src/components/CommonElementEvent/StatementInfo.js index 14d4c58..9dbc746 100644 --- a/src/components/CommonElementEvent/StatementInfo.js +++ b/src/components/CommonElementEvent/StatementInfo.js @@ -13,7 +13,7 @@ import { UploadOutlined, } from '@ant-design/icons'; -import { Modal, Upload, message } from 'antd'; +import { Modal, Upload, message } from 'antd-v4'; import * as commonUtils from '../../utils/utils'; import * as commonServices from '../../services/services'; import commonConfig from '../../utils/config'; diff --git a/src/components/CommonElementEvent/SupplyInfo.js b/src/components/CommonElementEvent/SupplyInfo.js index 813ead5..ab83db1 100644 --- a/src/components/CommonElementEvent/SupplyInfo.js +++ b/src/components/CommonElementEvent/SupplyInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Tabs, Spin, Avatar } from 'antd'; +import { Layout, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/SysMsgInfo.js b/src/components/CommonElementEvent/SysMsgInfo.js index a4d0a31..aaf8e99 100644 --- a/src/components/CommonElementEvent/SysMsgInfo.js +++ b/src/components/CommonElementEvent/SysMsgInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin } from 'antd';// Tabs, Form, +import { Layout, Spin } from 'antd-v4';// Tabs, Form, import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonElementEvent/TestStandInfo.js b/src/components/CommonElementEvent/TestStandInfo.js index c186cd6..d650c84 100644 --- a/src/components/CommonElementEvent/TestStandInfo.js +++ b/src/components/CommonElementEvent/TestStandInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Tabs, Spin, Avatar } from 'antd'; +import { Layout, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/CommonSystemSettingEvent/CommonSystemSetting.js b/src/components/CommonSystemSettingEvent/CommonSystemSetting.js index 30e644f..9e6c10b 100644 --- a/src/components/CommonSystemSettingEvent/CommonSystemSetting.js +++ b/src/components/CommonSystemSettingEvent/CommonSystemSetting.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin, Tabs } from 'antd'; +import { Layout, Spin, Tabs } from 'antd-v4'; import styles from '@/index.less'; import * as commonUtils from '@/utils/utils';/* 通用方法 */ import CommonBase from '@/components/Common/CommonBase'; diff --git a/src/components/CommonSystemSettingEvent/TabFinanceOffer.js b/src/components/CommonSystemSettingEvent/TabFinanceOffer.js index 359b5da..aa133a3 100644 --- a/src/components/CommonSystemSettingEvent/TabFinanceOffer.js +++ b/src/components/CommonSystemSettingEvent/TabFinanceOffer.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Row, Col } from 'antd'; +import { Row, Col } from 'antd-v4'; import ShowType from '@/components/Common/CommonComponent'; import styles from '@/index.less'; import * as commonUtils from '@/utils/utils'; diff --git a/src/components/CommonSystemSettingEvent/TabFinancePeriod.js b/src/components/CommonSystemSettingEvent/TabFinancePeriod.js index 5f47177..3c77239 100644 --- a/src/components/CommonSystemSettingEvent/TabFinancePeriod.js +++ b/src/components/CommonSystemSettingEvent/TabFinancePeriod.js @@ -2,7 +2,7 @@ import moment from 'moment'; import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Row, Col, message, DatePicker, Button } from 'antd'; +import { Row, Col, message, DatePicker, Button } from 'antd-v4'; import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */ import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */ import styles from '@/index.less'; diff --git a/src/components/CommonSystemSettingEvent/TabSalesBuyer.js b/src/components/CommonSystemSettingEvent/TabSalesBuyer.js index ebf5d19..76ce3a3 100644 --- a/src/components/CommonSystemSettingEvent/TabSalesBuyer.js +++ b/src/components/CommonSystemSettingEvent/TabSalesBuyer.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Row, Col } from 'antd'; +import { Row, Col } from 'antd-v4'; import ShowType from '@/components/Common/CommonComponent'; import styles from '@/index.less'; import * as commonUtils from '@/utils/utils'; diff --git a/src/components/CommonSystemSettingEvent/TabSysParam.js b/src/components/CommonSystemSettingEvent/TabSysParam.js index 2ceb08d..eb36395 100644 --- a/src/components/CommonSystemSettingEvent/TabSysParam.js +++ b/src/components/CommonSystemSettingEvent/TabSysParam.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Row, Col } from 'antd'; +import { Row, Col } from 'antd-v4'; import ShowType from '@/components/Common/CommonComponent'; import styles from '@/index.less'; import * as commonUtils from '@/utils/utils'; 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/FaceDetect/index.js b/src/components/FaceDetect/index.js index b8b6ec5..6e0e2e3 100644 --- a/src/components/FaceDetect/index.js +++ b/src/components/FaceDetect/index.js @@ -2,7 +2,7 @@ import { Component } from 'react'; import { VideoCameraOutlined } from '@ant-design/icons'; import '@ant-design/compatible/assets/index.css'; -import { Progress, message } from 'antd'; +import { Progress, message } from 'antd-v4'; import * as commonServices from "../../services/services"; import config from '@/utils/config'; import './index.less'; 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/ProcessCard/ProcessCard.js b/src/components/Manufacture/ProcessCard/ProcessCard.js index e8951f8..35922a6 100644 --- a/src/components/Manufacture/ProcessCard/ProcessCard.js +++ b/src/components/Manufacture/ProcessCard/ProcessCard.js @@ -6,7 +6,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Modal, Layout, Spin, Avatar, Select, message, Button } from 'antd'; +import { Modal, Layout, Spin, Avatar, Select, message, Button } from 'antd-v4'; import ProcessUp from '../../../assets/processUp.svg'; import ProcessDown from '../../../assets/processDown.svg'; import DisableProcessUp from '../../../assets/disableprocessUp.svg'; diff --git a/src/components/Manufacture/ProcessCardPack/ProcessCardPack.js b/src/components/Manufacture/ProcessCardPack/ProcessCardPack.js index da8a034..f9ccc88 100644 --- a/src/components/Manufacture/ProcessCardPack/ProcessCardPack.js +++ b/src/components/Manufacture/ProcessCardPack/ProcessCardPack.js @@ -7,7 +7,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Modal, Layout, Spin, Avatar, Select, message, Button, Tabs } from 'antd'; +import { Modal, Layout, Spin, Avatar, Select, message, Button, Tabs } from 'antd-v4'; import AddIcon from '../../../assets/add.svg'; import DisableAddIcon from '../../../assets/disableadd.svg'; import DelIcon from '../../../assets/delete.svg'; diff --git a/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js b/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js index b906de6..a582e96 100644 --- a/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js +++ b/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js @@ -9,7 +9,7 @@ import { RightOutlined, } from '@ant-design/icons'; import CloseRight from "../../../assets/close.svg"; -import { Modal, Layout, Spin, Avatar, Select, message, Button, Tabs, Collapse, Radio, Row, Col, Divider } from 'antd'; +import { Modal, Layout, Spin, Avatar, Select, message, Button, Tabs, Collapse, Radio, Row, Col, Divider } from 'antd-v4'; import AddIcon from '../../../assets/add.svg'; import DisableAddIcon from '../../../assets/disableadd.svg'; import DelIcon from '../../../assets/delete.svg'; 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/WorkOrder/SplitPaste.js b/src/components/Manufacture/WorkOrder/SplitPaste.js index 9d91f88..7fa70d3 100644 --- a/src/components/Manufacture/WorkOrder/SplitPaste.js +++ b/src/components/Manufacture/WorkOrder/SplitPaste.js @@ -2,7 +2,7 @@ /* eslint-disable function-paren-newline */ import React, { Component } from 'react'; import '@ant-design/compatible/assets/index.css'; -import { Row, Col, List, Card, Checkbox, Select, Form, Tree } from 'antd'; +import { Row, Col, List, Card, Checkbox, Select, Form, Tree } from 'antd-v4'; import ShowType from '@/components/Common/CommonComponent'; import * as commonUtils from '@/utils/utils'; import splitstyles from '../SplitPaste.less'; diff --git a/src/components/Manufacture/WorkOrder/WorkOrder.js b/src/components/Manufacture/WorkOrder/WorkOrder.js index b2dea91..c270275 100644 --- a/src/components/Manufacture/WorkOrder/WorkOrder.js +++ b/src/components/Manufacture/WorkOrder/WorkOrder.js @@ -16,7 +16,7 @@ import { Row, Col, Slider, -} from 'antd'; +} from 'antd-v4'; import AddIcon from '@/assets/add.svg'; import DisableAddIcon from '@/assets/disableadd.svg'; import DelIcon from '@/assets/delete.svg'; diff --git a/src/components/Manufacture/WorkOrderPack/WorkOrderPack.js b/src/components/Manufacture/WorkOrderPack/WorkOrderPack.js index 4adaa41..6c40c77 100644 --- a/src/components/Manufacture/WorkOrderPack/WorkOrderPack.js +++ b/src/components/Manufacture/WorkOrderPack/WorkOrderPack.js @@ -18,7 +18,7 @@ import { Avatar, Slider, Tabs -} from 'antd'; +} from 'antd-v4'; import AddIcon from '@/assets/add.svg'; import AddChildIcon from '@/assets/addChild.svg'; import DisableAddIcon from '@/assets/disableadd.svg'; diff --git a/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js b/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js index 9d622db..3312f5d 100644 --- a/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js +++ b/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js @@ -20,7 +20,7 @@ import { Collapse, Radio, Divider -} from 'antd'; +} from 'antd-v4'; import { RightOutlined, } from '@ant-design/icons'; diff --git a/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js b/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js index 8aa312b..467d8a7 100644 --- a/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js +++ b/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js @@ -21,7 +21,7 @@ import { Collapse, Radio, Divider -} from 'antd'; +} from 'antd-v4'; import { RightOutlined, } from '@ant-design/icons'; 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/MenuPanel/MenuPanel.js b/src/components/MenuPanel/MenuPanel.js index 8206f66..25d9c6a 100644 --- a/src/components/MenuPanel/MenuPanel.js +++ b/src/components/MenuPanel/MenuPanel.js @@ -1,7 +1,7 @@ /* eslint-disable no-undef,function-paren-newline */ import React, { Component } from 'react'; import { BarsOutlined, StarFilled } from '@ant-design/icons'; -import { Button } from 'antd'; +import { Button } from 'antd-v4'; import navdefault from '@/assets/navdefault.svg'; import config from '@/utils/config'; import * as commonFunc from '@/components/Common/commonFunc'; diff --git a/src/components/PrintPdf/PrintPdf.js b/src/components/PrintPdf/PrintPdf.js index 43a0d81..c93c47a 100644 --- a/src/components/PrintPdf/PrintPdf.js +++ b/src/components/PrintPdf/PrintPdf.js @@ -1,7 +1,7 @@ /* eslint-disable */ /* eslint-disable array-callback-return,no-undef */ import React, { Component } from 'react'; -import { Layout } from 'antd';// Tabs, Form, +import { Layout } from 'antd-v4';// Tabs, Form, // import * as commonUtils from '@/utils/utils'; /* 通用方法 */ import PreviewPdf from './PreviewPdf'; diff --git a/src/components/ProductionPlan/ProductionPlan.js b/src/components/ProductionPlan/ProductionPlan.js index e4148ce..36f32ae 100644 --- a/src/components/ProductionPlan/ProductionPlan.js +++ b/src/components/ProductionPlan/ProductionPlan.js @@ -15,7 +15,7 @@ import { Select, Row, Col, -} from 'antd'; +} from 'antd-v4'; import moment from 'moment'; import * as thisUtils from './ProductionPlanUtils';/* 单据业务功能 */ import styles1 from './index.less'; 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/components/QuoQuotation/Quotation/Quotation.js b/src/components/QuoQuotation/Quotation/Quotation.js index 8cc2e8d..99c96cb 100644 --- a/src/components/QuoQuotation/Quotation/Quotation.js +++ b/src/components/QuoQuotation/Quotation/Quotation.js @@ -3,7 +3,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Modal, Layout, Spin, Avatar, Select, message, Button, Slider,Table, Checkbox,Row, Col, } from 'antd'; +import { Modal, Layout, Spin, Avatar, Select, message, Button, Slider,Table, Checkbox,Row, Col, } from 'antd-v4'; import AddIcon from '../../../assets/add.svg'; import DisableAddIcon from '../../../assets/disableadd.svg'; import DelIcon from '../../../assets/delete.svg'; diff --git a/src/components/QuoQuotation/Quotation/SplitPasteQuotation.js b/src/components/QuoQuotation/Quotation/SplitPasteQuotation.js index 73f080e..c21ebdd 100644 --- a/src/components/QuoQuotation/Quotation/SplitPasteQuotation.js +++ b/src/components/QuoQuotation/Quotation/SplitPasteQuotation.js @@ -1,7 +1,7 @@ /* eslint-disable function-paren-newline */ import React, { Component } from 'react'; import '@ant-design/compatible/assets/index.css'; -import { Row, Col, List, Card, Checkbox, Select, Form } from 'antd'; +import { Row, Col, List, Card, Checkbox, Select, Form } from 'antd-v4'; import ShowType from '@/components/Common/CommonComponent'; import splitstyles from '@/components/Manufacture/SplitPaste.less'; import * as commonUtils from '@/utils/utils'; diff --git a/src/components/QuoQuotation/QuotationPack/QuotationPack.js b/src/components/QuoQuotation/QuotationPack/QuotationPack.js index 51cb91e..a9e204e 100644 --- a/src/components/QuoQuotation/QuotationPack/QuotationPack.js +++ b/src/components/QuoQuotation/QuotationPack/QuotationPack.js @@ -8,7 +8,7 @@ import React, { Component } from 'react'; import moment from 'moment'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Modal, Layout, Spin, Avatar, Select, message, Button, Slider, Tabs, Table, Checkbox, Row, Col, } from 'antd'; +import { Modal, Layout, Spin, Avatar, Select, message, Button, Slider, Tabs, Table, Checkbox, Row, Col, } from 'antd-v4'; import AddIcon from '../../../assets/add.svg'; import DisableAddIcon from '../../../assets/disableadd.svg'; import DelIcon from '../../../assets/delete.svg'; diff --git a/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js b/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js index 457e692..2b755eb 100644 --- a/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js +++ b/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js @@ -8,7 +8,7 @@ import React, { Component } from 'react'; import moment from 'moment'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Modal, Layout, Spin, Avatar, Select, message, Button, Slider, Tabs, Collapse, Radio, Row, Col, Table, Checkbox, } from 'antd'; +import { Modal, Layout, Spin, Avatar, Select, message, Button, Slider, Tabs, Collapse, Radio, Row, Col, Table, Checkbox, } from 'antd-v4'; import { RightOutlined } from '@ant-design/icons'; import AddIcon from '../../../assets/add.svg'; import DisableAddIcon from '../../../assets/disableadd.svg'; diff --git a/src/components/Tab/TabComponent.js b/src/components/Tab/TabComponent.js index 8d0aace..d560765 100644 --- a/src/components/Tab/TabComponent.js +++ b/src/components/Tab/TabComponent.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { DownSquareOutlined } from '@ant-design/icons'; import { Icon as LegacyIcon } from '@ant-design/compatible'; -import { Tabs, Dropdown, Menu, Button } from 'antd'; +import { Tabs, Dropdown, Menu, Button } from 'antd-v4'; import MenuPanel from '@/routes/menuPanel/menuPanel'; import * as commonUtils from '@/utils/utils'; import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ diff --git a/src/components/login/Login.js b/src/components/login/Login.js index 1a6eb28..b895c60 100644 --- a/src/components/login/Login.js +++ b/src/components/login/Login.js @@ -3,7 +3,7 @@ import { LockOutlined, UserOutlined } from '@ant-design/icons'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; import { Input, Button, Select, message, Radio } from 'antd-v4'; -import { FloatButton } from 'antd'; +import { FloatButton } from 'antd-v4'; import commonConfig from '../../utils/config'; import * as commonServices from '../../services/services'; import * as commonFunc from '../../components/Common/commonFunc'; diff --git a/src/components/productionPlanInfo/productionHeader.js b/src/components/productionPlanInfo/productionHeader.js index 3586f7f..8152abc 100644 --- a/src/components/productionPlanInfo/productionHeader.js +++ b/src/components/productionPlanInfo/productionHeader.js @@ -4,7 +4,7 @@ /* eslint-disable object-curly-newline,prefer-destructuring */ import React, { Component } from 'react'; import { ExportOutlined, PrinterOutlined, SaveOutlined } from '@ant-design/icons'; -import { Row, Col } from 'antd'; +import { Row, Col } from 'antd-v4'; import styles from '../Common/ToolBar/index.less'; import ShowType from '../Common/CommonComponent'; import * as commonUtils from '../../utils/utils';/* 通用方法 */ diff --git a/src/components/productionPlanInfo/productionPlanChangeMacheInfo.js b/src/components/productionPlanInfo/productionPlanChangeMacheInfo.js index 5080399..0dac436 100644 --- a/src/components/productionPlanInfo/productionPlanChangeMacheInfo.js +++ b/src/components/productionPlanInfo/productionPlanChangeMacheInfo.js @@ -2,7 +2,7 @@ import React, { Component } 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 CommonListEvent from './CommonListEvent';/* 继承销售模块业务功能 */ import * as commonFunc from './commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ import StaticEditTable from './CommonTable';/* 可编辑表格 */ diff --git a/src/components/productionPlanInfo/productionPlanInfo.js b/src/components/productionPlanInfo/productionPlanInfo.js index 4d72a72..25b6b48 100644 --- a/src/components/productionPlanInfo/productionPlanInfo.js +++ b/src/components/productionPlanInfo/productionPlanInfo.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Modal, Layout, Spin, Card, Row, Col } from 'antd'; // Switch Select, Tabs, +import { Modal, Layout, Spin, Card, Row, Col } from 'antd-v4'; // Switch Select, Tabs, import styles from '../../index.less'; import selfstyles from '../productionMainPlan/index.less'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/productionPlanInfo/productionPlanInfo2.js b/src/components/productionPlanInfo/productionPlanInfo2.js index 2dab945..1317f4f 100644 --- a/src/components/productionPlanInfo/productionPlanInfo2.js +++ b/src/components/productionPlanInfo/productionPlanInfo2.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin, Select } from 'antd'; // Switch +import { Layout, Spin, Select } from 'antd-v4'; // Switch import styles from '../../index.less'; import * as commonFunc from '../Common/commonFunc'; import CommonBase from '../Common/CommonBase'; diff --git a/src/components/productionPlanInfo/productionPlanOutside.js b/src/components/productionPlanInfo/productionPlanOutside.js index e1e1e74..49b465e 100644 --- a/src/components/productionPlanInfo/productionPlanOutside.js +++ b/src/components/productionPlanInfo/productionPlanOutside.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; -import { Modal, Layout, Spin, Card, Row, Col, message } from 'antd'; // Switch Select, Tabs, +import { Modal, Layout, Spin, Card, Row, Col, message } from 'antd-v4'; // Switch Select, Tabs, import styles from '../../index.less'; import selfstyles from '../productionMainPlan/index.less'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/models/app.js b/src/models/app.js index 06da906..411c3c2 100644 --- a/src/models/app.js +++ b/src/models/app.js @@ -2,7 +2,7 @@ import { history } from 'umi'; import config from '../utils/config'; import * as utils from '../utils/utils'; import * as services from '../services/services'; -import { message, notification, Modal } from 'antd'; +import { message, notification, Modal } from 'antd-v4'; // import { Toast } from 'antd-mobile'; import * as commonFunc from '../components/Common/commonFunc';/* 通用单据方法 */ diff --git a/src/models/content.js b/src/models/content.js index cfd457a..54d8148 100644 --- a/src/models/content.js +++ b/src/models/content.js @@ -2,7 +2,7 @@ * Created by mar105 on 2017-11-14. */ import { history } from 'umi'; -import { message } from 'antd'; +import { message } from 'antd-v4'; import * as services from '../services/services'; import * as commonUtils from '../utils/utils'; diff --git a/src/routes/tab/tab.js b/src/routes/tab/tab.js index 780221e..e20eb7e 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"; /* 可编辑公共列表 */ diff --git a/src/utils/utils.js b/src/utils/utils.js index 3525bef..ba42fe3 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -1,6 +1,6 @@ /* eslint-disable no-plusplus,radix,prefer-destructuring */ /* 用于放公用方法 */ -import { message, notification } from 'antd'; +import { message, notification } from 'antd-v4'; import lodash from 'lodash'; import moment from 'moment'; import { createContext } from 'react';