改进视图模型的refresh方法调用

Author: liu21st

src/model/View.php

@@ -36,7 +36,7 @@ public function __construct(?Model $model = null)
     {
         parent::__construct($model);
 
-        // 初始化模型
+        // 初始化模型数据
         $this->initData();
     }
 
@@ -45,7 +45,7 @@ public function __construct(?Model $model = null)
      *
      * @return void
      */
-    public function initData()
+    protected function initData()
     {
         if ($this->isEmpty()) {
             return ;
@@ -108,7 +108,6 @@ private function fetchViewAttr(string $field)
                 }
             }
         }
-
         return $value;
     }
 
@@ -146,7 +145,6 @@ private function getEntityPropertiesMap(): array
                     $properties[] = $field;
                 }
             }
-
             $this->setOption('view_properties', $properties);
         }
 
@@ -192,9 +190,7 @@ public function data(array $data)
      */
     public function refresh()
     {
-        if ($this->isEmpty()) {
-            $this->initData();
-        }
+        $this->initData();
         return $this;
     }
 
@@ -450,9 +446,8 @@ public static function create(array | object $data)
     {
         $entity = new static();
         $model  = $entity->model()->exists(false)->save($data, true);
-        $entity->refresh();
-
-        return $entity;
+        // 刷新视图模型数据
+        return $entity->refresh();
     }
 
     /**
@@ -468,9 +463,7 @@ public static function update(array | object $data, $where = [], array $allowFie
         $entity = new static();
         $model  = $entity->model()->allowField($allowField)->exists(true)->save($data, $where, true);
         // 刷新视图模型数据
-        $entity->refresh();
-
-        return $entity;
+        return $entity->refresh();
     }
 
     /**
@@ -571,7 +564,7 @@ public static function __callStatic($method, $args)
             // 调用model的静态方法
             $db = $entity->model();
         } else {
-            // 调用Query类查询方法
+            // 处理字段映射
             $map = $entity->getOption('viewMapping', []);
             $db  = $entity->model()->db()->fieldMap($map);
         }

src/model/concern/RelationShip.php

@@ -448,10 +448,10 @@ public function eagerlyResultSet(array $resultSet, array $relations, array $with
             $relationResult->eagerlyResultSet($resultSet, $relationName, $subRelation, $closure, $relationCache, $join);            
         }
 
-        // 视图模型初始化数据
+        // 刷新视图模型数据
         foreach ($resultSet as $result) {
             if ($result instanceof View) {
-                $result->initData();
+                $result->refresh();
             }
         }
     }
@@ -504,8 +504,8 @@ public function eagerlyResult(Model $result, array $relations, array $withRelati
         }
 
         if ($result instanceof View) {
-            // 视图模型初始化数据
-            $result->initData();
+            // 刷新视图模型数据
+            $result->refresh();
         }
     }