改进模型create和update方法支持实体模型返回

top-think · Nov 18, 2024 · 00aed1c · 00aed1c
1 parent 0a6dbfe
commit 00aed1c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/src/Model.php b/src/Model.php
@@ -283,7 +283,6 @@ public function __construct(array | object $data = [])
             }
         }
 
-        $this->parseEntity();
         // 执行初始化操作
         $this->initialize();
     }
@@ -318,16 +317,14 @@ public function setName(string $name)
     }
 
     /**
-     * 解析模型实例名称.
+     * 获取模型类名.
      *
-     * @return void
+     * @return string
      */
-    protected function parseEntity()
+    public static function getEntityClass()
     {
-        if (!$this->entityClass) {
-            $entity            = str_replace('\\model', '\\entity', static::class);
-            $this->entityClass = class_exists($entity) ? $entity: static::class;
-        }
+        $entity = str_replace('\\model', '\\entity', static::class);
+        return class_exists($entity) ? $entity: static::class;
     }
 
     /**
@@ -339,9 +336,10 @@ protected function parseEntity()
      *
      * @return Model
      */
-    public function newInstance(array $data = [], $where = null, array $options = [])
+    public function newInstance(array $data = [], $where = null, array $options = []): Modelable
     {
-        $model = new $this->entityClass($data, $this);
+        $class = static::getEntityClass();
+        $model = new $class($data, $this);
 
         if ($this->connection) {
             $model->setConnection($this->connection);
@@ -839,11 +837,11 @@ protected function insertData(array $data, ?string $sequence = null): bool
         if ($this->isAutoWriteId()) {
             $pk = $this->getPk();
             if (is_string($pk) && !isset($this->data[$pk])) {
-                $data[$pk]       = $this->autoWriteId();
+                $data[$pk] = $this->autoWriteId();
                 if ($this->entity) {
                     $this->entity->$pk = $data[$pk];
                 } else {
-                    $this->data[$pk] = $data[$pk];                    
+                    $this->data[$pk] = $data[$pk];
                 }
             }
         }
@@ -868,7 +866,7 @@ protected function insertData(array $data, ?string $sequence = null): bool
                 $field = is_string($name) ? $name : $val;
                 if (!isset($data[$field])) {
                     if (is_string($name)) {
-                        $data[$field] = $val;
+                        $data[$field]       = $val;
                         $this->data[$field] = $val;
                     } else {
                         $this->setAttr($field, null);
@@ -1038,9 +1036,10 @@ public function delete(): bool
      *
      * @return static
      */
-    public static function create(array | object $data, array $allowField = [], bool $replace = false, string $suffix = ''): Model
+    public static function create(array | object $data, array $allowField = [], bool $replace = false, string $suffix = ''): Modelable
     {
-        $model = new static();
+        $class = static::getEntityClass();
+        $model = new $class();
 
         if (!empty($allowField)) {
             $model->allowField($allowField);
@@ -1050,7 +1049,8 @@ public static function create(array | object $data, array $allowField = [], bool
             $model->setSuffix($suffix);
         }
 
-        $model->replace($replace)->save($data);
+        $model->replace($replace);
+        $model->save($data);
 
         return $model;
     }
@@ -1065,9 +1065,10 @@ public static function create(array | object $data, array $allowField = [], bool
      *
      * @return static
      */
-    public static function update(array | object $data, $where = [], array $allowField = [], string $suffix = '')
+    public static function update(array | object $data, $where = [], array $allowField = [], string $suffix = ''): Modelable
     {
-        $model = new static();
+        $class = static::getEntityClass();
+        $model = new $class();
 
         if (!empty($allowField)) {
             $model->allowField($allowField);
@@ -1081,7 +1082,8 @@ public static function update(array | object $data, $where = [], array $allowFie
             $model->setSuffix($suffix);
         }
 
-        $model->exists(true)->save($data);
+        $model->exists(true);
+        $model->save($data);
 
         return $model;
     }

diff --git a/src/model/concern/Attribute.php b/src/model/concern/Attribute.php
@@ -290,6 +290,10 @@ public function data(array | object $data, bool $set = false, array $allow = [])
             $data = get_object_vars($data);
         }
 
+        if (empty($data)) {
+            return $this;
+        }
+
         // 清空数据
         $this->data = [];