From e8d6ad127efeba2d16d0a04bdaf92b747fc467ec Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 15 二月 2025 09:51:22 +0800
Subject: [PATCH] #
---
rsf-admin/src/page/system/userLogin/UserLoginPanel.jsx | 2
rsf-admin/src/page/system/operationRecord/OperationRecordPanel.jsx | 2
rsf-admin/src/page/system/host/HostCreate.jsx | 6
rsf-admin/src/page/system/host/HostList.jsx | 10 +-
rsf-admin/src/page/system/operationRecord/OperationDetail.jsx | 0
rsf-admin/src/page/system/user/UserPanel.jsx | 2
rsf-admin/src/page/system/userLogin/index.jsx | 0
rsf-admin/src/page/system/operationRecord/OperationRecordEdit.jsx | 8 +-
rsf-admin/src/page/system/userLogin/UserLoginList.jsx | 10 +-
rsf-admin/src/page/system/config/ConfigPanel.jsx | 2
rsf-admin/src/page/system/menu/MenuList.jsx | 0
rsf-admin/src/page/system/role/AssignPermissions.jsx | 0
rsf-admin/src/page/system/dept/DeptEdit.jsx | 8 +-
rsf-admin/src/page/system/user/UserCreate.jsx | 8 +-
rsf-admin/src/page/system/config/index.jsx | 0
rsf-admin/src/page/system/user/index.jsx | 0
rsf-admin/src/page/system/host/index.jsx | 0
rsf-admin/src/page/system/tenant/TenantCreate.jsx | 2
rsf-admin/src/page/system/dept/DeptList.jsx | 0
rsf-admin/src/page/ResourceContent.js | 19 ++--
rsf-admin/src/page/system/userLogin/UserLoginEdit.jsx | 8 +-
rsf-admin/.env | 2
rsf-admin/src/page/system/role/index.jsx | 0
rsf-admin/src/page/system/menu/MenuEdit.jsx | 8 +-
rsf-admin/src/page/system/user/RolesField.jsx | 0
rsf-admin/src/page/system/host/HostEdit.jsx | 8 +-
rsf-admin/src/page/system/dept/index.jsx | 0
rsf-admin/src/page/system/config/ConfigCreate.jsx | 6
rsf-admin/src/page/system/role/RoleCreate.jsx | 6
rsf-admin/src/page/system/userLogin/UserLoginCreate.jsx | 6
rsf-admin/src/page/system/tenant/TenantList.jsx | 10 +-
rsf-admin/src/page/system/role/RolePanel.jsx | 2
rsf-admin/src/page/system/operationRecord/OperationRecordList.jsx | 8 +-
rsf-admin/src/page/system/user/UserList.jsx | 10 +-
rsf-admin/src/page/system/config/ConfigEdit.jsx | 8 +-
rsf-admin/src/page/system/role/RoleEdit.jsx | 8 +-
rsf-admin/src/page/system/tenant/index.jsx | 0
rsf-admin/src/page/system/user/RolesSelect.jsx | 0
rsf-admin/src/page/system/operationRecord/rowSx.jsx | 0
rsf-admin/src/page/system/user/UserListAside.jsx | 0
rsf-admin/src/page/system/config/ConfigList.jsx | 10 +-
rsf-admin/src/page/system/operationRecord/index.jsx | 0
rsf-admin/src/page/system/role/RoleList.jsx | 10 +-
rsf-admin/src/page/system/user/UserEdit.jsx | 10 +-
rsf-admin/src/page/system/tenant/TenantPanel.jsx | 2
rsf-admin/src/page/system/tenant/TenantEdit.jsx | 8 +-
rsf-admin/src/page/system/menu/index.jsx | 0
rsf-admin/src/page/system/host/HostPanel.jsx | 2
48 files changed, 106 insertions(+), 105 deletions(-)
diff --git a/rsf-admin/.env b/rsf-admin/.env
index 0abf3df..57761ad 100644
--- a/rsf-admin/.env
+++ b/rsf-admin/.env
@@ -1,2 +1,2 @@
-VITE_BASE_IP=localhost
+VITE_BASE_IP=192.168.4.179
VITE_BASE_PORT=8080
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index ef34985..333bfd5 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -4,17 +4,18 @@
ShowGuesser,
} from "react-admin";
-import host from "./host";
-import config from './config';
-import tenant from './tenant';
-import role from './role';
-import userLogin from './userLogin';
-import dept from "./dept";
-import menu from './menu'
-import user from './user';
-import operationRecord from './operationRecord';
+import host from "./system/host";
+import config from './system/config';
+import tenant from './system/tenant';
+import role from './system/role';
+import userLogin from './system/userLogin';
+import dept from "./system/dept";
+import menu from './system/menu'
+import user from './system/user';
+import operationRecord from './system/operationRecord';
const ResourceContent = (node) => {
+ console.log(node)
switch (node.component) {
case 'host':
return host;
diff --git a/rsf-admin/src/page/config/ConfigCreate.jsx b/rsf-admin/src/page/system/config/ConfigCreate.jsx
similarity index 96%
rename from rsf-admin/src/page/config/ConfigCreate.jsx
rename to rsf-admin/src/page/system/config/ConfigCreate.jsx
index 079e40e..44fab43 100644
--- a/rsf-admin/src/page/config/ConfigCreate.jsx
+++ b/rsf-admin/src/page/system/config/ConfigCreate.jsx
@@ -24,9 +24,9 @@
Grid,
Box,
} from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import StatusSelectInput from "../components/StatusSelectInput";
-import MemoInput from "../components/MemoInput";
+import DialogCloseButton from "@/page/components/DialogCloseButton";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
+import MemoInput from "@/page/components/MemoInput";
const ConfigCreate = (props) => {
const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/config/ConfigEdit.jsx b/rsf-admin/src/page/system/config/ConfigEdit.jsx
similarity index 94%
rename from rsf-admin/src/page/config/ConfigEdit.jsx
rename to rsf-admin/src/page/system/config/ConfigEdit.jsx
index 6b82d6c..ef2cfe8 100644
--- a/rsf-admin/src/page/config/ConfigEdit.jsx
+++ b/rsf-admin/src/page/system/config/ConfigEdit.jsx
@@ -21,10 +21,10 @@
import { Stack, Grid, Box, Typography } from '@mui/material';
import * as Common from '@/utils/common';
import { EDIT_MODE } from '@/config/setting';
-import EditBaseAside from "../components/EditBaseAside";
-import CustomerTopToolBar from "../components/EditTopToolBar";
-import MemoInput from "../components/MemoInput";
-import StatusSelectInput from "../components/StatusSelectInput";
+import EditBaseAside from "@/page/components/EditBaseAside";
+import CustomerTopToolBar from "@/page/components/EditTopToolBar";
+import MemoInput from "@/page/components/MemoInput";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
const FormToolbar = () => {
const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/config/ConfigList.jsx b/rsf-admin/src/page/system/config/ConfigList.jsx
similarity index 95%
rename from rsf-admin/src/page/config/ConfigList.jsx
rename to rsf-admin/src/page/system/config/ConfigList.jsx
index 41850e9..fb9b7c5 100644
--- a/rsf-admin/src/page/config/ConfigList.jsx
+++ b/rsf-admin/src/page/system/config/ConfigList.jsx
@@ -32,11 +32,11 @@
import { styled } from '@mui/material/styles';
import ConfigCreate from "./ConfigCreate";
import ConfigPanel from "./ConfigPanel";
-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 "@/page/components/EmptyData";
+import MyCreateButton from "@/page/components/MyCreateButton";
+import MyExportButton from '@/page/components/MyExportButton';
+import PageDrawer from "@/page/components/PageDrawer";
+import MyField from "@/page/components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common'
diff --git a/rsf-admin/src/page/config/ConfigPanel.jsx b/rsf-admin/src/page/system/config/ConfigPanel.jsx
similarity index 97%
rename from rsf-admin/src/page/config/ConfigPanel.jsx
rename to rsf-admin/src/page/system/config/ConfigPanel.jsx
index 353d3c8..8970bfa 100644
--- a/rsf-admin/src/page/config/ConfigPanel.jsx
+++ b/rsf-admin/src/page/system/config/ConfigPanel.jsx
@@ -4,7 +4,7 @@
useTranslate,
useRecordContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "@/page/components/PanelTypography";
import * as Common from '@/utils/common'
const ConfigPanel = () => {
diff --git a/rsf-admin/src/page/config/index.jsx b/rsf-admin/src/page/system/config/index.jsx
similarity index 100%
rename from rsf-admin/src/page/config/index.jsx
rename to rsf-admin/src/page/system/config/index.jsx
diff --git a/rsf-admin/src/page/dept/DeptEdit.jsx b/rsf-admin/src/page/system/dept/DeptEdit.jsx
similarity index 95%
rename from rsf-admin/src/page/dept/DeptEdit.jsx
rename to rsf-admin/src/page/system/dept/DeptEdit.jsx
index be02540..3699ac2 100644
--- a/rsf-admin/src/page/dept/DeptEdit.jsx
+++ b/rsf-admin/src/page/system/dept/DeptEdit.jsx
@@ -28,10 +28,10 @@
Grid,
Box,
} from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import StatusSelectInput from "../components/StatusSelectInput";
-import MemoInput from "../components/MemoInput";
-import TreeSelectInput from "../components/TreeSelectInput";
+import DialogCloseButton from "@/page/components/DialogCloseButton";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
+import MemoInput from "@/page/components/MemoInput";
+import TreeSelectInput from "@/page/components/TreeSelectInput";
const EditContent = ({ editRecord }) => {
const { resource } = useCreateContext();
diff --git a/rsf-admin/src/page/dept/DeptList.jsx b/rsf-admin/src/page/system/dept/DeptList.jsx
similarity index 100%
rename from rsf-admin/src/page/dept/DeptList.jsx
rename to rsf-admin/src/page/system/dept/DeptList.jsx
diff --git a/rsf-admin/src/page/dept/index.jsx b/rsf-admin/src/page/system/dept/index.jsx
similarity index 100%
rename from rsf-admin/src/page/dept/index.jsx
rename to rsf-admin/src/page/system/dept/index.jsx
diff --git a/rsf-admin/src/page/host/HostCreate.jsx b/rsf-admin/src/page/system/host/HostCreate.jsx
similarity index 95%
rename from rsf-admin/src/page/host/HostCreate.jsx
rename to rsf-admin/src/page/system/host/HostCreate.jsx
index 8061e95..2134aaf 100644
--- a/rsf-admin/src/page/host/HostCreate.jsx
+++ b/rsf-admin/src/page/system/host/HostCreate.jsx
@@ -24,9 +24,9 @@
Grid,
Box
} from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import StatusSelectInput from "../components/StatusSelectInput";
-import MemoInput from "../components/MemoInput";
+import DialogCloseButton from "@/page/components/DialogCloseButton";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
+import MemoInput from "@/page/components/MemoInput";
const HostCreate = (props) => {
const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/host/HostEdit.jsx b/rsf-admin/src/page/system/host/HostEdit.jsx
similarity index 90%
rename from rsf-admin/src/page/host/HostEdit.jsx
rename to rsf-admin/src/page/system/host/HostEdit.jsx
index 5f888bf..42566f5 100644
--- a/rsf-admin/src/page/host/HostEdit.jsx
+++ b/rsf-admin/src/page/system/host/HostEdit.jsx
@@ -20,10 +20,10 @@
import { Stack, Grid, Box, Typography } from '@mui/material';
import * as Common from '@/utils/common';
import { EDIT_MODE } from '@/config/setting';
-import EditBaseAside from "../components/EditBaseAside";
-import CustomerTopToolBar from "../components/EditTopToolBar";
-import MemoInput from "../components/MemoInput";
-import StatusSelectInput from "../components/StatusSelectInput";
+import EditBaseAside from "@/page/components/EditBaseAside";
+import CustomerTopToolBar from "@/page/components/EditTopToolBar";
+import MemoInput from "@/page/components/MemoInput";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
const FormToolbar = () => {
const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/host/HostList.jsx b/rsf-admin/src/page/system/host/HostList.jsx
similarity index 94%
rename from rsf-admin/src/page/host/HostList.jsx
rename to rsf-admin/src/page/system/host/HostList.jsx
index ac9be3d..1038cf0 100644
--- a/rsf-admin/src/page/host/HostList.jsx
+++ b/rsf-admin/src/page/system/host/HostList.jsx
@@ -30,13 +30,13 @@
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
-import EmptyData from "../components/EmptyData";
+import EmptyData from "@/page/components/EmptyData";
import HostCreate from "./HostCreate";
import HostPanel from "./HostPanel";
-import MyCreateButton from "../components/MyCreateButton";
-import MyExportButton from '../components/MyExportButton';
-import PageDrawer from "../components/PageDrawer";
-import MyField from "../components/MyField";
+import MyCreateButton from "@/page/components/MyCreateButton";
+import MyExportButton from '@/page/components/MyExportButton';
+import PageDrawer from "@/page/components/PageDrawer";
+import MyField from "@/page/components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common'
diff --git a/rsf-admin/src/page/host/HostPanel.jsx b/rsf-admin/src/page/system/host/HostPanel.jsx
similarity index 97%
rename from rsf-admin/src/page/host/HostPanel.jsx
rename to rsf-admin/src/page/system/host/HostPanel.jsx
index 2931cdb..9db98b0 100644
--- a/rsf-admin/src/page/host/HostPanel.jsx
+++ b/rsf-admin/src/page/system/host/HostPanel.jsx
@@ -4,7 +4,7 @@
useTranslate,
useRecordContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "@/page/components/PanelTypography";
import * as Common from '@/utils/common'
const HostPanel = () => {
diff --git a/rsf-admin/src/page/host/index.jsx b/rsf-admin/src/page/system/host/index.jsx
similarity index 100%
rename from rsf-admin/src/page/host/index.jsx
rename to rsf-admin/src/page/system/host/index.jsx
diff --git a/rsf-admin/src/page/menu/MenuEdit.jsx b/rsf-admin/src/page/system/menu/MenuEdit.jsx
similarity index 96%
rename from rsf-admin/src/page/menu/MenuEdit.jsx
rename to rsf-admin/src/page/system/menu/MenuEdit.jsx
index e7dfdbd..0f79182 100644
--- a/rsf-admin/src/page/menu/MenuEdit.jsx
+++ b/rsf-admin/src/page/system/menu/MenuEdit.jsx
@@ -28,10 +28,10 @@
Grid,
Box,
} from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import StatusSelectInput from "../components/StatusSelectInput";
-import MemoInput from "../components/MemoInput";
-import TreeSelectInput from "../components/TreeSelectInput";
+import DialogCloseButton from "@/page/components/DialogCloseButton";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
+import MemoInput from "@/page/components/MemoInput";
+import TreeSelectInput from "@/page/components/TreeSelectInput";
const EditContent = ({ editRecord }) => {
const { resource } = useCreateContext();
diff --git a/rsf-admin/src/page/menu/MenuList.jsx b/rsf-admin/src/page/system/menu/MenuList.jsx
similarity index 100%
rename from rsf-admin/src/page/menu/MenuList.jsx
rename to rsf-admin/src/page/system/menu/MenuList.jsx
diff --git a/rsf-admin/src/page/menu/index.jsx b/rsf-admin/src/page/system/menu/index.jsx
similarity index 100%
rename from rsf-admin/src/page/menu/index.jsx
rename to rsf-admin/src/page/system/menu/index.jsx
diff --git a/rsf-admin/src/page/operationRecord/OperationDetail.jsx b/rsf-admin/src/page/system/operationRecord/OperationDetail.jsx
similarity index 100%
rename from rsf-admin/src/page/operationRecord/OperationDetail.jsx
rename to rsf-admin/src/page/system/operationRecord/OperationDetail.jsx
diff --git a/rsf-admin/src/page/operationRecord/OperationRecordEdit.jsx b/rsf-admin/src/page/system/operationRecord/OperationRecordEdit.jsx
similarity index 95%
rename from rsf-admin/src/page/operationRecord/OperationRecordEdit.jsx
rename to rsf-admin/src/page/system/operationRecord/OperationRecordEdit.jsx
index 456c184..a3c4af5 100644
--- a/rsf-admin/src/page/operationRecord/OperationRecordEdit.jsx
+++ b/rsf-admin/src/page/system/operationRecord/OperationRecordEdit.jsx
@@ -24,10 +24,10 @@
import { Stack, Grid, Box, Typography } from '@mui/material';
import * as Common from '@/utils/common';
import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
-import EditBaseAside from "../components/EditBaseAside";
-import CustomerTopToolBar from "../components/EditTopToolBar";
-import MemoInput from "../components/MemoInput";
-import StatusSelectInput from "../components/StatusSelectInput";
+import EditBaseAside from "@/page/components/EditBaseAside";
+import CustomerTopToolBar from "@/page/components/EditTopToolBar";
+import MemoInput from "@/page/components/MemoInput";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
const FormToolbar = () => {
const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/operationRecord/OperationRecordList.jsx b/rsf-admin/src/page/system/operationRecord/OperationRecordList.jsx
similarity index 96%
rename from rsf-admin/src/page/operationRecord/OperationRecordList.jsx
rename to rsf-admin/src/page/system/operationRecord/OperationRecordList.jsx
index 940424a..249b3c1 100644
--- a/rsf-admin/src/page/operationRecord/OperationRecordList.jsx
+++ b/rsf-admin/src/page/system/operationRecord/OperationRecordList.jsx
@@ -34,10 +34,10 @@
import { Box, Typography, Card, Chip } from '@mui/material';
import { styled } from '@mui/material/styles';
import OperationRecordPanel from "./OperationRecordPanel";
-import EmptyData from "../components/EmptyData";
-import MyExportButton from '../components/MyExportButton';
-import PageDrawer from "../components/PageDrawer";
-import MyField from "../components/MyField";
+import EmptyData from "@/page/components/EmptyData";
+import MyExportButton from '@/page/components/MyExportButton';
+import PageDrawer from "@/page/components/PageDrawer";
+import MyField from "@/page/components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
import rowSx from './rowSx';
diff --git a/rsf-admin/src/page/operationRecord/OperationRecordPanel.jsx b/rsf-admin/src/page/system/operationRecord/OperationRecordPanel.jsx
similarity index 98%
rename from rsf-admin/src/page/operationRecord/OperationRecordPanel.jsx
rename to rsf-admin/src/page/system/operationRecord/OperationRecordPanel.jsx
index f929a38..55f07f4 100644
--- a/rsf-admin/src/page/operationRecord/OperationRecordPanel.jsx
+++ b/rsf-admin/src/page/system/operationRecord/OperationRecordPanel.jsx
@@ -4,7 +4,7 @@
useTranslate,
useRecordContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "@/page/components/PanelTypography";
import * as Common from '@/utils/common'
const OperationRecordPanel = () => {
diff --git a/rsf-admin/src/page/operationRecord/index.jsx b/rsf-admin/src/page/system/operationRecord/index.jsx
similarity index 100%
rename from rsf-admin/src/page/operationRecord/index.jsx
rename to rsf-admin/src/page/system/operationRecord/index.jsx
diff --git a/rsf-admin/src/page/operationRecord/rowSx.jsx b/rsf-admin/src/page/system/operationRecord/rowSx.jsx
similarity index 100%
rename from rsf-admin/src/page/operationRecord/rowSx.jsx
rename to rsf-admin/src/page/system/operationRecord/rowSx.jsx
diff --git a/rsf-admin/src/page/role/AssignPermissions.jsx b/rsf-admin/src/page/system/role/AssignPermissions.jsx
similarity index 100%
rename from rsf-admin/src/page/role/AssignPermissions.jsx
rename to rsf-admin/src/page/system/role/AssignPermissions.jsx
diff --git a/rsf-admin/src/page/role/RoleCreate.jsx b/rsf-admin/src/page/system/role/RoleCreate.jsx
similarity index 95%
rename from rsf-admin/src/page/role/RoleCreate.jsx
rename to rsf-admin/src/page/system/role/RoleCreate.jsx
index 0ded77a..2eda127 100644
--- a/rsf-admin/src/page/role/RoleCreate.jsx
+++ b/rsf-admin/src/page/system/role/RoleCreate.jsx
@@ -24,9 +24,9 @@
Grid,
Box,
} from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import StatusSelectInput from "../components/StatusSelectInput";
-import MemoInput from "../components/MemoInput";
+import DialogCloseButton from "@/page/components/DialogCloseButton";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
+import MemoInput from "@/page/components/MemoInput";
const RoleCreate = (props) => {
const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/role/RoleEdit.jsx b/rsf-admin/src/page/system/role/RoleEdit.jsx
similarity index 91%
rename from rsf-admin/src/page/role/RoleEdit.jsx
rename to rsf-admin/src/page/system/role/RoleEdit.jsx
index dd05f8c..9e65b52 100644
--- a/rsf-admin/src/page/role/RoleEdit.jsx
+++ b/rsf-admin/src/page/system/role/RoleEdit.jsx
@@ -21,10 +21,10 @@
import { Stack, Grid, Box, Typography } from '@mui/material';
import * as Common from '@/utils/common';
import { EDIT_MODE } from '@/config/setting';
-import EditBaseAside from "../components/EditBaseAside";
-import CustomerTopToolBar from "../components/EditTopToolBar";
-import MemoInput from "../components/MemoInput";
-import StatusSelectInput from "../components/StatusSelectInput";
+import EditBaseAside from "@/page/components/EditBaseAside";
+import CustomerTopToolBar from "@/page/components/EditTopToolBar";
+import MemoInput from "@/page/components/MemoInput";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
const FormToolbar = () => {
const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/role/RoleList.jsx b/rsf-admin/src/page/system/role/RoleList.jsx
similarity index 95%
rename from rsf-admin/src/page/role/RoleList.jsx
rename to rsf-admin/src/page/system/role/RoleList.jsx
index d03ab60..f02ac2d 100644
--- a/rsf-admin/src/page/role/RoleList.jsx
+++ b/rsf-admin/src/page/system/role/RoleList.jsx
@@ -34,11 +34,11 @@
import { styled } from '@mui/material/styles';
import RoleCreate from "./RoleCreate";
import RolePanel from "./RolePanel";
-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 "@/page/components/EmptyData";
+import MyCreateButton from "@/page/components/MyCreateButton";
+import MyExportButton from '@/page/components/MyExportButton';
+import PageDrawer from "@/page/components/PageDrawer";
+import MyField from "@/page/components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
import AssignPermissions from "./AssignPermissions";
diff --git a/rsf-admin/src/page/role/RolePanel.jsx b/rsf-admin/src/page/system/role/RolePanel.jsx
similarity index 97%
rename from rsf-admin/src/page/role/RolePanel.jsx
rename to rsf-admin/src/page/system/role/RolePanel.jsx
index d092997..79bfec9 100644
--- a/rsf-admin/src/page/role/RolePanel.jsx
+++ b/rsf-admin/src/page/system/role/RolePanel.jsx
@@ -4,7 +4,7 @@
useTranslate,
useRecordContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "@/page/components/PanelTypography";
import * as Common from '@/utils/common'
const RolePanel = () => {
diff --git a/rsf-admin/src/page/role/index.jsx b/rsf-admin/src/page/system/role/index.jsx
similarity index 100%
rename from rsf-admin/src/page/role/index.jsx
rename to rsf-admin/src/page/system/role/index.jsx
diff --git a/rsf-admin/src/page/tenant/TenantCreate.jsx b/rsf-admin/src/page/system/tenant/TenantCreate.jsx
similarity index 99%
rename from rsf-admin/src/page/tenant/TenantCreate.jsx
rename to rsf-admin/src/page/system/tenant/TenantCreate.jsx
index 94013a4..e4f2fcf 100644
--- a/rsf-admin/src/page/tenant/TenantCreate.jsx
+++ b/rsf-admin/src/page/system/tenant/TenantCreate.jsx
@@ -23,7 +23,7 @@
} from '@mui/material';
import { useForm, Controller, useWatch, FormProvider, useFormContext } from "react-hook-form";
import { matchPath, useLocation } from 'react-router';
-import DialogCloseButton from "../components/DialogCloseButton";
+import DialogCloseButton from "@/page/components/DialogCloseButton";
import Visibility from '@mui/icons-material/Visibility';
import VisibilityOff from '@mui/icons-material/VisibilityOff';
import request from '@/utils/request';
diff --git a/rsf-admin/src/page/tenant/TenantEdit.jsx b/rsf-admin/src/page/system/tenant/TenantEdit.jsx
similarity index 92%
rename from rsf-admin/src/page/tenant/TenantEdit.jsx
rename to rsf-admin/src/page/system/tenant/TenantEdit.jsx
index eb0a8d7..3b8efc2 100644
--- a/rsf-admin/src/page/tenant/TenantEdit.jsx
+++ b/rsf-admin/src/page/system/tenant/TenantEdit.jsx
@@ -21,10 +21,10 @@
import { Stack, Grid, Box, Typography } from '@mui/material';
import * as Common from '@/utils/common';
import { EDIT_MODE } from '@/config/setting';
-import EditBaseAside from "../components/EditBaseAside";
-import CustomerTopToolBar from "../components/EditTopToolBar";
-import MemoInput from "../components/MemoInput";
-import StatusSelectInput from "../components/StatusSelectInput";
+import EditBaseAside from "@/page/components/EditBaseAside";
+import CustomerTopToolBar from "@/page/components/EditTopToolBar";
+import MemoInput from "@/page/components/MemoInput";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
const FormToolbar = () => {
const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/tenant/TenantList.jsx b/rsf-admin/src/page/system/tenant/TenantList.jsx
similarity index 94%
rename from rsf-admin/src/page/tenant/TenantList.jsx
rename to rsf-admin/src/page/system/tenant/TenantList.jsx
index e4d2164..701461d 100644
--- a/rsf-admin/src/page/tenant/TenantList.jsx
+++ b/rsf-admin/src/page/system/tenant/TenantList.jsx
@@ -32,11 +32,11 @@
import { styled } from '@mui/material/styles';
import TenantCreate from "./TenantCreate";
import TenantPanel from "./TenantPanel";
-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 "@/page/components/EmptyData";
+import MyCreateButton from "@/page/components/MyCreateButton";
+import MyExportButton from '@/page/components/MyExportButton';
+import PageDrawer from "@/page/components/PageDrawer";
+import MyField from "@/page/components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common'
diff --git a/rsf-admin/src/page/tenant/TenantPanel.jsx b/rsf-admin/src/page/system/tenant/TenantPanel.jsx
similarity index 97%
rename from rsf-admin/src/page/tenant/TenantPanel.jsx
rename to rsf-admin/src/page/system/tenant/TenantPanel.jsx
index 0c822f7..3146a9b 100644
--- a/rsf-admin/src/page/tenant/TenantPanel.jsx
+++ b/rsf-admin/src/page/system/tenant/TenantPanel.jsx
@@ -4,7 +4,7 @@
useTranslate,
useRecordContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "@/page/components/PanelTypography";
import * as Common from '@/utils/common'
const TenantPanel = () => {
diff --git a/rsf-admin/src/page/tenant/index.jsx b/rsf-admin/src/page/system/tenant/index.jsx
similarity index 100%
rename from rsf-admin/src/page/tenant/index.jsx
rename to rsf-admin/src/page/system/tenant/index.jsx
diff --git a/rsf-admin/src/page/user/RolesField.jsx b/rsf-admin/src/page/system/user/RolesField.jsx
similarity index 100%
rename from rsf-admin/src/page/user/RolesField.jsx
rename to rsf-admin/src/page/system/user/RolesField.jsx
diff --git a/rsf-admin/src/page/user/RolesSelect.jsx b/rsf-admin/src/page/system/user/RolesSelect.jsx
similarity index 100%
rename from rsf-admin/src/page/user/RolesSelect.jsx
rename to rsf-admin/src/page/system/user/RolesSelect.jsx
diff --git a/rsf-admin/src/page/user/UserCreate.jsx b/rsf-admin/src/page/system/user/UserCreate.jsx
similarity index 97%
rename from rsf-admin/src/page/user/UserCreate.jsx
rename to rsf-admin/src/page/system/user/UserCreate.jsx
index c2d8e08..c6a9e42 100644
--- a/rsf-admin/src/page/user/UserCreate.jsx
+++ b/rsf-admin/src/page/system/user/UserCreate.jsx
@@ -28,10 +28,10 @@
Grid,
Box,
} from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import StatusSelectInput from "../components/StatusSelectInput";
-import MemoInput from "../components/MemoInput";
-import TreeSelectInput from "../components/TreeSelectInput";
+import DialogCloseButton from "@/page/components/DialogCloseButton";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
+import MemoInput from "@/page/components/MemoInput";
+import TreeSelectInput from "@/page/components/TreeSelectInput";
import RolesSelect from './RolesSelect'
const UserCreate = (props) => {
diff --git a/rsf-admin/src/page/user/UserEdit.jsx b/rsf-admin/src/page/system/user/UserEdit.jsx
similarity index 95%
rename from rsf-admin/src/page/user/UserEdit.jsx
rename to rsf-admin/src/page/system/user/UserEdit.jsx
index f040af2..d4c9e74 100644
--- a/rsf-admin/src/page/user/UserEdit.jsx
+++ b/rsf-admin/src/page/system/user/UserEdit.jsx
@@ -26,12 +26,12 @@
import { Stack, Grid, Box, Typography } from '@mui/material';
import * as Common from '@/utils/common';
import { EDIT_MODE } from '@/config/setting';
-import EditBaseAside from "../components/EditBaseAside";
-import CustomerTopToolBar from "../components/EditTopToolBar";
-import MemoInput from "../components/MemoInput";
-import StatusSelectInput from "../components/StatusSelectInput";
+import EditBaseAside from "@/page/components/EditBaseAside";
+import CustomerTopToolBar from "@/page/components/EditTopToolBar";
+import MemoInput from "@/page/components/MemoInput";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
import RolesSelect from "./RolesSelect";
-import TreeSelectInput from "../components/TreeSelectInput";
+import TreeSelectInput from "@/page/components/TreeSelectInput";
const FormToolbar = () => {
const { setValue, getValues } = useFormContext();
diff --git a/rsf-admin/src/page/user/UserList.jsx b/rsf-admin/src/page/system/user/UserList.jsx
similarity index 96%
rename from rsf-admin/src/page/user/UserList.jsx
rename to rsf-admin/src/page/system/user/UserList.jsx
index b1bcd32..bd68f46 100644
--- a/rsf-admin/src/page/user/UserList.jsx
+++ b/rsf-admin/src/page/system/user/UserList.jsx
@@ -36,11 +36,11 @@
import { styled } from '@mui/material/styles';
import UserCreate from "./UserCreate";
import UserPanel from "./UserPanel";
-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 "@/page/components/EmptyData";
+import MyCreateButton from "@/page/components/MyCreateButton";
+import MyExportButton from '@/page/components/MyExportButton';
+import PageDrawer from "@/page/components/PageDrawer";
+import MyField from "@/page/components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
import UserListAside from "./UserListAside";
diff --git a/rsf-admin/src/page/user/UserListAside.jsx b/rsf-admin/src/page/system/user/UserListAside.jsx
similarity index 100%
rename from rsf-admin/src/page/user/UserListAside.jsx
rename to rsf-admin/src/page/system/user/UserListAside.jsx
diff --git a/rsf-admin/src/page/user/UserPanel.jsx b/rsf-admin/src/page/system/user/UserPanel.jsx
similarity index 98%
rename from rsf-admin/src/page/user/UserPanel.jsx
rename to rsf-admin/src/page/system/user/UserPanel.jsx
index b3f5fea..7f6662a 100644
--- a/rsf-admin/src/page/user/UserPanel.jsx
+++ b/rsf-admin/src/page/system/user/UserPanel.jsx
@@ -4,7 +4,7 @@
useTranslate,
useRecordContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "@/page/components/PanelTypography";
import * as Common from '@/utils/common'
const UserPanel = () => {
diff --git a/rsf-admin/src/page/user/index.jsx b/rsf-admin/src/page/system/user/index.jsx
similarity index 100%
rename from rsf-admin/src/page/user/index.jsx
rename to rsf-admin/src/page/system/user/index.jsx
diff --git a/rsf-admin/src/page/userLogin/UserLoginCreate.jsx b/rsf-admin/src/page/system/userLogin/UserLoginCreate.jsx
similarity index 96%
rename from rsf-admin/src/page/userLogin/UserLoginCreate.jsx
rename to rsf-admin/src/page/system/userLogin/UserLoginCreate.jsx
index 7bd23f1..09853b2 100644
--- a/rsf-admin/src/page/userLogin/UserLoginCreate.jsx
+++ b/rsf-admin/src/page/system/userLogin/UserLoginCreate.jsx
@@ -27,9 +27,9 @@
Grid,
Box,
} from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import StatusSelectInput from "../components/StatusSelectInput";
-import MemoInput from "../components/MemoInput";
+import DialogCloseButton from "@/page/components/DialogCloseButton";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
+import MemoInput from "@/page/components/MemoInput";
const UserLoginCreate = (props) => {
const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/userLogin/UserLoginEdit.jsx b/rsf-admin/src/page/system/userLogin/UserLoginEdit.jsx
similarity index 93%
rename from rsf-admin/src/page/userLogin/UserLoginEdit.jsx
rename to rsf-admin/src/page/system/userLogin/UserLoginEdit.jsx
index c6c1f34..67d3a58 100644
--- a/rsf-admin/src/page/userLogin/UserLoginEdit.jsx
+++ b/rsf-admin/src/page/system/userLogin/UserLoginEdit.jsx
@@ -24,10 +24,10 @@
import { Stack, Grid, Box, Typography } from '@mui/material';
import * as Common from '@/utils/common';
import { EDIT_MODE } from '@/config/setting';
-import EditBaseAside from "../components/EditBaseAside";
-import CustomerTopToolBar from "../components/EditTopToolBar";
-import MemoInput from "../components/MemoInput";
-import StatusSelectInput from "../components/StatusSelectInput";
+import EditBaseAside from "@/page/components/EditBaseAside";
+import CustomerTopToolBar from "@/page/components/EditTopToolBar";
+import MemoInput from "@/page/components/MemoInput";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
const FormToolbar = () => {
const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/userLogin/UserLoginList.jsx b/rsf-admin/src/page/system/userLogin/UserLoginList.jsx
similarity index 94%
rename from rsf-admin/src/page/userLogin/UserLoginList.jsx
rename to rsf-admin/src/page/system/userLogin/UserLoginList.jsx
index bfa653c..b8758f8 100644
--- a/rsf-admin/src/page/userLogin/UserLoginList.jsx
+++ b/rsf-admin/src/page/system/userLogin/UserLoginList.jsx
@@ -35,11 +35,11 @@
import { styled } from '@mui/material/styles';
import UserLoginCreate from "./UserLoginCreate";
import UserLoginPanel from "./UserLoginPanel";
-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 "@/page/components/EmptyData";
+import MyCreateButton from "@/page/components/MyCreateButton";
+import MyExportButton from '@/page/components/MyExportButton';
+import PageDrawer from "@/page/components/PageDrawer";
+import MyField from "@/page/components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common'
diff --git a/rsf-admin/src/page/userLogin/UserLoginPanel.jsx b/rsf-admin/src/page/system/userLogin/UserLoginPanel.jsx
similarity index 97%
rename from rsf-admin/src/page/userLogin/UserLoginPanel.jsx
rename to rsf-admin/src/page/system/userLogin/UserLoginPanel.jsx
index c686a63..d47c403 100644
--- a/rsf-admin/src/page/userLogin/UserLoginPanel.jsx
+++ b/rsf-admin/src/page/system/userLogin/UserLoginPanel.jsx
@@ -4,7 +4,7 @@
useTranslate,
useRecordContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "@/page/components/PanelTypography";
import * as Common from '@/utils/common'
const UserLoginPanel = () => {
diff --git a/rsf-admin/src/page/userLogin/index.jsx b/rsf-admin/src/page/system/userLogin/index.jsx
similarity index 100%
rename from rsf-admin/src/page/userLogin/index.jsx
rename to rsf-admin/src/page/system/userLogin/index.jsx
--
Gitblit v1.9.1