Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

陈鑫涛
2 parents d4888657 094f239c
Showing 19 changed files with 19 additions and 19 deletions
src/components/Common/BoxDesignCompontent/index.js
src/components/Common/CommonInstructSet.js
src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx
src/components/Common/CommonPartsInfo/index.js
src/components/Common/CommonViewDragable/index.js
src/components/Common/FileImposition/index.js
src/components/Common/OfficePreview/index.js
src/components/Common/PersonCenter/MenuSearchPopovor.js
src/components/Common/Typesetting/typesetting.js
src/components/Common/WorkCalendar/WorkCalendar.js
src/components/Common/WorkOrderSystem/WorkOrderSystemAdd.js
src/components/Common/WorkOrderSystem/WorkOrderSystemDetail.js
src/components/Common/WorkOrderSystem/WorkOrderSystemService/index.js
src/components/CommonSystemSettingEvent/TabSysParamsIcon.js
src/components/Manufacture/CommonPackEvent.js
src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
src/components/QuickQuote/index.jsx
src/routes/tab/tab.js
 /* 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";
@@ -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";
@@ -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";
@@ -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,
@@ -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";
@@ -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";
 /* 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";
 /* 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 => {
 /* 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";
@@ -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"; /* 通用方法 */
@@ -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";
@@ -13,7 +13,7 @@ import {
   Spin,
   Input,
   Image
-} from "antd";
+} from "antd-v4";
 import {
   CheckOutlined,
   CloseCircleOutlined,
 /* 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 () => {
 /* 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";
 // 判断图片是否存在
 /* 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";
 /* 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";
 /* 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";
 /* 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";
 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"; /* 可编辑公共列表 */