From 5ebb7525afe9f570b75e98a030c749cc898b731c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 17 二月 2025 13:24:09 +0800
Subject: [PATCH] Merge branch 'main' of http://47.97.1.152:5880/r/wms-master
---
rsf-admin/src/page/tenant/TenantCreate.jsx | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/rsf-admin/src/page/tenant/TenantCreate.jsx b/rsf-admin/src/page/tenant/TenantCreate.jsx
index 4e0dea7..94013a4 100644
--- a/rsf-admin/src/page/tenant/TenantCreate.jsx
+++ b/rsf-admin/src/page/tenant/TenantCreate.jsx
@@ -1,19 +1,8 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
import {
- CreateBase,
useTranslate,
- TextInput,
- NumberInput,
- BooleanInput,
- DateInput,
- SaveButton,
- SelectInput,
- Toolbar,
- required,
- useDataProvider,
useNotify,
- Form,
- useCreateController,
+ useRefresh,
} from 'react-admin';
import {
Dialog,
@@ -35,15 +24,15 @@
import { useForm, Controller, useWatch, FormProvider, useFormContext } from "react-hook-form";
import { matchPath, useLocation } from 'react-router';
import DialogCloseButton from "../components/DialogCloseButton";
-import StatusSelectInput from "../components/StatusSelectInput";
-import MemoInput from "../components/MemoInput";
import Visibility from '@mui/icons-material/Visibility';
import VisibilityOff from '@mui/icons-material/VisibilityOff';
+import request from '@/utils/request';
const TenantCreate = (props) => {
const { open, setOpen } = props;
const translate = useTranslate();
const notify = useNotify();
+ const refresh = useRefresh();
const {
control,
handleSubmit,
@@ -96,14 +85,20 @@
};
const onSubmit = (data) => {
- console.log(data);
- return;
-
- // setOpen(false);
- reset();
- // notify('common.response.success');
-
- // notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
+ request.post('/tenant/init', data).then(res => {
+ const { code, msg, data } = res.data;
+ if (code === 200) {
+ notify(msg, { type: 'success', messageArgs: { _: msg } });
+ setOpen(false);
+ reset();
+ refresh();
+ } else {
+ notify(msg, { type: 'error', messageArgs: { _: msg } });
+ }
+ }).catch((error) => {
+ notify(error.message, { type: 'error', messageArgs: { _: error.message } });
+ console.error(error);
+ })
}
return (
@@ -252,7 +247,7 @@
message: translate('ra.validation.required'),
},
pattern: {
- value: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,13}$/,
+ value: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d\.]{6,13}$/,
message: translate('page.settings.resetPwd.tip.pwdInputLimit'),
},
}}
--
Gitblit v1.9.1