@jiangood/open-admin 3.1.7 → 3.1.9

package/package.json

@@ -55,7 +55,7 @@
     "lint": "eslint src --max-warnings=0",
     "lint:fix": "eslint src --fix"
   },
-  "version": "3.1.7",
+  "version": "3.1.9",
   "overrides": {
     "zod-validation-error": "^4.0.2"
   }

package/src/framework/GlobalData.ts

@@ -8,6 +8,8 @@ const SITE_ARTICLES_KEY = "siteArticles";
 export interface SiteInfo {
     title?: string;
     waterMark?: boolean;
+    /** 登录失效（空闲超时/未登录）时全局弹窗的提示文案，对应 sys.login-expired-message */
+    loginExpiredMessage?: string;
     [key: string]: unknown;
 }
 

package/src/framework/biz/OrgTree.tsx

@@ -24,6 +24,10 @@ export class OrgTree extends React.Component<OrgTreeProps, OrgTreeState> {
     componentDidMount() {
         HttpClient.get('admin/sysOrg/tree', null).then(tree => {
             this.setState({treeData: tree.data, treeDataLoading: false})
+        }).catch(() => {
+            // 失败时结束 loading 并置空（组件会显示空状态提示），避免一直停留在骨架屏；
+            // 401 由 HttpClient 广播 loginExpired（全局弹窗提示），其余错误仍按 toastError 弹错
+            this.setState({treeData: [], treeDataLoading: false})
         })
     }
 

package/src/framework/biz/PermActions.tsx

@@ -101,7 +101,7 @@ export class PermActions extends React.Component<PermActionsProps> {
 
         if (!more || visible.length <= 1) {
             const buttons = visible.map((action, index) => (
-                <React.Fragment key={index}>{this.renderButton(action, size)}</React.Fragment> // NOSONAR: 按钮无稳定 id，静态过滤后顺序不变
+                <React.Fragment key={index}>{this.renderButton(action, size)}</React.Fragment>
             ));
             return <Space>{buttons}</Space>;
         }

package/src/framework/biz/RoleTree.tsx

@@ -24,6 +24,10 @@ export class RoleTree extends React.Component<RoleTreeProps, RoleTreeState> {
     componentDidMount() {
         HttpClient.get('admin/sysRole/biz-tree', null).then(tree => {
             this.setState({treeData: tree.data, treeDataLoading: false})
+        }).catch(() => {
+            // 失败时结束 loading 并置空（组件会显示空状态提示），避免一直停留在骨架屏；
+            // 401 由 HttpClient 广播 loginExpired（全局弹窗提示），其余错误仍按 toastError 弹错
+            this.setState({treeData: [], treeDataLoading: false})
         })
     }
 

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

@@ -8,6 +8,7 @@ import {
 import axios from "axios";
 import qs from 'qs';
 import type {AxiosProgressEvent, AxiosRequestConfig, AxiosResponse} from "axios";
+import {EventBus} from "../../utils/EventBus";
 
 const axiosInstance = axios.create({
   baseURL: import.meta.env.VITE_SERVER_SERVLET_CONTEXT_PATH,
@@ -40,8 +41,8 @@ export interface DownloadModalProps {
   onFinish?: () => void;
 }
 
-export class DownloadModal extends React.Component<DownloadModalProps, ModalState> { // NOSONAR: state/定时器字段构造器赋值，无法全部 readonly
-  private abortController: AbortController | null = null; // NOSONAR: 构造器中赋值
+export class DownloadModal extends React.Component<DownloadModalProps, ModalState> {
+  private abortController: AbortController | null = null;
   private lastOptions: DownloadOptions | null = null;
   private lastTime: number = 0;
   private lastLoaded: number = 0;
@@ -61,7 +62,7 @@ export class DownloadModal extends React.Component<DownloadModalProps, ModalStat
     };
   }
 
-  download = (options: DownloadOptions) => { // NOSONAR: ref 暴露给父组件/业务项目调用的公共 API
+  download = (options: DownloadOptions) => {
     this.startDownload(options);
   };
 
@@ -264,6 +265,12 @@ export class DownloadModal extends React.Component<DownloadModalProps, ModalStat
       if (error.message) {
         msg = error.message;
       }
+      // 登录失效：交由全局登录失效弹窗提示，避免在此显示「Request failed with status code 401」
+      if (axios.isAxiosError(error) && error.response?.status === 401) {
+        EventBus.emit('loginExpired');
+        this.setState({open: false, status: ''});
+        return;
+      }
       console.error('[DownloadModal] 下载失败:', msg);
       this.setState({
         status: 'failed',

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

@@ -12,9 +12,9 @@ export interface FormModalProps {
   children?: React.ReactNode
 }
 
-export default class FormModal extends React.Component<FormModalProps> { // NOSONAR: state 构造器中赋值
+export default class FormModal extends React.Component<FormModalProps> {
 
-  readonly state = { // NOSONAR: React state 惯例
+  readonly state = {
     visible: false,
     confirmLoading: false,
   }
@@ -22,11 +22,11 @@ export default class FormModal extends React.Component<FormModalProps> { // NOSO
   private pendingValues: Record<string, unknown> | null = null
   private formRef = React.createRef<FormInstance>()
 
-  get formInstance() { // NOSONAR: ref 暴露给父组件/业务项目调用的公共 API
+  get formInstance() {
     return this.formRef.current
   }
 
-  open = (values?: Record<string, unknown>) => { // NOSONAR: ref 暴露给父组件/业务项目调用的公共 API
+  open = (values?: Record<string, unknown>) => {
     this.pendingValues = values || {}
     this.setState({visible: true})
   }

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

@@ -0,0 +1,249 @@
+import React from "react";
+import { Alert, Spin, Typography } from "antd";
+import { HttpClient } from "../../utils";
+import { getToken } from "../../config";
+
+/** 增量拉取时每次最多读取的字节数（与后端默认值一致） */
+const DEFAULT_LENGTH = 256 * 1024;
+
+/** 运行中日志的默认刷新间隔（毫秒） */
+const DEFAULT_POLL_INTERVAL = 1500;
+
+export interface LogViewerProps {
+    /** 日志 key，如 `job/{logId}`；与后端 `admin/sys/log/{*key}` 对应 */
+    logKey?: string;
+    /**
+     * 自定义读取地址，覆盖默认的 `admin/sys/log/{logKey}`。
+     * <p>
+     * 用于「带行级/数据权限、由业务模块自己提供读取接口」的场景：
+     * 只要接口返回同样的 `{content, nextOffset, eof}` 结构，就能复用本组件的增量跟随。
+     */
+    url?: string;
+    /** 任务是否仍在运行：为 true 时按 `pollInterval` 增量轮询，false 时只读一次 */
+    running?: boolean;
+    /** 运行中的轮询间隔（毫秒），默认 1500 */
+    pollInterval?: number;
+    /** 可视高度（像素），默认 500 */
+    height?: number;
+    /** 是否自动滚动到底部，默认 true；用户上滑查看历史后不再强制跟随 */
+    autoFollow?: boolean;
+    /** 内容为空时的提示 */
+    emptyText?: React.ReactNode;
+    className?: string;
+    style?: React.CSSProperties;
+}
+
+interface LogViewerState {
+    content: string;
+    nextOffset: number;
+    loading: boolean;
+    error: string | null;
+    eof: boolean;
+}
+
+/**
+ * 文件日志查看器：按字节偏移增量读取日志文件。
+ * <p>
+ * 运行中的任务（`running`）按 `pollInterval` 反复拉取新增内容并追加；任务结束后停止轮询，
+ * 且会补拉一次剩余内容。日志很长时也不会每次整文件重读。
+ * <p>
+ * 使用方式（定时任务日志）：
+ * ```tsx
+ * <LogViewer logKey={`job/${logId}`} running={isRunning} />
+ * ```
+ */
+export class LogViewer extends React.Component<LogViewerProps, LogViewerState> {
+
+    state: LogViewerState = {
+        content: "",
+        nextOffset: 0,
+        loading: false,
+        error: null,
+        eof: false,
+    };
+
+    private containerRef = React.createRef<HTMLPreElement>();
+    private timer: ReturnType<typeof setTimeout> | null = null;
+    private mounted = false;
+    /** 用户是否仍处于底部（跟随最新日志）；上滑后置为 false */
+    private follow = true;
+    /** 请求进行中标记，避免慢请求叠加 */
+    private fetching = false;
+    /** 请求进行中被跳过的拉取请求，结束后立即补一次 */
+    private pendingFetch = false;
+    /** 请求代号：切换 logKey / 重新加载后，丢弃旧请求的迟到响应 */
+    private generation = 0;
+
+    componentDidMount() {
+        this.mounted = true;
+        this.reload();
+    }
+
+    componentDidUpdate(prevProps: LogViewerProps) {
+        if (prevProps.logKey !== this.props.logKey || prevProps.url !== this.props.url) {
+            this.reload();
+            return;
+        }
+        // 运行状态变化（尤其运行中 -> 结束）时补拉一次，拿到最后一段日志
+        if (prevProps.running !== this.props.running) {
+            this.schedule(0);
+        }
+    }
+
+    componentWillUnmount() {
+        this.mounted = false;
+        this.clearTimer();
+    }
+
+    /** 从头重新加载 */
+    reload = () => {
+        this.clearTimer();
+        this.generation++;
+        this.pendingFetch = false;
+        this.follow = true;
+        this.setState({ content: "", nextOffset: 0, loading: true, error: null, eof: false },
+            () => this.fetchChunk(true));
+    };
+
+    private clearTimer() {
+        if (this.timer) {
+            clearTimeout(this.timer);
+            this.timer = null;
+        }
+    }
+
+    private schedule(delay?: number) {
+        if (!this.mounted) {
+            return;
+        }
+        this.clearTimer();
+        const running = !!this.props.running;
+        // 未运行时只在需要时补拉（delay 显式传入），不做周期性轮询
+        if (!running && delay == null) {
+            return;
+        }
+        const interval = this.props.pollInterval ?? DEFAULT_POLL_INTERVAL;
+        this.timer = setTimeout(() => this.fetchChunk(false), delay ?? interval);
+    }
+
+    private fetchChunk(initial: boolean) {
+        const { logKey, url } = this.props;
+        // 业务模块自建接口（带行级权限）可通过 url 覆盖默认的通用日志接口
+        const requestUrl = url || (logKey ? `admin/sys/log/${logKey}` : null);
+        if (!requestUrl) {
+            return;
+        }
+        if (this.fetching) {
+            // 已有请求在途：打完标记，等它结束后立即补一次
+            this.pendingFetch = true;
+            return;
+        }
+        this.fetching = true;
+        const generation = this.generation;
+        const offset = initial ? 0 : this.state.nextOffset;
+
+        HttpClient.get<{ content: string; nextOffset: number; eof: boolean }>(
+            requestUrl,
+            { offset, length: DEFAULT_LENGTH },
+            { toastError: false }
+        ).then(rs => {
+            if (!this.mounted || generation !== this.generation) {
+                return;
+            }
+            const chunk = rs.data;
+            if (!chunk) {
+                this.setState({ loading: false, eof: true });
+                return;
+            }
+            this.setState(prev => ({
+                content: initial ? (chunk.content || "") : prev.content + (chunk.content || ""),
+                nextOffset: chunk.nextOffset,
+                eof: chunk.eof,
+                loading: false,
+                error: null,
+            }), () => {
+                this.scrollToBottom();
+                if (!chunk.eof) {
+                    // 还有剩余内容（超过单次读取上限）：立即续读
+                    this.schedule(0);
+                } else {
+                    // 已读到末尾：运行中按间隔等新内容，已结束则停止
+                    this.schedule();
+                }
+            });
+        }).catch(e => {
+            if (!this.mounted || generation !== this.generation) {
+                return;
+            }
+            this.setState({ loading: false, error: e?.message || "日志加载失败" });
+            // 运行中遇到临时错误（如文件尚未创建）继续重试
+            this.schedule();
+        }).finally(() => {
+            this.fetching = false;
+            if (this.pendingFetch) {
+                this.pendingFetch = false;
+                this.fetchChunk(false);
+            }
+        });
+    }
+
+    private scrollToBottom() {
+        const el = this.containerRef.current;
+        if (!el || !(this.props.autoFollow ?? true)) {
+            return;
+        }
+        if (!this.follow) {
+            return;
+        }
+        el.scrollTop = el.scrollHeight;
+    }
+
+    private handleScroll = () => {
+        const el = this.containerRef.current;
+        if (!el) {
+            return;
+        }
+        // 距底部 24px 内视为跟随
+        this.follow = el.scrollHeight - el.scrollTop - el.clientHeight < 24;
+    };
+
+    render() {
+        const { height = 500, emptyText = "暂无日志", className, style } = this.props;
+        const { content, loading, error } = this.state;
+        const token = getToken();
+
+        return <div className={className} style={{ height, position: "relative", ...style }}>
+            {error && content.length === 0
+                ? <Alert type="error" showIcon message={error}/>
+                : <>
+                    {loading && content.length === 0 && (
+                        <div style={{ position: "absolute", inset: 0, display: "flex", alignItems: "center", justifyContent: "center" }}>
+                            <Spin/>
+                        </div>
+                    )}
+                    {!loading && content.length === 0 && (
+                        <Typography.Text type="secondary">{emptyText}</Typography.Text>
+                    )}
+                    <pre
+                        ref={this.containerRef}
+                        onScroll={this.handleScroll}
+                        style={{
+                            margin: 0,
+                            height: "100%",
+                            overflow: "auto",
+                            whiteSpace: "pre-wrap",
+                            wordBreak: "break-all",
+                            fontSize: 12,
+                            lineHeight: 1.6,
+                            padding: 12,
+                            boxSizing: "border-box",
+                            backgroundColor: token.colorBgContainer,
+                            color: token.colorText,
+                            border: `1px solid ${token.colorBorderSecondary}`,
+                            borderRadius: token.borderRadius,
+                        }}
+                    >{content}</pre>
+                </>}
+        </div>;
+    }
+}

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

@@ -12,7 +12,7 @@ const iconLoaders: Record<string, () => Promise<{ default: IconComponent }>> = {
 for (const [path, loader] of Object.entries(
     import.meta.glob('/node_modules/@ant-design/icons/es/icons/*.js')
 )) {
-    const name = /([^/]+)\.js$/.exec(path)?.[1]; // NOSONAR: 提取文件名，已最简
+    const name = /([^/]+)\.js$/.exec(path)?.[1];
     if (name) {
         iconLoaders[name] = loader as () => Promise<{ default: IconComponent }>;
     }

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

@@ -2,6 +2,8 @@
   width: 100%;
   height: 100%;
   overflow: auto;
+  /* 页面底色统一走变量：暗色由 darkColorBgLayout / antd 算法决定，业务可覆盖 */
+  background: var(--oa-color-bg-layout, #f5f5f5);
 
   .oa-page-header {
     margin-bottom: 16px;

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

@@ -1,38 +1,44 @@
 import React from "react";
-import { Typography } from "antd";
+import { Space, Typography } from "antd";
 import './index.less'
-import {getToken} from "../../config";
-import { PermActions } from "../../biz/PermActions";
+import { PermActions, type PermAction } from "../../biz/PermActions";
+import { PermUtils } from "../../utils";
+
+/** 兼容旧写法：按子节点的 perm 属性过滤（新代码请用 PermAction[]） */
+function renderActionNodes(nodes: React.ReactNode) {
+    const visible = React.Children.toArray(nodes).filter((node) => {
+        const perm = (node as React.ReactElement<{ perm?: string }>)?.props?.perm;
+        return !perm || PermUtils.hasPermission(perm);
+    });
+    if (visible.length === 0) return null;
+    return <Space>{visible}</Space>;
+}
 
 interface PageProps {
     padding?: boolean;
+    /** @deprecated 页面底色已默认跟随布局底色，该参数不再产生差异；保留仅为兼容旧写法 */
     backgroundGray?: boolean;
     debug?: boolean;
     title?: React.ReactNode;
     description?: React.ReactNode;
-    actions?: React.ReactNode;
+    /** 右侧操作区：推荐传 PermAction[]（数据驱动），兼容带 perm 属性的节点 */
+    actions?: PermAction[] | React.ReactNode;
     children?: React.ReactNode;
 }
 
 export class Page extends React.Component<PageProps> {
     render() {
-        const { padding = true, backgroundGray = false, debug = false, title, description, actions, children } = this.props;
+        const { padding = true, debug = false, title, description, actions, children } = this.props;
         const hasHeader = title != null || description != null || actions != null;
         const style: React.CSSProperties = {};
 
         if (padding) {
             style.padding = 16;
         }
-        const token = getToken();
-        if (backgroundGray) {
-            style.backgroundColor = token.colorBgLayout;
-        }
+        // 页面底色由 .oa-page 统一使用 --oa-color-bg-layout，避免内联值脱离变量体系
         if (debug) {
             style.backgroundColor = 'rgba(255, 0, 0, 0.08)';
         }
-        if (!style.backgroundColor) {
-            style.backgroundColor = token.colorBgLayout;
-        }
 
         return <div className={'oa-page'} style={style}>
             {hasHeader && (
@@ -44,7 +50,9 @@ export class Page extends React.Component<PageProps> {
                                 {description && <div><Typography.Text type="secondary">{description}</Typography.Text></div>}
                             </div>
                         </div>
-                        {actions && <PermActions>{actions}</PermActions>}
+                        {actions != null && (Array.isArray(actions)
+                            ? <PermActions actions={actions}/>
+                            : renderActionNodes(actions))}
                     </div>
                 </div>
             )}

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

@@ -9,7 +9,7 @@ export interface PageLoadingProps {
     messages?: string[];
 }
 
-export function PageLoading(props: PageLoadingProps) { // NOSONAR: 仅读取 props，函数组件无需变更
+export function PageLoading(props: PageLoadingProps) {
     const titles = props.messages || (props.message ? [props.message] : ['页面加载中...']);
     const primaryColor = getToken().colorPrimary ?? "";
 
@@ -22,7 +22,7 @@ export function PageLoading(props: PageLoadingProps) { // NOSONAR: 仅读取 pro
                 <div className="oa-page-loading-messages">
                     {titles.map((msg, i) => (
                         <Alert
-                            key={i} // NOSONAR: 提示文案列表静态无稳定 key
+                            key={i}
                             title={<span style={{color: primaryColor}}>{msg}</span>}
                             type="info"
                             showIcon

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

@@ -69,6 +69,11 @@
             gap: 8px;
             flex: 1;
             min-width: 0;
+
+            /* 仅内联搜索时允许换行，存量工具栏布局与之前完全一致 */
+            &.has-inline-search {
+                flex-wrap: wrap;
+            }
         }
 
         .pro-table-toolbar-right {
@@ -81,6 +86,45 @@
         }
     }
 
+    /* searchInline：搜索控件内联在工具栏左侧，与操作按钮同一行 */
+    .pro-table-search-inline {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        flex-wrap: wrap;
+        margin: 0;
+
+        /* 定宽由 --oa-search-inline-width 控制，业务侧可覆盖；noStyle 的输入控件同样收敛 */
+        > .ant-form-item,
+        > .ant-input,
+        > .ant-input-affix-wrapper,
+        > .ant-picker,
+        > .ant-select {
+            width: var(--oa-search-inline-width, 260px);
+            max-width: 100%;
+        }
+
+        .ant-form-item {
+            margin: 0;
+        }
+
+        /* 视觉隐藏的提交按钮：保留回车提交能力，且不占位（不用 display:none，避免浏览器忽略默认提交按钮） */
+        .pro-table-search-submit {
+            position: absolute;
+            width: 1px;
+            height: 1px;
+            min-width: 0;
+            padding: 0;
+            margin: -1px;
+            border: 0;
+            overflow: hidden;
+            white-space: nowrap;
+            clip-path: inset(50%);
+            opacity: 0;
+            pointer-events: none;
+        }
+    }
+
     /* 桌面窄窗口下收敛搜索栏列数，避免标签+输入挤压/溢出 */
     @media (max-width: 1400px) {
         .filter-bar {

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

@@ -57,8 +57,14 @@ export interface ProTableProps<T = unknown> {
         onChange?: (selectedRowKeys: React.Key[], selectedRows: T[]) => void;
     };
     defaultPageSize?: number;
-    /** 搜索栏每行列数，默认 4 */
+    /** 搜索栏每行列数，默认 4（searchInline 时忽略） */
     searchFormCols?: number;
+    /**
+     * 搜索表单内联渲染到工具栏左侧，与操作按钮同一行（单条件页面省一行空间）。
+     * 内联模式不渲染「查询/重置」按钮：回车提交，条件清空后自动回到无筛选状态。
+     * 默认 false = 现有独立筛选卡
+     */
+    searchInline?: boolean;
     /** 搜索表单渲染函数，返回 Form.Item 列表 */
     searchFormRender?: () => React.ReactNode;
     scrollY?: number | string;
@@ -201,13 +207,15 @@ this.setState({loading: true})
         // 有筛选条件时区分「无匹配结果」与「暂无数据」，避免业务人员误以为数据丢失
         const hasFilter = Object.keys(this.state.params || {}).length > 0
 
+        const inlineSearch = this.renderInlineSearch()
 
         return <div className={'oa-pro-table '} id={this.id}>
             {this.renderForm()}
             <div className="pro-table-wrapper">
-                {(toolBarRender || toolBarRightRender) && <div className="pro-table-toolbar">
-                    {toolBarRender && <div className="pro-table-toolbar-left">
-                        {this.getToolBarRenderNode(toolBarRender)}
+                {(inlineSearch || toolBarRender || toolBarRightRender) && <div className="pro-table-toolbar">
+                    {(inlineSearch || toolBarRender) && <div className={'pro-table-toolbar-left' + (inlineSearch ? ' has-inline-search' : '')}>
+                        {inlineSearch}
+                        {toolBarRender && this.getToolBarRenderNode(toolBarRender)}
                     </div>}
                     {toolBarRightRender && <div className="pro-table-toolbar-right">
                         {this.getToolBarRenderNode(toolBarRightRender)}
@@ -258,10 +266,9 @@ this.setState({loading: true})
 
 
     renderForm = () => {
-        if (this.props.children) {
-            throw new Error('[ProTable] children 已废弃，请使用 searchFormRender prop 替代')
-        }
-        const searchContent = this.props.searchFormRender?.()
+        // 内联模式：搜索表单改由工具栏渲染（见 renderInlineSearch）
+        if (this.props.searchInline) return
+        const searchContent = this.getSearchContent()
         if (!searchContent) return
 
         return (
@@ -269,10 +276,7 @@ this.setState({loading: true})
                 className="filter-bar"
                 style={{'--oa-filter-cols': this.props.searchFormCols ?? 4} as React.CSSProperties}
                 onFinish={(values) => this.onSearch(values)}
-                ref={(instance) => {
-                    this.formRef.current = instance;
-                    if (this.props.formRef) this.props.formRef.current = instance;
-                }}
+                ref={this.bindFormRef}
             >
                 {searchContent}
                 <div className="filter-actions">
@@ -286,6 +290,43 @@ this.setState({loading: true})
         )
     };
 
+    /** 内联搜索：单条件页面把搜索控件放到工具栏左侧，回车即查询，复用 onSearch 的取数逻辑 */
+    renderInlineSearch = () => {
+        if (!this.props.searchInline) return
+        const searchContent = this.getSearchContent()
+        if (!searchContent) return
+
+        return (
+            <Form
+                className="pro-table-search-inline"
+                onFinish={(values) => this.onSearch(values)}
+                onValuesChange={(changedValues) => {
+                    // 条件被清空（allowClear 等）后自动回到无筛选状态，否则用户还要再按一次回车
+                    const cleared = Object.values(changedValues).some(v => v == null || v === '' || (Array.isArray(v) && v.length === 0))
+                    if (cleared) this.formRef.current?.submit()
+                }}
+                ref={this.bindFormRef}
+            >
+                {searchContent}
+                {/* 视觉隐藏的提交按钮：多字段内联时也能回车提交 */}
+                <Button className="pro-table-search-submit" htmlType="submit" tabIndex={-1} aria-hidden/>
+            </Form>
+        )
+    };
+
+    /** 校验已废弃的 children 用法，返回搜索表单内容（无搜索表单时返回空） */
+    getSearchContent = () => {
+        if (this.props.children) {
+            throw new Error('[ProTable] children 已废弃，请使用 searchFormRender prop 替代')
+        }
+        return this.props.searchFormRender?.()
+    }
+
+    bindFormRef = (instance: FormInstance | null) => {
+        this.formRef.current = instance;
+        if (this.props.formRef) this.props.formRef.current = instance;
+    }
+
     getToolBarRenderNode(toolBarRender: ProTableToolBarRender<T>) {
         if (!toolBarRender) {
             return
@@ -323,7 +364,7 @@ this.setState({loading: true})
         this.setState({params: values, current: 1, sorter: {}}, this.loadData)
     }
 
-    changeFormValues = (values: Record<string, unknown>) => { // NOSONAR: ref 暴露给父组件/业务项目调用的公共 API
+    changeFormValues = (values: Record<string, unknown>) => {
         if (this.formRef.current) {
             this.formRef.current.resetFields()
             this.formRef.current.setFieldsValue(values)

package/src/framework/components/index.ts

@@ -9,6 +9,7 @@ export * from './ContextMenu'
 export * from './DownloadModal'
 export * from './OrgSwitcher'
 export * from './ThemeSettings'
+export * from './LogViewer'
 export { default as ErrorBoundary } from './ErrorBoundary'
 export { default as FormModal } from './FormModal'
 export { default as FormDrawer } from './DrawerForm'