diff --git a/src/App.jsx b/src/App.jsx index 06cee48..c057552 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -36,7 +36,7 @@ import Credit_card_bill from './views/Credit_card_bill'; import Sale from './views/Sale'; import Sale_sub from './views/Sale_sub'; import Sale_KPI from './views/Sale_KPI'; -import Logo from './logo.png'; +// import Logo from './logo.png'; import { observer } from 'mobx-react'; import ExchangeRate from './charts/ExchangeRate'; import KPI from './views/KPI'; @@ -49,7 +49,7 @@ import { WaterMark } from '@ant-design/pro-components'; const App = () => { const { Content, Footer, Sider, } = Layout; - const { auth_store } = useContext(stores_Context); + const { auth_store, date_picker_store } = useContext(stores_Context); const [collapsed, setCollapsed] = useState(false); @@ -183,16 +183,16 @@ const App = () => { bottom: 0, zIndex: 999, }} - zeroWidthTriggerStyle={collapsed ? { zIndex: 90, bottom: '64px', top: 'unset', left: 'unset', right: '-34px' } : { bottom: '64px', top: 'unset', left: 'unset', right: 0 }} - // onBreakpoint={(broken) => { - // console.log(broken); - // }} + zeroWidthTriggerStyle={collapsed ? { zIndex: 90, bottom: '64px', top: '3px', left: 'unset', right: '-34px' } : { bottom: '64px', top: '3px', left: 'unset', right: 0 }} + onBreakpoint={(broken) => { + date_picker_store.setSiderBroken(broken); + }} onCollapse={(collapsed, type) => { setCollapsed(collapsed); }} > {/* */} - setCollapsed(!collapsed)} /> + date_picker_store.siderBroken ? setCollapsed(!collapsed) : false} /> diff --git a/src/charts/Customer_care_inchina.jsx b/src/charts/Customer_care_inchina.jsx index 135492c..1b8e45e 100644 --- a/src/charts/Customer_care_inchina.jsx +++ b/src/charts/Customer_care_inchina.jsx @@ -17,7 +17,7 @@ const Customer_care_inchina = () => { return (
- + { return (
- + - { return (
- + { return ( <> - + { const { page } = useParams(); const { pathname } = useLocation(); const { date_picker_store: searchFormStore, orders_store, DataPivotStore } = useContext(stores_Context); - const { formValues, formValuesToSub } = searchFormStore; + const { formValues, formValuesToSub, siderBroken } = searchFormStore; const { originData } = DataPivotStore.detailData[page]; const { xField: defaultDateType, yField: defaultValKey, yFieldAlias, tableColumns, childrenColumns, searchInitial } = pageSetting[page]; @@ -355,7 +355,7 @@ export default observer((props) => { return (
- + { return ( <> - + { export default observer(() => { const { date_picker_store: searchFormStore, DistributionStore } = useContext(stores_Context); - const { formValues, formValuesToSub } = searchFormStore; + const { formValues, formValuesToSub, siderBroken } = searchFormStore; const { curTab, dateStringQ, dateStringY } = DistributionStore; const pageRefresh = (obj) => { @@ -206,7 +206,7 @@ export default observer(() => { }; return ( <> - + { // const navigate = useNavigate(); const { TradeStore, date_picker_store: searchFormStore } = useContext(stores_Context); const { searchValues, sideData, summaryData, BuData, topData, timeData, timeLineKey, targetTableProps, timeDiffData, groupKey } = TradeStore; - const { formValues } = searchFormStore; + const { formValues, siderBroken } = searchFormStore; useEffect(() => { if (empty(summaryData.dataSource)) { @@ -182,7 +182,7 @@ export default observer(() => { const [showDiff, setShowDiff] = useState(false); return ( <> - + - + { }; return (
- + 返回 diff --git a/src/views/Sale.jsx b/src/views/Sale.jsx index ed83323..c900384 100644 --- a/src/views/Sale.jsx +++ b/src/views/Sale.jsx @@ -206,7 +206,7 @@ const Sale = () => { return (
- + item.key); const Sale_KPI = () => { const { sale_store, date_picker_store: searchFormStore } = useContext(stores_Context); - const { formValues } = searchFormStore; + const { formValues, siderBroken } = searchFormStore; const { groupType, loading, operator, tableDataSource: dataSource } = sale_store.salesTrade; const yearData = sale_store.salesTrade[groupType].reduce((r, ele) => r.concat(Object.values(ele.mData)), []); @@ -158,7 +158,7 @@ const Sale_KPI = () => { const lineConfig = { appendPadding: 10, xField: 'groupDateVal', yField: 'SumML', seriesField: 'groupsLabel', isGroup: true, smooth: false, meta: comm.cloneDeep(dataFieldAlias), }; return (
- + { - +