改进Model的虚拟模型判断 取消视图模型的只读功能

Author: liu21st

src/Model.php

@@ -347,10 +347,6 @@ public function save(array | object $data = [], $where = [], bool $refresh = fal
             $this->initializeData($data, true);
         }
 
-        if ($this->isVirtual() || $this->isView()) {
-            return true;
-        }
-
         if (false === $this->trigger('BeforeWrite')) {
             return false;
         }
@@ -514,7 +510,7 @@ public function isChange(string $name): bool
     }
 
     /**
-     * 是否为虚拟模型（不能查询）.
+     * 是否为虚拟模型（不能查询和写入）.
      *
      * @return bool
      */
@@ -523,26 +519,6 @@ public function isVirtual(): bool
         return false;
     }
 
-    /**
-     * 设置为视图模型（不能写入）.
-     *
-     * @return $this
-     */
-    public function asView(bool $isView = true)
-    {
-        return $this->setOption('is_view', $isView);
-    }
-
-    /**
-     * 是否为视图模型（不能写入）.
-     *
-     * @return bool
-     */
-    public function isView(): bool
-    {
-        return $this->getOption('is_view', false);
-    }
-
     /**
      * 刷新模型数据.
      *
@@ -596,12 +572,6 @@ public static function saveAll(iterable $dataSet, bool $replace = true): Collect
      */
     public function delete(): bool
     {
-        if ($this->isVirtual() || $this->isView()) {
-            $this->exists(false);
-            $this->clear();
-            return true;
-        }
-
         if ($this->isEmpty() || false === $this->trigger('BeforeDelete')) {
             return false;
         }
@@ -638,7 +608,14 @@ public static function create(array | object $data, array $allowField = [], bool
     {
         $model = new static();
 
-        $model->allowField($allowField)->replace($replace)->save($data, true);
+        if ($model->isVirtual()) {
+            if (!empty($data)) {
+                // 初始化模型数据
+                $model->initializeData($data, true);
+            }
+        } else {
+            $model->allowField($allowField)->replace($replace)->save($data, true);            
+        }
 
         return $model->fetchModel($model);
     }
@@ -655,6 +632,7 @@ public static function create(array | object $data, array $allowField = [], bool
     public static function update(array | object $data, $where = [], array $allowField = [], bool $refresh = false): Modelable
     {
         $model  = new static();
+  
         $model->allowField($allowField)->exists(true)->save($data, $where, $refresh);
         return $model->fetchModel($model);
     }
@@ -670,11 +648,7 @@ public static function update(array | object $data, $where = [], array $allowFie
     public static function destroy($data, bool $force = false): bool
     {
         $model = new static();
-        if ($model->isVirtual() || $model->isView()) {
-            return true;
-        }
-
-        $db = $model->db();
+        $db    = $model->db();
 
         if (is_array($data) && key($data) !== 0) {
             $db->where($data);
@@ -819,9 +793,6 @@ public function __set(string $name, $value): void
      */
     public function __isset(string $name): bool
     {
-        if ($this->isView()) {
-            return isset(self::$weakMap[$this]['data'][$name]);
-        }
         return !is_null($this->get($name, false));
     }
 

src/model/View.php

@@ -37,11 +37,6 @@ public function __construct(?Model $model = null, bool $with = false)
     {
         parent::__construct($model);
 
-        if ($this->getOption('readonly')) {
-            // 设置为只读视图模型
-            $this->model()->asView(true);
-        }
-
         // 初始化模型
         $this->initData(!$with);
     }
@@ -413,10 +408,6 @@ protected function validate(array $data = [], array $allow = []): array
      */
     public function save(): bool
     {
-        if ($this->getOption('readonly')) {
-            return false;
-        }
-
         // 根据映射关系转换为实际模型数据
         $data = $this->convertData();
         // 处理自动时间字段数据

src/model/concern/DbConnect.php

@@ -34,6 +34,10 @@ public static function setDb($db)
      */
     public function getQuery()
     {
+        if ($this->isVirtual()) {
+            throw new Exception('virtual model not support db query');
+        }
+
         $db = $this->initDb()->newQuery($this->getOption('query'));
 
         if ($this->getOption('cache')) {
@@ -84,7 +88,7 @@ protected function getFields(?string $field = null)
     {
         $schema = $this->getOption('schema');
         if (empty($schema)) {
-            if ($this->isView() || $this->isVirtual()) {
+            if ($this->isVirtual()) {
                 $schema = $this->getOption('type', []);
             } else {
                 // 获取数据表信息
@@ -190,12 +194,7 @@ public static function withoutGlobalScope(?array $scope = null): Query
     public static function __callStatic($method, $args)
     {
         $model = new static();
-
-        if ($model->isVirtual()) {
-            throw new Exception('virtual model not support db query');
-        }
-
-        $db = $model->db();
+        $db    = $model->db();
 
         if (!empty(self::$weakMap[$model]['autoRelation'])) {
             // 自动获取关联数据

tests/orm/ModelViewTest.php

@@ -146,14 +146,7 @@ public function testViewModelRelation()
         $this->assertTrue(isset($viewModel->user_age));
         $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);

tests/orm/ModelVirtualTest.php

@@ -4,6 +4,7 @@
 namespace tests\orm;
 
 use PHPUnit\Framework\TestCase;
+use think\db\exception\DbException;
 use think\model\Virtual;
 
 /**
@@ -22,18 +23,29 @@ public function testVirtualModelBasic()
     {
         // 测试数据操作
         $model = new VirtualModel();
-        $data  = ['name' => 'test', 'age' => 18];
-        $this->assertTrue($model->save($data));
-        $this->assertEquals($data, $model->getData());
+        $model->name = 'test';
+        $model->age  = 18;
+        $this->assertEquals('test', $model->name);
+        $this->assertEquals(18, $model->age);
 
         // 测试更新数据
-        $updateData = ['age' => 20];
-        $this->assertTrue($model->save($updateData));
+        $model->age = 20;
         $this->assertEquals(20, $model->getData('age'));
 
-        // 测试删除数据
-        $this->assertTrue($model->delete());
-        $this->assertEmpty($model->getData());
+        $this->expectException(DbException::class);
+        $this->expectExceptionMessage("virtual model not support db query");
+        $model->save();
+    }
+
+    public function testVirtualDelete()
+    {
+        $model = new VirtualModel(['name' => 'test', 'age' => 18]);
+        $this->assertEquals('test', $model->name);
+        $this->assertEquals(18, $model->age);
+
+        $this->expectException(DbException::class);
+        $this->expectExceptionMessage("virtual model not support db query");
+        $model->delete();
     }
 
     public function testVirtualModelCreate()