From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 10 四月 2025 11:40:02 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/system/serialRuleItem/SerialRuleItemList.jsx | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/rsf-admin/src/page/system/serialRuleItem/SerialRuleItemList.jsx b/rsf-admin/src/page/system/serialRuleItem/SerialRuleItemList.jsx index 7a79285..703190d 100644 --- a/rsf-admin/src/page/system/serialRuleItem/SerialRuleItemList.jsx +++ b/rsf-admin/src/page/system/serialRuleItem/SerialRuleItemList.jsx @@ -42,18 +42,18 @@ import { styled } from "@mui/material/styles"; import SerialRuleItemCreate from "./SerialRuleItemCreate"; import SerialRuleItemPanel from "./SerialRuleItemPanel"; -import EmptyData from "../components/EmptyData"; -import MyCreateButton from "../components/MyCreateButton"; -import MyExportButton from "../components/MyExportButton"; -import PageDrawer from "../components/PageDrawer"; -import MyField from "../components/MyField"; +import EmptyData from "../../components/EmptyData"; +import MyCreateButton from "../../components/MyCreateButton"; +import MyExportButton from "../../components/MyExportButton"; +import PageDrawer from "../../components/PageDrawer"; +import MyField from "../../components/MyField"; import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, } from "@/config/setting"; import * as Common from "@/utils/common"; -import CustomerTopToolBar from "../components/EditTopToolBar"; +import CustomerTopToolBar from "../../components/EditTopToolBar"; const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({ "& .css-1vooibu-MuiSvgIcon-root": { @@ -148,8 +148,6 @@ <BulkDeleteButton mutationMode={OPERATE_MODE} /> )} rowClick={(id, resource, record) => false} - expand={() => <SerialRuleItemPanel />} - expandSingle={true} omit={["id", "createTime", "createBy", "memo"]} > <NumberField source="id" /> -- Gitblit v1.9.1