process Closure expr the same way

atk4 · May 17, 2023 · 05a4b64 · 05a4b64
1 parent 7bb89f4
commit 05a4b64
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Form/Control/Multiline.php b/src/Form/Control/Multiline.php
@@ -771,9 +771,7 @@ private function getExpressionValues(Model $entity): array
     {
         $dummyFields = $this->getExpressionFields($entity);
         foreach ($dummyFields as $k => $field) {
-            if (!$field->expr instanceof \Closure) {
-                $dummyFields[$k]->expr = $this->getDummyExpression($field, $entity);
-            }
+            $dummyFields[$k]->expr = $this->getDummyExpression($field, $entity);
         }
 
         if ($dummyFields === []) {
@@ -830,6 +828,9 @@ private function getExpressionValues(Model $entity): array
     private function getDummyExpression(SqlExpressionField $exprField, Model $entity)
     {
         $expr = $exprField->expr;
+        if ($expr instanceof \Closure) {
+            $expr = $exprField->getDsqlExpression($entity->getModel()->expr(''));
+        }
         if ($expr instanceof Persistence\Sql\Expression) {
             $expr = \Closure::bind(fn () => $expr->template, null, Persistence\Sql\Expression::class)();
         }