diff --git a/src/food-market.public/src/components/SignupForm.tsx b/src/food-market.public/src/components/SignupForm.tsx index a33e333..baa5a9b 100644 --- a/src/food-market.public/src/components/SignupForm.tsx +++ b/src/food-market.public/src/components/SignupForm.tsx @@ -82,19 +82,28 @@ export default function SignupForm({ defaultPlan = 'start' }: Props) {
{error}
)} - setEmail(e.target.value)} + { setEmail(e.target.value); setFieldErrors(p => ({...p, email: undefined})) }} + onBlur={() => { const e = validateEmail(email); setFieldErrors(p => ({...p, email: e ?? undefined})) }} autoComplete="email" placeholder="name@example.kz" className={inputCls(!!fieldErrors.email)} /> - setPassword(e.target.value)} + { setPassword(e.target.value); setFieldErrors(p => ({...p, password: undefined})) }} + onBlur={() => { const e = validatePassword(password); setFieldErrors(p => ({...p, password: e ?? undefined})) }} autoComplete="new-password" className={inputCls(!!fieldErrors.password)} /> - setOrgName(e.target.value)} + { setOrgName(e.target.value); setFieldErrors(p => ({...p, orgName: undefined})) }} + onBlur={() => { setFieldErrors(p => ({...p, orgName: !orgName.trim() ? 'Название магазина обязательно для заполнения' : undefined})) }} placeholder="Наименование организации" className={inputCls(!!fieldErrors.orgName)} /> - + { setPhone(v); setFieldErrors(p => ({...p, phone: undefined})) }} + onBlur={() => { const e = validatePhone(phone); setFieldErrors(p => ({...p, phone: e ?? undefined})) }} + required className={inputCls(!!fieldErrors.phone)} />
Тариф
diff --git a/src/food-market.web/src/pages/CounterpartiesPage.tsx b/src/food-market.web/src/pages/CounterpartiesPage.tsx index 5f68df5..6f7909a 100644 --- a/src/food-market.web/src/pages/CounterpartiesPage.tsx +++ b/src/food-market.web/src/pages/CounterpartiesPage.tsx @@ -1,5 +1,6 @@ import { useState } from 'react' import { useQuery } from '@tanstack/react-query' +import { validateEmail, validatePhone } from '@/lib/validation' import { Plus, Trash2 } from 'lucide-react' import { api } from '@/lib/api' import { ListPageShell } from '@/components/ListPageShell' @@ -51,6 +52,7 @@ export function CounterpartiesPage() { const { data, isLoading, page, setPage, search, setSearch, sortKey, sortOrder, setSort } = useCatalogList(URL) const { create, update, remove } = useCatalogMutations(URL, URL) const [form, setForm] = useState
(null) + const [fieldErrors, setFieldErrors] = useState>>({}) const countries = useQuery({ queryKey: ['countries-lookup'], @@ -64,7 +66,7 @@ export function CounterpartiesPage() { const payload = { ...rest, countryId: countryId || null } if (id) await update.mutateAsync({ id, input: payload }) else await create.mutateAsync(payload) - setForm(null) + setForm(null); setFieldErrors({}) } return ( @@ -75,7 +77,7 @@ export function CounterpartiesPage() { actions={ <> - + } footer={data && data.total > 0 && ( @@ -89,13 +91,13 @@ export function CounterpartiesPage() { sortKey={sortKey} sortOrder={sortOrder} onSortChange={setSort} - onRowClick={(r) => setForm({ + onRowClick={(r) => { setFieldErrors({}); setForm({ id: r.id, name: r.name, legalName: r.legalName ?? '', type: r.type, bin: r.bin ?? '', iin: r.iin ?? '', taxNumber: r.taxNumber ?? '', countryId: r.countryId ?? '', address: r.address ?? '', phone: r.phone ?? '', email: r.email ?? '', bankName: r.bankName ?? '', bankAccount: r.bankAccount ?? '', bik: r.bik ?? '', contactPerson: r.contactPerson ?? '', notes: r.notes ?? '', - })} + }) }} columns={[ { header: 'Название', sortKey: 'name', cell: (r) => r.name }, { header: 'Тип', width: '120px', sortKey: 'type', cell: (r) => typeLabel[r.type] }, @@ -108,7 +110,7 @@ export function CounterpartiesPage() { setForm(null)} + onClose={() => { setForm(null); setFieldErrors({}) }} title={form?.id ? 'Редактировать контрагента' : 'Новый контрагент'} width="max-w-3xl" footer={ @@ -117,7 +119,7 @@ export function CounterpartiesPage() { @@ -232,7 +235,7 @@ export function EmployeeRolesPage() { setForm(null)} + onClose={() => { setForm(null); setNameErr(null) }} title={form?.id ? (form.isSystem ? `Системная роль «${form.name}» (только просмотр)` : `Редактировать роль «${form.name}»`) : 'Новая роль'} @@ -243,7 +246,7 @@ export function EmployeeRolesPage() {