@redneckz/wildless-cms-uni-blocks 0.14.280 → 0.14.281

package/src/components/ApplicationFormCustom/ApplicationFormCustom.fixture.tsx

@@ -33,9 +33,9 @@ export default {
         sections={[
           {
             inputs: [
-              { name: 'name', required: true },
-              { name: 'middleName' },
-              { name: 'consentDataProcessing', required: true },
+              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'middleName' },
+              { fieldType: 'common', name: 'consentDataProcessing', required: true },
             ],
           },
         ]}
@@ -57,22 +57,22 @@ export default {
             title: 'Вид эквайринга и регион',
             columns: 2,
             inputs: [
-              { name: 'acquiringType', required: true },
-              { name: 'region', required: true },
+              { fieldType: 'common', name: 'acquiringType', required: true },
+              { fieldType: 'common', name: 'region', required: true },
             ],
           },
           {
             title: 'Данные организации',
             columns: 2,
             inputs: [
-              { name: 'fullName', required: true },
-              { name: 'inn', required: true },
-              { name: 'name', required: true },
-              { name: 'phone', required: true },
+              { fieldType: 'common', name: 'fullName', required: true },
+              { fieldType: 'common', name: 'inn', required: true },
+              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'phone', required: true },
             ],
           },
-          { inputs: [{ name: 'onlineCheckout' }] },
-          { inputs: [{ name: 'posTerminal' }] },
+          { inputs: [{ fieldType: 'common', name: 'onlineCheckout' }] },
+          { inputs: [{ fieldType: 'common', name: 'posTerminal' }] },
         ]}
         button={button}
         link={linkCorp}
@@ -95,10 +95,10 @@ export default {
           },
           {
             inputs: [
-              { name: 'name', required: true },
-              { name: 'email', required: true },
-              { name: 'consentToReceiveMaterials' },
-              { name: 'consentDataProcessing', required: true },
+              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'email', required: true },
+              { fieldType: 'common', name: 'consentToReceiveMaterials' },
+              { fieldType: 'common', name: 'consentDataProcessing', required: true },
             ],
           },
         ]}
@@ -118,14 +118,14 @@ export default {
         sections={[
           {
             inputs: [
-              { name: 'surname', required: true },
-              { name: 'name', required: true },
-              { name: 'middleName' },
-              { name: 'phone', required: true },
-              { name: 'birthday', required: true },
-              { name: 'isClient' },
-              { name: 'comment', required: true },
-              { name: 'consentDataProcessing', required: true },
+              { fieldType: 'common', name: 'surname', required: true },
+              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'middleName' },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'birthday', required: true },
+              { fieldType: 'common', name: 'isClient' },
+              { fieldType: 'common', name: 'comment', required: true },
+              { fieldType: 'common', name: 'consentDataProcessing', required: true },
             ],
           },
         ]}
@@ -146,14 +146,22 @@ export default {
           {
             columns: 2,
             inputs: [
-              { name: 'fullName', required: true, label: 'Наименование организации' },
-              { name: 'inn', required: true },
-              { name: 'name', required: true },
-              { name: 'phone', required: true },
+              {
+                fieldType: 'common',
+                name: 'fullName',
+                required: true,
+                label: 'Наименование организации',
+              },
+              { fieldType: 'common', name: 'inn', required: true },
+              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'phone', required: true },
             ],
           },
           {
-            inputs: [{ name: 'partnerComments', label: 'Комментарий' }, { name: 'isClient' }],
+            inputs: [
+              { fieldType: 'common', name: 'partnerComments', label: 'Комментарий' },
+              { fieldType: 'common', name: 'isClient' },
+            ],
           },
         ]}
         button={button}
@@ -176,10 +184,10 @@ export default {
         sections={[
           {
             inputs: [
-              { name: 'name', required: true, label: 'ФИО' },
-              { name: 'phone', required: true },
-              { name: 'isClient' },
-              { name: 'consentDataProcessing', required: true },
+              { fieldType: 'common', name: 'name', required: true, label: 'ФИО' },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'isClient' },
+              { fieldType: 'common', name: 'consentDataProcessing', required: true },
             ],
           },
         ]}
@@ -198,15 +206,15 @@ export default {
         endpoint="sendcorporatelead"
         sections={[
           {
-            inputs: [{ name: 'region', required: true }],
+            inputs: [{ fieldType: 'common', name: 'region', required: true }],
           },
           {
             columns: 2,
             inputs: [
-              { name: 'name', required: true },
-              { name: 'phone', required: true },
-              { name: 'inn', required: true },
-              { name: 'email', required: true },
+              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'inn', required: true },
+              { fieldType: 'common', name: 'email', required: true },
             ],
           },
         ]}
@@ -225,15 +233,27 @@ export default {
         endpoint="sendcorporatelead"
         sections={[
           {
-            inputs: [{ name: 'fullName', required: true, label: 'Наименование организации' }],
+            inputs: [
+              {
+                fieldType: 'common',
+                name: 'fullName',
+                required: true,
+                label: 'Наименование организации',
+              },
+            ],
           },
           {
             columns: 2,
             inputs: [
-              { name: 'region', required: true },
-              { name: 'collectionCount', required: true, label: 'Количество объектов инкассации' },
-              { name: 'phone', required: true },
-              { name: 'email' },
+              { fieldType: 'common', name: 'region', required: true },
+              {
+                fieldType: 'common',
+                name: 'collectionCount',
+                required: true,
+                label: 'Количество объектов инкассации',
+              },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'email' },
             ],
           },
         ]}
@@ -254,26 +274,34 @@ export default {
           {
             title: 'Параметры кредита',
             columns: 2,
-            inputs: [{ name: 'amount' }, { name: 'term' }],
+            inputs: [
+              { fieldType: 'common', name: 'amount' },
+              { fieldType: 'common', name: 'term' },
+            ],
           },
           {
             title: 'Данные организации',
             columns: 2,
             inputs: [
-              { name: 'fullName', required: true, label: 'Наименование организации' },
-              { name: 'annualRevenue', required: true },
-              { name: 'inn', required: true },
-              { name: 'name', required: true, label: 'Контактное лицо' },
-              { name: 'phone', required: true },
-              { name: 'email', required: true },
+              {
+                fieldType: 'common',
+                name: 'fullName',
+                required: true,
+                label: 'Наименование организации',
+              },
+              { fieldType: 'common', name: 'annualRevenue', required: true },
+              { fieldType: 'common', name: 'inn', required: true },
+              { fieldType: 'common', name: 'name', required: true, label: 'Контактное лицо' },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'email', required: true },
             ],
           },
           {
             title: 'Офис банка',
             columns: 2,
             inputs: [
-              { name: 'region', required: true },
-              { name: 'addressBranch', required: true },
+              { fieldType: 'common', name: 'region', required: true },
+              { fieldType: 'common', name: 'addressBranch', required: true },
             ],
           },
         ]}
@@ -293,14 +321,14 @@ export default {
         sections={[
           {
             inputs: [
-              { name: 'surname', required: true },
-              { name: 'name', required: true },
-              { name: 'middleName' },
-              { name: 'phone', required: true },
-              { name: 'region', required: true },
-              { name: 'email' },
-              { name: 'comment', required: true },
-              { name: 'consentDataProcessing', required: true },
+              { fieldType: 'common', name: 'surname', required: true },
+              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'middleName' },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'region', required: true },
+              { fieldType: 'common', name: 'email' },
+              { fieldType: 'common', name: 'comment', required: true },
+              { fieldType: 'common', name: 'consentDataProcessing', required: true },
             ],
           },
         ]}
@@ -321,9 +349,9 @@ export default {
           {
             title: 'Оставьте заявку и мы ответим на любые вопросы по депозитам',
             inputs: [
-              { name: 'name', required: true },
-              { name: 'phone', required: true },
-              { name: 'consentDataProcessing', required: true },
+              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'consentDataProcessing', required: true },
             ],
           },
         ]}
@@ -344,16 +372,18 @@ export default {
         sections={[
           {
             inputs: [
-              { name: 'feedbackType', required: true },
+              { fieldType: 'common', name: 'feedbackType', required: true },
               {
+                fieldType: 'common',
                 name: 'serviceDirection',
                 condition: {
                   name: 'feedbackType',
                   values: ['FEEDBACK_QS'],
                 },
               },
-              { name: 'region', required: true },
+              { fieldType: 'common', name: 'region', required: true },
               {
+                fieldType: 'common',
                 name: 'addressBranch',
                 required: true,
                 condition: {
@@ -361,20 +391,29 @@ export default {
                   values: ['FEEDBACK_QS'],
                 },
               },
-              { name: 'surname', required: true },
-              { name: 'name', required: true },
-              { name: 'middleName' },
+              { fieldType: 'common', name: 'surname', required: true },
+              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'middleName' },
               {
+                fieldType: 'common',
                 name: 'inn',
                 required: true,
-                condition: { name: 'serviceDirection', values: ['Юридическое лицо / ИП'] },
+                condition: {
+                  name: 'serviceDirection',
+                  values: ['Юридическое лицо / ИП'],
+                },
               },
               {
+                fieldType: 'common',
                 name: 'fullName',
                 label: 'Наименование организации',
-                condition: { name: 'serviceDirection', values: ['Юридическое лицо / ИП'] },
+                condition: {
+                  name: 'serviceDirection',
+                  values: ['Юридическое лицо / ИП'],
+                },
               },
               {
+                fieldType: 'common',
                 name: 'birthday',
                 required: true,
                 condition: {
@@ -382,9 +421,10 @@ export default {
                   values: ['FEEDBACK'],
                 },
               },
-              { name: 'feedbackMethod', required: true },
-              { name: 'phone', required: true },
+              { fieldType: 'common', name: 'feedbackMethod', required: true },
+              { fieldType: 'common', name: 'phone', required: true },
               {
+                fieldType: 'common',
                 name: 'secondaryPhone',
                 required: true,
                 condition: {
@@ -392,8 +432,9 @@ export default {
                   values: ['FEEDBACK_QS'],
                 },
               },
-              { name: 'email', required: true },
+              { fieldType: 'common', name: 'email', required: true },
               {
+                fieldType: 'common',
                 name: 'bankEmpolee',
                 condition: {
                   name: 'feedbackType',
@@ -401,14 +442,15 @@ export default {
                 },
               },
               {
+                fieldType: 'common',
                 name: 'applicationDate',
                 condition: {
                   name: 'feedbackType',
                   values: ['FEEDBACK_QS'],
                 },
               },
-              { name: 'comment', required: true },
-              { name: 'consentDataProcessing', required: true },
+              { fieldType: 'common', name: 'comment', required: true },
+              { fieldType: 'common', name: 'consentDataProcessing', required: true },
             ],
           },
         ]}
@@ -430,13 +472,13 @@ export default {
           {
             columns: 2,
             inputs: [
-              { name: 'surname', required: true },
-              { name: 'name', required: true },
-              { name: 'middleName' },
-              { name: 'birthday', required: true },
-              { name: 'phone', required: true },
-              { name: 'email', required: true },
-              { name: 'consentDataProcessing', required: true },
+              { fieldType: 'common', name: 'surname', required: true },
+              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'middleName' },
+              { fieldType: 'common', name: 'birthday', required: true },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'email', required: true },
+              { fieldType: 'common', name: 'consentDataProcessing', required: true },
             ],
           },
         ]}
@@ -460,10 +502,10 @@ export default {
         sections={[
           {
             inputs: [
-              { name: 'name', required: true, label: 'ФИО' },
-              { name: 'region', required: true },
-              { name: 'phone', required: true },
-              { name: 'consentDataProcessing', required: true },
+              { fieldType: 'common', name: 'name', required: true, label: 'ФИО' },
+              { fieldType: 'common', name: 'region', required: true },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'consentDataProcessing', required: true },
             ],
           },
         ]}
@@ -485,24 +527,24 @@ export default {
             title: 'Ваши данные',
             columns: 2,
             inputs: [
-              { name: 'surname', required: true },
-              { name: 'name', required: true },
-              { name: 'middleName' },
-              { name: 'phone', required: true },
-              { name: 'email' },
-              { name: 'serviceType', required: true },
+              { fieldType: 'common', name: 'surname', required: true },
+              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'middleName' },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'email' },
+              { fieldType: 'common', name: 'serviceType', required: true },
             ],
           },
           {
             title: 'Офис банка',
             columns: 2,
             inputs: [
-              { name: 'region', required: true },
-              { name: 'addressBranch', required: true },
+              { fieldType: 'common', name: 'region', required: true },
+              { fieldType: 'common', name: 'addressBranch', required: true },
             ],
           },
-          { inputs: [{ name: 'comment' }] },
-          { inputs: [{ name: 'consentDataProcessing', required: true }] },
+          { inputs: [{ fieldType: 'common', name: 'comment' }] },
+          { inputs: [{ fieldType: 'common', name: 'consentDataProcessing', required: true }] },
         ]}
         button={button}
         link={link}
@@ -518,14 +560,23 @@ export default {
         typeForm="KVED"
         endpoint="sendcorporatelead"
         sections={[
-          { inputs: [{ name: 'vedTypes' }] },
+          {
+            inputs: [
+              {
+                fieldType: 'ved',
+                name: 'vedTypes',
+                defaultValue: 'currencyControl',
+              },
+            ],
+          },
           { title: 'Данные организации', inputs: [] },
           {
             inputs: [
               {
+                fieldType: 'common',
                 name: 'region',
                 required: true,
-                condition: { name: 'vedTypes', values: ['currencyControl'] },
+                condition: { fieldType: 'common', name: 'vedTypes', values: ['currencyControl'] },
               },
             ],
           },
@@ -533,6 +584,7 @@ export default {
             columns: 2,
             inputs: [
               {
+                fieldType: 'common',
                 name: 'inn',
                 required: true,
                 condition: {
@@ -540,10 +592,16 @@ export default {
                   values: ['currencyControl'],
                 },
               },
-              { name: 'fullName', required: true, label: 'Наименование организации' },
-              { name: 'name', required: true, label: 'ФИО' },
-              { name: 'phone', required: true },
               {
+                fieldType: 'common',
+                name: 'fullName',
+                required: true,
+                label: 'Наименование организации',
+              },
+              { fieldType: 'common', name: 'name', required: true, label: 'ФИО' },
+              { fieldType: 'common', name: 'phone', required: true },
+              {
+                fieldType: 'common',
                 name: 'email',
                 required: true,
                 condition: {
@@ -554,7 +612,7 @@ export default {
             ],
           },
           {
-            inputs: [{ name: 'partnerComments', label: 'Обращение' }],
+            inputs: [{ fieldType: 'common', name: 'partnerComments', label: 'Обращение' }],
           },
         ]}
         button={button}

package/src/components/ApplicationFormCustom/ApplicationFormCustomContent.ts

@@ -55,18 +55,48 @@ export type NameFieldDef =
   | 'consentDataProcessing';
 
 export type ConditionFieldProps = {
+  /** @title Условия отображения полей */
   condition?: {
     name: NameFieldDef;
+    /** @title Значения при которых отображаются поля */
     values: string[];
   };
 };
 
-export type FieldDef = Required &
+export type FieldDefaultDef = Required &
   LabelProps &
   ConditionFieldProps & {
     name: NameFieldDef;
   };
 
+/**
+ * @title Поля ввода по умолчанию
+ * @default {"fieldType": "common"}
+ */
+export type FieldCommonDef = FieldDefaultDef & {
+  /** @default "common" */
+  fieldType: 'common';
+};
+
+type VedTypes = 'currencyControl' | 'documentOperations' | 'conversionTransactions' | 'otherIssues';
+
+/**
+ * @title Поле ввода ВЭД
+ * @default {"fieldType": "ved", "name": "vedTypes", "defaultValue": "currencyControl"}
+ */
+export type FieldVedDef = FieldDefaultDef & {
+  /** @default "ved" */
+  fieldType: 'ved';
+  /** @title Значение по умолчанию */
+  defaultValue?: VedTypes;
+};
+
+/**
+ * @title Поле
+ * @default { "fieldType": "common" }
+ */
+export type FieldDef = FieldCommonDef | FieldVedDef;
+
 /**
  * @title Тип формы
  * @required

package/src/components/ApplicationFormCustom/VedField.tsx

@@ -20,7 +20,7 @@ export const VedField = JSX<CustomFieldProps>(({ field }) => {
   }, [value]);
 
   return (
-    <div className="py-m space-x-m grid @xl:flex @xl:items-center">
+    <div className="py-m gap-m grid @xl:flex @xl:items-center">
       <Radio
         name="vedTypes"
         text="Валютный контроль"

package/src/components/ApplicationFormCustom/getInitialFormState.tsx

@@ -2,7 +2,6 @@ import { type Option } from '../../ui-kit/Select/Option';
 import { ACQUIRING_TYPES } from './AcquiringField';
 import { type FieldDef } from './ApplicationFormCustomContent';
 import { FEEDBACK_METHOD, FEEDBACK_TYPES, SERVICE_DIRECTIONS, SERVICE_TYPES } from './contants';
-import { getNamesFromInput } from './getNamesFromInput';
 import { VED_TYPES } from './VedField';
 
 export interface FormState {
@@ -53,8 +52,12 @@ const initialFormState = {
 
 export const getInitialFormState = (inputs: FieldDef[], typeForm = ''): FormState => {
   const formState = Object.fromEntries(
-    getNamesFromInput(inputs).map((_) => [_, initialFormState[_]]),
+    inputs.map((_) => [
+      _.name,
+      (_.fieldType === 'ved' && _?.defaultValue) || initialFormState[_.name],
+    ]),
   );
+
   if (formState?.serviceType && typeForm === 'PREMIUMSERVICE') {
     formState.serviceType = SERVICE_TYPES[1];
   }

package/src/model/LinkProps.ts

@@ -5,10 +5,10 @@ import { type TextProps } from './HeadlineType';
  * @title Таргет (target)
  * @enumNames [
  *    "",
- *    "self (текущее окно или фрейм)",
- *    "blank (новое окно)",
+ *    "self (текущее вкладка или фрейм)",
+ *    "blank (новое вкладка)",
  *    "parent (фрейм-родитель)",
- *    "top (текущее окно)"
+ *    "top (текущее вкладка)"
  *  ]
  */
 export type Target = '' | '_self' | '_blank' | '_parent' | '_top';