added select2 type

TonisOrmisson · Mar 28, 2024 · a8c511d · a8c511d
1 parent 2dccfb0
commit a8c511d
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -53,3 +53,36 @@ echo Html::textarea('my-credentials-input-field','', ['id' => 'my-credentials-in
 ```
 ![alt text](images/example-2.png)
 
+### Example usage Select2
+
+```
+
+// ######################### example 3 select
+$jsonData = '{"select2":3}';
+$variables = [
+    'select2'=>[
+        'label' => Yii::t('app','A select 2 example'),
+        'type' => JsonForm::TYPE_SELECT2,
+        'select' => [
+            1 => "one",
+            2 => "two",
+            3 => "three"
+        ],
+        'options' => ['placeholder' => 'Select a number ...'],
+        'pluginOptions' => [
+            'allowClear' => true
+        ]
+    ],
+];
+
+echo JsonForm::widget([
+    'id' => 'my-id-3',
+    'json' => $jsonData,
+    'jsonFieldId' => 'my-credentials-input-field-3',
+    'variables' => $variables,
+]);
+echo Html::textarea('my-credentials-input-field-3','', ['id' => 'my-credentials-input-field-3']);
+```
+![alt text](images/example-3.png)
+
+
diff --git a/images/example-3.png b/images/example-3.png
diff --git a/src/views/_field.php b/src/views/_field.php
@@ -43,20 +43,21 @@
                 'name' => $id,
                 'value' => $value,
                 'type' => DatePicker::TYPE_COMPONENT_PREPEND,
-                'pluginOptions' => $options,
+                'pluginOptions' => $pluginOptions,
             ]); ?>
         <?php elseif ($type == JsonForm::TYPE_DATETIME): ?>
             <?= DateTimePicker::widget([
                 'id' => $id,
                 'name' => $id,
                 'value' => $value,
                 'type' => DateTimePicker::TYPE_COMPONENT_PREPEND,
-                'pluginOptions' => $options,
+                'pluginOptions' => $pluginOptions,
             ]); ?>
         <?php elseif ($type == JsonForm::TYPE_SELECT2): ?>
             <?= \kartik\select2\Select2::widget([
                 'id' => $id,
                 'name' => $id,
+                'value' => $value,
                 'data' => $select,
                 'options' => $options,
                 'pluginOptions' => $pluginOptions

diff --git a/src/views/json-form.php b/src/views/json-form.php
@@ -101,22 +101,28 @@ function setOptionsValues(id,jsonFieldId,optionsArray) {
             if (!$widget->isKeyed) {
                 $label = "";
             }
-
-            $options['id'] = $id;
-            //$options['name'] = $widget->fieldName;
-
-            if (isset($variable['options'])) {
-                $options = array_merge($options, $variable['options']);
+            $select = $variable['select'] ?? [];
+            $pluginOptions = $variable['pluginOptions'] ?? [];
+            $options = $variable['options'] ?? [];
+
+
+            if(empty($pluginOptions)) {
+                $pluginOptions['id'] = $id;
+                // old config
+                if (isset($variable['options'])) {
+                    $pluginOptions = array_merge($pluginOptions, $variable['options']);
+                }
+                $pluginOptions['class'] = "form-control values";
             }
 
+
             $value = (isset($currentData[$id]) ? $currentData[$id] : null);
             $type = (isset($variable['type']) ? $variable['type'] : null);
 
             if (!$widget->isKeyed) {
                 $id = $widget->nonKeyedId($id);
             }
 
-            $options['class'] = "form-control values";
             ?>
 
             <?= $this->render('_field', [
@@ -126,6 +132,8 @@ function setOptionsValues(id,jsonFieldId,optionsArray) {
                 'label' => $label,
                 'value' => $value,
                 'options' => $options,
+                'select' => $select,
+                'pluginOptions' => $pluginOptions,
             ]); ?>
 
         <?php endforeach; ?>