@jiangood/open-admin 1.1.2 → 1.2.1

package/src/.umi-production/core/helmet.ts

@@ -2,7 +2,7 @@
 // This file is generated by Umi automatically
 // DO NOT CHANGE IT MANUALLY!
 import React from 'react';
-import { HelmetProvider } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.25_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react';
+import { HelmetProvider } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.33_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react';
 import { context } from './helmetContext';
 
 export const innerProvider = (container) => {

package/src/.umi-production/core/history.ts

@@ -1,7 +1,7 @@
 // @ts-nocheck
 // This file is generated by Umi automatically
 // DO NOT CHANGE IT MANUALLY!
-import { createHashHistory, createMemoryHistory, createBrowserHistory } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.25_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react';
+import { createHashHistory, createMemoryHistory, createBrowserHistory } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.33_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react';
 import type { UmiHistory } from './historyIntelli';
 
 let history: UmiHistory;

package/src/.umi-production/core/historyIntelli.ts

@@ -2,7 +2,7 @@
 // This file is generated by Umi automatically
 // DO NOT CHANGE IT MANUALLY!
 import { getRoutes } from './route'
-import type { History } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.25_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react'
+import type { History } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.33_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react'
 
 type Routes = Awaited<ReturnType<typeof getRoutes>>['routes']
 type AllRoute = Routes[keyof Routes]

package/src/.umi-production/exports.ts

@@ -7,10 +7,10 @@ export type { RuntimeConfig } from './core/defineApp'
 // plugins
 // plugins types.d.ts
 // @umijs/renderer-*
-export { createBrowserHistory, createHashHistory, createMemoryHistory, Helmet, HelmetProvider, createSearchParams, generatePath, matchPath, matchRoutes, Navigate, NavLink, Outlet, resolvePath, useLocation, useMatch, useNavigate, useOutlet, useOutletContext, useParams, useResolvedPath, useRoutes, useSearchParams, useAppData, useClientLoaderData, useLoaderData, useRouteProps, useSelectedRoutes, useServerLoaderData, renderClient, __getRoot, Link, useRouteData, __useFetcher, withRouter } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.25_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react';
-export type { History, ClientLoader } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.25_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react'
+export { createBrowserHistory, createHashHistory, createMemoryHistory, Helmet, HelmetProvider, createSearchParams, generatePath, matchPath, matchRoutes, Navigate, NavLink, Outlet, resolvePath, useLocation, useMatch, useNavigate, useOutlet, useOutletContext, useParams, useResolvedPath, useRoutes, useSearchParams, useAppData, useClientLoaderData, useLoaderData, useRouteProps, useSelectedRoutes, useServerLoaderData, renderClient, __getRoot, Link, useRouteData, __useFetcher, withRouter } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.33_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react';
+export type { History, ClientLoader } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.33_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react'
 // umi/client/client/plugin
-export { ApplyPluginsType, PluginManager } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/umi@4.6.25_@babel+core@7.29.0_@types+node@25.2.0_@types+react@19.2.10_eslint@8.57.1_les_8a4f28b54c2f6a68b87ec2eb73b109c4/node_modules/umi/client/client/plugin.js';
+export { ApplyPluginsType, PluginManager } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/umi@4.6.33_@babel+core@7.29.0_@types+node@25.5.0_@types+react@19.2.14_eslint@8.57.1_lig_f543cb11e6d746f2acaaf8cf866d6b1b/node_modules/umi/client/client/plugin.js';
 export { history, createHistory } from './core/history';
 export { terminal } from './core/terminal';
 // react ssr

package/src/.umi-production/testBrowser.tsx

@@ -3,7 +3,7 @@
 // DO NOT CHANGE IT MANUALLY!
 import React, { useEffect, useState } from 'react';
 import { ApplyPluginsType } from 'umi';
-import { renderClient, RenderClientOpts } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.25_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react';
+import { renderClient, RenderClientOpts } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.33_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react';
 import { createHistory } from './core/history';
 import { createPluginManager } from './core/plugin';
 import { getRoutes } from './core/route';

package/src/.umi-production/tsconfig.json

@@ -27,7 +27,7 @@
         "src/.umi/*"
       ],
       "umi": [
-        "../../node_modules/.pnpm/umi@4.6.25_@babel+core@7.29.0_@types+node@25.2.0_@types+react@19.2.10_eslint@8.57.1_les_8a4f28b54c2f6a68b87ec2eb73b109c4/node_modules/umi"
+        "../../node_modules/.pnpm/umi@4.6.33_@babel+core@7.29.0_@types+node@25.5.0_@types+react@19.2.14_eslint@8.57.1_lig_f543cb11e6d746f2acaaf8cf866d6b1b/node_modules/umi"
       ],
       "umi/typings": [
         "src/.umi/typings"

package/src/.umi-production/umi.ts

@@ -3,7 +3,7 @@
 // DO NOT CHANGE IT MANUALLY!
 import './core/polyfill';
 
-import { renderClient } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.25_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react';
+import { renderClient } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.33_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react';
 import { getRoutes } from './core/route';
 import { createPluginManager } from './core/plugin';
 import { createHistory } from './core/history';
@@ -78,6 +78,6 @@ render();
 
     if (typeof window !== 'undefined') {
       window.g_umi = {
-        version: '4.6.25',
+        version: '4.6.33',
       };
     }

package/src/framework/pages/LoginPageUtils.ts

@@ -9,7 +9,7 @@ export class LoginPageUtils {
     static postLogin(values) {
         return new Promise((resolve, reject) => {
             console.log('开始登录')
-            HttpUtils.postForm('/admin/auth/login', values).then(rs => {
+            HttpUtils.post('/admin/auth/login', values).then(rs => {
                 console.log('登录结果', rs)
                 EventBusUtils.emit('loginSuccess')
                 let redirect = LoginPageUtils.getRedirect();

package/src/layouts/admin/index.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import {Badge, Layout, Menu, Watermark} from 'antd';
+import {Badge, Layout, Menu, Spin, Watermark} from 'antd';
 
 import {history, Link} from 'umi';
 import "./index.less"
@@ -20,12 +20,15 @@ export default class extends React.Component {
         menuTree: [],
         menuMap: {},
         pathMenuMap: {},
+        defaultOpenKeys: null,
+        menuLoading:true,
 
 
         currentMenuKey: null,
 
 
         siteInfo: {},
+
     }
 
 
@@ -43,9 +46,11 @@ export default class extends React.Component {
 
 
     initMenu = () => {
+        this.setState({menuLoading: true})
         HttpUtils.get('/admin/menuInfo').then(info => {
             const {menuTree, pathMenuMap, menuMap} = info
-            this.setState({menuMap})
+            const defaultOpenKeys = [menuTree.find(e => e.children != null).key]; //打开第一个文件夹
+            this.setState({menuMap, defaultOpenKeys})
 
             let pathname = PageUtils.currentPathname();
 
@@ -63,6 +68,8 @@ export default class extends React.Component {
             this.setState({menuTree, pathMenuMap})
 
             this.loadBadge(menuMap)
+        }).finally(()=>{
+            this.setState({menuLoading: false})
         })
 
 
@@ -114,25 +121,12 @@ export default class extends React.Component {
                     <Gap/>
 
 
-                    <Menu items={this.state.menuTree}
-                          theme='dark'
-                          mode="inline"
-                          className='left-menu'
-                          onClick={({key}) => {
-                              const menu = this.state.menuMap[key]
-                              let {path} = menu;
-                              this.setState({currentMenuKey: key})
-                              history.push(path)
-                          }}
-                          selectedKeys={[this.state.currentMenuKey]}
-                          inlineIndent={16}
-                    >
-                    </Menu>
+                    {this.renderLeftMenu()}
 
                 </Sider>
 
                 <Content id='admin-layout-content'>
-                    {this.getContent(loginInfo)}
+                    {this.renderCenterContent(loginInfo)}
                 </Content>
 
             </Layout>
@@ -140,7 +134,28 @@ export default class extends React.Component {
     }
 
 
-    getContent = () => {
+    renderLeftMenu() {
+        if(this.state.menuLoading){
+            return <Spin />
+        }
+        return <Menu items={this.state.menuTree}
+                     theme='dark'
+                     mode="inline"
+                     className='left-menu'
+                     defaultOpenKeys={this.state.defaultOpenKeys}
+                     onClick={({key}) => {
+                         const menu = this.state.menuMap[key]
+                         let {path} = menu;
+                         this.setState({currentMenuKey: key})
+                         history.push(path)
+                     }}
+                     selectedKeys={[this.state.currentMenuKey]}
+                     inlineIndent={16}
+        >
+        </Menu>;
+    }
+
+    renderCenterContent = () => {
         const {siteInfo, loginInfo} = this.state
         if (this.state.menuTree.length === 0) { // 加载菜单中
             return <></>

package/src/layouts/admin/index.less

@@ -47,10 +47,13 @@
       scrollbar-color: unset;
 
       .ant-menu-submenu-selected {
-        div {
+        &>div {
           color: white !important;
         }
       }
+      .ant-menu-item-group-title {
+        color: #5E8CD6; /* 主色透明 */
+      }
     }
 
   }

package/src/pages/system/role/index.jsx

@@ -173,7 +173,6 @@ export default class extends React.Component {
             menuIds: [...this.state.menuChecked, ...this.state.menuHalfChecked]
         }
         HttpUtils.post('admin/sysRole/grantMenu', params).then(rs => {
-            debugger
             this.setState({menuOpen: false})
         })
     }