Commit f99aeef3 authored by 靳野's avatar 靳野

feat:替换从dva导入为umi

parent 3f8f6486
import { DownloadOutlined } from '@ant-design/icons'; import { DownloadOutlined } from '@ant-design/icons';
import { Popover, Typography } from 'antd'; import { Popover, Typography } from 'antd';
import React, { useRef } from 'react'; import React, { useRef } from 'react';
import { connect } from 'dva'; import { connect } from 'umi';
import { isAntDesignPro } from '@/utils/utils'; import { isAntDesignPro } from '@/utils/utils';
import styles from './index.less'; import styles from './index.less';
......
import { LogoutOutlined, SettingOutlined, UserOutlined, EditOutlined } from '@ant-design/icons'; import { LogoutOutlined, SettingOutlined, UserOutlined, EditOutlined } from '@ant-design/icons';
import { Avatar, Menu, Spin } from 'antd'; import { Avatar, Menu, Spin } from 'antd';
import React from 'react'; import React from 'react';
import { connect } from 'dva'; import { connect, history } from 'umi';
import { history } from 'umi';
import HeaderDropdown from '../HeaderDropdown'; import HeaderDropdown from '../HeaderDropdown';
import styles from './index.less'; import styles from './index.less';
......
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { Tag, message, Badge } from 'antd'; import { Tag, message, Badge } from 'antd';
import { connect } from 'dva'; import { connect } from 'umi';
import groupBy from 'lodash/groupBy'; import groupBy from 'lodash/groupBy';
import moment from 'moment'; import moment from 'moment';
import { BellOutlined } from '@ant-design/icons'; import { BellOutlined } from '@ant-design/icons';
......
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Tag, message } from 'antd'; import { Tag, message } from 'antd';
import { connect } from 'dva'; import { connect } from 'umi';
import groupBy from 'lodash/groupBy'; import groupBy from 'lodash/groupBy';
import moment from 'moment'; import moment from 'moment';
import NoticeIcon from '../NoticeIcon'; import NoticeIcon from '../NoticeIcon';
......
import { Tooltip } from 'antd'; import { Tooltip } from 'antd';
import React from 'react'; import React from 'react';
import { NotificationOutlined } from '@ant-design/icons'; import { NotificationOutlined } from '@ant-design/icons';
import { connect } from 'dva'; import { connect } from 'umi';
import Avatar from './AvatarDropdown'; import Avatar from './AvatarDropdown';
import HeaderSearch from '../HeaderSearch'; import HeaderSearch from '../HeaderSearch';
import styles from './index.less'; import styles from './index.less';
......
...@@ -2,7 +2,7 @@ import React, { useState, useEffect, forwardRef, useImperativeHandle } from 'rea ...@@ -2,7 +2,7 @@ import React, { useState, useEffect, forwardRef, useImperativeHandle } from 'rea
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import { Modal, Tabs, Pagination, Spin, notification, Checkbox, Badge } from 'antd'; import { Modal, Tabs, Pagination, Spin, notification, Checkbox, Badge } from 'antd';
import { apiGetBussinessMsgList, apiGetBusinessMsgUnReadCount } from '@/services/messageReminder'; import { apiGetBussinessMsgList, apiGetBusinessMsgUnReadCount } from '@/services/messageReminder';
import { connect } from 'dva'; import { connect } from 'umi';
import Empty from '../Empty'; import Empty from '../Empty';
import styles from './index.less'; import styles from './index.less';
import { CHANNEL_ID } from '@/utils/constants'; import { CHANNEL_ID } from '@/utils/constants';
......
...@@ -4,7 +4,7 @@ import { CloseOutlined, DoubleLeftOutlined, DoubleRightOutlined } from '@ant-des ...@@ -4,7 +4,7 @@ import { CloseOutlined, DoubleLeftOutlined, DoubleRightOutlined } from '@ant-des
import classNames from 'classnames'; import classNames from 'classnames';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
// import copy from 'copy-to-clipboard'; // import copy from 'copy-to-clipboard';
import { connect } from 'dva'; import { connect } from 'umi';
import { apiGetBussinessMsgList } from '@/services/messageReminder'; import { apiGetBussinessMsgList } from '@/services/messageReminder';
import Empty from '../Empty'; import Empty from '../Empty';
import styles from './index.less'; import styles from './index.less';
......
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
/* eslint-disable no-underscore-dangle, no-confusing-arrow */ /* eslint-disable no-underscore-dangle, no-confusing-arrow */
import ProLayout from '@ant-design/pro-layout'; import ProLayout from '@ant-design/pro-layout';
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import { Link } from 'umi'; import { Link, connect } from 'umi';
import { connect } from 'dva';
import { Icon as LegacyIcon } from '@ant-design/compatible'; import { Icon as LegacyIcon } from '@ant-design/compatible';
import { Result, Button, Layout, Menu } from 'antd'; import { Result, Button, Layout, Menu } from 'antd';
import Authorized from '@/utils/Authorized'; import Authorized from '@/utils/Authorized';
......
import React from 'react'; import React from 'react';
import { connect } from 'dva'; import { Redirect, connect } from 'umi';
import { Redirect } from 'umi';
import PageLoading from '@/components/PageLoading'; import PageLoading from '@/components/PageLoading';
import localStorage from '@/utils/localStorage'; import localStorage from '@/utils/localStorage';
import sessionStorage from '@/utils/sessionStorage'; import sessionStorage from '@/utils/sessionStorage';
......
import { getMenuData, getPageTitle } from '@ant-design/pro-layout'; import { getMenuData, getPageTitle } from '@ant-design/pro-layout';
import { Helmet } from 'react-helmet'; import { Helmet } from 'react-helmet';
import React from 'react'; import React from 'react';
import { connect } from 'dva'; import { connect } from 'umi';
import logo from '../assets/logo.png'; import logo from '../assets/logo.png';
import styles from './UserLayout.less'; import styles from './UserLayout.less';
......
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { Row, Col } from 'antd'; import { Row, Col } from 'antd';
import { Link } from 'umi'; import { Link, connect } from 'umi';
import { FileTextOutlined } from '@ant-design/icons'; import { FileTextOutlined } from '@ant-design/icons';
import style from './styles.less'; import style from './styles.less';
import { getPendingNum } from './service'; import { getPendingNum } from './service';
import { connect } from 'dva';
import { AFTER_SALE_ORDER, PENDING_DELIVERY_ORDER } from '@/../config/permission.config'; import { AFTER_SALE_ORDER, PENDING_DELIVERY_ORDER } from '@/../config/permission.config';
const Admin = props => { const Admin = props => {
......
...@@ -3,7 +3,7 @@ import { Tabs, notification, Form, Modal } from 'antd'; ...@@ -3,7 +3,7 @@ import { Tabs, notification, Form, Modal } from 'antd';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import ProTable from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table';
import { AFTER_SALE_ORDER } from '@/../config/permission.config'; import { AFTER_SALE_ORDER } from '@/../config/permission.config';
import { connect } from 'dva'; import { connect } from 'umi';
import { FormSearch } from '@/components/FormSearch'; import { FormSearch } from '@/components/FormSearch';
import moment from 'moment'; import moment from 'moment';
import { useLocation } from 'react-router-dom'; import { useLocation } from 'react-router-dom';
......
...@@ -2,7 +2,7 @@ import { Tabs } from 'antd'; ...@@ -2,7 +2,7 @@ import { Tabs } from 'antd';
import React from 'react'; import React from 'react';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { AFTER_SALE_ORDER } from '@/../config/permission.config'; import { AFTER_SALE_ORDER } from '@/../config/permission.config';
import { connect } from 'dva'; import { connect } from 'umi';
import Pending from './Pending'; import Pending from './Pending';
import PassAudit from './PassAudit'; import PassAudit from './PassAudit';
......
import React from 'react'; import React from 'react';
import Redirect from 'umi/redirect'; import Redirect from 'umi/redirect';
import { connect } from 'dva'; import { connect } from 'umi';
import pathToRegexp from 'path-to-regexp'; import pathToRegexp from 'path-to-regexp';
import Authorized from '@/utils/Authorized'; import Authorized from '@/utils/Authorized';
......
...@@ -13,7 +13,7 @@ import { ...@@ -13,7 +13,7 @@ import {
} from 'antd'; } from 'antd';
import React, { Component, useState } from 'react'; import React, { Component, useState } from 'react';
import { SwapRightOutlined } from '@ant-design/icons'; import { SwapRightOutlined } from '@ant-design/icons';
import { connect } from 'dva'; import { connect } from 'umi';
import { saveAs } from 'file-saver'; import { saveAs } from 'file-saver';
import { format } from 'date-fns'; import { format } from 'date-fns';
import styles from '../style.less'; import styles from '../style.less';
......
import { Form, Button, Input, Select, notification, Cascader, InputNumber } from 'antd'; import { Form, Button, Input, Select, notification, Cascader, InputNumber } from 'antd';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { SwapRightOutlined } from '@ant-design/icons'; import { SwapRightOutlined } from '@ant-design/icons';
import { connect } from 'dva'; import { connect } from 'umi';
import ImportGoodsModal from '@/components/ImportGoodsModal'; import ImportGoodsModal from '@/components/ImportGoodsModal';
import styles from '../../style.less'; import styles from '../../style.less';
import { apiDownBiddingTemplate, apiUploadGoodsFile } from '../../service'; import { apiDownBiddingTemplate, apiUploadGoodsFile } from '../../service';
......
...@@ -3,7 +3,7 @@ import '@ant-design/compatible/assets/index.css'; ...@@ -3,7 +3,7 @@ import '@ant-design/compatible/assets/index.css';
import { Card, Pagination, Table, notification, Drawer, Spin } from 'antd'; import { Card, Pagination, Table, notification, Drawer, Spin } from 'antd';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { connect } from 'dva'; import { connect } from 'umi';
import styles from '../style.less'; import styles from '../style.less';
import { apiCategoryListType, apiProductBiddingInfo } from '../service'; import { apiCategoryListType, apiProductBiddingInfo } from '../service';
......
...@@ -3,7 +3,7 @@ import '@ant-design/compatible/assets/index.css'; ...@@ -3,7 +3,7 @@ import '@ant-design/compatible/assets/index.css';
import { Card, Pagination, Table, notification, Drawer, Spin, Button, Modal } from 'antd'; import { Card, Pagination, Table, notification, Drawer, Spin, Button, Modal } from 'antd';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { connect } from 'dva'; import { connect } from 'umi';
import styles from './style.less'; import styles from './style.less';
import UpdateStock from './UpdateStock'; import UpdateStock from './UpdateStock';
......
...@@ -7,7 +7,7 @@ import ProTable from '@ant-design/pro-table'; ...@@ -7,7 +7,7 @@ import ProTable from '@ant-design/pro-table';
import { saveAs } from 'file-saver'; import { saveAs } from 'file-saver';
import { format } from 'date-fns'; import { format } from 'date-fns';
import moment from 'moment'; import moment from 'moment';
import { connect } from 'dva'; import { connect } from 'umi';
import PaymentBillModal from './components/PaymentBillModal'; import PaymentBillModal from './components/PaymentBillModal';
import UploadInvoiceModal from './components/UploadInvoiceModal'; import UploadInvoiceModal from './components/UploadInvoiceModal';
import InvoiceListModal from './components/InvoiceListModal'; import InvoiceListModal from './components/InvoiceListModal';
......
...@@ -13,7 +13,7 @@ import { ...@@ -13,7 +13,7 @@ import {
} from 'antd'; } from 'antd';
import React, { Component, useState } from 'react'; import React, { Component, useState } from 'react';
import { SwapRightOutlined } from '@ant-design/icons'; import { SwapRightOutlined } from '@ant-design/icons';
import { connect } from 'dva'; import { connect } from 'umi';
import { saveAs } from 'file-saver'; import { saveAs } from 'file-saver';
import { format } from 'date-fns'; import { format } from 'date-fns';
import styles from '../style.less'; import styles from '../style.less';
......
...@@ -3,7 +3,7 @@ import '@ant-design/compatible/assets/index.css'; ...@@ -3,7 +3,7 @@ import '@ant-design/compatible/assets/index.css';
import { Card, Pagination, Table, notification, Drawer, Spin, Button, Modal } from 'antd'; import { Card, Pagination, Table, notification, Drawer, Spin, Button, Modal } from 'antd';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { connect } from 'dva'; import { connect } from 'umi';
import styles from './style.less'; import styles from './style.less';
import UpdateStock from './UpdateStock'; import UpdateStock from './UpdateStock';
......
...@@ -2,7 +2,7 @@ import { Button, Upload, notification } from 'antd'; ...@@ -2,7 +2,7 @@ import { Button, Upload, notification } from 'antd';
import React, { useRef } from 'react'; import React, { useRef } from 'react';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import ProTable from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table';
import { connect } from 'dva'; import { connect } from 'umi';
import { POP_BATCH_DELIVERY } from '@/../config/permission.config'; import { POP_BATCH_DELIVERY } from '@/../config/permission.config';
import { import {
queryToBatchSend, queryToBatchSend,
......
...@@ -3,9 +3,8 @@ import React, { useState, useEffect, useRef } from 'react'; ...@@ -3,9 +3,8 @@ import React, { useState, useEffect, useRef } from 'react';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { useLocation } from 'react-router-dom'; import { useLocation } from 'react-router-dom';
import ProTable from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table';
import { FormInstance } from 'antd/lib/form';
import moment from 'moment'; import moment from 'moment';
import { connect } from 'dva'; import { connect } from 'umi';
import { POP_PENDING_DELIVERY_ORDER, POP_DELIVERY_ORDER } from '@/../config/permission.config'; import { POP_PENDING_DELIVERY_ORDER, POP_DELIVERY_ORDER } from '@/../config/permission.config';
import style from './index.less'; import style from './index.less';
import LogisticsForm from './components/LogisticsForm'; import LogisticsForm from './components/LogisticsForm';
...@@ -63,7 +62,7 @@ const TableList = props => { ...@@ -63,7 +62,7 @@ const TableList = props => {
const multiLogisticsModalRef = useRef(); const multiLogisticsModalRef = useRef();
const actionRef = useRef(); const actionRef = useRef();
const ref = useRef(FormInstance); const ref = useRef();
const handleCom = async (skuInfo, expressInfo) => { const handleCom = async (skuInfo, expressInfo) => {
const tempObj = { const tempObj = {
expressCompanyCode: expressInfo?.expressCompanyCode ?? '', expressCompanyCode: expressInfo?.expressCompanyCode ?? '',
......
...@@ -5,7 +5,7 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout'; ...@@ -5,7 +5,7 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import ProTable from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table';
import { saveAs } from 'file-saver'; import { saveAs } from 'file-saver';
import { format } from 'date-fns'; import { format } from 'date-fns';
import { connect } from 'dva'; import { connect } from 'umi';
import { RECONCILIATION_QUERY } from '@/../config/permission.config'; import { RECONCILIATION_QUERY } from '@/../config/permission.config';
import { columns, toolBarRender } from './data'; import { columns, toolBarRender } from './data';
import { query, confirmSelfBill, downloadSelfBillDetail } from './service'; import { query, confirmSelfBill, downloadSelfBillDetail } from './service';
...@@ -165,9 +165,6 @@ const ReconciliationQuery = props => { ...@@ -165,9 +165,6 @@ const ReconciliationQuery = props => {
bordered bordered
toolBarRender={onToolBarRender} toolBarRender={onToolBarRender}
scroll={{ x: '100%', y: 400 }} scroll={{ x: '100%', y: 400 }}
pagination={{
pageSize: 100,
}}
/> />
</PageHeaderWrapper> </PageHeaderWrapper>
</Spin> </Spin>
......
...@@ -5,7 +5,7 @@ import { Button, Upload, notification, Spin } from 'antd'; ...@@ -5,7 +5,7 @@ import { Button, Upload, notification, Spin } from 'antd';
import React, { useRef, useEffect, useState } from 'react'; import React, { useRef, useEffect, useState } from 'react';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import ProTable from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table';
import { connect } from 'dva'; import { connect } from 'umi';
import { columns, toolBarRender, dateStateEnum } from './data'; import { columns, toolBarRender, dateStateEnum } from './data';
import { query, selfPaymentBill } from './service'; import { query, selfPaymentBill } from './service';
import { SETTLEMENT_SHEET } from '@/../config/permission.config'; import { SETTLEMENT_SHEET } from '@/../config/permission.config';
......
...@@ -3,7 +3,7 @@ import React, { useRef, useEffect, useState } from 'react'; ...@@ -3,7 +3,7 @@ import React, { useRef, useEffect, useState } from 'react';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import ProTable from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table';
import lodash from 'lodash'; import lodash from 'lodash';
import { connect } from 'dva'; import { connect } from 'umi';
import { AFTER_SALE_ADDRESS } from '@/../config/permission.config'; import { AFTER_SALE_ADDRESS } from '@/../config/permission.config';
import styles from './index.less'; import styles from './index.less';
import AddrForm from './form'; import AddrForm from './form';
......
import { Tabs } from 'antd'; import { Tabs } from 'antd';
import React from 'react'; import React from 'react';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { connect } from 'dva'; import { connect } from 'umi';
import { CANCEL_BILL_MANAGE } from '@/../config/permission.config'; import { CANCEL_BILL_MANAGE } from '@/../config/permission.config';
import Pending from './Pending'; import Pending from './Pending';
import PassAudit from './PassAudit'; import PassAudit from './PassAudit';
......
...@@ -2,7 +2,7 @@ import { Button, Popconfirm, notification } from 'antd'; ...@@ -2,7 +2,7 @@ import { Button, Popconfirm, notification } from 'antd';
import React, { useRef, useEffect, useState } from 'react'; import React, { useRef, useEffect, useState } from 'react';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import ProTable from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table';
import { connect } from 'dva'; import { connect } from 'umi';
import { columns } from './data'; import { columns } from './data';
import AddArea from './addArea'; import AddArea from './addArea';
import { searchList, addressTree } from './services'; import { searchList, addressTree } from './services';
......
...@@ -2,7 +2,7 @@ import { Button, Upload, notification } from 'antd'; ...@@ -2,7 +2,7 @@ import { Button, Upload, notification } from 'antd';
import React, { useRef } from 'react'; import React, { useRef } from 'react';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import ProTable from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table';
import { connect } from 'dva'; import { connect } from 'umi';
import { BATCH_DELIVERY } from '@/../config/permission.config'; import { BATCH_DELIVERY } from '@/../config/permission.config';
import { import {
queryToBatchSend, queryToBatchSend,
......
...@@ -5,7 +5,7 @@ import { useLocation } from 'react-router-dom'; ...@@ -5,7 +5,7 @@ import { useLocation } from 'react-router-dom';
import ProTable from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table';
import { FormInstance } from 'antd/lib/form'; import { FormInstance } from 'antd/lib/form';
import moment from 'moment'; import moment from 'moment';
import { connect } from 'dva'; import { connect } from 'umi';
import { PENDING_DELIVERY_ORDER, DELIVERY_ORDER } from '@/../config/permission.config'; import { PENDING_DELIVERY_ORDER, DELIVERY_ORDER } from '@/../config/permission.config';
import style from './index.less'; import style from './index.less';
import LogisticsForm from './components/LogisticsForm'; import LogisticsForm from './components/LogisticsForm';
......
import { Form, Tabs, Input, Button, Pagination, notification } from 'antd'; import { Form, Tabs, Input, Button, Pagination, notification } from 'antd';
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { connect } from 'dva'; import { connect } from 'umi';
import { QUERY_ORDER } from '@/../config/permission.config'; import { QUERY_ORDER } from '@/../config/permission.config';
import { values } from 'lodash'; import { values } from 'lodash';
import style from './index.less'; import style from './index.less';
......
import { Alert, Tabs } from 'antd'; import { Alert, Tabs } from 'antd';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { connect } from 'dva'; import { connect } from 'umi';
import LoginComponents from './components/Login'; import LoginComponents from './components/Login';
import styles from './style.less'; import styles from './style.less';
import LoginSMS from './components/Login/LoginSms'; import LoginSMS from './components/Login/LoginSms';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment