From 0ad9bb87156809c94cb42408c194cacf6e280d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=D1=81=20=D0=A1=D1=83=D0=BB=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <si@op16.ru>
Date: Mon, 31 Aug 2026 17:02:56 +0300
Subject: [PATCH] =?UTF-8?q?fix(gps):=20=D1=83=D0=B1=D1=80=D0=B0=D0=BD=20?=
 =?UTF-8?q?=D1=81=D0=BB=D0=BE=D0=B9=20=D0=B4=D0=B5=D1=82=D0=B5=D0=BA=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B8=20LBS=20=D0=BF=D0=BE=20stale=20re-send=20(=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=B5=D1=87=D0=B0=D0=BB=20~100%=20=D1=82=D0=BE?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BA);=20is=5Flbs=20=D1=82=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BA=D0=BE=20=D0=BF=D0=BE=20=D0=BF=D1=80=D0=BE=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BB=D1=8C=D0=BD=D0=BE=D0=BC=D1=83=20=D1=84=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=B3=D1=83=20valid=3Dfalse=20+=20=D1=84=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/CompanyFieldInput.tsx   |  4 +
 client/src/components/ContactField.tsx        | 16 ++--
 client/src/components/CreateTaskDialog.tsx    |  3 +-
 .../src/components/CreateTaskFormContent.tsx  | 91 +++++++++++++++----
 client/src/components/GeoField.tsx            | 12 ++-
 client/src/components/RegistryCellEditor.tsx  |  8 +-
 .../src/components/TableFieldMultiSelect.tsx  |  7 +-
 client/src/components/TableFieldSelect.tsx    |  7 +-
 .../components/TableFieldWithSubdirectory.tsx |  6 ++
 client/src/components/TaskRegularTable.tsx    | 43 ++++-----
 .../fields/SearchableMultiSelect.tsx          |  5 +-
 .../components/fields/SearchableSelect.tsx    |  5 +-
 client/src/components/fields/field-styles.ts  | 27 ++++++
 client/src/components/task-form-fields.tsx    | 12 ++-
 client/src/components/ui/table.tsx            |  8 +-
 client/src/pages/TaskDetail.tsx               | 21 ++++-
 server/gps/geozone.service.ts                 | 27 ++----
 17 files changed, 208 insertions(+), 94 deletions(-)
 create mode 100644 client/src/components/fields/field-styles.ts

diff --git a/client/src/components/CompanyFieldInput.tsx b/client/src/components/CompanyFieldInput.tsx
index aa4fd36..b42bcf9 100644
--- a/client/src/components/CompanyFieldInput.tsx
+++ b/client/src/components/CompanyFieldInput.tsx
@@ -2,6 +2,7 @@ import { useState, useRef, useEffect, useCallback } from "react";
 import { Input } from "@/components/ui/input";
 import { Popover, PopoverAnchor, PopoverContent } from "@/components/ui/popover";
 import { apiRequest } from "@/lib/queryClient";
+import { fieldControlClass, type FieldControlSize } from "@/components/fields/field-styles";
 import { Loader2 } from "lucide-react";
 
 export interface DadataCompany {
@@ -34,6 +35,7 @@ interface CompanyFieldInputProps {
   onClear?: () => void;
   placeholder?: string;
   disabled?: boolean;
+  size?: FieldControlSize;
 }
 
 export default function CompanyFieldInput({
@@ -43,6 +45,7 @@ export default function CompanyFieldInput({
   onClear,
   placeholder = "Начните вводить название компании",
   disabled = false,
+  size = 'form',
 }: CompanyFieldInputProps) {
   const [inputValue, setInputValue] = useState(value);
   const [suggestions, setSuggestions] = useState<DadataCompany[]>([]);
@@ -118,6 +121,7 @@ export default function CompanyFieldInput({
             onChange={handleInputChange}
             placeholder={placeholder}
             disabled={disabled}
+            className={fieldControlClass(size)}
             data-testid="input-company-search"
           />
           {isLoading && (
diff --git a/client/src/components/ContactField.tsx b/client/src/components/ContactField.tsx
index faebf80..1b609e5 100644
--- a/client/src/components/ContactField.tsx
+++ b/client/src/components/ContactField.tsx
@@ -1,6 +1,7 @@
 import { useState, useEffect } from "react";
 import { Input } from "@/components/ui/input";
 import { Button } from "@/components/ui/button";
+import { fieldControlClass, type FieldControlSize } from "@/components/fields/field-styles";
 import { Plus, X } from "lucide-react";
 
 export interface ContactValue {
@@ -14,6 +15,7 @@ interface ContactFieldProps {
   value: ContactValue | string | null;
   onChange: (value: ContactValue) => void;
   disabled?: boolean;
+  size?: FieldControlSize;
 }
 
 function safeParseContact(value: ContactValue | string | null): ContactValue {
@@ -28,7 +30,7 @@ function safeParseContact(value: ContactValue | string | null): ContactValue {
   return value as ContactValue;
 }
 
-export default function ContactField({ value, onChange, disabled = false }: ContactFieldProps) {
+export default function ContactField({ value, onChange, disabled = false, size = 'form' }: ContactFieldProps) {
   const parsed = safeParseContact(value);
   const [name, setName] = useState(parsed.name || "");
   const [position, setPosition] = useState(parsed.position || "");
@@ -101,7 +103,7 @@ export default function ContactField({ value, onChange, disabled = false }: Cont
           onChange={(e) => handleNameChange(e.target.value)}
           disabled={disabled}
           placeholder="ФИО (Иванов И.И.)"
-          className="h-8 flex-1 min-w-[140px]"
+          className={fieldControlClass(size, 'flex-1 min-w-[140px]')}
         />
         {/* Должность */}
         <Input
@@ -109,7 +111,7 @@ export default function ContactField({ value, onChange, disabled = false }: Cont
           onChange={(e) => handlePositionChange(e.target.value)}
           disabled={disabled}
           placeholder="Должность (Директор)"
-          className="h-8 flex-1 min-w-[140px]"
+          className={fieldControlClass(size, 'flex-1 min-w-[140px]')}
         />
         {/* Телефон — первый + кнопка добавить */}
         <div className="flex gap-1 flex-1 min-w-[180px]">
@@ -118,7 +120,7 @@ export default function ContactField({ value, onChange, disabled = false }: Cont
             onChange={(e) => changePhone(0, e.target.value)}
             disabled={disabled}
             placeholder="Телефон +7 (999) 123-45-67"
-            className="h-8 flex-1 min-w-0"
+            className={fieldControlClass(size, 'flex-1 min-w-0')}
           />
           <Button
             type="button"
@@ -139,7 +141,7 @@ export default function ContactField({ value, onChange, disabled = false }: Cont
             onChange={(e) => changeEmail(0, e.target.value)}
             disabled={disabled}
             placeholder="Email ivan@example.com"
-            className="h-8 flex-1 min-w-0"
+            className={fieldControlClass(size, 'flex-1 min-w-0')}
           />
           <Button
             type="button"
@@ -165,7 +167,7 @@ export default function ContactField({ value, onChange, disabled = false }: Cont
                 onChange={(e) => changePhone(idx + 1, e.target.value)}
                 disabled={disabled}
                 placeholder="+7 (999) 123-45-67"
-                className="h-8 flex-1 min-w-0"
+                className={fieldControlClass(size, 'flex-1 min-w-0')}
               />
               <Button
                 type="button"
@@ -192,7 +194,7 @@ export default function ContactField({ value, onChange, disabled = false }: Cont
                 onChange={(e) => changeEmail(idx + 1, e.target.value)}
                 disabled={disabled}
                 placeholder="ivan@example.com"
-                className="h-8 flex-1 min-w-0"
+                className={fieldControlClass(size, 'flex-1 min-w-0')}
               />
               <Button
                 type="button"
diff --git a/client/src/components/CreateTaskDialog.tsx b/client/src/components/CreateTaskDialog.tsx
index 5a8735f..fb022e5 100644
--- a/client/src/components/CreateTaskDialog.tsx
+++ b/client/src/components/CreateTaskDialog.tsx
@@ -22,7 +22,8 @@ export function CreateTaskDialog({
 }: CreateTaskDialogProps) {
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-lg max-h-[85vh] overflow-hidden flex flex-col">
+      {/* На мобильных — full-screen диалог, на десктопе — как раньше (max-w-lg, max-h-85vh) */}
+      <DialogContent className="max-w-lg max-h-[85vh] overflow-hidden flex flex-col max-md:h-dvh max-md:max-h-none max-md:rounded-none max-md:w-full">
         <CreateTaskFormContent
           formId={formId}
           open={open}
diff --git a/client/src/components/CreateTaskFormContent.tsx b/client/src/components/CreateTaskFormContent.tsx
index 822cfa9..a185925 100644
--- a/client/src/components/CreateTaskFormContent.tsx
+++ b/client/src/components/CreateTaskFormContent.tsx
@@ -11,6 +11,10 @@ import { Input } from '@/components/ui/input';
 import { Button } from '@/components/ui/button';
 import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form';
 import { Textarea } from '@/components/ui/textarea';
+import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
+import { Switch } from '@/components/ui/switch';
+import { cn } from '@/lib/utils';
+import { fieldControlClass, fieldLabelClass, fieldErrorClass } from '@/components/fields/field-styles';
 import { DialogHeader, DialogTitle, DialogDescription } from '@/components/ui/dialog';
 import CompanyFieldInput, { DadataCompany } from '@/components/CompanyFieldInput';
 import GeoField from '@/components/GeoField';
@@ -370,7 +374,8 @@ export function CreateTaskFormContent({
 
       <div className="flex-1 overflow-y-auto">
         <Form {...form}>
-          <form onSubmit={form.handleSubmit((data) => createTaskMutation.mutate(data))} className="space-y-3">
+          {/* Сетка полей в стиле NocoBase/antd: на десктопе 2 колонки, широкие поля — на всю строку */}
+          <form onSubmit={form.handleSubmit((data) => createTaskMutation.mutate(data))} className="grid gap-x-4 gap-y-3 md:grid-cols-2">
 
             {!formInfo?.hiddenSystemFields?.includes('assignedTo') && (
               /* Ответственный */
@@ -379,7 +384,7 @@ export function CreateTaskFormContent({
                 name="assignedTo"
                 render={({ field }) => (
                   <FormItem className="space-y-1">
-                    <FormLabel className="text-sm">Ответственный</FormLabel>
+                    <FormLabel className={fieldLabelClass}>Ответственный</FormLabel>
                     <FormControl>
                       <UserFieldSelect
                         formField={{ id: 0, code: 'assignedTo', name: 'Ответственный', type: 'user', options: {} } as FormFieldData}
@@ -388,7 +393,7 @@ export function CreateTaskFormContent({
                         onChange={(value) => field.onChange(value === '' ? undefined : parseInt(value))}
                       />
                     </FormControl>
-                    <FormMessage />
+                    <FormMessage className={fieldErrorClass} />
                   </FormItem>
                 )}
               />
@@ -401,24 +406,24 @@ export function CreateTaskFormContent({
                 name="dueDate"
                 render={({ field }) => (
                   <FormItem className="space-y-1">
-                    <FormLabel className="text-sm">Срок выполнения</FormLabel>
+                    <FormLabel className={fieldLabelClass}>Срок выполнения</FormLabel>
                     <FormControl>
                       <div className="flex items-center gap-2">
                         <Input
                           type="date"
                           {...field}
                           data-testid="input-task-due-date"
-                          className="h-8 flex-1"
+                          className={fieldControlClass('form', 'flex-1')}
                         />
                         <Input
                           type="time"
                           {...form.register('dueTime')}
                           data-testid="input-task-due-time"
-                          className="h-8 w-[110px]"
+                          className={fieldControlClass('form', 'w-[110px]')}
                         />
                       </div>
                     </FormControl>
-                    <FormMessage />
+                    <FormMessage className={fieldErrorClass} />
                   </FormItem>
                 )}
               />
@@ -427,10 +432,17 @@ export function CreateTaskFormContent({
             {/* Кастомные поля формы */}
             {fields && fields.length > 0 && (
               <>
-                <div className="border-t pt-2 mt-2" />
-                {fields.filter((formField) => isFieldVisibleForCreate(formField) && !companyAutofillTargets.has(formField.code)).map((formField) => {
+                <div className="border-t md:col-span-2" />
+                {fields.filter((formField) =>
+                  isFieldVisibleForCreate(formField) &&
+                  !companyAutofillTargets.has(formField.code) &&
+                  // document_template и button действуют на существующую задачу — в форме создания не рендерим
+                  formField.type !== 'document_template' && formField.type !== 'button'
+                ).map((formField) => {
                   const fieldName = `customField_${formField.id}`;
                   const isImmutable = isFieldImmutableForCreate(formField);
+                  // Широкие составные поля занимают обе колонки сетки
+                  const isWideField = ['textarea', 'rich-text', 'geo', 'contact', 'company', 'file', 'checklist'].includes(formField.type);
 
                   return (
                     <FormField
@@ -438,10 +450,10 @@ export function CreateTaskFormContent({
                       control={form.control}
                       name={fieldName as any}
                       render={({ field }) => (
-                        <FormItem className="space-y-1">
-                          <FormLabel className="text-sm">
+                        <FormItem className={cn('space-y-1', isWideField && 'md:col-span-2')}>
+                          <FormLabel className={fieldLabelClass}>
+                            {isFieldRequiredForCreate(formField) && <span className="text-destructive mr-0.5">*</span>}
                             {formField.name}
-                            {isFieldRequiredForCreate(formField) && <span className="text-red-500 ml-1">*</span>}
                           </FormLabel>
                           <FormControl>
                             <fieldset disabled={isImmutable} className="min-w-0 border-0 p-0 m-0">
@@ -453,7 +465,7 @@ export function CreateTaskFormContent({
                                         placeholder={formField.placeholder || `Введите ${formField.name.toLowerCase()}...`}
                                         {...field}
                                         data-testid={`input-custom-${formField.code}`}
-                                        className="h-8"
+                                        className={fieldControlClass('form')}
                                       />
                                     );
                                   case 'number':
@@ -466,7 +478,7 @@ export function CreateTaskFormContent({
                                         value={field.value ?? ''}
                                         onChange={(e) => field.onChange(e.target.value.replace(/\s/g, ''))}
                                         data-testid={`input-custom-${formField.code}`}
-                                        className="h-8"
+                                        className={fieldControlClass('form')}
                                       />
                                     );
                                   case 'date':
@@ -480,7 +492,7 @@ export function CreateTaskFormContent({
                                           onChange={(e) => field.onChange(e.target.value)}
                                           disabled={isProlongation}
                                           data-testid={`input-custom-${formField.code}`}
-                                          className="h-8"
+                                          className={fieldControlClass('form')}
                                         />
                                         {formField.autoProlongation && (
                                           <label className="flex items-center space-x-2 text-sm cursor-pointer">
@@ -506,6 +518,47 @@ export function CreateTaskFormContent({
                                         data-testid={`textarea-custom-${formField.code}`}
                                       />
                                     );
+                                  case 'rich-text':
+                                    return (
+                                      <Textarea
+                                        placeholder={formField.placeholder || 'HTML: <b>жирный</b>, <i>курсив</i>, <ul><li>список</li></ul>'}
+                                        className="resize-none font-mono text-xs"
+                                        rows={4}
+                                        {...field}
+                                        data-testid={`textarea-custom-${formField.code}`}
+                                      />
+                                    );
+                                  case 'radio-group': {
+                                    const radioOptions = normalizeSelectOptions(formField.options);
+                                    return (
+                                      <RadioGroup
+                                        value={field.value != null ? String(field.value) : ''}
+                                        onValueChange={field.onChange}
+                                        className="flex flex-wrap gap-x-4 gap-y-1.5 pt-1"
+                                        data-testid={`radio-custom-${formField.code}`}
+                                      >
+                                        {radioOptions.map((option) => (
+                                          <label key={option.value} className="flex items-center gap-1.5 text-sm cursor-pointer">
+                                            <RadioGroupItem value={option.value} />
+                                            <span>{option.label}</span>
+                                          </label>
+                                        ))}
+                                      </RadioGroup>
+                                    );
+                                  }
+                                  case 'toggle':
+                                    return (
+                                      <div className="flex items-center gap-2 h-8">
+                                        <Switch
+                                          checked={field.value === true || field.value === 'true'}
+                                          onCheckedChange={field.onChange}
+                                          data-testid={`toggle-custom-${formField.code}`}
+                                        />
+                                        <span className="text-sm text-muted-foreground">
+                                          {field.value === true || field.value === 'true' ? 'Да' : 'Нет'}
+                                        </span>
+                                      </div>
+                                    );
                                   case 'select': {
                                     const selectOptions = normalizeSelectOptions(formField.options).map((option) => ({
                                       value: option.value,
@@ -781,14 +834,14 @@ export function CreateTaskFormContent({
                                         placeholder={formField.placeholder || `Введите ${formField.name.toLowerCase()}...`}
                                         {...field}
                                         data-testid={`input-custom-${formField.code}`}
-                                        className="h-8"
+                                        className={fieldControlClass('form')}
                                       />
                                     );
                                 }
                               })()}
                             </fieldset>
                           </FormControl>
-                          <FormMessage />
+                          <FormMessage className={fieldErrorClass} />
                         </FormItem>
                       )}
                     />
@@ -797,8 +850,8 @@ export function CreateTaskFormContent({
               </>
             )}
 
-            {/* Кнопки действий */}
-            <div className="flex justify-end space-x-2 pt-3 border-t mt-3">
+            {/* Кнопки действий — липкий футер внутри скроллящегося контента диалога */}
+            <div className="sticky bottom-0 bg-background border-t flex justify-end gap-2 pt-3 pb-1 md:col-span-2">
               <Button
                 type="button"
                 variant="outline"
diff --git a/client/src/components/GeoField.tsx b/client/src/components/GeoField.tsx
index a12c76f..9864cba 100644
--- a/client/src/components/GeoField.tsx
+++ b/client/src/components/GeoField.tsx
@@ -3,6 +3,7 @@ import { Input } from "@/components/ui/input";
 import { Button } from "@/components/ui/button";
 import { Popover, PopoverAnchor, PopoverContent } from "@/components/ui/popover";
 import { apiRequest } from "@/lib/queryClient";
+import { fieldControlClass, type FieldControlSize } from "@/components/fields/field-styles";
 import { Loader2, MapPin, Navigation } from "lucide-react";
 
 export interface GeoValue {
@@ -27,6 +28,7 @@ interface GeoFieldProps {
   value: GeoValue | string | null;
   onChange: (value: GeoValue) => void;
   disabled?: boolean;
+  size?: FieldControlSize;
 }
 
 function formatCoords(geo: GeoValue): string {
@@ -60,7 +62,7 @@ function safeParseGeo(value: GeoValue | string | null): GeoValue {
   return (value || {}) as GeoValue;
 }
 
-export default function GeoField({ value, onChange, disabled = false }: GeoFieldProps) {
+export default function GeoField({ value, onChange, disabled = false, size = 'form' }: GeoFieldProps) {
   const geo = safeParseGeo(value);
   const [inputValue, setInputValue] = useState(geo.address || "");
   const [coordInput, setCoordInput] = useState(formatCoords(geo));
@@ -161,16 +163,16 @@ export default function GeoField({ value, onChange, disabled = false }: GeoField
       <Popover open={isOpen} onOpenChange={setIsOpen} modal={false}>
         <PopoverAnchor asChild>
           <div className="relative flex-1 min-w-[200px]">
-            <MapPin className="absolute left-2.5 top-2.5 h-4 w-4 text-muted-foreground" />
+            <MapPin className="absolute left-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
             <Input
               placeholder="Начните вводить адрес..."
               value={inputValue}
               onChange={(e) => handleAddressChange(e.target.value)}
               disabled={disabled}
-              className="pl-9 w-full"
+              className={fieldControlClass(size, 'pl-9 w-full')}
             />
             {isLoading && (
-              <Loader2 className="absolute right-2.5 top-2.5 h-4 w-4 animate-spin text-muted-foreground" />
+              <Loader2 className="absolute right-2.5 top-1/2 -translate-y-1/2 h-4 w-4 animate-spin text-muted-foreground" />
             )}
           </div>
         </PopoverAnchor>
@@ -201,7 +203,7 @@ export default function GeoField({ value, onChange, disabled = false }: GeoField
           value={coordInput}
           onChange={(e) => handleCoordChange(e.target.value)}
           disabled={disabled}
-          className="flex-1 font-mono text-sm min-w-0"
+          className={fieldControlClass(size, 'flex-1 font-mono min-w-0')}
         />
         <Button
           type="button"
diff --git a/client/src/components/RegistryCellEditor.tsx b/client/src/components/RegistryCellEditor.tsx
index b1cc3b6..0c48ee7 100644
--- a/client/src/components/RegistryCellEditor.tsx
+++ b/client/src/components/RegistryCellEditor.tsx
@@ -8,6 +8,7 @@ import GeoField, { type GeoValue } from '@/components/GeoField';
 import ContractNumberField from '@/components/ContractNumberField';
 import ContactField from '@/components/ContactField';
 import { normalizeSelectOptions } from '@/lib/fieldOptions';
+import { fieldControlClass } from '@/components/fields/field-styles';
 import { SearchableMultiSelect } from '@/components/fields/SearchableMultiSelect';
 import { AutoResizeTextarea } from '@/components/ui/auto-resize-textarea';
 
@@ -124,7 +125,8 @@ export default function RegistryCellEditor({
     }
   };
 
-  const inputClass = 'h-6 px-1 py-0 border-0 shadow-none focus-visible:ring-1 bg-transparent text-sm w-full';
+  // Единый стиль контрола ячейки таблицы (cell-вариант дизайн-системы полей)
+  const inputClass = fieldControlClass('cell', 'px-1 py-0');
 
   const renderEditor = () => {
     const type = systemField || field?.type;
@@ -244,6 +246,7 @@ export default function RegistryCellEditor({
           return (
             <div className="w-full min-w-[160px]" onClick={(e) => e.stopPropagation()}>
               <SearchableMultiSelect
+                size="cell"
                 options={opts.map((o) => ({ value: o.value, label: o.label }))}
                 selected={selected}
                 onChange={(next) => {
@@ -366,6 +369,7 @@ export default function RegistryCellEditor({
                 placeholder={field.placeholder}
                 options={field.options}
                 value={editValue}
+                size="cell"
                 onChange={(val) => {
                   setEditValue(val.length > 0 ? val : null);
                   setTimeout(() => saveValue(val.length > 0 ? val : null), 0);
@@ -378,6 +382,7 @@ export default function RegistryCellEditor({
                 placeholder={field.placeholder}
                 options={field.options}
                 value={editValue}
+                size="cell"
                 onChange={(val) => {
                   setEditValue(val);
                   // TableFieldSelect закрывается по выбору — сохраняем сразу
@@ -392,6 +397,7 @@ export default function RegistryCellEditor({
         return (
           <div className="w-full min-w-[200px]" onClick={(e) => e.stopPropagation()}>
             <CompanyFieldInput
+              size="cell"
               value={editValue === null || editValue === undefined ? '' : String(editValue)}
               onChange={(val) => setEditValue(val)}
               onSelect={(company: DadataCompany) => {
diff --git a/client/src/components/TableFieldMultiSelect.tsx b/client/src/components/TableFieldMultiSelect.tsx
index 8a4d861..4d354be 100644
--- a/client/src/components/TableFieldMultiSelect.tsx
+++ b/client/src/components/TableFieldMultiSelect.tsx
@@ -6,6 +6,7 @@ import { Button } from '@/components/ui/button';
 import { Popover, PopoverAnchor, PopoverContent } from '@/components/ui/popover';
 import { Table, X } from 'lucide-react';
 import { DirectoryTreeMultiSelect, type DirectoryTreeNode } from '@/components/directories/DirectoryTreeMultiSelect';
+import { fieldControlClass, type FieldControlSize } from '@/components/fields/field-styles';
 import { apiRequest } from '@/lib/queryClient';
 import type { DataTableRow } from '@shared/schema';
 
@@ -16,6 +17,7 @@ interface TableFieldMultiSelectProps {
   options?: unknown;
   value: any;
   onChange: (value: string[]) => void;
+  size?: FieldControlSize;
 }
 
 export default function TableFieldMultiSelect({
@@ -25,6 +27,7 @@ export default function TableFieldMultiSelect({
   options,
   value,
   onChange,
+  size = 'form',
 }: TableFieldMultiSelectProps) {
   const opts = options && !Array.isArray(options) ? (options as Record<string, any>) : {};
   const tableId = opts.tableId as number | undefined;
@@ -130,7 +133,7 @@ export default function TableFieldMultiSelect({
   }
 
   if (isLoading) {
-    return <Input disabled className="h-8" placeholder="Загрузка..." />;
+    return <Input disabled className={fieldControlClass(size)} placeholder="Загрузка..." />;
   }
 
   if (error) {
@@ -148,7 +151,7 @@ export default function TableFieldMultiSelect({
           <div className="relative w-[200px] flex-shrink-0">
             <Input
               ref={inputRef}
-              className="h-8"
+              className={fieldControlClass(size)}
               placeholder={placeholder || 'Выберите значения...'}
               value={isOpen ? searchTerm : (selectedLabels.length > 0 ? `${selectedLabels.length} выбрано` : placeholder || 'Выберите значения...')}
               onChange={(e) => {
diff --git a/client/src/components/TableFieldSelect.tsx b/client/src/components/TableFieldSelect.tsx
index 89bc3b6..69fa2b2 100644
--- a/client/src/components/TableFieldSelect.tsx
+++ b/client/src/components/TableFieldSelect.tsx
@@ -4,6 +4,7 @@ import { Input } from '@/components/ui/input';
 import { Popover, PopoverAnchor, PopoverContent } from '@/components/ui/popover';
 import { Table } from 'lucide-react';
 import { DirectoryTreeSelect, type DirectoryTreeNode } from '@/components/directories/DirectoryTreeSelect';
+import { fieldControlClass, type FieldControlSize } from '@/components/fields/field-styles';
 import { apiRequest } from '@/lib/queryClient';
 import type { DataTableRow } from '@shared/schema';
 
@@ -14,6 +15,7 @@ interface TableFieldSelectProps {
   options?: unknown;
   value: any;
   onChange: (value: string) => void;
+  size?: FieldControlSize;
 }
 
 export default function TableFieldSelect({
@@ -23,6 +25,7 @@ export default function TableFieldSelect({
   options,
   value,
   onChange,
+  size = 'form',
 }: TableFieldSelectProps) {
   const opts = options && !Array.isArray(options) ? (options as Record<string, any>) : {};
   const tableId = opts.tableId as number | undefined;
@@ -104,7 +107,7 @@ export default function TableFieldSelect({
   }
 
   if (isLoading) {
-    return <Input disabled className="h-8" placeholder="Загрузка..." />;
+    return <Input disabled className={fieldControlClass(size)} placeholder="Загрузка..." />;
   }
 
   if (error) {
@@ -132,7 +135,7 @@ export default function TableFieldSelect({
         <div className="relative w-full">
           <Input
             ref={inputRef}
-            className="h-8"
+            className={fieldControlClass(size)}
             placeholder={placeholder || 'Выберите значение...'}
             value={isOpen ? searchTerm : selectedDisplay || ''}
             onChange={(e) => {
diff --git a/client/src/components/TableFieldWithSubdirectory.tsx b/client/src/components/TableFieldWithSubdirectory.tsx
index a07a8fe..a2cb113 100644
--- a/client/src/components/TableFieldWithSubdirectory.tsx
+++ b/client/src/components/TableFieldWithSubdirectory.tsx
@@ -3,6 +3,7 @@ import { useQuery } from '@tanstack/react-query';
 import { apiRequest } from '@/lib/queryClient';
 import TableFieldSelect from '@/components/TableFieldSelect';
 import TableFieldMultiSelect from '@/components/TableFieldMultiSelect';
+import type { FieldControlSize } from '@/components/fields/field-styles';
 import type { DataTableSubdirectory } from '@shared/schema';
 
 interface TableFieldValue {
@@ -18,6 +19,7 @@ interface TableFieldWithSubdirectoryProps {
   value: any;
   onChange: (value: string) => void;
   allowMultiple?: boolean;
+  size?: FieldControlSize;
 }
 
 function parseTableValue(value: any): TableFieldValue {
@@ -61,6 +63,7 @@ export default function TableFieldWithSubdirectory({
   value,
   onChange,
   allowMultiple,
+  size = 'form',
 }: TableFieldWithSubdirectoryProps) {
   const opts = options && !Array.isArray(options) ? (options as Record<string, any>) : {};
   const tableId = opts.tableId as number | undefined;
@@ -103,6 +106,7 @@ export default function TableFieldWithSubdirectory({
         options={options}
         value={parentId || ''}
         onChange={onChange as any}
+        size={size}
       />
     );
   }
@@ -121,6 +125,7 @@ export default function TableFieldWithSubdirectory({
         options={parentOptions}
         value={parentId || ''}
         onChange={handleParentChange}
+        size={size}
       />
       {subdirectory && (
         <TableFieldSelect
@@ -130,6 +135,7 @@ export default function TableFieldWithSubdirectory({
           options={childOptions}
           value={childId || ''}
           onChange={handleChildChange}
+          size={size}
         />
       )}
     </div>
diff --git a/client/src/components/TaskRegularTable.tsx b/client/src/components/TaskRegularTable.tsx
index b7d4b9f..48065a4 100644
--- a/client/src/components/TaskRegularTable.tsx
+++ b/client/src/components/TaskRegularTable.tsx
@@ -7,6 +7,7 @@ import ContractNumberDisplay from '@/components/ContractNumberDisplay';
 import { Plus, Trash2, Loader2, Clock } from 'lucide-react';
 import { queryClient, apiRequest, OfflineQueuedError } from '@/lib/queryClient';
 import { useToast } from '@/hooks/use-toast';
+import { fieldControlClass } from '@/components/fields/field-styles';
 import type { TableColumnDef, RegularTableRow } from '@shared/schema';
 import { evaluateAllFormulas, evaluateAggregateFormula, FORMULA_ERROR, FORMULA_CIRCULAR_ERROR } from '@/lib/formulaEngine';
 import { normalizeSelectOptions, getSelectOptionLabel } from '@/lib/fieldOptions';
@@ -58,7 +59,7 @@ function DataTableCell({ tableId, displayColumn, value, onChange, readOnly }: Da
 
   return (
     <Select value={value} onValueChange={onChange}>
-      <SelectTrigger className="h-6 border-0 shadow-none focus:ring-1 px-1">
+      <SelectTrigger className={fieldControlClass('cell', 'px-1')}>
         <SelectValue placeholder="Выбрать..." />
       </SelectTrigger>
       <SelectContent>
@@ -308,11 +309,11 @@ export default function TaskRegularTable({ taskId, tabId, columns, readOnly = fa
           </colgroup>
           <thead>
             <tr className="bg-muted/50">
-              <th className="border px-0.5 py-0.5 text-center text-muted-foreground font-medium text-xs">#</th>
+              <th className="border-b px-0.5 py-1.5 text-center text-muted-foreground font-medium text-[12px]">#</th>
               {columns.map(col => (
                 <th 
                   key={col.id} 
-                  className="border px-1 py-0.5 text-left font-medium relative group"
+                  className="border-b px-3 py-1.5 text-left text-[12px] font-medium text-muted-foreground relative group"
                 >
                   <span className="truncate block">{col.name}</span>
                   <div
@@ -322,14 +323,14 @@ export default function TaskRegularTable({ taskId, tabId, columns, readOnly = fa
                 </th>
               ))}
               {!readOnly && (
-                <th className="border px-0.5 py-0.5 text-center"></th>
+                <th className="border-b px-0.5 py-1.5 text-center"></th>
               )}
             </tr>
           </thead>
           <tbody>
             {rows.length === 0 && localPendingRows.length === 0 ? (
               <tr>
-                <td colSpan={columns.length + (readOnly ? 1 : 2)} className="border px-2 py-3 text-center text-muted-foreground">
+                <td colSpan={columns.length + (readOnly ? 1 : 2)} className="border-b px-3 py-3 text-center text-muted-foreground">
                   Нет данных. Нажмите "Добавить строку" для добавления.
                 </td>
               </tr>
@@ -339,8 +340,8 @@ export default function TaskRegularTable({ taskId, tabId, columns, readOnly = fa
                 const resolvedFormulaValues = allResolvedRowValues[rowIndex];
 
                 return (
-                <tr key={row.id} className="hover:bg-muted/30">
-                  <td className="border px-0.5 py-0 text-center text-muted-foreground text-xs">
+                <tr key={row.id} className="h-10 hover:bg-muted/40">
+                  <td className="border-b px-0.5 py-0 text-center text-muted-foreground text-xs">
                     {rowIndex + 1}
                   </td>
                   {columns.map(col => {
@@ -358,7 +359,7 @@ export default function TaskRegularTable({ taskId, tabId, columns, readOnly = fa
                       return (
                         <td
                           key={col.id}
-                          className="border px-0.5 py-0"
+                          className="border-b px-3 py-0"
                           data-testid={`cell-${row.id}-${col.id}`}
                         >
                           <div className="min-h-[24px] flex items-center px-0.5 truncate">
@@ -375,7 +376,7 @@ export default function TaskRegularTable({ taskId, tabId, columns, readOnly = fa
                       return (
                         <td
                           key={col.id}
-                          className="border px-0.5 py-0"
+                          className="border-b px-3 py-0"
                           data-testid={`cell-${row.id}-${col.id}`}
                         >
                           <div className="min-h-[24px] flex items-center px-0.5 truncate bg-yellow-50 dark:bg-yellow-950/30 font-mono text-xs">
@@ -401,12 +402,12 @@ export default function TaskRegularTable({ taskId, tabId, columns, readOnly = fa
                     return (
                       <td 
                         key={col.id} 
-                        className="border px-0.5 py-0 hover:bg-muted/50"
+                        className="border-b px-3 py-0 hover:bg-muted/50"
                         data-testid={`cell-${row.id}-${col.id}`}
                       >
                         {col.type === 'select' && !readOnly ? (
                           <Select value={cellValue} onValueChange={handleSelectChange}>
-                            <SelectTrigger className="h-6 border-0 shadow-none focus:ring-1 px-1">
+                            <SelectTrigger className={fieldControlClass('cell', 'px-1')}>
                               <SelectValue placeholder="Выбрать..." />
                             </SelectTrigger>
                             <SelectContent>
@@ -442,7 +443,7 @@ export default function TaskRegularTable({ taskId, tabId, columns, readOnly = fa
                                 onBlur={handleCellBlur}
                                 onKeyDown={handleKeyDown}
                                 autoFocus
-                                className="h-6 px-1 py-0 border-0 focus-visible:ring-1 bg-background w-full"
+                                className={fieldControlClass('cell', 'px-1 py-0')}
                                 type={col.type === 'number' ? 'number' : col.type === 'date' ? 'date' : 'text'}
                               />
                             }
@@ -460,7 +461,7 @@ export default function TaskRegularTable({ taskId, tabId, columns, readOnly = fa
                     );
                   })}
                   {!readOnly && (
-                    <td className="border px-0 py-0 text-center">
+                    <td className="border-b px-0 py-0 text-center">
                       <Button
                         variant="ghost"
                         size="sm"
@@ -477,17 +478,17 @@ export default function TaskRegularTable({ taskId, tabId, columns, readOnly = fa
                 );
               })}
               {localPendingRows.map((row, idx) => (
-                <tr key={`pending-${row.id}`} className="bg-amber-50/50 dark:bg-amber-950/20 opacity-70">
-                  <td className="border px-0.5 py-0 text-center text-muted-foreground text-xs">
+                <tr key={`pending-${row.id}`} className="h-10 bg-amber-50/50 dark:bg-amber-950/20 opacity-70">
+                  <td className="border-b px-0.5 py-0 text-center text-muted-foreground text-xs">
                     {rows.length + idx + 1}
                   </td>
                   {columns.map(col => (
-                    <td key={col.id} className="border px-0.5 py-0">
+                    <td key={col.id} className="border-b px-3 py-0">
                       <div className="min-h-[24px] flex items-center px-0.5 text-muted-foreground text-xs italic">—</div>
                     </td>
                   ))}
                   {!readOnly && (
-                    <td className="border px-0 py-0 text-center">
+                    <td className="border-b px-0 py-0 text-center">
                       <Clock className="w-3 h-3 text-amber-500 mx-auto animate-pulse" aria-label="Ожидает синхронизации" />
                     </td>
                   )}
@@ -499,17 +500,17 @@ export default function TaskRegularTable({ taskId, tabId, columns, readOnly = fa
           {hasAggregateRow && (
             <tfoot>
               <tr className="bg-blue-50 dark:bg-blue-950/30 font-medium">
-                <td className="border px-0.5 py-0.5 text-center text-muted-foreground text-xs">∑</td>
+                <td className="border-t px-0.5 py-0.5 text-center text-muted-foreground text-xs">∑</td>
                 {columns.map(col => {
                   if (!col.aggregateFormula) {
-                    return <td key={col.id} className="border px-0.5 py-0.5" />;
+                    return <td key={col.id} className="border-t px-3 py-0.5" />;
                   }
                   const result = evaluateAggregateFormula(col.aggregateFormula, allResolvedRowValues, columnNames);
                   const isErr = result === FORMULA_ERROR;
                   return (
                     <td
                       key={col.id}
-                      className="border px-0.5 py-0.5"
+                      className="border-t px-3 py-0.5"
                       data-testid={`aggregate-${col.id}`}
                     >
                       <div className="min-h-[24px] flex items-center px-0.5 truncate font-mono text-xs">
@@ -522,7 +523,7 @@ export default function TaskRegularTable({ taskId, tabId, columns, readOnly = fa
                     </td>
                   );
                 })}
-                {!readOnly && <td className="border px-0.5 py-0.5" />}
+                {!readOnly && <td className="border-t px-0.5 py-0.5" />}
               </tr>
             </tfoot>
           )}
diff --git a/client/src/components/fields/SearchableMultiSelect.tsx b/client/src/components/fields/SearchableMultiSelect.tsx
index 612e8f4..55c5e2d 100644
--- a/client/src/components/fields/SearchableMultiSelect.tsx
+++ b/client/src/components/fields/SearchableMultiSelect.tsx
@@ -4,6 +4,7 @@ import { Popover, PopoverAnchor, PopoverContent } from '@/components/ui/popover'
 import { Checkbox } from '@/components/ui/checkbox';
 import { Button } from '@/components/ui/button';
 import { X } from 'lucide-react';
+import { fieldControlClass, type FieldControlSize } from '@/components/fields/field-styles';
 
 interface Option {
   value: string;
@@ -17,6 +18,7 @@ interface SearchableMultiSelectProps {
   placeholder?: string;
   dataTestid?: string;
   disabled?: boolean;
+  size?: FieldControlSize;
 }
 
 export function SearchableMultiSelect({
@@ -26,6 +28,7 @@ export function SearchableMultiSelect({
   placeholder = 'Выберите...',
   dataTestid,
   disabled,
+  size = 'form',
 }: SearchableMultiSelectProps) {
   const [searchTerm, setSearchTerm] = useState('');
   const [isOpen, setIsOpen] = useState(false);
@@ -54,7 +57,7 @@ export function SearchableMultiSelect({
         <div className="relative w-full">
           <Input
             ref={inputRef}
-            className="h-8"
+            className={fieldControlClass(size)}
             placeholder={placeholder}
             disabled={disabled}
             value={isOpen ? searchTerm : (selectedLabels.length > 0 ? `${selectedLabels.length} выбрано` : placeholder)}
diff --git a/client/src/components/fields/SearchableSelect.tsx b/client/src/components/fields/SearchableSelect.tsx
index e1ab6c7..15150e1 100644
--- a/client/src/components/fields/SearchableSelect.tsx
+++ b/client/src/components/fields/SearchableSelect.tsx
@@ -1,6 +1,7 @@
 import { useMemo, useRef, useState } from 'react';
 import { Input } from '@/components/ui/input';
 import { Popover, PopoverAnchor, PopoverContent } from '@/components/ui/popover';
+import { fieldControlClass, type FieldControlSize } from '@/components/fields/field-styles';
 
 interface Option {
   value: string;
@@ -14,6 +15,7 @@ interface SearchableSelectProps {
   placeholder?: string;
   dataTestid?: string;
   disabled?: boolean;
+  size?: FieldControlSize;
 }
 
 export function SearchableSelect({
@@ -23,6 +25,7 @@ export function SearchableSelect({
   placeholder = 'Выберите...',
   dataTestid,
   disabled,
+  size = 'form',
 }: SearchableSelectProps) {
   const [searchTerm, setSearchTerm] = useState('');
   const [isOpen, setIsOpen] = useState(false);
@@ -48,7 +51,7 @@ export function SearchableSelect({
         <div className="relative w-full">
           <Input
             ref={inputRef}
-            className="h-8"
+            className={fieldControlClass(size)}
             placeholder={placeholder}
             disabled={disabled}
             value={isOpen ? searchTerm : (selected?.label || '')}
diff --git a/client/src/components/fields/field-styles.ts b/client/src/components/fields/field-styles.ts
new file mode 100644
index 0000000..5f4ae6b
--- /dev/null
+++ b/client/src/components/fields/field-styles.ts
@@ -0,0 +1,27 @@
+import { cn } from '@/lib/utils';
+
+// Единый стиль контрола поля (референс NocoBase/antd): один визуал во всех контекстах
+// size: form — форма создания (h-8 w-full), detail — карточка задачи (h-7 w-auto), cell — ячейка таблицы (h-7 border-0)
+export type FieldControlSize = 'form' | 'detail' | 'cell';
+
+// Базовые классы контрола: рамка, фон, типографика и состояния hover/focus
+const FIELD_CONTROL_BASE =
+  'rounded-md border border-input bg-background px-2.5 text-base md:text-[13px] transition-[color,background-color,border-color,box-shadow] hover:border-primary/50 focus:outline-none focus:ring-2 focus:ring-ring/20 focus:border-primary';
+
+// Классы по контексту использования
+const FIELD_CONTROL_SIZE: Record<FieldControlSize, string> = {
+  form: 'h-8 w-full',
+  detail: 'h-7 w-auto max-w-[420px]',
+  cell: 'h-7 w-full border-0 bg-transparent shadow-none hover:border-transparent focus:ring-1',
+};
+
+// Единый класс контрола поля. Дополнительные классы передаются вторым аргументом.
+export function fieldControlClass(size: FieldControlSize = 'form', className?: string): string {
+  return cn(FIELD_CONTROL_BASE, FIELD_CONTROL_SIZE[size], className);
+}
+
+// Единый стиль label поля формы (вертикальная раскладка, как в NocoBase/antd)
+export const fieldLabelClass = 'text-[13px] font-medium text-muted-foreground';
+
+// Единый стиль сообщения об ошибке под полем
+export const fieldErrorClass = 'text-xs text-destructive';
diff --git a/client/src/components/task-form-fields.tsx b/client/src/components/task-form-fields.tsx
index 7fdbc8b..4756977 100644
--- a/client/src/components/task-form-fields.tsx
+++ b/client/src/components/task-form-fields.tsx
@@ -7,6 +7,7 @@ import { Link2, Plus, Upload, FileText, X as XIcon } from 'lucide-react';
 import { useToast } from '@/hooks/use-toast';
 import { apiRequest, queryClient } from '@/lib/queryClient';
 import { normalizeSelectOptions } from '@/lib/fieldOptions';
+import { fieldControlClass, type FieldControlSize } from '@/components/fields/field-styles';
 import { CreateTaskDialog } from '@/components/CreateTaskDialog';
 
 export interface FormFieldData {
@@ -59,11 +60,12 @@ export interface UserData {
 export type FileFieldValue = { url: string; name: string; size: number };
 
 // Компонент выбора связанной задачи из другой формы
-export function TaskFieldSelect({ formField, value, onChange, showCreateButton = true }: {
+export function TaskFieldSelect({ formField, value, onChange, showCreateButton = true, size = 'form' }: {
   formField: FormFieldData;
   value: any;
   onChange: (value: string) => void;
   showCreateButton?: boolean;
+  size?: FieldControlSize;
 }) {
   const linkedFormId = formField.linkedFormId;
   const [createDialogOpen, setCreateDialogOpen] = useState(false);
@@ -122,7 +124,7 @@ export function TaskFieldSelect({ formField, value, onChange, showCreateButton =
           <div className="relative w-full flex items-center gap-2">
             <Input
               ref={inputRef}
-              className="h-8 flex-1"
+              className={fieldControlClass(size, 'flex-1')}
               placeholder={inputPlaceholder}
               disabled={isLoading || !!error}
               value={isOpen ? searchTerm : (selectedTask ? selectedTask.title : '')}
@@ -212,12 +214,14 @@ export function UserFieldSelect({
   formField,
   users,
   value,
-  onChange
+  onChange,
+  size = 'form'
 }: {
   formField: FormFieldData;
   users: UserData[];
   value: any;
   onChange: (value: string) => void;
+  size?: FieldControlSize;
 }) {
   const [searchTerm, setSearchTerm] = useState('');
   const [isOpen, setIsOpen] = useState(false);
@@ -260,7 +264,7 @@ export function UserFieldSelect({
         <div className="relative w-full">
           <Input
             ref={inputRef}
-            className="h-8"
+            className={fieldControlClass(size)}
             placeholder={formField.placeholder || 'Выберите пользователя...'}
             value={isOpen ? searchTerm : (selectedUser ? `${selectedUser.firstName} ${selectedUser.middleName || ''} ${selectedUser.lastName}` : '')}
             onChange={(e) => {
diff --git a/client/src/components/ui/table.tsx b/client/src/components/ui/table.tsx
index e04e9dd..c25d708 100644
--- a/client/src/components/ui/table.tsx
+++ b/client/src/components/ui/table.tsx
@@ -20,7 +20,7 @@ const TableHeader = React.forwardRef<
   HTMLTableSectionElement,
   React.HTMLAttributes<HTMLTableSectionElement>
 >(({ className, ...props }, ref) => (
-  <thead ref={ref} className={cn("[&_tr]:border-b", className)} {...props} />
+  <thead ref={ref} className={cn("[&_tr]:border-b [&_tr]:bg-muted/50", className)} {...props} />
 ))
 TableHeader.displayName = "TableHeader"
 
@@ -58,7 +58,7 @@ const TableRow = React.forwardRef<
   <tr
     ref={ref}
     className={cn(
-      "border-b transition-colors duration-150 hover:bg-muted/40 data-[state=selected]:bg-muted",
+      "border-b h-10 transition-colors duration-150 hover:bg-muted/40 data-[state=selected]:bg-muted",
       className
     )}
     {...props}
@@ -73,7 +73,7 @@ const TableHead = React.forwardRef<
   <th
     ref={ref}
     className={cn(
-      "h-7 px-2 text-left align-middle text-xs font-medium text-muted-foreground uppercase tracking-wider [&:has([role=checkbox])]:pr-0",
+      "h-10 px-3 text-left align-middle text-[12px] font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0",
       className
     )}
     {...props}
@@ -87,7 +87,7 @@ const TableCell = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <td
     ref={ref}
-    className={cn("py-1 px-2 align-middle text-sm [&:has([role=checkbox])]:pr-0", className)}
+    className={cn("py-1 px-3 align-middle text-sm [&:has([role=checkbox])]:pr-0", className)}
     {...props}
   />
 ))
diff --git a/client/src/pages/TaskDetail.tsx b/client/src/pages/TaskDetail.tsx
index 90c503f..69b5246 100644
--- a/client/src/pages/TaskDetail.tsx
+++ b/client/src/pages/TaskDetail.tsx
@@ -23,6 +23,7 @@ import { addFileToken, openFilePresigned } from '@/lib/fileUtils';
 import { normalizeSelectOptions, getSelectOptionLabel } from '@/lib/fieldOptions';
 import { statusBadgeStyle, getContrastTextColor } from '@/lib/statusColor';
 import { SearchableMultiSelect } from '@/components/fields/SearchableMultiSelect';
+import { fieldControlClass } from '@/components/fields/field-styles';
 import TaskChat from '../components/TaskChat';
 import { JsComponentRenderer } from '@/components/tabs/JsComponentRenderer';
 import { FileViewerModal, detectViewerType } from '@/components/FileViewerModal';
@@ -1147,8 +1148,10 @@ function FieldValueRow({
 
   // Рендер редактора по типу поля (per-field: сохранение по blur/Enter/выбору/закрытию)
   const renderEditor = () => {
+    // Единый стиль контрола карточки задачи (detail-вариант дизайн-системы полей)
     const inputClass = cn(
-      'border border-input rounded px-1.5 text-base md:text-[13px] bg-background focus:outline-none focus:ring-1 focus:ring-ring w-auto max-w-[320px] h-7 leading-6',
+      fieldControlClass('detail'),
+      'leading-6',
       effectiveError && 'border-destructive ring-destructive'
     );
     const textareaClass = cn(
@@ -1281,6 +1284,7 @@ function FieldValueRow({
         return (
           <div className="flex-1 min-w-0 max-w-[320px]" onClick={e => e.stopPropagation()}>
             <SearchableMultiSelect
+              size="detail"
               options={opts.map((o) => ({ value: o.value, label: o.label }))}
               selected={selected}
               onChange={(next) => {
@@ -1373,6 +1377,7 @@ function FieldValueRow({
       return (
         <div className="flex-1 min-w-0" onClick={e => e.stopPropagation()}>
           <GeoField
+            size="detail"
             value={editValue as unknown as GeoValue | string | null}
             onChange={val => updateEditValue(val)}
           />
@@ -1382,8 +1387,9 @@ function FieldValueRow({
     // Компания: выбор подсказки сохраняет сразу (с autofill), закрытие — сохраняет введённый текст
     if (field.type === 'company') {
       return (
-        <div className="w-auto max-w-[420px] [&_input]:h-7 [&_input]:text-base md:[&_input]:text-[13px]" onClick={e => e.stopPropagation()}>
+        <div className="w-auto max-w-[420px]" onClick={e => e.stopPropagation()}>
           <CompanyFieldInput
+            size="detail"
             value={editValue === null || editValue === undefined ? '' : String(editValue)}
             onChange={val => updateEditValue(val)}
             onSelect={company => {
@@ -1442,6 +1448,7 @@ function FieldValueRow({
               value={editValue}
               onChange={(val) => updateEditValue(val)}
               allowMultiple={field.allowMultiple || false}
+              size="detail"
             />
           </div>
         );
@@ -1449,13 +1456,14 @@ function FieldValueRow({
       // Мультивыбор строк: сохранение по каждому переключению
       if (field.allowMultiple) {
         return (
-          <div className="w-auto max-w-[420px] [&_input]:h-7 [&_input]:text-base md:[&_input]:text-[13px]" onClick={e => e.stopPropagation()}>
+          <div className="w-auto max-w-[420px]" onClick={e => e.stopPropagation()}>
             <TableFieldMultiSelect
               fieldId={field.id}
               fieldCode={field.code}
               placeholder={field.placeholder}
               options={field.options}
               value={editValue}
+              size="detail"
               onChange={(val) => {
                 updateEditValue(val);
                 commitValue(val, { close: false });
@@ -1466,13 +1474,14 @@ function FieldValueRow({
       }
       // Одиночный выбор строки: сохранение сразу по выбору
       return (
-        <div className="w-auto max-w-[420px] [&_input]:h-7 [&_input]:text-base md:[&_input]:text-[13px]" onClick={e => e.stopPropagation()}>
+        <div className="w-auto max-w-[420px]" onClick={e => e.stopPropagation()}>
           <TableFieldSelect
             fieldId={field.id}
             fieldCode={field.code}
             placeholder={field.placeholder}
             options={field.options}
             value={editValue}
+            size="detail"
             onChange={(val) => commitValue(val)}
           />
         </div>
@@ -1483,6 +1492,7 @@ function FieldValueRow({
       return (
         <div className="flex-1 min-w-0" onClick={e => e.stopPropagation()}>
           <ContactField
+            size="detail"
             value={editValue as any}
             onChange={(val) => updateEditValue(JSON.stringify(val))}
           />
@@ -1492,12 +1502,13 @@ function FieldValueRow({
     // Связанная задача: сохранение сразу по выбору
     if (field.type === 'task' && field.linkedFormId) {
       return (
-        <div className="w-auto max-w-[420px] [&_input]:h-7 [&_input]:text-base md:[&_input]:text-[13px]" onClick={e => e.stopPropagation()}>
+        <div className="w-auto max-w-[420px]" onClick={e => e.stopPropagation()}>
           <TaskFieldSelect
             formField={field as any}
             value={editValue as string | number | null | undefined}
             onChange={(val) => commitValue(val)}
             showCreateButton={false}
+            size="detail"
           />
         </div>
       );
diff --git a/server/gps/geozone.service.ts b/server/gps/geozone.service.ts
index 65f8244..4a34f62 100644
--- a/server/gps/geozone.service.ts
+++ b/server/gps/geozone.service.ts
@@ -414,14 +414,9 @@ function medianAnchor(window: Array<{ lat: number; lng: number }>): { lat: numbe
 // восстанавливается из last_* объекта в БД)
 const assetWalkers = new Map<number, JumpFilterWalker>();
 
-// Время (server time, ms) последнего stale-verdict'а по объекту.
-// Идущие stale re-send'ы — сигнал потери GPS: свежие точки в течение
-// STALE_LBS_WINDOW_MS после последнего stale считаются LBS (координаты
-// сотовой вышки) — сохраняются и показываются, но не участвуют в геозонах.
-const assetLastStaleAt = new Map<number, number>();
-
-// Окно после последнего stale re-send'а, в котором свежие точки считаются LBS
-const STALE_LBS_WINDOW_MS = 10 * 60 * 1000;
+// РЕШЕНО (2026-08-31): слой «stale re-send => LBS-режим» убран — он помечал
+// ~100% точек (любая ретрансляция пакета открывала 10-мин окно LBS).
+// Источник истины: протокольный флаг valid=false (Traccar) + физика фильтров.
 
 // Таймаут запроса к OSRM Nearest API (фильтр «далеко от дороги»)
 const OSRM_NEAREST_TIMEOUT_MS = 2000;
@@ -490,9 +485,6 @@ export async function processPosition(
   // Гидратация in-memory состояния после рестарта: если в БД объект помечен
   // «потерян GPS», а lastStaleAt пуст — считаем, что stale был только что
   // (осторожный режим до свежих событий)
-  if (asset.gpsLost && !assetLastStaleAt.has(assetId)) {
-    assetLastStaleAt.set(assetId, Date.now());
-  }
 
   const settings = await gpsStorage.getSettings(organizationId);
 
@@ -506,7 +498,6 @@ export async function processPosition(
   // Сохраняем как примерную (is_lbs), маркер двигаем, но walker/геозоны/пробег
   // не трогаем. Заодно это сигнал потери GPS — как stale re-send.
   if (input.forceLbs) {
-    assetLastStaleAt.set(assetId, Date.now());
     if (!asset.gpsLost) {
       await gpsStorage.setGpsLost(assetId, true);
       console.log(`[GPS] gps_lost ON: asset=${assetId} (valid=false от протокола)`);
@@ -555,13 +546,6 @@ export async function processPosition(
       // Stale re-send = трекер сам сообщает, когда в последний раз видел спутники
       // (замороженный fixTime). Фиксируем как «время последнего GPS-фикса».
       await gpsStorage.updateAssetGpsFix(assetId, recordedAt);
-      // Идущие stale re-send'ы — сигнал потери GPS: запоминаем время последнего
-      // stale и включаем режим «потерян GPS» у объекта
-      assetLastStaleAt.set(assetId, Date.now());
-      if (!asset.gpsLost) {
-        await gpsStorage.setGpsLost(assetId, true);
-        console.log(`[GPS] gps_lost ON: asset=${assetId} (stale re-send)`);
-      }
       console.log(
         `[GPS] skipped stale: asset=${assetId} recordedAt=${recordedAt.toISOString()} <= lastRecordedAt=${prev?.recordedAt.toISOString()}`
       );
@@ -589,8 +573,9 @@ export async function processPosition(
   // свежая точка — это координаты сотовой вышки (LBS), а не GPS-фикс.
   // Такие точки сохраняем и показываем (пунктир на карте), но в логику
   // геозон не пускаем. jump/echo/джиттер-отбросы режим не переключают.
-  const lastStaleAt = assetLastStaleAt.get(assetId);
-  const isLbs = lastStaleAt !== undefined && Date.now() - lastStaleAt < STALE_LBS_WINDOW_MS;
+  // Сюда доходят только точки без протокольного признака LBS
+  // (forceLbs-точки обработаны и вышли выше) — значит, обычная GPS-точка
+  const isLbs = false;
 
   // Фильтр «далеко от дороги» — ТОЛЬКО в режиме потери GPS (LBS-точки):
   // координаты сотовых вышек обычно >100 м от ближайшей дороги, настоящий