fix: json field array writing #1

Chance-fyi · Oct 21, 2022 · 201085c · 201085c
1 parent 8e3d3d5
commit 201085c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -20,5 +20,8 @@
         "phpunit/phpunit": "10.0.x-dev",
         "illuminate/database": "^8.0",
         "topthink/think-orm": "2.0.x-dev"
+    },
+    "require": {
+        "ext-json": "*"
     }
 }
diff --git a/src/orm/illuminate/Log.php b/src/orm/illuminate/Log.php
@@ -86,7 +86,13 @@ public function getChangedAttributes($model): array
     public function getValue($model, string $key): string
     {
         $keyText = $key . "_text";
-        return (string)($model->$keyText ?? $model->$key);
+        $value = $model->$keyText ?? $model->$key;
+
+        if (is_array($value)) {
+            return json_encode($value, JSON_UNESCAPED_UNICODE);
+        } else {
+            return (string)$value;
+        }
     }
 
     /**

diff --git a/src/orm/think/Log.php b/src/orm/think/Log.php
@@ -89,11 +89,11 @@ public function getValue($model, string $key): string
         $value = $model->$keyText ?? $model->$key;
 
         if (is_array($value)) {
-            return implode(" ", $value);
+            return json_encode($value, JSON_UNESCAPED_UNICODE);
         } elseif ($value instanceof Raw) {
             return $value->getValue();
         } else {
-            return $value;
+            return (string)$value;
         }
     }
 
@@ -106,7 +106,13 @@ public function getOldValue($model, string $key): string
     {
         $keyText = $key . "_text";
         $attributeFun = "get" . Str::studly(Str::lower($keyText)) . "Attr";
-        return (string)(method_exists($model, $attributeFun) ? $model->$attributeFun($model->getOrigin($key)) : $model->getOrigin($key));
+        $value = method_exists($model, $attributeFun) ? $model->$attributeFun($model->getOrigin($key)) : $model->getOrigin($key);
+
+        if (is_array($value)) {
+            return json_encode($value, JSON_UNESCAPED_UNICODE);
+        } else {
+            return (string)$value;
+        }
     }
 
     /**