改进视图模型无需指定together自动关联写入

改进关联模型使用外键去重后查询

Author: liu21st

src/model/View.php

@@ -331,22 +331,31 @@ protected function convertData(): array
         $mapping    = $this->getOption('autoMappingAlias', []);
         $data       = $this->getData();
         $item       = [];
+        $together   = [];
         foreach ($properties as $key => $field) {
             if (strpos($field, '->')) {
-                $fields = explode('->', $field);
-                $last   = array_pop($fields);
-                $target = $this->model();
+                $fields     = explode('->', $field);
+                $together[] = current($fields);
+                $last       = array_pop($fields);
+                $target     = $this->model();
                 foreach ($fields as $attr) {
                     $target = $target->$attr;
                 }
                 $target->$last = $data[$key];
             } elseif (is_int($key) && isset($mapping[$field])) {
                 [$relation] = explode('->', $mapping[$field]);
+                $together[] = $relation;
                 $this->model()->$relation->$field = $data[$field];
             } else {
                 $item[$field] =  $data[is_int($key) ? $field : $key];
             }
         }
+
+        if (!empty($together)) {
+            // 自动关联写入
+            $together = array_unique($together);
+            $this->model()->together($together);
+        }
         return $item;
     }
 
@@ -378,6 +387,10 @@ protected function validate(array $data = [], array $allow = []): array
      */
     public function save(): bool
     {
+        if (!$this->getOption('allowWrite', false)) {
+            return false;
+        }
+
         // 根据映射关系转换为实际模型数据
         $data = $this->convertData();
         // 处理自动时间字段数据

src/model/relation/BelongsTo.php

@@ -228,7 +228,7 @@ protected function eagerlySet(array &$resultSet, string $relation, array $subRel
             $defaultModel = $this->getDefaultModel($default);
 
             $data = $this->eagerlyWhere([
-                [$localKey, 'in', $range],
+                [$localKey, 'in', array_unique($range)],
             ], $localKey, $subRelation, $closure, $cache);
 
             // 动态绑定参数

src/model/relation/BelongsToMany.php

@@ -314,7 +314,7 @@ public function eagerlyResultSet(array &$resultSet, string $relation, array $sub
         if (!empty($range)) {
             // 查询关联数据
             $data = $this->eagerlyManyToMany([
-                ['pivot.' . $localKey, 'in', $range],
+                ['pivot.' . $localKey, 'in', array_unique($range)],
             ], $subRelation, $closure, $cache);
 
             // 关联数据封装

src/model/relation/HasMany.php

@@ -91,7 +91,7 @@ public function eagerlyResultSet(array &$resultSet, string $relation, array $sub
 
         if (!empty($range)) {
             $data = $this->eagerlyOneToMany([
-                [$this->foreignKey, 'in', $range],
+                [$this->foreignKey, 'in', array_unique($range)],
             ], $subRelation, $closure, $cache);
 
             // 关联数据封装

src/model/relation/HasManyThrough.php

@@ -177,7 +177,7 @@ public function eagerlyResultSet(array &$resultSet, string $relation, array $sub
             $this->query->removeWhereField($foreignKey);
 
             $data = $this->eagerlyWhere([
-                [$this->foreignKey, 'in', $range],
+                [$this->foreignKey, 'in', array_unique($range)],
             ], $foreignKey, $subRelation, $closure, $cache);
 
             // 关联数据封装

src/model/relation/MorphMany.php

@@ -170,7 +170,7 @@ public function eagerlyResultSet(array &$resultSet, string $relation, array $sub
 
         if (!empty($range)) {
             $where = [
-                [$morphKey, 'in', $range],
+                [$morphKey, 'in', array_unique($range)],
                 [$morphType, '=', $type],
             ];
             $data = $this->eagerlyMorphToMany($where, $subRelation, $closure, $cache);

src/model/relation/MorphToMany.php

@@ -106,7 +106,7 @@ public function eagerlyResultSet(array &$resultSet, string $relation, array $sub
         if (!empty($range)) {
             // 查询关联数据
             $data = $this->eagerlyManyToMany([
-                ['pivot.' . $this->localKey, 'in', $range],
+                ['pivot.' . $this->localKey, 'in', array_unique($range)],
                 ['pivot.' . $this->morphType, '=', $this->morphClass],
             ], $subRelation, $closure, $cache);