视图模型增加reflesh方法 原allowWrite参数改为readonly参数 默认支持写入 除非设置readonly为true

Author: liu21st

src/Model.php

@@ -652,9 +652,7 @@ public static function update(array | object $data, $where = [], array $allowFie
 
         $model->allowField($allowField)->exists(true)->save($data, $where);
         // 刷新数据
-        $model->refresh();
-
-        return $model->fetchModel($model);
+        return $model->fetchModel($model->refresh());
     }
 
     /**

src/model/View.php

@@ -37,8 +37,8 @@ public function __construct(?Model $model = null, bool $with = false)
     {
         parent::__construct($model);
 
-        if (!$this->getOption('allowWrite', false)) {
-            // 设置为视图模型
+        if ($this->getOption('readonly')) {
+            // 设置为只读视图模型
             $this->model()->asView(true);
         }
 
@@ -193,6 +193,19 @@ public function data(array $data)
         return $this;
     }
 
+    /**
+     * 刷新模型数据.
+     *
+     * @return $this
+     */
+    public function refresh()
+    {
+        if ($this->isEmpty()) {
+            $this->initData();
+        }
+        return $this;
+    }
+
     /**
      * 清空视图模型数据
      *
@@ -348,9 +361,11 @@ protected function convertData(): array
                 $last       = array_pop($fields);
                 $target     = $this->model();
                 foreach ($fields as $attr) {
-                    $target = $target->$attr;
+                    $target = $target?->$attr;
+                }
+                if ($target) {
+                    $target->$last = $data[$key];
                 }
-                $target->$last = $data[$key];
             } elseif (is_int($key) && isset($mapping[$field])) {
                 [$relation] = explode('->', $mapping[$field]);
                 $together[] = $relation;
@@ -396,7 +411,7 @@ protected function validate(array $data = [], array $allow = []): array
      */
     public function save(): bool
     {
-        if (!$this->getOption('allowWrite', false)) {
+        if ($this->getOption('readonly')) {
             return false;
         }
 
@@ -410,6 +425,53 @@ public function save(): bool
         return $this->model()->save($data);
     }
 
+    /**
+     * 删除模型数据.
+     *
+     * @return bool
+     */
+    public function delete(): bool
+    {
+        if ($this->model()->delete()) {
+            $this->clear();
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 写入数据.
+     *
+     * @param array|object  $data 数据
+     * @return static
+     */
+    public static function create(array | object $data)
+    {
+        $entity = new static();
+        $model  = $entity->model()->exists(false)->save($data, true);
+        $entity->refresh();
+
+        return $entity;
+    }
+
+    /**
+     * 更新数据.
+     *
+     * @param array|object  $data 数据
+     * @param mixed  $where       更新条件
+     * @param array  $allowField  允许字段
+     * @return static
+     */
+    public static function update(array | object $data, $where = [], array $allowField = [])
+    {
+        $entity = new static();
+        $model  = $entity->model()->allowField($allowField)->exists(true)->save($data, $where);
+        $entity->refresh();
+
+        return $entity;
+    }
+
     /**
      * 获取属性 支持获取器
      *
@@ -501,53 +563,6 @@ public function __unserialize(array $data)
         }
     }
 
-    /**
-     * 删除模型数据.
-     *
-     * @return bool
-     */
-    public function delete(): bool
-    {
-        if ($this->model()->delete()) {
-            $this->clear();
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * 写入数据.
-     *
-     * @param array|object  $data 数据
-     * @return static
-     */
-    public static function create(array | object $data)
-    {
-        $entity = new static();
-        $model  = $entity->model()->exists(false)->create($data);
-        $entity->setModel($model)->initData();
-
-        return $entity;
-    }
-
-    /**
-     * 更新数据.
-     *
-     * @param array|object  $data 数据
-     * @param mixed  $where       更新条件
-     * @param array  $allowField  允许字段
-     * @return static
-     */
-    public static function update(array | object $data, $where = [], array $allowField = [])
-    {
-        $entity = new static();
-        $model  = $entity->model()->update($data, $where, $allowField);
-        $entity->setModel($model)->initData();
-
-        return $entity;
-    }
-
     public static function __callStatic($method, $args)
     {
         $entity = new static();

tests/orm/ModelViewTest.php

@@ -24,7 +24,8 @@ class UserViewModel extends View
     protected function getOptions(): array
     {
         return [
-            'modelClass'      => TestUserModel::class,
+            'modelClass'  => TestUserModel::class,
+            'autoMapping' => ['profile'],
             'viewMapping' => [
                 'nickname' => 'name',
                 'user_age' => 'age',
@@ -33,6 +34,11 @@ protected function getOptions(): array
             ],
         ];
     }
+
+    public function setReadonly(bool $readonly)
+    {
+        return $this->setOption('readonly', $readonly);
+    }
 }
 
 class TestUserModel extends Model
@@ -141,10 +147,17 @@ public function testViewModelRelation()
         $this->assertFalse(isset($viewModel->not_exist));
 
         // 测试视图模型写入限制
+        $viewModel->setReadonly(true); // 只读模型
+        $viewModel->nickname = 'new_name';
+        $viewModel->save();
+        $viewModel = UserViewModel::find($user->id);
+        $this->assertEquals('test2', $viewModel->nickname); 
+
+        $viewModel->setReadonly(false); // 可写模型
         $viewModel->nickname = 'new_name';
         $viewModel->save();
         $viewModel = UserViewModel::find($user->id);
-        $this->assertEquals('test2', $viewModel->nickname); // 视图模型不允许修改数据
+        $this->assertEquals('new_name', $viewModel->nickname);         
     }
 
     public function testEmptyViewModel()
@@ -178,7 +191,7 @@ public function testViewModelWithRelation()
         ]);
 
         // 加载关联数据
-        $viewModel = UserViewModel::with(['profile'])->find($user->id);
+        $viewModel = UserViewModel::find($user->id);
 
         $this->assertEquals('test3', $viewModel->nickname);
         $this->assertEquals('test_test3', $viewModel->test_name);