skyouc
1 天以前 c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1
Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
3个文件已修改
45 ■■■■■ 已修改文件
rsf-admin/src/layout/MyMenu.jsx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/layout/SubMenu.jsx 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/layout/MyMenu.jsx
@@ -91,7 +91,7 @@
              primaryText={node.name}
              leftIcon={getIcon(node.icon)}
              dense={dense}
              sx={{ '& .RaMenuItemLink-icon': { visibility: 'hidden', minWidth: '24px' } }}
              // sx={{ '& .RaMenuItemLink-icon': { visibility: 'hidden' } }}
            />
          );
        }
rsf-admin/src/layout/SubMenu.jsx
@@ -1,6 +1,7 @@
import * as React from 'react';
import { ReactElement, ReactNode } from 'react';
import {
    Box,
    List,
    MenuItem,
    ListItemIcon,
@@ -18,13 +19,18 @@
    const [sidebarIsOpen] = useSidebarState();
    const header = (
        <MenuItem dense={dense} onClick={handleToggle} sx={{ display: 'flex', alignItems: 'center' }}>
       <MenuItem dense={dense} onClick={handleToggle} sx={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
            <Box sx={{ display: 'flex', alignItems: 'center', flex: 1 }}>
            <ListItemIcon sx={{ minWidth: 40, color: 'text.secondary', display: 'flex', alignItems: 'center' }}>
                {icon ? icon :  isOpen ? <KeyboardArrowDownIcon /> : <KeyboardArrowRightIcon />}
                    {icon}
            </ListItemIcon>
            <Typography variant="inherit" color="textSecondary" sx={{ ml: 1, display: 'flex', alignItems: 'center' }}>
                {translate(name)}
            </Typography>
            </Box>
            <Box sx={{ display: 'flex', alignItems: 'center', minWidth: 24 }}>
                {isOpen ? <KeyboardArrowDownIcon fontSize="small" sx={{color: 'text.secondary'}} /> : <KeyboardArrowRightIcon fontSize="small" sx={{color: 'text.secondary'}} />}
            </Box>
        </MenuItem>
    );
@@ -42,20 +48,21 @@
                    dense={dense}
                    component="div"
                    disablePadding
                    sx={{
                        '& .MuiTypography-root': {
                            visibility: 'hidden'
                        },
                        '& .MuiMenuItem-root': {
                            transition:
                                'padding-left 195ms cubic-bezier(0.4, 0, 0.6, 1) 0ms',
                            paddingLeft: theme =>
                                sidebarIsOpen
                                    ? theme.spacing(4)
                                    : theme.spacing(2),
                        },
                    }}
                    // sx={{
                    //     '& .MuiMenuItem-root': {
                    //         transition:
                    //             'padding-left 195ms cubic-bezier(0.4, 0, 0.6, 1) 0ms',
                    //         paddingLeft: theme =>
                    //             sidebarIsOpen
                    //                 ? theme.spacing(4)
                    //                 : theme.spacing(2),
                    //     },
                    //     // 显示二级菜单的icon
                    //     '& .RaMenuItemLink-icon': {
                    //         visibility: 'visible !important',
                    //         minWidth: '24px'
                    //     }
                    // }}
                >
                    {children}
                </List>
rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx
@@ -144,13 +144,13 @@
            <DateField source="createTime" label="common.field.createTime" showTime />
            <BooleanField source="statusBool" label="common.field.status" sortable={false} />
            <TextField source="memo" label="common.field.memo" sortable={false} />
            <WrapperField cellClassName="opt" label="common.field.opt">
            {/* <WrapperField cellClassName="opt" label="common.field.opt">
              <Button label="ra.action.edit" onClick={(id, resource, record) => {
                setEditDialog(true)
                setSelect(record)
              }} />
              <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
            </WrapperField>
            </WrapperField> */}
          </StyledDatagrid>
        </List>
        <PurchaseItemEdit