类型转换优先判断FieldTypeTransform

top-think · Sep 9, 2024 · dab5fc6 · dab5fc6
1 parent 804bd69
commit dab5fc6
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/model/concern/Attribute.php b/src/model/concern/Attribute.php
@@ -470,10 +470,10 @@ protected function writeTransform($value, string | array $type)
 
         $typeTransform = static function (string $type, $value, $model) {
             if (str_contains($type, '\\') && class_exists($type)) {
-                if ($value instanceof BackedEnum) {
-                    $value = $value->value;
-                } elseif (is_subclass_of($type, FieldTypeTransform::class)) {
+                if (is_subclass_of($type, FieldTypeTransform::class)) {
                     $value = $type::set($value, $model);
+                } elseif ($value instanceof BackedEnum) {
+                    $value = $value->value;
                 } elseif ($value instanceof Stringable) {
                     $value = $value->__toString();
                 }
@@ -645,13 +645,13 @@ protected function readTransform($value, string | array $type)
 
         $typeTransform = static function (string $type, $value, $model) {
             if (str_contains($type, '\\') && class_exists($type)) {
-                if (is_subclass_of($type, BackedEnum::class)) {
+                if (is_subclass_of($type, FieldTypeTransform::class)) {
+                    $value = $type::get($value, $model);
+                } elseif (is_subclass_of($type, BackedEnum::class)) {
                     $value = $type::from($value);
                     if (is_subclass_of($type, EnumTransform::class)) {
                         $value = $value->value();
                     }
-                } elseif (is_subclass_of($type, FieldTypeTransform::class)) {
-                    $value = $type::get($value, $model);
                 } else {
                     // 对象类型
                     $value = new $type($value);