#
luxiaotao1123
2024-09-24 351f8191a009e12b66e1215eaac70f3857a9b504
#
4个文件已修改
1个文件已添加
103 ■■■■ 已修改文件
zy-acs-flow/src/i18n/core/chineseMessages.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/i18n/en.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/i18n/zh.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/bus/BusList.jsx 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/components/ConfirmButton.jsx 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/i18n/core/chineseMessages.js
@@ -89,11 +89,11 @@
            bulk_delete_content:
                'Are you sure you want to delete this %{name}? |||| Are you sure you want to delete these %{smart_count} items?',
            bulk_delete_title:
                '删除 %{name} |||| Delete %{smart_count} %{name}',
                '删除 %{name} |||| 删除 %{smart_count} %{name}',
            bulk_update_content:
                'Are you sure you want to update this %{name}? |||| Are you sure you want to update these %{smart_count} items?',
            bulk_update_title:
                'Update %{name} |||| Update %{smart_count} %{name}',
                '修改 %{name} |||| 修改 %{smart_count} %{name}',
            clear_array_input: 'Are you sure you want to clear the whole list?',
            delete_content: '您确实要删除此项吗?',
            delete_title: '删除 %{name} #%{id}',
zy-acs-flow/src/i18n/en.js
@@ -64,6 +64,12 @@
            },
            loadMore: 'Load More Data',
        },
        msg: {
            confirm: {
                tip: 'Tip',
                desc: 'Are you sure you wanna do this?',
            },
        },
    },
    filters: {
        lastCreated: 'Last created',
zy-acs-flow/src/i18n/zh.js
@@ -64,6 +64,12 @@
            },
            loadMore: '加载更多',
        },
        msg: {
            confirm: {
                tip: '提示',
                desc: '你确定要操作此项吗?',
            },
        },
    },
    filters: {
        lastCreated: '最近创建',
zy-acs-flow/src/page/bus/BusList.jsx
@@ -47,6 +47,8 @@
import BusListAside from "./BusListAside";
import { getBusStsColor } from '@/utils/color-util';
import CancelIcon from '@mui/icons-material/Cancel';
import request from '@/utils/request';
import ConfirmButton from "../components/ConfirmButton";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
    '& .css-1vooibu-MuiSvgIcon-root': {
@@ -99,8 +101,9 @@
    const [createDialog, setCreateDialog] = useState(false);
    const [drawerVal, setDrawerVal] = useState(false);
    const onCancel = (onCancel) => {
        alert(onCancel.busNo);
    const onCancel = (busId) => {
        console.log(busId);
    }
    return (
@@ -171,18 +174,29 @@
                    <FunctionField label="common.field.opt" cellClassName="opt" render={record => (
                        (record.busSts === 15 || true) && (
                            // <DeleteButton label="" sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
                            <Button
                            // <Button
                            //     size="small"
                            //     color="error"
                            //     startIcon={<CancelIcon />}
                            //     sx={{ padding: '1px', fontSize: '.75rem' }}
                            //     onClick={(event) => {
                            //         event.stopPropagation();
                            //         onCancel(record);
                            //     }}
                            // >
                            //     {translate('ra.action.cancel')}
                            // </Button>
                            <ConfirmButton
                                label="ra.action.cancel"
                                size="small"
                                color="error"
                                startIcon={<CancelIcon />}
                                sx={{ padding: '1px', fontSize: '.75rem' }}
                                onClick={(event) => {
                                    event.stopPropagation();
                                    onCancel(record);
                                data={record.busNo}
                                onConfirm={() => {
                                    onCancel(record.id);
                                }}
                            >
                                {translate('ra.action.cancel')}
                            </Button>
                            />
                        )
                    )} />
                </StyledDatagrid>
zy-acs-flow/src/page/components/ConfirmButton.jsx
New file
@@ -0,0 +1,55 @@
import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
import { Button, Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle } from '@mui/material';
import {
    useTranslate,
} from 'react-admin';
const ConfirmButton = (props) => {
    const { label, onConfirm, data, ...rest } = props;
    const translate = useTranslate();
    const [open, setOpen] = useState(false);
    const handleClickOpen = (event) => {
        event.stopPropagation();
        setOpen(true);
    };
    const handleClose = (event) => {
        event.stopPropagation();
        setOpen(false);
    };
    const handleConfirm = (event) => {
        handleClose(event);
        onConfirm();
    };
    return (
        <>
            <Button
                onClick={handleClickOpen}
                {...rest}
            >
                {translate(label)}
            </Button>
            <Dialog open={open} onClose={handleClose}>
                <DialogTitle>{translate('common.msg.confirm.tip')}</DialogTitle>
                <DialogContent>
                    <DialogContentText>
                        {translate('common.msg.confirm.desc')}
                    </DialogContentText>
                </DialogContent>
                <DialogActions>
                    <Button onClick={handleClose} color="primary">
                        {translate('ra.action.cancel')}
                    </Button>
                    <Button onClick={handleConfirm} color="primary">
                        {translate('ra.action.confirm')}
                    </Button>
                </DialogActions>
            </Dialog>
        </>
    )
}
export default ConfirmButton;