改进视图模型的save方法

Author: liu21st

src/Model.php

@@ -385,8 +385,7 @@ public function save(array | object $data = [], $where = [], bool $refresh = fal
             $this->setKey($db->getLastInsID());
         } elseif ($refresh) {
             // 刷新数据
-            $data = $db->find()->getData();
-            $this->data($data);
+            $this->refresh();
         }
         $this->trigger($isUpdate ? 'AfterUpdate' : 'AfterInsert');
         $this->trigger('AfterWrite');

src/model/View.php

@@ -65,6 +65,8 @@ protected function initData()
                 $this->$key = $this->fetchViewAttr($field, $data);
             }
         }
+        // 标记数据存在
+        $this->exists(true);
     }
 
     /**
@@ -244,6 +246,7 @@ public function clear()
         foreach ($this->getEntityProperties() as $field) {
             $this->$field = null;
         }
+        $this->exists(false);
         return $this;
     }
 
@@ -456,23 +459,58 @@ protected function validate(array $data = [], array $allow = []): array
         return $data;
     }
 
+    /**
+     * 设置数据是否存在.
+     *
+     * @param bool $exists
+     *
+     * @return $this
+     */
+    public function exists(bool $exists = true)
+    {
+        return $this->setOption('exists', $exists);
+    }
+
+    /**
+     * 判断数据是否存在数据库.
+     *
+     * @return bool
+     */
+    public function isExists(): bool
+    {
+        return $this->getOption('exists', false);
+    }
+
     /**
      * 保存模型实例数据.
      *
-     * @param mixed $insert   是否强制新增 true为强制新增
+     * @param array|object $data 数据
+     * @param mixed $where 更新条件 true为强制新增
      * @param bool  $refresh  是否刷新数据
      * @return bool
      */
-    public function save($insert = false, bool $refresh = false): bool
+    public function save(array | object $data = [], $where = [], bool $refresh = false): bool
     {
+        if ($data) {
+            $this->data($data);
+        }
+
         // 根据映射关系转换为实际模型数据
         $data = $this->convertData();
         // 处理自动时间字段数据
         foreach ($this->model()->getAutoTimeFields() as $field) {
             unset($data[$field]);
         }
 
-        return $this->model()->save($data, $insert, $refresh);
+        $result = $this->model()
+            ->exists($this->isExists())
+            ->save($data, $where, $refresh);
+
+        if ($result) {
+            // 刷新数据
+            $this->refresh();
+        }
+        return $result;
     }
 
     /**
@@ -499,9 +537,8 @@ public function delete(): bool
     public static function create(array | object $data)
     {
         $entity = new static();
-        $model  = $entity->data($data)->save(true);
-        // 刷新视图模型数据
-        return $entity->refresh();
+        $entity->exists(false)->save($data, true);
+        return $entity;
     }
 
     /**
@@ -514,9 +551,8 @@ public static function create(array | object $data)
     public static function update(array | object $data, $where = [])
     {
         $entity = new static();
-        $model  = $entity->data($data)->save($where, true);
-        // 刷新视图模型数据
-        return $entity->refresh();
+        $entity->exists(true)->save($data, $where, true);
+        return $entity;
     }
 
     /**
@@ -540,10 +576,10 @@ public static function saveAll(iterable $dataSet, bool $replace = true): Collect
                         $exists = false;
                     }
                 }
-                $entity->model()->exists($exists);
+                $entity->exists($exists);
             }
-            $entity->data($data)->save(!$replace, true);
-            $collection[] = $entity->refresh();
+            $entity->save($data, !$replace, true);
+            $collection[] = $entity;
         }
         return new Collection($collection);
     }

tests/orm/ModelViewTest.php

@@ -15,6 +15,7 @@ class UserProfileModel extends Model
 
 class UserViewModel extends View
 {
+    public $id;
     public $nickname;
     public $test_name;
     public $user_age;
@@ -170,14 +171,21 @@ public function testEmptyViewModel()
     public function testViewModelWithRelation()
     {
         // 创建测试数据
+        $user = new UserViewModel;
+        $user->nickname = 'test3';
+        $user->user_age = 28;
+        $user->status   = 1;
+        $user->email    = '[email protected]';
+        $user->address  = 'Test Address';       
+        $user->save();
+
         $user = UserViewModel::create([
             'nickname' => 'test3',
             'user_age' => 28,
             'status'   => 1,
             'email'    => '[email protected]',
             'address'  => 'Test Address',            
-        ]);
-
+        ]);        
         // 加载关联数据
         $viewModel = UserViewModel::find($user->id);
 
@@ -198,6 +206,45 @@ public function testViewModelWithRelation()
         $data = json_decode($json, true);
         $this->assertEquals('[email protected]', $data['email']);
         $this->assertEquals('Test Address', $data['address']);
+
+        // 测试关联模型写入
+        $viewModel->nickname = 'update_test3';
+        $viewModel->email = '[email protected]';
+        $viewModel->address = 'update_Test Address';
+        $viewModel->save();
+
+        // 验证关联模型更新
+        $updatedModel = UserViewModel::where('nickname', 'update_test3')->where('email', '[email protected]')->find();
+        $this->assertEquals('update_test3', $updatedModel->nickname);
+        $this->assertEquals('[email protected]', $updatedModel->email);
+
+        // 批量创建或更新数据
+        $dataset = [
+            ['nickname' => 'test4',
+            'user_age' => 20,
+            'status'   => 1,
+            'email'    => '[email protected]',
+            'address'  => 'Address4',],
+            ['id'      => 1,
+            'nickname' => 'test3',
+            'user_age' => 18,
+            'status'   => 1,
+            'email'    => '[email protected]',
+            'address'  => 'Test Address',],            
+        ];
+        $list = UserViewModel::saveAll($dataset);
+        foreach ($list as $key => $user) {
+            $this->assertEquals($dataset[$key]['nickname'], $user->nickname);
+            $this->assertEquals($dataset[$key]['email'], $user->email);
+        }
+        $viewModel = UserViewModel::find(1);
+        $this->assertEquals('test3', $viewModel->nickname);
+        $this->assertEquals('test_test3', $viewModel->test_name);
+        $this->assertEquals(18, $viewModel->user_age);
+
+        $user = UserViewModel::update(['nickname' => 'new nickname'], ['id' => 1]);
+        $this->assertEquals('new nickname', $user->nickname);
+        
     }
 
     public function testViewModelWithoutRelation()