改进模型事件 实体模型增加更新数据自动写入功能

Author: liu21st

src/Entity.php

@@ -85,7 +85,6 @@ public function __construct(array | object $data = [], ?Model $model = null)
             'mapping'       => $options['mapping'] ?? [],
             'strict'        => $options['strict'] ?? true,
             'bind_attr'     => $options['bind_attr'] ?? [],
-            'auto_insert'   => $options['auto_insert'] ?? [],
             'auto_relation' => $options['auto_relation'] ?? [],
             'relation_keys' => $options['relation_keys'] ?? [],
         ];
@@ -827,10 +826,8 @@ public function save(array | object $data = [], $where = []): bool
         // 自动时间戳处理
         $this->autoDateTime($data, $isUpdate);
 
-        if (!$isUpdate) {
-            // 自动写入数据
-            $this->autoInsertData($data);
-        }
+        // 自动写入数据
+        $this->autoWriteData($data, $isUpdate);
 
         $model = $this->model();
         if ($model instanceof Model) {
@@ -906,23 +903,22 @@ protected function autoDateTime(array &$data, bool $update)
      * 字段自动写入.
      *
      * @param array $data 数据
+     * @param bool  $isUpdate 是否更新
      * @return void
      */
-    protected function autoInsertData(array &$data)
-    {
-        $autoInsert = $this->getOption('auto_insert', []);
-        if (!empty($autoInsert)) {
-            foreach ($autoInsert as $name => $val) {
-                $field = is_string($name) ? $name : $val;
-                if (!isset($data[$field])) {
-                    if ($val instanceof Closure) {
-                        $value = $val($this);
-                    } else {
-                        $value = is_string($name) ? $val : $this->setWithAttr($field, null, $data);
-                    }
-                    $data[$field] = $value;
-                    $this->setData($field, $value);
+    protected function autoWriteData(array &$data, bool $isUpdate)
+    {
+        $auto = $this->getOption($isUpdate ? 'auto_update' : 'auto_insert', []);
+        foreach ($auto as $name => $val) {
+            $field = is_string($name) ? $name : $val;
+            if (!isset($data[$field])) {
+                if ($val instanceof Closure) {
+                    $value = $val($this);
+                } else {
+                    $value = is_string($name) ? $val : $this->setWithAttr($field, null, $data);
                 }
+                $data[$field] = $value;
+                $this->setData($field, $value);
             }
         }
     }

src/Model.php

@@ -762,7 +762,7 @@ protected function updateData(array $data): bool
 
         // 获取有更新的数据
         if (!$this->entity) {
-            $data = $this->getChangedData($data);
+            $data = $this->getChangedData($this->data);
         }
 
         if (empty($data)) {
@@ -841,6 +841,10 @@ protected function insertData(array $data, ?string $sequence = null): bool
 
         $this->checkData();
 
+        if (!$this->entity) {
+            $data = $this->data;
+        }
+
         // 主键自动写入
         if ($this->isAutoWriteId()) {
             $pk = $this->getPk();