From 8c172b59a575562913df6b17d77c16f376a915c0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 10 九月 2024 17:10:48 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/user/UserList.jsx | 25 +++++++++---
zy-acs-flow/src/page/user/UserEdit.jsx | 1
zy-acs-flow/src/page/settings/Settings.jsx | 37 +++++++++++++-----
3 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/zy-acs-flow/src/page/settings/Settings.jsx b/zy-acs-flow/src/page/settings/Settings.jsx
index d995c57..ae356ee 100644
--- a/zy-acs-flow/src/page/settings/Settings.jsx
+++ b/zy-acs-flow/src/page/settings/Settings.jsx
@@ -1,20 +1,35 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
-import Player from "../../map/player";
-
-let player;
+import {
+ Edit,
+ SimpleForm,
+ FormDataConsumer,
+ useTranslate,
+ TextInput,
+ NumberInput,
+ BooleanInput,
+ SaveButton,
+ SelectInput,
+ Toolbar,
+ Labeled,
+ NumberField,
+ required,
+ useRecordContext,
+ DeleteButton,
+} from 'react-admin';
+import { useWatch, useFormContext } from "react-hook-form";
+import { Stack, Grid, Box, Typography, Card, CardContent } from '@mui/material';
+import * as Common from '@/utils/common';
+import { } from '@/config/setting';
const Settings = () => {
- const mapRef = React.useRef();
-
-
- useEffect(() => {
- player = new Player(mapRef.current)
- }, [])
return (
<>
- <h1>Settings</h1>
- <div ref={mapRef} ></div>
+ <Card>
+ <CardContent>
+
+ </CardContent>
+ </Card>
</>
)
}
diff --git a/zy-acs-flow/src/page/user/UserEdit.jsx b/zy-acs-flow/src/page/user/UserEdit.jsx
index c1fe113..b5b48b1 100644
--- a/zy-acs-flow/src/page/user/UserEdit.jsx
+++ b/zy-acs-flow/src/page/user/UserEdit.jsx
@@ -20,6 +20,7 @@
useRecordContext,
DeleteButton,
PasswordInput,
+ email,
} from 'react-admin';
import { useFormContext } from 'react-hook-form';
import { Stack, Grid, Box, Typography } from '@mui/material';
diff --git a/zy-acs-flow/src/page/user/UserList.jsx b/zy-acs-flow/src/page/user/UserList.jsx
index ba3dc7f..5a55c8b 100644
--- a/zy-acs-flow/src/page/user/UserList.jsx
+++ b/zy-acs-flow/src/page/user/UserList.jsx
@@ -43,7 +43,7 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE } from '@/config/setting';
import * as Common from '@/utils/common';
import UserListAside from "./UserListAside";
-import RolesField from './RolesField';
+import RolesField from './RolesField';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -52,13 +52,26 @@
'& .RaDatagrid-row': {
cursor: 'auto'
},
- '& .column-name': {
+ '& .column-username': {
+ maxWidth: '10em',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ whiteSpace: 'nowrap',
+ },
+ '& .column-nickname': {
+ maxWidth: '10em',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ whiteSpace: 'nowrap',
+ },
+ '& .column-deptId': {
+ maxWidth: '10em',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ whiteSpace: 'nowrap',
},
'& .opt': {
width: 200
- },
- '& .column-deptId': {
- maxWidth: 80
},
'& .column-statusBool': {
maxWidth: 60
@@ -137,7 +150,7 @@
rowClick={(id, resource, record) => false}
expand={() => <UserPanel />}
expandSingle={true}
- omit={['id', 'email', 'idCard', 'birthday', 'updateTime', 'createTime', 'memo']}
+ omit={['id', 'email', 'idCard', 'birthday', 'realName', 'updateTime', 'createTime', 'memo']}
>
<NumberField source="id" />
<TextField source="username" label="table.field.user.username" />
--
Gitblit v1.9.1