Merge branch 'dakou' of http://172.14.1.63:3000/zhangzl/react-ruoyi into dakou

# Conflicts:
#	new-react-admin-ui/src/App.tsx

new-react-admin-ui/src/App.tsx

@@ -16,8 +16,6 @@ import { MenuEdit } from '@/pages/menus/MenuEdit';
 import { MenuCreate } from '@/pages/menus/MenuCreate';
 import { Dashboard } from '@/pages/Dashboard';
 import DashboardList from '@/pages/dashboard/DashboardList';
-import OrderEdit from '@/pages/dashboard/OrderEdit';
-import DateBased from '@/pages/pastlogs/DateBased';
 import { Layout } from '@/components/Layout';
 import ErrorPage from '@/pages/ErrorPage';
 
@@ -74,21 +72,12 @@ export const App = () => {
           list={DashboardList}
         />
         <Resource
-          name="system/orderedit"
-          list={OrderEdit}
-        />
-        <Resource
           name="label/generations"
           list={LabelGenerationList}
         />
-        <Resource
-          name="pastlogs"
-          list={DateBased}
-        />
         
         <CustomRoutes noLayout>
           <Route path="/error" element={<ErrorPage />} />
-          <Route path="/orderedit" element={<OrderEdit />} />
         </CustomRoutes>
         
         {/* Dashboard通过Resource自动路由，无需CustomRoutes */}

new-react-admin-ui/src/adapters/ruoyiDataProvider.ts

@@ -399,6 +399,19 @@ export const ruoyiDataProvider: RuoyiDataProvider = {
           data: { ...params.data, id: data.data?.menuId || Date.now() },
         };
       }
+
+      case 'usermanagements': {
+        const requestData = {
+          ...params.data,
+        };
+        const data = await request<Result>(`/system/user`, {
+          method: 'POST',
+          body: JSON.stringify(requestData),
+        });
+        return {
+          data: { ...params.data, id: data.data?.userId || Date.now() },
+        };
+      }
       
 
       
@@ -455,6 +468,20 @@ export const ruoyiDataProvider: RuoyiDataProvider = {
           data: { ...params.data, id: params.data.menuId || params.id },
         };
       }
+
+      case 'usermanagements': {
+        const requestData = {
+          ...params.data,
+        };
+        await request<Result>(`/system/user`, {
+          method: 'PUT',
+          body: JSON.stringify(requestData),
+        });
+        // 确保返回的数据包含id字段
+        return {
+          data: { ...params.data, id: params.data.userId || params.id },
+        };
+      }
       
 
       

new-react-admin-ui/src/pages/generations/LabelGenerationList.tsx

@@ -226,8 +226,6 @@ export const LabelGenerationList = () => {
       };
 
       const response = await dataProvider.getList('label/generations', {
-        pagination: { page: 1, perPage: 100 },
-        sort: { field: 'creationDate', order: 'DESC' },
         filter: queryParams
       });
 
@@ -522,9 +520,6 @@ export const LabelGenerationList = () => {
           rowData={rowData}
           columnDefs={columnDefs}
           domLayout="autoHeight"
-          suppressHorizontalScroll={false}
-          rowHeight={35}
-          headerHeight={35}
         />
       </div>