@jiangood/open-admin 1.3.4 → 2.0.1

package/src/framework/utils/EventBusUtils.ts

@@ -89,7 +89,6 @@ export class EventBusUtils {
         name: string,
         ...args: T
     ): void {
-        console.log('触发事件：',name, args)
         const list = EventBusUtils.__stack[name] as StaticEventEntry<T>[];
 
         if (list !== undefined) {

package/src/framework/utils/MessageUtils.tsx

@@ -103,7 +103,6 @@ export class MessageUtils {
      * 错误消息
      */
     static error(content: String, duration: number = 3) {
-        console.log('调用 MessageUtils.error',content)
         if(!this.messageApi){
             alert(content)
             return
@@ -144,7 +143,6 @@ export class MessageUtils {
     static config(messageApi: MessageInstance, modalApi: HookAPI) {
         this.messageApi = messageApi;
         this.modalApi = modalApi;
-        console.log('MessageUtils.config', messageApi, modalApi)
     }
 
     private static modalApi:HookAPI = null;

package/src/framework/utils/TreeUtils.ts

@@ -1,4 +1,4 @@
-import {ArrUtils} from "./ArrUtils"; // 假设 ArrUtil 已经被正确定义和导出
+import {ArrayUtils} from "./ArrayUtils";
 
 /**
  * 🌳 通用树节点接口
@@ -169,7 +169,7 @@ export class TreeUtils {
             // 优先使用 key 字段，其次使用 id 字段
             const key = item.key || item.id;
 
-            if (ArrUtils.contains(keyList, key)) {
+            if (ArrayUtils.contains(keyList, key)) {
                 itemList.push(item);
             }
         });

package/src/framework/utils/index.ts

@@ -1,5 +1,5 @@
 export * from "./DateUtils";
-export * from "./ArrUtils";
+export * from "./ArrayUtils";
 export * from "./UrlUtils"
 export * from "./StringUtils"
 export * from "./EventBusUtils";

package/src/framework/utils/system/FormRegistryUtils.ts

@@ -39,7 +39,6 @@ export class FormRegistryUtils {
     }
 
     FormRegistryUtils.forms.set(formKey, formComponent);
-    console.log(`✅ 【FormRegistryUtils】表单 "${formKey}" 注册成功`);
   }
 
   /**

package/src/framework/utils/system/PermUtils.ts

@@ -1,5 +1,5 @@
 import {SysUtils} from "./SysUtils";
-import {ArrUtils} from "../ArrUtils";
+import {ArrayUtils} from "../ArrayUtils";
 
 /**
  * 登录用户信息接口，
@@ -49,7 +49,7 @@ export class PermUtils {
 
     // 检查是否拥有超级权限 '*'
     // 假设 ArrUtils.contains(array, item) 存在且返回 boolean
-    if (ArrUtils.contains(permissions, "*")) {
+    if (ArrayUtils.contains(permissions, "*")) {
       return true;
     }
 

package/src/framework/views/ViewApproveStatus/index.tsx

@@ -0,0 +1,11 @@
+import {DictUtils} from "../../utils";
+import {Tag} from "antd";
+import {Component} from "react";
+import type {ViewProps} from "../types";
+
+export class ViewApproveStatus extends Component<ViewProps<String>> {
+    render() {
+        const {value} = this.props;
+        return DictUtils.dictTag('approveStatus', value);
+    }
+}

package/src/framework/views/ViewBoolean/index.tsx

@@ -0,0 +1,6 @@
+import type {ViewProps} from "../types";
+
+export function ViewBoolean(props: ViewProps<boolean>) {
+    const {value} = props;
+    return value == null ? null : (value ? '是' : '否');
+}

package/src/framework/views/ViewFile/{index.jsx → index.tsx}

@@ -6,16 +6,16 @@ export class ViewFile extends React.Component {
 
 
     render() {
-        let fileId = this.props.value
+        const fileId = this.props.value
 
         if (!fileId) {
             return <Empty/>;
         }
 
-        let arr = fileId.split(',');
+        const arr = fileId.split(',');
 
-        let urlList = arr.map(id => 'admin/sysFile/preview/' + id);
-        let height = this.props.height;
+        const urlList = arr.map(id => 'admin/sysFile/preview/' + id);
+        const height = this.props.height;
 
         if(urlList.length === 1){
             const url = urlList[0]

package/src/framework/views/ViewImage/{index.jsx → index.tsx}

@@ -15,10 +15,10 @@ export class ViewImage extends React.Component {
       vs = vs.split(',');
     }
 
-    let urlList = [];
+    const urlList = [];
     for (let v of vs) {
-      let isId = v.indexOf('/') === -1;
-      let isAbsUrl = v.startsWith('http');
+      const isId = v.indexOf('/') === -1;
+      const isAbsUrl = v.startsWith('http');
       if (isAbsUrl) {
         urlList.push(v);
         continue;

package/src/framework/views/ViewPassword/{index.jsx → index.tsx}

@@ -9,11 +9,11 @@ export class ViewPassword extends React.Component {
     }
 
     render() {
-        let v = this.props.value;
+        const v = this.props.value;
         if (v == null) {
             return null
         }
-        let visible = this.state.visible;
+        const visible = this.state.visible;
         return <Space>
             <span>{this.state.visible ? v : '******'}</span>
             <a onClick={() => this.setState({visible: !visible})}>

package/src/framework/views/ViewProcessInstanceProgressButton/{index.jsx → index.tsx}

@@ -9,8 +9,7 @@ export class ViewProcessInstanceProgressButton extends React.Component {
     }
 
     onClick = () => {
-        console.log('点击追踪流程')
-        let content = <ViewProcessInstanceProgress value={this.props.value} />;
+        const content = <ViewProcessInstanceProgress value={this.props.value} />;
         MessageUtils.alert(content,{
             title:'流程审批信息',
             width:800

package/src/layouts/PageRender.jsx

@@ -26,7 +26,7 @@ let APP_DATA_CACHE = null
  * @constructor
  */
 export  function PageRender(props) {
-    let {pathname, search, passLocation} = props
+    const {pathname, search, passLocation} = props
 
     let appData = useAppData()
     if(Object.keys(appData).length === 0){
@@ -49,13 +49,13 @@ class _PageRender extends React.Component {
     }
 
     passLocationRender = () => {
-        let {pathname, search,  appData} = this.props
+        const {pathname, search,  appData} = this.props
 
         const map = appData.routeComponents
         const key = pathname.substring(1); // 移除第一个斜杠
-        let componentType = map[key] || map[key + '/index']
+        const componentType = map[key] || map[key + '/index']
         if (componentType) {
-            let params =search ? UrlUtils.getParams(search): {}
+            const params =search ? UrlUtils.getParams(search): {}
             const location = {pathname, search, params}
             return React.createElement(componentType, {location});
         }
@@ -63,8 +63,8 @@ class _PageRender extends React.Component {
 
 
     defaultRender = () => {
-        let {pathname, appData} = this.props
-        let matchArr = matchRoutes(appData.clientRoutes, pathname)
+        const {pathname, appData} = this.props
+        const matchArr = matchRoutes(appData.clientRoutes, pathname)
 
         if (matchArr != null) {
             if (pathname === '/') {

package/src/layouts/admin/HeaderRight.jsx

@@ -6,7 +6,7 @@ import {DeviceUtils, HttpUtils, MessageUtils,  PageUtils, SysUtils} from "../../
 
 
 const ID = 'header-right';
-export default class HeaderRight extends React.Component {
+export class HeaderRight extends React.Component {
 
     state = {
         isMobileDevice: false
@@ -27,7 +27,7 @@ export default class HeaderRight extends React.Component {
             await MessageUtils.alert('退出登录成功');
             history.replace('/login')
         }).catch(async e => {
-            let confirm = await MessageUtils.confirm('退出登录失败，是否清空缓存');
+            const confirm = await MessageUtils.confirm('退出登录失败，是否清空缓存');
             if (confirm) {
                 localStorage.clear();
                 history.replace('/login')

package/src/layouts/admin/TabPageRender.jsx

@@ -4,7 +4,9 @@ import {Tabs} from "antd";
 import {PageRender} from "../PageRender";
 import {PageUtils} from "../../framework";
 
-class TabPageRender extends React.Component {
+const MAX_TABS = 20;
+
+class TabPageRenderComponent extends React.Component {
 
     state = {
         active: null,
@@ -12,6 +14,8 @@ class TabPageRender extends React.Component {
         tabs: [],
     }
 
+    accessOrder = [];
+
     componentDidMount() {
         const url = this.getUrl(this.props)
         this.onUrlChange(url);
@@ -31,21 +35,34 @@ class TabPageRender extends React.Component {
         }
     }
 
+    recordAccess(url) {
+        this.accessOrder = this.accessOrder.filter(k => k !== url);
+        this.accessOrder.push(url);
+    }
+
     onUrlChange = url => {
         const {location} = this.props
-
         const {pathname, search} = location
-        let {tabs} = this.state
+        const {tabs} = this.state
 
         const old = tabs.find(t => t.key === url)
         if (old == null) {
             const cmp = <PageRender pathname={pathname} search={search}/>
-            let label = this.getLabel(pathname);
+            const label = this.getLabel(pathname);
             tabs.push({
                 key: url,
                 label: label,
                 children: cmp
             });
+
+            if (tabs.length > MAX_TABS) {
+                const keep = new Set([url, ...this.accessOrder.slice(-3)]);
+                const removeIdx = tabs.findIndex(t => !keep.has(t.key));
+                if (removeIdx > -1) {
+                    tabs.splice(removeIdx, 1);
+                }
+            }
+
             this.setState({tabs: [...tabs]})
         }else {
             const menu = this.props.pathMenuMap[pathname]
@@ -54,6 +71,7 @@ class TabPageRender extends React.Component {
             }
         }
 
+        this.recordAccess(url);
         this.setState({active: url})
     };
 
@@ -61,7 +79,7 @@ class TabPageRender extends React.Component {
         if (path === '/') {
             return '首页'
         }
-        let label = PageUtils.currentLabel();
+        const label = PageUtils.currentLabel();
 
         if (!label) {
             const menu = this.props.pathMenuMap[path]
@@ -75,7 +93,7 @@ class TabPageRender extends React.Component {
 
 
     render() {
-        let {tabs} = this.state
+        const {tabs} = this.state
         if (tabs.length === 0) {
             return null
         }
@@ -102,9 +120,8 @@ class TabPageRender extends React.Component {
 
     lastTabClickTime = 0
     onTabClick = (key, event) => {
-        let now = new Date().getTime();
-        let doubleClick = now - this.lastTabClickTime < 300;
-        // 双击时刷新
+        const now = new Date().getTime();
+        const doubleClick = now - this.lastTabClickTime < 300;
         if (doubleClick) {
             this.refresh(key);
         }
@@ -118,10 +135,8 @@ class TabPageRender extends React.Component {
         if(tab != null){
             const old = tab.children
             if(old != null){
-                console.log('准备刷新：', key)
                 tab.children = '刷新中...'
                 this.setState({tabs}, () => {
-                    console.log('刷新节点', tab)
                     tab.children = old
                     this.setState({tabs})
                 })
@@ -138,6 +153,7 @@ class TabPageRender extends React.Component {
     onRemove = url => {
         let {tabs} = this.state
         tabs = tabs.filter(t => t.key !== url)
+        this.accessOrder = this.accessOrder.filter(k => k !== url);
 
         this.setState({tabs})
         if (tabs.length > 0) {
@@ -154,5 +170,4 @@ class TabPageRender extends React.Component {
 }
 
 
-// 让组件有路由相关的参数，如 this.props.location
-export default withRouter(TabPageRender)
+export const TabPageRender = withRouter(TabPageRenderComponent)

package/src/layouts/admin/index.jsx

@@ -1,12 +1,12 @@
 import React from 'react';
-import {Badge, Layout, Menu, Spin, Watermark} from 'antd';
+import {Badge, Layout, Menu, Skeleton, Watermark} from 'antd';
 
 import {history, Link} from 'umi';
 import "./index.less"
-import {Gap, HttpUtils, NamedIcon, PageUtils, SysUtils, ThemeUtils, TreeUtils} from "../../framework";
+import {ErrorBoundary, Gap, HttpUtils, NamedIcon, PageUtils, SysUtils, ThemeUtils, TreeUtils} from "../../framework";
 
-import HeaderRight from "./HeaderRight";
-import TabPageRender from "./TabPageRender";
+import { HeaderRight } from "./HeaderRight";
+import { TabPageRender } from "./TabPageRender";
 
 const {Header, Sider, Content} = Layout;
 /**
@@ -32,11 +32,10 @@ export default class extends React.Component {
 
 
     componentDidMount() {
-        console.log('Admin Layout didMount')
         // 判断是否手机端，自动收起菜单
 
 
-        let siteInfo = SysUtils.getSiteInfo();
+        const siteInfo = SysUtils.getSiteInfo();
         const loginInfo = SysUtils.getLoginInfo()
         this.setState({siteInfo, loginInfo})
 
@@ -46,18 +45,18 @@ export default class extends React.Component {
 
     initMenu = () => {
         this.setState({menuLoading: true})
-        HttpUtils.get('/admin/menuInfo').then(info => {
+        HttpUtils.get('/admin/menu-info').then(info => {
             const {menuTree, pathMenuMap, menuMap} = info
             this.setState({menuMap})
 
-            let pathname = PageUtils.currentPathname();
+            const pathname = PageUtils.currentPathname();
 
             TreeUtils.walk(menuTree, (item) => {
                 item.icon = <NamedIcon name={item.icon || 'AppstoreOutlined'} style={{fontSize: 12}}/>
             })
 
             if (pathname !== "" && pathname !== "/") {
-                let menu = pathMenuMap[pathname]
+                const menu = pathMenuMap[pathname]
                 if (menu) {
                     this.setState({currentMenuKey: menu.key})
                 }
@@ -124,7 +123,9 @@ export default class extends React.Component {
                 </Sider>
 
                 <Content id='admin-layout-content'>
-                    {this.renderCenterContent(loginInfo)}
+                    <ErrorBoundary>
+                        {this.renderCenterContent(loginInfo)}
+                    </ErrorBoundary>
                 </Content>
 
             </Layout>
@@ -134,7 +135,7 @@ export default class extends React.Component {
 
     renderLeftMenu() {
         if(this.state.menuLoading){
-            return <Spin />
+            return <div style={{padding: 16}}><Skeleton active title={false} paragraph={{rows: 8}} /></div>;
         }
         return <Menu items={this.state.menuTree}
                      theme='dark'
@@ -142,7 +143,7 @@ export default class extends React.Component {
                      className='left-menu'
                      onClick={({key}) => {
                          const menu = this.state.menuMap[key]
-                         let {path} = menu;
+                         const {path} = menu;
                          this.setState({currentMenuKey: key})
                          history.push(path)
                      }}
@@ -155,9 +156,9 @@ export default class extends React.Component {
     renderCenterContent = () => {
         const {siteInfo, loginInfo} = this.state
         if (this.state.menuTree.length === 0) { // 加载菜单中
-            return <></>
+            return <Skeleton active paragraph={{rows: 10}} style={{padding: 24}} />
         }
-        let tabPageRenderNode = <TabPageRender pathMenuMap={this.state.pathMenuMap}/>;
+        const tabPageRenderNode = <TabPageRender pathMenuMap={this.state.pathMenuMap}/>;
         if (siteInfo.waterMark === true) {
             return <Watermark content={[loginInfo.name, loginInfo.account]}>
                 {tabPageRenderNode}

package/src/layouts/admin/index.less

@@ -48,7 +48,7 @@
 
       .ant-menu-submenu-selected {
         &>div {
-          color: white !important;
+          color: white;
         }
       }
       .ant-menu-item-group-title {

package/src/layouts/index.jsx

@@ -1,11 +1,13 @@
-import AdminLayout from "./admin"
 import React from "react";
 import {ConfigProvider} from "antd";
-
-import {Outlet, withRouter} from "umi";
 import zhCN from 'antd/locale/zh_CN';
+import dayjs from 'dayjs';
+import 'dayjs/locale/zh-cn';
+import {Outlet, withRouter} from "umi";
+
+import AdminLayout from "./admin"
 import {
-    ArrUtils,
+    ArrayUtils,
     HttpUtils,
     MessageHolder,
     PageLoading,
@@ -13,12 +15,10 @@ import {
     SysUtils,
     ThemeUtils,
 } from "../framework";
-import dayjs from 'dayjs';
-import 'dayjs/locale/zh-cn';
+import {Logger} from "../framework/utils/Logger";
 
 import '../style/global.less'
 import './index.less'
-import {Logger} from "../framework/utils/Logger";
 
 dayjs.locale('zh-cn');
 
@@ -33,7 +33,7 @@ function checkIsSimplePage(pathname) {
     if(pathname.startsWith("/test/")){
         return true
     }
-    return ArrUtils.contains(SIMPLE_URLS, pathname) ;
+    return ArrayUtils.contains(SIMPLE_URLS, pathname) ;
 }
 
 function checkIsPurePage(pathname){
@@ -78,12 +78,12 @@ class _Layouts extends React.Component {
 
 
     loadLoginInfo = () => {
-        let {pathname} = this.props.location;
+        const {pathname} = this.props.location;
         if (checkIsPurePage(pathname) || checkIsSimplePage(pathname) || this.state.loginInfoFinish) {
             return;
         }
 
-        HttpUtils.get('/admin/public/checkLogin')
+        HttpUtils.get('/admin/public/check-login')
             .then(rs => {
                 const {needUpdatePwd, dictInfo, loginInfo} = rs
                 SysUtils.setDictInfo(dictInfo)
@@ -147,7 +147,7 @@ class _Layouts extends React.Component {
 
 
     renderContent = () => {
-        let {pathname} = this.props.location;
+        const {pathname} = this.props.location;
 
         if(checkIsPurePage(pathname)){
             return <Outlet/>
@@ -158,8 +158,7 @@ class _Layouts extends React.Component {
             return <PageLoading message='加载消息组件...'/>
         }
 
-        let {params = {}} = this.props.location;
-        console.log('layout: params', params)
+        const {params = {}} = this.props.location;
         if (checkIsSimplePage(pathname) || params.hasOwnProperty('_noLayout')) {
             return <Outlet/>
         }

package/src/layouts/index.less

@@ -14,8 +14,8 @@ html,body{
 
 @media (max-width: 767px) {        //移动端css
 
-  .hide-on-mobile{
-    display: none !important;
+  body .hide-on-mobile{
+    display: none;
   }
 
 }

package/src/loading.jsx

@@ -1,18 +1,19 @@
 import React from "react";
-import {Spin} from "antd";
-import {ThemeUtils} from "./framework";
+import { Spin } from "antd";
+import { ThemeUtils } from "./framework";
 
-export default class extends React.Component {
-    render() {
-        return <div
-            style={{
-                display: 'flex',
-                alignItems: 'center',
-                justifyContent: 'center',
-                height: '100vh',
-                background: ThemeUtils.getColor("background-color")
-            }}>
-            <Spin size='large'/>
-        </div>
-    }
-}
+const Loading = () => (
+  <div
+    style={{
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      height: '100vh',
+      background: ThemeUtils.getColor("background-color")
+    }}
+  >
+    <Spin size='large' />
+  </div>
+);
+
+export default Loading;