改进虚拟模型

Author: liu21st

src/Model.php

@@ -509,16 +509,6 @@ public function isChange(string $name): bool
         return $this->getData($name) !== $this->getOrigin($name);
     }
 
-    /**
-     * 是否为虚拟模型（不能查询和写入）.
-     *
-     * @return bool
-     */
-    public function isVirtual(): bool
-    {
-        return false;
-    }
-
     /**
      * 刷新模型数据.
      *
@@ -607,16 +597,7 @@ public function delete(): bool
     public static function create(array | object $data, array $allowField = [], bool $replace = false): Modelable
     {
         $model = new static();
-
-        if ($model->isVirtual()) {
-            if (!empty($data)) {
-                // 初始化模型数据
-                $model->initializeData($data, true);
-            }
-        } else {
-            $model->allowField($allowField)->replace($replace)->save($data, true);            
-        }
-        
+        $model->allowField($allowField)->replace($replace)->save($data, true);            
         return $model->fetchModel($model);
     }
 
@@ -632,7 +613,6 @@ 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);
     }

src/model/Virtual.php

@@ -13,7 +13,9 @@
 
 namespace think\model;
 
+use think\db\exception\DbException as Exception;
 use think\Model;
+use think\model\contract\Modelable;
 
 /**
  * Class Virtual.
@@ -22,12 +24,49 @@
 abstract class Virtual extends Model
 {
     /**
-     * 设置为虚拟模型.
+     * 写入数据.
      *
-     * @return bool
+     * @param array|object  $data 数据
+     * @param array  $allowField  允许字段
+     * @param bool   $replace     使用Replace
+     * @return Modelable
      */
-    public function isVirtual(): bool
+    public static function create(array | object $data, array $allowField = [], bool $replace = false): Modelable
     {
-        return true;
+        $model = new static();
+
+        if (!empty($data)) {
+            // 初始化模型数据
+            $model->initializeData($data, true);
+        }
+        
+        return $model->fetchModel($model);
     }
+
+    /**
+     * 获取Db对象实例.
+     * @return Query
+     */
+    public function getQuery()
+    {
+        throw new Exception('virtual model not support db query');
+    }
+
+    /**
+     * 获取数据表字段类型列表（或某个字段的类型）.
+     *
+     * @param string|null $field 字段名
+     *
+     * @return array|string
+     */
+    protected function getFields(?string $field = null)
+    {
+        $schema = $this->getOption('schema', []);
+
+        if ($field) {
+            return $schema[$field] ?? null;
+        }
+
+        return $schema;
+    }    
 }

src/model/concern/Attribute.php

@@ -40,7 +40,7 @@ trait Attribute
      *
      * @return void
      */
-    private function initializeData(array | object $data, bool $fromSave = false)
+    protected function initializeData(array | object $data, bool $fromSave = false)
     {
         // 分析数据
         $data    = $this->parseData($data);

src/model/concern/DbConnect.php

@@ -14,7 +14,6 @@
 namespace think\model\concern;
 
 use think\db\BaseQuery as Query;
-use think\db\exception\DbException as Exception;
 use think\facade\Db;
 
 /**
@@ -34,10 +33,6 @@ 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')) {
@@ -88,20 +83,17 @@ protected function getFields(?string $field = null)
     {
         $schema = $this->getOption('schema');
         if (empty($schema)) {
-            if ($this->isVirtual()) {
-                $schema = $this->getOption('type', []);
-            } else {
-                // 获取数据表信息
-                $db     = $this->initDb();
-                $fields = $db->getFieldsType();
-                $schema = array_merge($fields, $this->getOption('type', []));
-                // 获取主键和自增字段
-                if (!$this->getOption('pk')) {
-                    $this->setOption('pk', $db->getPk());
-                }
-                if (!$this->getOption('autoInc')) {
-                    $this->setOption('autoInc', $db->getAutoInc());
-                }
+            // 获取数据表信息
+            $db     = $this->initDb();
+            $fields = $db->getFieldsType();
+            $schema = array_merge($fields, $this->getOption('type', []));
+            // 获取主键和自增字段
+            if (!$this->getOption('pk')) {
+                $this->setOption('pk', $db->getPk());
+            }
+
+            if (!$this->getOption('autoInc')) {
+                $this->setOption('autoInc', $db->getAutoInc());
             }
 
             $this->setOption('schema', $schema);