From 93bbd47562b1e0e9d6445ec4c24c617275cadb29 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 27 May 2024 17:04:40 +0200 Subject: [PATCH] wip #6937 @1 --- src/app/Magic/Fields/Field.php | 7 +++++ src/app/Magic/Fields/HiddenVisible.php | 9 +++++++ src/public/bunchmultiple/bunchmultiple.js | 3 +++ .../views/fields/hidden_visible.blade.php | 26 +++++++++++++++++++ src/resources/views/when.blade.php | 6 ++++- 5 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/app/Magic/Fields/HiddenVisible.php create mode 100644 src/resources/views/fields/hidden_visible.blade.php diff --git a/src/app/Magic/Fields/Field.php b/src/app/Magic/Fields/Field.php index 9c5bfd7..4b1bb48 100644 --- a/src/app/Magic/Fields/Field.php +++ b/src/app/Magic/Fields/Field.php @@ -431,6 +431,13 @@ class Field implements \ArrayAccess if (is_scalar($w)) { $w = ['values' => [$w], 'operator' => $defaultOperator]; } else { + if (isset($w['value'])) { + $w['values'] = $w['value']; + unset($w['value']); + } + if (is_scalar($w['values'])) { + $w['values'] = [$w['values']]; + } if (isset($w['values'])) { if (!isset($w['operator'])) { $w['operator'] = $defaultOperator; diff --git a/src/app/Magic/Fields/HiddenVisible.php b/src/app/Magic/Fields/HiddenVisible.php new file mode 100644 index 0000000..c79d420 --- /dev/null +++ b/src/app/Magic/Fields/HiddenVisible.php @@ -0,0 +1,9 @@ + 0) { + $(input).next('.hidden-visible-value').text(v); + } } }, }; diff --git a/src/resources/views/fields/hidden_visible.blade.php b/src/resources/views/fields/hidden_visible.blade.php new file mode 100644 index 0000000..e375a13 --- /dev/null +++ b/src/resources/views/fields/hidden_visible.blade.php @@ -0,0 +1,26 @@ +@php +$v=old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; +@endphp + +@include('crud::fields.inc.wrapper_start') + + @include('crud::fields.inc.translatable_icon') + + @if(isset($field['prefix']) || isset($field['suffix']))
@endif + @if(isset($field['prefix']))
{!! $field['prefix'] !!}
@endif + + +
+ @if(isset($field['suffix']))
{!! $field['suffix'] !!}
@endif + @if(isset($field['prefix']) || isset($field['suffix']))
@endif + + {{-- HINT --}} + @if (isset($field['hint'])) +

{!! $field['hint'] !!}

+ @endif + diff --git a/src/resources/views/when.blade.php b/src/resources/views/when.blade.php index a4d2449..66e3002 100644 --- a/src/resources/views/when.blade.php +++ b/src/resources/views/when.blade.php @@ -27,6 +27,7 @@ var element = $(this); if ($(this).data('when-normalized') === undefined) { $(this).data('when-normalized', normalizeWhen($(this).data('when'))); + console.log(normalizeWhen($(this).data('when'))); } var when = $(this).data('when-normalized'); @@ -82,6 +83,9 @@ function checkCondition(condition, operator, val) { try { + if(val==='/index.html') { + console.log(condition, operator, val); + } if (condition.id === undefined) { condition.id = ''; } @@ -94,7 +98,7 @@ if (operator === '=') { return condition.id == val; } - if (operator === '!=' || operator === '!') { + if (operator === '!=' || operator === 'not' || operator === '!') { return condition.id != val; } } catch (e) { -- 2.39.5