bd 13.0

views/admin/additional_elements/_delete_field_box_button.php

@@ -0,0 +1 @@
+<a href="#" class="delete-button btn-danger deleteButton">X</a>

views/admin/field_type/_button.php

@@ -5,7 +5,8 @@
  *
  * @var \itguild\forms\ActiveForm $form
  * @var integer $count
- *
+ * @var integer $name
+ * @var \itguild\forms\core\cg_view\CgView $cgView
  */
 
 use itguild\forms\inputs\Checkbox;
@@ -13,10 +14,11 @@ use itguild\forms\inputs\TextInput;
 
 
 $form->field(TextInput::class, name: "InputForm[$count][name]", params: ['class' => "form-control",
-    'placeholder' => "Наименование поля"])->setLabel("Наименование поля (например \"Телефон\")")->render();
+    'placeholder' => "Наименование поля", 'value' => $name ?? null])->setLabel("Наименование поля (например \"Телефон\")")->render();
 $form->field(Checkbox::class, name: "InputForm[$count][required]", params:['value' => '1'])->setLabel("Обязательное")->render();
 $form->field(\itguild\forms\inputs\Hidden::class, name: "InputForm[$count][type]", params: ['value' => '5'])->render();
+
+$cgView->render("/admin/additional_elements/_delete_field_box_button.php", []);
 ?>
-<button class="delete-button btn-danger">X</button>
 </div>
 

views/admin/field_type/_checkBox.php

@@ -5,16 +5,18 @@
  *
  * @var \itguild\forms\ActiveForm $form
  * @var integer $count
- *
+ * @var integer $name
+ * @var \itguild\forms\core\cg_view\CgView $cgView
  */
 
 use itguild\forms\inputs\Checkbox;
 use itguild\forms\inputs\TextInput;
 
 $form->field(TextInput::class, name: "InputForm[$count][name]", params: ['class' => "form-control",
-    'placeholder' => "Наименование"])->setLabel("Наименование (например \"Телефон\")")->render();
+    'placeholder' => "Наименование", 'value' => $name ?? null])->setLabel("Наименование (например \"Телефон\")")->render();
 $form->field(Checkbox::class, name: "InputForm[$count][required]", params:['value' => '1'])->setLabel("Обязательное")->render();
 $form->field(\itguild\forms\inputs\Hidden::class, name: "InputForm[$count][type]", params: ['value' => '1'])->render();
+
+$cgView->render("/admin/additional_elements/_delete_field_box_button.php", []);
 ?>
-    <button class="delete-button btn-danger">X</button>
 </div>

views/admin/field_type/_radioButton.php

@@ -5,19 +5,22 @@
  *
  * @var \itguild\forms\ActiveForm $form
  * @var integer $count
- *
+ * @var integer $name
+ * @var string $value
+ * @var \itguild\forms\core\cg_view\CgView $cgView
  */
 
 use itguild\forms\inputs\Checkbox;
 use itguild\forms\inputs\TextInput;
 
 $form->field(TextInput::class, name: "InputForm[$count][name]", params: ['class' => "form-control",
-    'placeholder' => "Наименование"])->setLabel("Наименование (например \"Телефон\")")->render();
-$form->field(\itguild\forms\inputs\TextArea::class, name: "InputForm[$count][radio]", params: ['class' => "form-control"])
+    'placeholder' => "Наименование", 'value' => $name ?? null])->setLabel("Наименование (например \"Телефон\")")->render();
+$form->field(\itguild\forms\inputs\TextArea::class, name: "InputForm[$count][radio]", params: ['class' => "form-control", 'value' => $value])
     ->setLabel("Введите радио кнопки, каждую на новой строке")
     ->render();
 $form->field(Checkbox::class, name: "InputForm[$count][required]", params:['value' => '1'])->setLabel("Обязательное")->render();
 $form->field(\itguild\forms\inputs\Hidden::class, name: "InputForm[$count][type]", params: ['value' => '4'])->render();
+
+$cgView->render("/admin/additional_elements/_delete_field_box_button.php", []);
 ?>
-    <button class="delete-button btn-danger">X</button>
 </div>

views/admin/field_type/_select.php

@@ -1,25 +1,34 @@
-<div class="form-block form-control">
-<b><p>Список</p></b>
 <?php
 /**
  *
  * @var \itguild\forms\ActiveForm $form
  * @var integer $count
- *
+ * @var integer $name
+ * @var string $value
+ * @var \itguild\forms\core\cg_view\CgView $cgView
  */
 
 use itguild\forms\inputs\Checkbox;
 use itguild\forms\inputs\TextArea;
 use itguild\forms\inputs\TextInput;
 
-
-$form->field(TextInput::class, name: "InputForm[$count][name]", params: ['class' => "form-control",
-    'placeholder' => "Наименование"])->setLabel("Наименование (например \"Список городов\")")->render();
-$form->field(TextArea::class, name: "InputForm[$count][options]", params: ['class' => "form-control"])
-    ->setLabel("Опции выпадающего списка, каждый с новой строки")
-    ->render();
-$form->field(Checkbox::class, name: "InputForm[$count][required]", params:['value' => '1'])->setLabel("Обязательное")->render();
-$form->field(\itguild\forms\inputs\Hidden::class, name: "InputForm[$count][type]", params: ['value' => '6'])->render();
 ?>
-    <button class="delete-button btn-danger">X</button>
+<div class="form-block form-control">
+    <b><p>Список</p></b>
+
+    <?php
+
+    $form->field(TextInput::class, name: "InputForm[$count][name]", params: ['class' => "form-control",
+        'placeholder' => "Наименование", 'value' => $name ?? null])->setLabel("Наименование (например \"Список городов\")")->render();
+    $form->field(TextArea::class, name: "InputForm[$count][options]", params: [
+        'class' => "form-control",
+        'value' => $value,
+    ])
+        ->setLabel("Опции выпадающего списка, каждый с новой строки")
+        ->render();
+    $form->field(Checkbox::class, name: "InputForm[$count][required]", params: ['value' => '1'])->setLabel("Обязательное")->render();
+    $form->field(\itguild\forms\inputs\Hidden::class, name: "InputForm[$count][type]", params: ['value' => '6'])->render();
+
+    $cgView->render("/admin/additional_elements/_delete_field_box_button.php", []);
+    ?>
 </div>

views/admin/field_type/_text_input.php

@@ -5,6 +5,9 @@
  *
  * @var \itguild\forms\ActiveForm $form
  * @var integer $count
+ * @var integer $name
+ * @var integer $placeholder
+ * @var \itguild\forms\core\cg_view\CgView $cgView
  *
  */
 
@@ -12,11 +15,12 @@ use itguild\forms\inputs\Checkbox;
 use itguild\forms\inputs\TextInput;
 
 $form->field(TextInput::class, name: "InputForm[$count][name]", params: ['class' => "form-control",
-    'placeholder' => "Наименование поля"])->setLabel("Наименование поля (например \"Телефон\")")->render();
+    'placeholder' => "Наименование поля", 'value' => $name ?? null])->setLabel("Наименование поля (например \"Телефон\")")->render();
 $form->field(TextInput::class, name: "InputForm[$count][placeholder]", params: ['class' => "form-control",
-    'placeholder' => 'Placeholder'])->setLabel("Placeholder")->render();
+    'placeholder' => 'Placeholder', "value" => $placeholder ?? null])->setLabel("Placeholder")->render();
 $form->field(Checkbox::class, name: "InputForm[$count][required]", params:['value' => '1'])->setLabel("Обязательное")->render();
 $form->field(\itguild\forms\inputs\Hidden::class, name: "InputForm[$count][type]", params: ['value' => '2'])->render();
+
+$cgView->render("/admin/additional_elements/_delete_field_box_button.php", []);
 ?>
-    <button class="delete-button btn-danger">X</button>
 </div>

views/admin/field_type/_textarea.php

@@ -5,17 +5,21 @@
  *
  * @var \itguild\forms\ActiveForm $form
  * @var integer $count
- *
+ * @var integer $name
+ * @var integer $placeholder
+ * @var \itguild\forms\core\cg_view\CgView $cgView
  */
 use itguild\forms\inputs\Checkbox;
 use itguild\forms\inputs\TextInput;
 
+
 $form->field(TextInput::class, name: "InputForm[$count][name]", params: ['class' => "form-control",
-    'placeholder' => "Наименование поля"])->setLabel("Наименование поля (например \"Телефон\")")->render();
+    'placeholder' => "Наименование поля", 'value' => $name ?? null])->setLabel("Наименование поля (например \"Телефон\")")->render();
 $form->field(TextInput::class, name: "InputForm[$count][placeholder]", params: ['class' => "form-control",
-    'placeholder' => 'Placeholder'])->setLabel("Placeholder")->render();
+    'placeholder' => 'Placeholder', "value" => $placeholder ?? null])->setLabel("Placeholder")->render();
 $form->field(Checkbox::class, name: "InputForm[$count][required]", params:['value' => '1'])->setLabel("Обязательное")->render();
 $form->field(\itguild\forms\inputs\Hidden::class, name: "InputForm[$count][type]", params: ['value' => '3'])->render();
+
+$cgView->render("/admin/additional_elements/_delete_field_box_button.php", []);
 ?>
-    <button class="delete-button btn-danger">X</button>
 </div>

views/admin/index.php

@@ -6,6 +6,7 @@
  */
 
 use itguild\forms\ActiveForm;
+use itguild\forms\app\models\InputTypeModel;
 use itguild\forms\inputs\TextInput;
 use itguild\forms\inputs\TextArea;
 use itguild\forms\app\controllers\AdminController;
@@ -67,12 +68,7 @@ $form->field(\itguild\forms\inputs\Hidden::class, name: "formId", params: [
 ])->render();
 
 if (isset($fields)){
-    $i = 0;
-    foreach ($fields as $field){
-        $viewName = \itguild\forms\app\models\InputTypeModel::getViewNameByTypeId($field['input_type_id']);
-        $cgView->render("/admin/field_type/$viewName.php", ['form' => new ActiveForm(), 'count' => $i]);
-        $i++;
-    }
+    \itguild\forms\widgets\FormFieldBlockWidget::create()->run(['fields' => $fields]);
 }
 
 $form->field(\itguild\forms\inputs\Button::class, name: "", params: [