From c22029e6f768ea588cf22821bd232c0624b951b9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 26 九月 2024 08:14:54 +0800
Subject: [PATCH] Merge branch 'master' of github.com:luxiaotao1123/rsc-flow

---
 zy-acs-flow/src/page/action/ActionList.jsx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zy-acs-flow/src/page/action/ActionList.jsx b/zy-acs-flow/src/page/action/ActionList.jsx
index cc4c9b1..bfdfea8 100644
--- a/zy-acs-flow/src/page/action/ActionList.jsx
+++ b/zy-acs-flow/src/page/action/ActionList.jsx
@@ -65,10 +65,10 @@
 
 const filters = [
     // <SearchInput source="condition" alwaysOn />,
+    <TextInput source="groupId" label="table.field.action.groupId" alwaysOn resettable />,
     <ReferenceInput source="agvId" label="table.field.action.agvId" reference="agv" alwaysOn>
         <AutocompleteInput label="table.field.action.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
     </ReferenceInput>,
-    <TextInput source="groupId" label="table.field.action.groupId" alwaysOn resettable />,
     <ReferenceInput source="busId" label="table.field.action.busId" reference="bus">
         <AutocompleteInput label="table.field.action.busId" optionText="busNo" filterToQuery={(val) => ({ seqNum: val })} />
     </ReferenceInput>,
@@ -141,7 +141,7 @@
             >
                 <StyledDatagrid
                     preferenceKey='action'
-                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+                    bulkActionButtons={false}
                     rowClick={(id, resource, record) => false}
                     expand={() => <ActionPanel />}
                     expandSingle={true}

--
Gitblit v1.9.1