update 支持一对多查询

kvnZero · kvnZero · commit 6c27356d35cb · 2021-11-06T17:40:55.000+08:00
diff --git a/app/ApiJson/Parse/Parse.php b/app/ApiJson/Parse/Parse.php
@@ -35,11 +35,10 @@ public function __construct(protected array $json, protected string $method = 'G
     {
     }
 
-    public function handle(bool $isQueryMany = false): array
+    public function handle(bool $isQueryMany = false, array $extendData = []): array
     {
         $result = [];
         foreach ($this->json as $tableName => $condition) { //可以优化成协程行为（如果没有依赖赋值的前提下）
-            $tableMany = false;
             if (in_array($tableName, $this->filterKey())) {
                 $this->tagColumn[$tableName] = $condition;
                 continue;
@@ -50,28 +49,23 @@ public function handle(bool $isQueryMany = false): array
             }
             if ($tableName == '[]') {
                 $parse = new self($condition, $this->method, $condition['tag'] ?? '');
-                $result[$tableName] = $parse->handle(true); //提供行为
+                $result[$tableName] = $parse->handle(true, array_merge($result, $extendData)); //提供行为
                 continue; //跳出不往下执行
             }
             if (str_ends_with($tableName, '[]')) {
                 $isQueryMany = true;
-                $tableMany = true;
             }
 //            if (!preg_match("/^[A-Za-z]+$/", $tableName) || !is_array($condition)) {
 //                continue; //不满足表名规范 跳出不往下执行
 //            }
-            $this->tableEntities[$tableName] = new TableEntity($tableName, $this->json, $this->getGlobalArgs(), $result);
+            $this->tableEntities[$tableName] = new TableEntity($tableName, $this->json, $this->getGlobalArgs(), array_merge($result, $extendData));
             foreach ($this->supMethod as $methodClass) {
                 /** @var AbstractMethod $method */
                 $method = new $methodClass($this->tableEntities[$tableName], $this->method);
                 $method->setQueryMany($isQueryMany);
                 $response = $method->handle();
                 if (!is_null($response)) {
-                    if ($isQueryMany && $tableMany == false) {
-                        $result = $response;
-                    } else {
-                        $result[$tableName] = $response;
-                    }
+                    $result[$tableName] = $response;
                     break;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,10 @@ public function __construct(protected array $json, protected string $method = 'G`
`35`	`35`	`{`
`36`	`36`	`}`
`37`	`37`
`38`		`- public function handle(bool $isQueryMany = false): array`
	`38`	`+ public function handle(bool $isQueryMany = false, array $extendData = []): array`
`39`	`39`	`{`
`40`	`40`	`$result = [];`
`41`	`41`	`foreach ($this->json as $tableName => $condition) { //可以优化成协程行为（如果没有依赖赋值的前提下）`
`42`		`- $tableMany = false;`
`43`	`42`	`if (in_array($tableName, $this->filterKey())) {`
`44`	`43`	`$this->tagColumn[$tableName] = $condition;`
`45`	`44`	`continue;`
`@@ -50,28 +49,23 @@ public function handle(bool $isQueryMany = false): array`
`50`	`49`	`}`
`51`	`50`	`if ($tableName == '[]') {`
`52`	`51`	`$parse = new self($condition, $this->method, $condition['tag'] ?? '');`
`53`		`- $result[$tableName] = $parse->handle(true); //提供行为`
	`52`	`+ $result[$tableName] = $parse->handle(true, array_merge($result, $extendData)); //提供行为`
`54`	`53`	`continue; //跳出不往下执行`
`55`	`54`	`}`
`56`	`55`	`if (str_ends_with($tableName, '[]')) {`
`57`	`56`	`$isQueryMany = true;`
`58`		`- $tableMany = true;`
`59`	`57`	`}`
`60`	`58`	`// if (!preg_match("/^[A-Za-z]+$/", $tableName) \|\| !is_array($condition)) {`
`61`	`59`	`// continue; //不满足表名规范跳出不往下执行`
`62`	`60`	`// }`
`63`		`- $this->tableEntities[$tableName] = new TableEntity($tableName, $this->json, $this->getGlobalArgs(), $result);`
	`61`	`+ $this->tableEntities[$tableName] = new TableEntity($tableName, $this->json, $this->getGlobalArgs(), array_merge($result, $extendData));`
`64`	`62`	`foreach ($this->supMethod as $methodClass) {`
`65`	`63`	`/** @var AbstractMethod $method */`
`66`	`64`	`$method = new $methodClass($this->tableEntities[$tableName], $this->method);`
`67`	`65`	`$method->setQueryMany($isQueryMany);`
`68`	`66`	`$response = $method->handle();`
`69`	`67`	`if (!is_null($response)) {`
`70`		`- if ($isQueryMany && $tableMany == false) {`
`71`		`- $result = $response;`
`72`		`- } else {`
`73`		`- $result[$tableName] = $response;`
`74`		`- }`
	`68`	`+ $result[$tableName] = $response;`
`75`	`69`	`break;`
`76`	`70`	`}`
`77`	`71`	`}`