@jiangood/open-admin 2.5.5 → 2.5.7

package/src/.umi-production/core/route.tsx

@@ -19,14 +19,14 @@ if (process.env.NODE_ENV === 'development') {
 import React from 'react';
 
 export async function getRoutes() {
-  const routes = {"404":{"path":"*","id":"404","parentId":"@@/global-layout"},"userCenter/ChangePassword":{"path":"userCenter/ChangePassword","id":"userCenter/ChangePassword","parentId":"@@/global-layout"},"system/user/UserPerm":{"path":"system/user/UserPerm","id":"system/user/UserPerm","parentId":"@@/global-layout"},"userCenter/message":{"path":"userCenter/message","id":"userCenter/message","parentId":"@@/global-layout"},"system/dict/index":{"path":"system/dict","id":"system/dict/index","parentId":"@@/global-layout"},"system/file/index":{"path":"system/file","id":"system/file/index","parentId":"@@/global-layout"},"system/role/index":{"path":"system/role","id":"system/role/index","parentId":"@@/global-layout"},"system/user/index":{"path":"system/user","id":"system/user/index","parentId":"@@/global-layout"},"system/job/index":{"path":"system/job","id":"system/job/index","parentId":"@@/global-layout"},"system/log/index":{"path":"system/log","id":"system/log/index","parentId":"@@/global-layout"},"system/org/index":{"path":"system/org","id":"system/org/index","parentId":"@@/global-layout"},"system/role/perm":{"path":"system/role/perm","id":"system/role/perm","parentId":"@@/global-layout"},"userCenter/index":{"path":"userCenter","id":"userCenter/index","parentId":"@@/global-layout"},"about":{"path":"about","id":"about","parentId":"@@/global-layout"},"index":{"path":"/","id":"index","parentId":"@@/global-layout"},"login":{"path":"login","id":"login","parentId":"@@/global-layout"},"@@/global-layout":{"id":"@@/global-layout","path":"/","isLayout":true}} as const;
+  const routes = {"404":{"path":"*","id":"404","parentId":"@@/global-layout"},"account/changePassword":{"path":"account/changePassword","id":"account/changePassword","parentId":"@@/global-layout"},"system/role/rolePerm":{"path":"system/role/rolePerm","id":"system/role/rolePerm","parentId":"@@/global-layout"},"system/user/userPerm":{"path":"system/user/userPerm","id":"system/user/userPerm","parentId":"@@/global-layout"},"system/dict/index":{"path":"system/dict","id":"system/dict/index","parentId":"@@/global-layout"},"system/file/index":{"path":"system/file","id":"system/file/index","parentId":"@@/global-layout"},"system/role/index":{"path":"system/role","id":"system/role/index","parentId":"@@/global-layout"},"system/user/index":{"path":"system/user","id":"system/user/index","parentId":"@@/global-layout"},"system/job/index":{"path":"system/job","id":"system/job/index","parentId":"@@/global-layout"},"system/log/index":{"path":"system/log","id":"system/log/index","parentId":"@@/global-layout"},"system/org/index":{"path":"system/org","id":"system/org/index","parentId":"@@/global-layout"},"forceUpdatePwd":{"path":"forceUpdatePwd","id":"forceUpdatePwd","parentId":"@@/global-layout"},"account/index":{"path":"account","id":"account/index","parentId":"@@/global-layout"},"about":{"path":"about","id":"about","parentId":"@@/global-layout"},"index":{"path":"/","id":"index","parentId":"@@/global-layout"},"login":{"path":"login","id":"login","parentId":"@@/global-layout"},"@@/global-layout":{"id":"@@/global-layout","path":"/","isLayout":true}} as const;
   return {
     routes,
     routeComponents: {
 '404': React.lazy(() => import(/* webpackChunkName: "src__pages__404" */'../../../src/pages/404.jsx')),
-'userCenter/ChangePassword': React.lazy(() => import(/* webpackChunkName: "src__pages__userCenter__ChangePassword" */'../../../src/pages/userCenter/ChangePassword.jsx')),
-'system/user/UserPerm': React.lazy(() => import(/* webpackChunkName: "src__pages__system__user__UserPerm" */'../../../src/pages/system/user/UserPerm.jsx')),
-'userCenter/message': React.lazy(() => import(/* webpackChunkName: "src__pages__userCenter__message" */'../../../src/pages/userCenter/message.jsx')),
+'account/changePassword': React.lazy(() => import(/* webpackChunkName: "src__pages__account__changePassword" */'../../../src/pages/account/changePassword.jsx')),
+'system/role/rolePerm': React.lazy(() => import(/* webpackChunkName: "src__pages__system__role__rolePerm" */'../../../src/pages/system/role/rolePerm.jsx')),
+'system/user/userPerm': React.lazy(() => import(/* webpackChunkName: "src__pages__system__user__userPerm" */'../../../src/pages/system/user/userPerm.jsx')),
 'system/dict/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__dict__index" */'../../../src/pages/system/dict/index.jsx')),
 'system/file/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__file__index" */'../../../src/pages/system/file/index.jsx')),
 'system/role/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__role__index" */'../../../src/pages/system/role/index.jsx')),
@@ -34,8 +34,8 @@ export async function getRoutes() {
 'system/job/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__job__index" */'../../../src/pages/system/job/index.jsx')),
 'system/log/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__log__index" */'../../../src/pages/system/log/index.jsx')),
 'system/org/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__org__index" */'../../../src/pages/system/org/index.jsx')),
-'system/role/perm': React.lazy(() => import(/* webpackChunkName: "src__pages__system__role__perm" */'../../../src/pages/system/role/perm.jsx')),
-'userCenter/index': React.lazy(() => import(/* webpackChunkName: "src__pages__userCenter__index" */'../../../src/pages/userCenter/index.jsx')),
+'forceUpdatePwd': React.lazy(() => import(/* webpackChunkName: "src__pages__forceUpdatePwd" */'../../../src/pages/forceUpdatePwd.jsx')),
+'account/index': React.lazy(() => import(/* webpackChunkName: "src__pages__account__index" */'../../../src/pages/account/index.jsx')),
 'about': React.lazy(() => import(/* webpackChunkName: "src__pages__about" */'../../../src/pages/about.jsx')),
 'index': React.lazy(() => import(/* webpackChunkName: "src__pages__index" */'../../../src/pages/index.jsx')),
 'login': React.lazy(() => import(/* webpackChunkName: "src__pages__login" */'../../../src/pages/login.jsx')),

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

@@ -9,7 +9,7 @@ import { createPluginManager } from './core/plugin';
 import { createHistory } from './core/history';
 import Loading from '/home/runner/work/open-admin/open-admin/web/src/loading.jsx';
 import { ApplyPluginsType } from 'umi';
-import {FormRegistryUtils} from '/home/runner/work/open-admin/open-admin/web/src/framework';
+import {FormRegistry} from '/home/runner/work/open-admin/open-admin/web/src/framework';
 
 const publicPath = "./";
 const runtimePublicPath = false;

package/src/framework/GlobalData.d.ts

@@ -0,0 +1,8 @@
+export class GlobalData {
+    static setSiteInfo(data: object): void;
+    static getSiteInfo(): object;
+    static setLoginInfo(data: object): void;
+    static getLoginInfo(): object;
+    static setDictInfo(data: object | null): void;
+    static getDictInfo(): object | null;
+}

package/src/framework/GlobalData.js

@@ -0,0 +1,33 @@
+import {StorageUtils} from './utils/StorageUtils';
+
+const SITE_INFO_KEY = "siteInfo";
+const LOGIN_INFO_KEY = "loginInfo";
+const DICT_INFO_KEY = "dictInfo";
+
+export class GlobalData {
+    static setSiteInfo(data) {
+        StorageUtils.set(SITE_INFO_KEY, data);
+    }
+
+    static getSiteInfo() {
+        return StorageUtils.get(SITE_INFO_KEY) || {};
+    }
+
+    static setLoginInfo(data) {
+        StorageUtils.set(LOGIN_INFO_KEY, data);
+    }
+
+    static getLoginInfo() {
+        return StorageUtils.get(LOGIN_INFO_KEY) || {};
+    }
+
+    static setDictInfo(data) {
+        StorageUtils.set(DICT_INFO_KEY, data);
+    }
+
+    static getDictInfo() {
+        return StorageUtils.get(DICT_INFO_KEY);
+    }
+}
+
+export { SITE_INFO_KEY, LOGIN_INFO_KEY, DICT_INFO_KEY };

package/src/framework/{components/system → biz}/HasPerm.tsx

@@ -1,5 +1,5 @@
 import {ReactNode} from "react";
-import {PermUtils} from "../../utils";
+import {PermUtils} from "../utils";
 
 /**
  * 使用该组件，可以判断权限

package/src/framework/{components/OrgTree/index.tsx → biz/OrgTree.tsx}

@@ -1,9 +1,19 @@
 import {Alert, Skeleton, Tree} from 'antd';
 import React from 'react';
 import * as Icons from '@ant-design/icons';
-import {HttpUtils} from "../../utils";
+import {HttpUtils} from "../utils";
 
-export class OrgTree extends React.Component<any, any> {
+interface OrgTreeProps {
+    onChange?: (orgId: string | null) => void;
+}
+
+interface OrgTreeState {
+    treeDataLoading: boolean;
+    treeData: any[];
+    currentOrgId: string | null;
+}
+
+export class OrgTree extends React.Component<OrgTreeProps, OrgTreeState> {
 
     state = {
         treeDataLoading: true,

package/src/framework/{components/system/ButtonList.tsx → biz/PermActions.tsx}

@@ -1,13 +1,13 @@
 import React from 'react';
 import { Space } from 'antd';
-import { PermUtils } from '../../utils';
+import { PermUtils } from '../utils';
 
 /**
- * 带权限的按钮列表
- * @param maxNum: 显示子节点的个数， 超过的为收缩起来
+ * 带权限的操作区。根据子元素的 `perm` 属性控制显隐，默认用 Space 包裹。
+ * @param gap - 是否在操作项之间增加间距，默认 true
  */
-export function ButtonList(props) {
-  const { children } = props;
+export function PermActions(props) {
+  const { children, gap = true } = props;
 
   const checkPerm = (element) => {
     const _props = element?.props;
@@ -18,5 +18,6 @@ export function ButtonList(props) {
     (child) => child != null && checkPerm(child)
   );
 
+  if (!gap) return <>{nodes}</>;
   return <Space>{nodes}</Space>;
 }

package/src/framework/{components/RoleTree/index.tsx → biz/RoleTree.tsx}

@@ -1,9 +1,19 @@
 import {Skeleton, Tree} from 'antd';
 import React from 'react';
 import {SolutionOutlined} from '@ant-design/icons';
-import {HttpUtils} from "../../utils";
+import {HttpUtils} from "../utils";
 
-export class RoleTree extends React.Component<any, any> {
+interface RoleTreeProps {
+    onSelect?: (orgId: string | null) => void;
+}
+
+interface RoleTreeState {
+    treeDataLoading: boolean;
+    treeData: any[];
+    currentOrgId: string | null;
+}
+
+export class RoleTree extends React.Component<RoleTreeProps, RoleTreeState> {
 
     state = {
         treeDataLoading: true,
@@ -25,7 +35,7 @@ export class RoleTree extends React.Component<any, any> {
     render() {
         const {treeData, treeDataLoading} = this.state
         if (treeDataLoading) {
-            return <Skeleton title='加载中...'/>
+            return <Skeleton active title={{ width: '60%' }} paragraph={{ rows: 6 }} />;
         }
 
         return <Tree

package/src/framework/{components/system → biz}/index.tsx

@@ -1,8 +1,10 @@
-import {FieldRemoteSelect, FieldRemoteSelectMultiple, FieldRemoteTreeSelect} from "../../fields";
+import {FieldRemoteSelect, FieldRemoteSelectMultiple, FieldRemoteTreeSelect} from "../fields";
 import React from "react";
 
-export * from './ButtonList'
+export * from './PermActions'
 export * from './HasPerm'
+export * from './OrgTree'
+export * from './RoleTree'
 
 export function FieldUserSelect(props) {
     return <FieldRemoteSelect url="admin/sysUser/options" {...props} />;

package/src/framework/components/ContextMenu/index.tsx

@@ -21,17 +21,25 @@ export const ContextMenu: React.FC<ContextMenuProps> = ({ x, y, items, onClick,
     const ref = useRef<HTMLDivElement>(null);
 
     useEffect(() => {
-        const handler = (e: MouseEvent) => {
+        const handleMouseDown = (e: MouseEvent) => {
             if (ref.current && !ref.current.contains(e.target as Node)) {
                 onClose();
             }
         };
+        const handleScroll = () => onClose();
+        const handleKeyDown = (e: KeyboardEvent) => {
+            if (e.key === 'Escape') onClose();
+        };
         const timer = setTimeout(() => {
-            document.addEventListener('mousedown', handler);
+            document.addEventListener('mousedown', handleMouseDown);
+            document.addEventListener('scroll', handleScroll, true);
+            document.addEventListener('keydown', handleKeyDown);
         }, 0);
         return () => {
             clearTimeout(timer);
-            document.removeEventListener('mousedown', handler);
+            document.removeEventListener('mousedown', handleMouseDown);
+            document.removeEventListener('scroll', handleScroll, true);
+            document.removeEventListener('keydown', handleKeyDown);
         };
     }, [onClose]);
 
@@ -66,7 +74,7 @@ export const ContextMenu: React.FC<ContextMenuProps> = ({ x, y, items, onClick,
                             padding: '5px 12px',
                             fontSize: 13,
                             cursor: item.disabled ? 'not-allowed' : 'pointer',
-                            color: item.danger ? '#ff4d4f' : item.disabled ? '#rgba(0,0,0,0.25)' : '#333',
+                            color: item.danger ? '#ff4d4f' : item.disabled ? 'rgba(0,0,0,0.25)' : '#333',
                             display: 'flex',
                             alignItems: 'center',
                             gap: 8,

package/src/framework/components/DownloadModal/index.tsx

@@ -0,0 +1,332 @@
+import React from "react";
+import {Button, Modal, Progress, Tag} from "antd";
+import {
+  DownloadOutlined,
+  CheckCircleOutlined,
+  CloseCircleOutlined,
+} from "@ant-design/icons";
+import axios from "axios";
+import qs from 'qs';
+
+const axiosInstance = axios.create({
+  baseURL: (typeof SERVLET_CONTEXT !== 'undefined' && SERVLET_CONTEXT) || '',
+  withCredentials: true,
+  headers: {'Content-Type': 'application/json'},
+  paramsSerializer: (params) => qs.stringify(params, {indices: false})
+});
+
+interface DownloadOptions {
+  url: string;
+  params?: Record<string, any>;
+  data?: Record<string, any>;
+  method?: 'GET' | 'POST';
+  fileName?: string;
+}
+
+interface ModalState {
+  open: boolean;
+  status: '' | 'downloading' | 'completed' | 'failed';
+  fileName: string;
+  progress: number;
+  loaded: number;
+  total: number;
+  speed: string;
+  errorMessage: string;
+}
+
+export class DownloadModal extends React.Component<{}, ModalState> {
+  static instance: DownloadModal | null = null;
+  private abortController: AbortController | null = null;
+  private lastOptions: DownloadOptions | null = null;
+  private lastTime: number = 0;
+  private lastLoaded: number = 0;
+  private speedTimer: ReturnType<typeof setInterval> | null = null;
+
+  constructor(props: {}) {
+    super(props);
+    this.state = {
+      open: false,
+      status: '',
+      fileName: '',
+      progress: 0,
+      loaded: 0,
+      total: 0,
+      speed: '',
+      errorMessage: '',
+    };
+    DownloadModal.instance = this;
+  }
+
+  static download(options: DownloadOptions) {
+    const instance = DownloadModal.instance;
+    if (instance) {
+      instance.startDownload(options);
+    } else {
+      console.warn('[DownloadModal] 组件未挂载，download() 调用被忽略');
+    }
+  }
+
+  componentWillUnmount() {
+    this.clearSpeedTimer();
+    DownloadModal.instance = null;
+  }
+
+  private clearSpeedTimer() {
+    if (this.speedTimer) {
+      clearInterval(this.speedTimer);
+      this.speedTimer = null;
+    }
+  }
+
+  private formatSize(bytes: number): string {
+    if (bytes === 0) return '0 B';
+    const units = ['B', 'KB', 'MB', 'GB'];
+    const k = 1024;
+    const i = Math.floor(Math.log(bytes) / Math.log(k));
+    const size = (bytes / Math.pow(k, i)).toFixed(i > 0 ? 1 : 0);
+    return `${size} ${units[i]}`;
+  }
+
+  private formatSpeed(bytesPerSecond: number): string {
+    return this.formatSize(bytesPerSecond) + '/s';
+  }
+
+  private handleCancel = () => {
+    if (this.abortController) {
+      this.abortController.abort();
+      this.abortController = null;
+    }
+    this.clearSpeedTimer();
+    this.setState({open: false, status: ''});
+  };
+
+  private handleClose = () => {
+    this.setState({open: false, status: ''});
+  };
+
+  private handleRetry = () => {
+    if (this.lastOptions) {
+      this.startDownload(this.lastOptions);
+    }
+  };
+
+  private saveBlob(response: any) {
+    return new Promise<void>((resolve, reject) => {
+      const {data: blob, headers} = response;
+
+      // 检查是否为 JSON 错误响应
+      if (blob.type === 'application/json') {
+        const reader = new FileReader();
+        reader.readAsText(blob, 'utf-8');
+        reader.onerror = function () {
+        reject(new Error('读取下载数据失败'));
+      };
+      reader.onload = function () {
+          try {
+            const rs = JSON.parse(reader.result as string);
+            reject(new Error(rs.message || '下载失败'));
+          } catch (e) {
+            reject(new Error('解析错误响应失败'));
+          }
+        };
+        return;
+      }
+
+      // 从 Content-Disposition 解析文件名
+      const contentDisposition = headers['content-disposition'] || headers['Content-Disposition'];
+      let filename = this.state.fileName;
+      if (!filename && contentDisposition) {
+        const match = /filename\*?=(?:['"]?)(?:UTF-8''|)(.+?)(?:['"]?$|;)/i.exec(contentDisposition);
+        let parsedName = match && match[1] ? match[1].trim() : 'download.file';
+        try {
+          parsedName = decodeURIComponent(parsedName.replace(/"/g, ''));
+        } catch (e) {
+          parsedName = parsedName.replace(/"/g, '');
+        }
+        filename = parsedName;
+      }
+
+      const url = window.URL.createObjectURL(new Blob([blob]));
+      const link = document.createElement('a');
+      link.style.display = 'none';
+      link.href = url;
+      link.download = filename || 'download.file';
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+      window.URL.revokeObjectURL(url);
+      resolve();
+    });
+  }
+
+  startDownload(options: DownloadOptions) {
+    // 取消之前的下载
+    if (this.abortController) {
+      this.abortController.abort();
+    }
+
+    this.lastOptions = options;
+    this.abortController = new AbortController();
+    this.lastTime = Date.now();
+    this.lastLoaded = 0;
+
+    this.setState({
+      open: true,
+      status: 'downloading',
+      fileName: options.fileName || '',
+      progress: 0,
+      loaded: 0,
+      total: 0,
+      speed: '',
+      errorMessage: '',
+    });
+
+    // 定时更新速度（当 total 未知时也能显示）
+    this.speedTimer = setInterval(() => {
+      const now = Date.now();
+      const elapsed = (now - this.lastTime) / 1000;
+      if (elapsed > 1 && this.lastLoaded > 0) {
+        const speed = this.lastLoaded / elapsed;
+        this.setState({speed: this.formatSpeed(speed)});
+        this.lastTime = now;
+        this.lastLoaded = 0;
+      }
+    }, 2000);
+
+    const config: any = {
+      url: options.url,
+      method: options.method || 'GET',
+      responseType: 'blob',
+      signal: this.abortController.signal,
+      onDownloadProgress: (progressEvent: any) => {
+        const {loaded, total} = progressEvent;
+        const now = Date.now();
+        // 计算速度
+        const elapsed = (now - this.lastTime) / 1000;
+        let speed = 0;
+        if (elapsed > 1) {
+          speed = (loaded - this.lastLoaded) / elapsed;
+          this.lastTime = now;
+          this.lastLoaded = loaded;
+        }
+        this.setState({
+          progress: total ? Math.round((loaded / total) * 100) : 0,
+          loaded,
+          total,
+          speed: speed > 0 ? this.formatSpeed(speed) : this.state.speed,
+        });
+      },
+    };
+
+    if (options.params) {
+      config.params = options.params;
+    }
+    if (options.data) {
+      config.data = options.data;
+    }
+
+    axiosInstance(config).then((response: any) => {
+      this.clearSpeedTimer();
+      return this.saveBlob(response);
+    }).then(() => {
+      const total = this.state.total;
+      this.setState({
+        status: 'completed',
+        progress: 100,
+        speed: '',
+        loaded: total || this.state.loaded,
+      });
+    }).catch((error: any) => {
+      this.clearSpeedTimer();
+      if (axios.isCancel(error)) {
+        // 用户取消，不显示错误
+        this.setState({open: false, status: ''});
+        return;
+      }
+      let msg = '下载失败';
+      if (error.message) {
+        msg = error.message;
+      }
+      console.error('[DownloadModal] 下载失败:', msg);
+      this.setState({
+        status: 'failed',
+        errorMessage: msg,
+      });
+    });
+  }
+
+  render() {
+    const {open, status, fileName, progress, loaded, total, speed, errorMessage} = this.state;
+
+    return (
+      <Modal
+        title={<span><DownloadOutlined style={{marginRight: 8}}/>文件下载</span>}
+        open={open}
+        maskClosable={false}
+        closable={status !== 'downloading'}
+        onCancel={this.handleClose}
+        footer={
+          status === 'downloading' ? (
+            <Button danger onClick={this.handleCancel}>取消下载</Button>
+          ) : status === 'failed' ? (
+            <>
+              <Button onClick={this.handleClose}>关闭</Button>
+              <Button type="primary" onClick={this.handleRetry}>重试</Button>
+            </>
+          ) : null
+        }
+        destroyOnClose
+      >
+        <div style={{padding: '20px 0'}}>
+          {/* 文件名 */}
+          <div style={{marginBottom: 16, fontSize: 15, fontWeight: 500, color: '#333'}}>
+            <DownloadOutlined style={{marginRight: 8}}/>
+            {fileName || '未知文件'}
+          </div>
+
+          {/* 下载中 */}
+          {status === 'downloading' && (
+            <>
+              <Progress percent={progress} status="active" strokeColor="var(--ant-color-primary)"/>
+              <div style={{marginTop: 8, fontSize: 13, color: '#999'}}>
+                <span>{this.formatSize(loaded)}</span>
+                {total > 0 && <span> / {this.formatSize(total)}</span>}
+                {speed && <span style={{marginLeft: 12}}>{speed}</span>}
+              </div>
+              <div style={{marginTop: 8}}>
+                <Tag color="processing">下载中...</Tag>
+              </div>
+            </>
+          )}
+
+          {/* 已完成 */}
+          {status === 'completed' && (
+            <>
+              <Progress percent={100} status="success"/>
+              <div style={{marginTop: 8, fontSize: 13, color: '#999'}}>
+                {loaded > 0 && <span>文件大小：{this.formatSize(loaded)}</span>}
+              </div>
+              <div style={{marginTop: 8}}>
+                <Tag icon={<CheckCircleOutlined/>} color="success">下载完成</Tag>
+              </div>
+            </>
+          )}
+
+          {/* 失败 */}
+          {status === 'failed' && (
+            <>
+              <Progress percent={progress} status="exception"/>
+              <div style={{marginTop: 8, fontSize: 13, color: '#ff4d4f'}}>
+                <CloseCircleOutlined style={{marginRight: 4}}/>
+                {errorMessage}
+              </div>
+              <div style={{marginTop: 8}}>
+                <Tag icon={<CloseCircleOutlined/>} color="error">下载失败</Tag>
+              </div>
+            </>
+          )}
+        </div>
+      </Modal>
+    );
+  }
+}

package/src/framework/components/ErrorBoundary/index.tsx

@@ -6,6 +6,8 @@ interface Props {
     children: React.ReactNode;
     /** 自定义降级 UI */
     fallback?: React.ReactNode;
+    /** 最小化模式（仅显示标题和刷新按钮，不显示错误详情） */
+    minimal?: boolean;
     /** 错误回调，可用于上报 */
     onError?: (error: Error, errorInfo: React.ErrorInfo) => void;
 }
@@ -46,6 +48,22 @@ export default class ErrorBoundary extends React.Component<Props, State> {
             return this.props.fallback;
         }
 
+        // minimal 模式：简洁降级，只引导刷新
+        if (this.props.minimal) {
+            return (
+                <Result
+                    status="error"
+                    title="应用出现异常"
+                    subTitle="页面渲染时发生错误，请尝试刷新页面。"
+                    extra={[
+                        <Button key="refresh" onClick={() => window.location.reload()}>
+                            刷新页面
+                        </Button>,
+                    ]}
+                />
+            );
+        }
+
         const detailStyle: React.CSSProperties = {
             maxHeight: 300, overflow: 'auto',
             fontSize: 12, fontFamily: 'monospace',

package/src/framework/components/NamedIcon/{index.jsx → index.tsx}

@@ -1,9 +1,14 @@
 import * as Icons from '@ant-design/icons';
 import { WarningOutlined } from '@ant-design/icons';
+import React from 'react';
 
-export function NamedIcon(props) {
+type NamedIconProps = {
+    name: string;
+} & React.ComponentProps<typeof WarningOutlined>;
+
+export function NamedIcon(props: NamedIconProps): React.ReactElement {
     const {name, ...rest} = props;
-    const IconType = Icons[name];
+    const IconType = Icons[name as keyof typeof Icons];
 
     if (IconType) {
         return <IconType {...rest}></IconType>;
@@ -11,4 +16,4 @@ export function NamedIcon(props) {
 
     console.warn(`NamedIcon: icon "${name}" not found, using fallback`);
     return <WarningOutlined {...rest} />;
-}
+}

package/src/framework/components/Page/index.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { Typography } from "antd";
 import './index.less'
 import {ThemeUtils} from "../../utils";
-import { ButtonList } from "../system/ButtonList";
+import { PermActions } from "../../biz/PermActions";
 
 interface PageProps {
     padding?: boolean;
@@ -38,7 +38,7 @@ export const Page: React.FC<PageProps> = ({ padding = true, backgroundGray = fal
                             {description && <div><Typography.Text type="secondary">{description}</Typography.Text></div>}
                         </div>
                     </div>
-                    {actions && <ButtonList>{actions}</ButtonList>}
+                    {actions && <PermActions>{actions}</PermActions>}
                 </div>
             </div>
         )}

package/src/framework/components/ProTable/index.tsx

@@ -98,17 +98,10 @@ export class ProTable extends React.Component {
     updateSelectedRows = list => {
         const {rowKey = "id"} = this.props
         const {selectedRows} = this.state
-        for (let i = 0; i < selectedRows.length; i++) {
-            for (let newItem of list) {
-                const oldItem = selectedRows[i];
-                if (oldItem[rowKey] === newItem[rowKey]) {
-                    selectedRows[i] = newItem;
-                    break
-                }
-            }
-        }
+        const rowMap = new Map(list.map(item => [item[rowKey], item]))
+        const updated = selectedRows.map(old => rowMap.get(old[rowKey]) || old)
 
-        this.setState({selectedRows: [...selectedRows]})
+        this.setState({selectedRows: updated})
     };