Merge pull request kvnZero#13 from kvnZero/feat/测试中修改

Feat/测试中修改

Author: kvnZero

Diff for: app/ApiJson/Entity/ConditionEntity.php

@@ -11,9 +11,9 @@ class ConditionEntity
      */
     protected array $where = [];
 
-    protected int $limit = 0;
+    protected int $limit = 10;
     protected int $offset = 0;
-    protected array $column = ['*'];
+    protected string $column = '*';
     protected array $group = [];
     protected array $order = [];
     protected array $having = [];
@@ -60,9 +60,9 @@ public function addQueryWhere(string $key, string $sql, array $bindArgs = [])
     }
 
     /**
-     * @param array|string[] $column
+     * @param string $column
      */
-    public function setColumn(array $column): void
+    public function setColumn(string $column): void
     {
         $this->column = $column;
     }
@@ -108,9 +108,9 @@ public function setOrder(array $order): void
     }
 
     /**
-     * @return array
+     * @return string
      */
-    public function getColumn(): array
+    public function getColumn(): string
     {
         return $this->column;
     }

Diff for: app/ApiJson/Handle/AbstractHandle.php

@@ -65,7 +65,9 @@ protected function subTableQuery(array $data): QueryInterface
     {
         $tableName = $data['from'];
         $tableEntity = new TableEntity($tableName, $data);
-        $handle = new Handle($tableEntity->getConditionEntity(), $tableEntity);
+        $conditionEntity = $tableEntity->getConditionEntity();
+        $conditionEntity->setLimit(0);
+        $handle = new Handle($conditionEntity, $tableEntity);
         $handle->build();
         /** @var QueryInterface $query */
         return new (ApplicationContext::getContainer()->get(ConfigInterface::class)->get(QueryInterface::class))($tableEntity->getRealTableName(), $tableEntity->getConditionEntity());

Diff for: app/ApiJson/Handle/FunctionColumnHandle.php

@@ -16,7 +16,7 @@ public function buildModel()
         }, ARRAY_FILTER_USE_KEY) as $key => $value)
         {
             $value = str_replace([';',':'], [',', ' AS '], $value);
-            $this->condition->setColumn(explode(',', $value));
+            $this->condition->setColumn($value);
             $this->unsetKey[] = $this->keyWord;
         }
     }

Diff for: app/ApiJson/Handle/WhereSubQueryHandle.php

@@ -12,15 +12,17 @@ protected function buildModel()
         {
             $query = $this->subTableQuery($value);
 
-            $op = '=';
+            $op = ' = ';
             if(str_ends_with($key, '>=@')) {
-                $op = '>=';
+                $op = ' >= ';
             } else if(str_ends_with($key, '<=@')) {
-                $op = '<=';
+                $op = ' <= ';
             } else if(str_ends_with($key, '>@')) {
-                $op = '>';
+                $op = ' > ';
             } else if(str_ends_with($key, '<@')) {
-                $op = '<';
+                $op = ' < ';
+            } else if(str_ends_with($key, '{}@')) {
+                $op = ' IN ';
             }
             $sql = sprintf('`%s`%s(%s)', $this->sanitizeKey($key), $op, $query->toSql());
             $this->condition->addQueryWhere($key, $sql, $query->getBindings());

Diff for: app/ApiJson/Model/MysqlQuery.php

@@ -102,7 +102,7 @@ protected function buildQuery(bool $query = true)
         }
         if (!$query) return; //下面不再非查询操作
 
-        $this->db->select($this->conditionEntity->getColumn());
+        $this->db->select(Db::raw($this->conditionEntity->getColumn()));
         $limit = $this->conditionEntity->getLimit();
         if ($limit > 0) {
             $this->db->limit($limit);

Diff for: app/ApiJson/Parse/Parse.php

@@ -39,8 +39,12 @@ public function __construct(protected array $json, protected string $method = 'G
 
     public function handle(bool $isQueryMany = false, array $extendData = []): array
     {
+        if (empty($extendData)) {
+            $extendData = $this->json; //引入原json
+        }
         $result = [];
         foreach ($this->json as $tableName => $condition) { //可以优化成协程行为（如果没有依赖赋值的前提下）
+            if (is_null($condition)) continue;
             if (in_array($tableName, $this->filterKey())) {
                 $this->tagColumn[$tableName] = $condition;
                 continue;
@@ -56,9 +60,9 @@ public function handle(bool $isQueryMany = false, array $extendData = []): array
             if (str_ends_with($tableName, '[]')) {
                 $isQueryMany = true;
             }
-//            if (!preg_match("/^[A-Za-z]+$/", $tableName) || !is_array($condition)) {
-//                continue; //不满足表名规范 跳出不往下执行
-//            }
+            if (!preg_match("/^[A-Z].+/", $tableName) || !is_array($condition)) {
+                continue; //不满足表名规范 跳出不往下执行
+            }
             $this->tableEntities[$tableName] = new TableEntity($tableName, $this->json, $this->getGlobalArgs(), array_merge($result, $extendData));
             foreach ($this->supMethod as $methodClass) {
                 /** @var AbstractMethod $method */
@@ -93,6 +97,10 @@ protected function handleArray(array $jsonData, array $extendData = []): array
     {
         $result = [[]];
         foreach ($jsonData as $tableName => $condition) { //可以优化成协程行为（如果没有依赖赋值的前提下）
+            if (is_null($condition)) continue;
+            if (!preg_match("/^[A-Z].+/", $tableName) || !is_array($condition)) {
+                continue; //不满足表名规范 跳出不往下执行
+            }
             foreach ($result as $key => $item) {
                 if (in_array($tableName, $this->filterKey())) {
                     $this->tagColumn[$tableName] = $condition;

Diff for: app/ApiJson/Replace/QuoteReplace.php

@@ -9,13 +9,24 @@ protected function process()
         $condition = $this->condition->getCondition();
 
         foreach (array_filter($condition, function($key){
-            return str_ends_with($key, '@') && !str_ends_with($key, '}{@');
+            return str_ends_with($key, '@');
         }, ARRAY_FILTER_USE_KEY) as $key => $value)
         {
+            if (!is_string($value)) continue;
             $path = str_replace(['/', '[]'], ['.', 'currentItem'], $value);
-            $newKey = substr($key, 0, strlen($key) - 1);
-            $condition[$newKey] = data_get($this->condition->getExtendData(), $path);
-            unset($condition[$key]);
+            if (str_starts_with($path, '.')) {
+                $path = 'currentItem' . $path;
+            }
+            $value = data_get($this->condition->getExtendData(), $path);
+            if (!is_null($value)) { //常规情况下的引用
+                $newKey = substr($key, 0, strlen($key) - 1);
+                $condition[$newKey] = $value;
+                unset($condition[$key]);
+            } else { //非常规情况下引入 比如引入子查询等
+                $path .= '@';
+                $value = data_get($this->condition->getExtendData(), $path);
+                $condition[$key] = $value;
+            }
             $this->condition->setCondition($condition);
         }
     }