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

package/mobile/src/components/ApplicationFormCustom/ApplicationFormCustom.example.json

@@ -13,22 +13,22 @@
             "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": {
           "text": "Отправить заявку",
@@ -56,10 +56,10 @@
           },
           {
             "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 }
             ]
           }
         ],
@@ -86,32 +86,40 @@
           {
             "inputs": [
               {
+                "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
               }
@@ -138,23 +146,27 @@
         "typeForm": "BCRD",
         "endpoint": "sendcorporatelead",
         "sections": [
-          { "inputs": [{ "name": "region", "required": true }] },
+          { "inputs": [{ "fieldType": "common", "name": "region", "required": true }] },
           {
             "columns": 2,
             "inputs": [
               {
+                "fieldType": "common",
                 "name": "name",
                 "required": true
               },
               {
+                "fieldType": "common",
                 "name": "phone",
                 "required": true
               },
               {
+                "fieldType": "common",
                 "name": "inn",
                 "required": true
               },
               {
+                "fieldType": "common",
                 "name": "email",
                 "required": true
               }
@@ -181,17 +193,27 @@
         "typeForm": "BROK",
         "endpoint": "sendcorporatelead",
         "sections": [
-          { "inputs": [{ "name": "region", "required": true }] },
+          { "inputs": [{ "fieldType": "common", "name": "region", "required": true }] },
           {
             "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" }, { "name": "isClient" }] }
+          {
+            "inputs": [
+              { "fieldType": "common", "name": "partnerComments" },
+              { "fieldType": "common", "name": "isClient" }
+            ]
+          }
         ],
         "button": {
           "text": "Отправить заявку",
@@ -216,17 +238,21 @@
           {
             "inputs": [
               {
+                "fieldType": "common",
                 "name": "name",
                 "required": true
               },
               {
+                "fieldType": "common",
                 "name": "phone",
                 "required": true
               },
               {
+                "fieldType": "common",
                 "name": "isClient"
               },
               {
+                "fieldType": "common",
                 "name": "consentDataProcessing",
                 "required": true
               }
@@ -255,20 +281,26 @@
         "sections": [
           {
             "inputs": [
-              { "name": "fullName", "required": true, "label": "Наименование организации" }
+              {
+                "fieldType": "common",
+                "name": "fullName",
+                "required": true,
+                "label": "Наименование организации"
+              }
             ]
           },
           {
             "columns": 2,
             "inputs": [
-              { "name": "region", "required": true },
+              { "fieldType": "common", "name": "region", "required": true },
               {
+                "fieldType": "common",
                 "name": "collectionCount",
                 "required": true,
                 "label": "Количество объектов инкассации"
               },
-              { "name": "phone", "required": true },
-              { "name": "email", "required": true }
+              { "fieldType": "common", "name": "phone", "required": true },
+              { "fieldType": "common", "name": "email", "required": true }
             ]
           }
         ],
@@ -295,26 +327,39 @@
           {
             "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 }
             ]
           }
         ],
@@ -341,32 +386,40 @@
           {
             "inputs": [
               {
+                "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
               }
@@ -396,14 +449,17 @@
           {
             "inputs": [
               {
+                "fieldType": "common",
                 "name": "name",
                 "required": true
               },
               {
+                "fieldType": "common",
                 "name": "phone",
                 "required": true
               },
               {
+                "fieldType": "common",
                 "name": "consentDataProcessing",
                 "required": true
               }
@@ -432,16 +488,18 @@
         "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": {
@@ -449,20 +507,23 @@
                   "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": ["Юридическое лицо / ИП"] }
               },
               {
+                "fieldType": "common",
                 "name": "fullName",
                 "label": "Наименование организации",
                 "condition": { "name": "serviceDirection", "values": ["Юридическое лицо / ИП"] }
               },
               {
+                "fieldType": "common",
                 "name": "birthday",
                 "required": true,
                 "condition": {
@@ -470,9 +531,10 @@
                   "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": {
@@ -480,8 +542,9 @@
                   "values": ["FEEDBACK_QS"]
                 }
               },
-              { "name": "email", "required": true },
+              { "fieldType": "common", "name": "email", "required": true },
               {
+                "fieldType": "common",
                 "name": "bankEmpolee",
                 "condition": {
                   "name": "feedbackType",
@@ -489,14 +552,15 @@
                 }
               },
               {
+                "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 }
             ]
           }
         ],
@@ -523,18 +587,22 @@
           {
             "inputs": [
               {
+                "fieldType": "common",
                 "name": "name",
                 "required": true
               },
               {
+                "fieldType": "common",
                 "name": "region",
                 "required": true
               },
               {
+                "fieldType": "common",
                 "name": "phone",
                 "required": true
               },
               {
+                "fieldType": "common",
                 "name": "consentDataProcessing",
                 "required": true
               }
@@ -564,13 +632,13 @@
           {
             "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" }
+              { "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" }
             ]
           }
         ],
@@ -598,24 +666,24 @@
             "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" }] }
+          { "inputs": [{ "fieldType": "common", "name": "comment" }] },
+          { "inputs": [{ "fieldType": "common", "name": "consentDataProcessing" }] }
         ],
         "button": {
           "text": "Отправить заявку",
@@ -638,12 +706,15 @@
         "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"] }
@@ -654,6 +725,7 @@
             "columns": 2,
             "inputs": [
               {
+                "fieldType": "common",
                 "name": "inn",
                 "required": true,
                 "condition": {
@@ -661,10 +733,16 @@
                   "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": {
@@ -675,7 +753,7 @@
             ]
           },
           {
-            "inputs": [{ "name": "partnerComments", "label": "Обращение" }]
+            "inputs": [{ "fieldType": "common", "name": "partnerComments", "label": "Обращение" }]
           }
         ],
         "button": {

package/mobile/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/mobile/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/mobile/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/mobile/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';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.280",
+  "version": "0.14.281",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ApplicationFormCustom/AddressBranchField.tsx

@@ -26,8 +26,8 @@ export const AddressBranchField = JSX<RegionFieldProps>(({ field, input, isPremi
 
   return (
     <SelectControl
-      label="Адрес"
-      placeholder="Выберите адрес"
+      label="Отделение"
+      placeholder="Выберите отделение"
       options={(addressBranch || []).map(({ address = '' }) => ({
         key: address,
         text: address,