Release v2.0.2 (#304)

* Add App Store .gitignore Entry and Include install.lock in Repository * fix [BUG] 后台菜单的level字段出错 #244 * Apply cs-fix --------- Co-authored-by: wlfpanda <[email protected]>
mineadmin · Jul 9, 2024 · d431f1a · d431f1a
1 parent d129ec7
commit d431f1a
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 51 deletions.
diff --git a/CHANGELOG-2.0.md b/CHANGELOG-2.0.md
diff --git a/CHANGELOG-2.0.zh_CN.md b/CHANGELOG-2.0.zh_CN.md
diff --git a/app/System/Mapper/SystemMenuMapper.php b/app/System/Mapper/SystemMenuMapper.php
@@ -158,6 +158,21 @@ public function update(mixed $id, array $data): bool
         return parent::update($id, $data);
     }
 
+    /**
+     * 批量更新菜单.
+     */
+    #[DeleteCache('loginInfo:*'), Transaction]
+    public function batchUpdate(array $update): bool
+    {
+        foreach ($update as $item) {
+            $result = parent::update($item['id'], $item['data']);
+            if (! $result) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * 逻辑删除菜单.
      */
@@ -189,6 +204,15 @@ public function checkChildrenExists(int $id): bool
         return $this->model::withTrashed()->where('parent_id', $id)->exists();
     }
 
+    /**
+     * 获取子孙menus.
+     */
+    public function getDescendantsMenus(int $parentId): array
+    {
+        $params = ['level' => $parentId];
+        return $this->handleSearch($this->model::query(), $params)->get()->toArray();
+    }
+
     /**
      * 搜索处理器.
      */
@@ -198,6 +222,10 @@ public function handleSearch(Builder $query, array $params): Builder
             $query->where('status', $params['status']);
         }
 
+        if (isset($params['level']) && filled($params['level'])) {
+            $query->where('level', 'like', '%' . $params['level'] . '%');
+        }
+
         if (isset($params['name']) && filled($params['name'])) {
             $query->where('name', 'like', '%' . $params['name'] . '%');
         }

diff --git a/app/System/Service/SystemMenuService.php b/app/System/Service/SystemMenuService.php
@@ -121,7 +121,23 @@ public function genButtonMenu(SystemMenu $model): bool
      */
     public function update(mixed $id, array $data): bool
     {
-        return $this->mapper->update($id, $this->handleData($data));
+        $handleData = $this->handleData($data);
+        if (! $this->checkChildrenExists($id)) {
+            return $this->mapper->update($id, $handleData);
+        }
+        $update[] = [
+            'id' => $id,
+            'data' => $handleData,
+        ];
+        $descendants = $this->mapper->getDescendantsMenus((int) $id);
+        foreach ($descendants as $descendant) {
+            $handleDescendantMenuLevelData = $this->handleDescendantMenuLevels($descendant['level'], $handleData['level'], $id);
+            $update[] = [
+                'id' => $descendant['id'],
+                'data' => ['level' => $handleDescendantMenuLevelData],
+            ];
+        }
+        return $this->mapper->batchUpdate($update);
     }
 
     /**
@@ -166,4 +182,13 @@ protected function handleData(array $data): array
         }
         return $data;
     }
+
+    protected function handleDescendantMenuLevels(string $descendantLevel, string $handleDataLevel, int $id): string
+    {
+        $descendantLevelArr = explode(',', $descendantLevel);
+        $handleDataLevelArr = explode(',', $handleDataLevel);
+        $position = array_search($id, $descendantLevelArr);
+        array_splice($descendantLevelArr, 0, $position, $handleDataLevelArr);
+        return implode(',', $descendantLevelArr);
+    }
 }
diff --git a/plugin/mine-admin/app-store/.gitignore b/plugin/mine-admin/app-store/.gitignore
@@ -0,0 +1 @@
+!install.lock
diff --git a/plugin/mine-admin/app-store/install.lock b/plugin/mine-admin/app-store/install.lock
@@ -0,0 +1 @@
+1