@jiangood/open-admin 3.1.7 → 3.1.8

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.8",
   "overrides": {
     "zod-validation-error": "^4.0.2"
   }

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/components/DownloadModal/index.tsx

@@ -40,8 +40,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 +61,7 @@ export class DownloadModal extends React.Component<DownloadModalProps, ModalStat
     };
   }
 
-  download = (options: DownloadOptions) => { // NOSONAR: ref 暴露给父组件/业务项目调用的公共 API
+  download = (options: DownloadOptions) => {
     this.startDownload(options);
   };
 

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/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.tsx

@@ -1,8 +1,19 @@
 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;
@@ -10,7 +21,8 @@ interface PageProps {
     debug?: boolean;
     title?: React.ReactNode;
     description?: React.ReactNode;
-    actions?: React.ReactNode;
+    /** 右侧操作区：推荐传 PermAction[]（数据驱动），兼容带 perm 属性的节点 */
+    actions?: PermAction[] | React.ReactNode;
     children?: React.ReactNode;
 }
 
@@ -44,7 +56,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/fields/BaseRemoteSelect/index.tsx

@@ -21,8 +21,8 @@ export interface BaseRemoteSelectProps {
  * 处理通用的数据加载、防抖搜索、竞态处理、错误提示逻辑。
  * 子类只需覆写 getLoadParams() 和 render()。
  */
-export class BaseRemoteSelect<P extends BaseRemoteSelectProps = BaseRemoteSelectProps> extends React.Component<P, BaseRemoteSelectState> { // NOSONAR: state/防抖字段构造器赋值
-    private fetchIdRef: number = 0; // NOSONAR: 构造器中赋值
+export class BaseRemoteSelect<P extends BaseRemoteSelectProps = BaseRemoteSelectProps> extends React.Component<P, BaseRemoteSelectState> {
+    private fetchIdRef: number = 0;
     private loadDataDebounce: ReturnType<typeof debounce>;
 
     static readonly defaultProps = {
@@ -117,14 +117,14 @@ export class BaseRemoteSelect<P extends BaseRemoteSelectProps = BaseRemoteSelect
 
     // ========== Helper 方法 ==========
 
-    getShowSearch(): { filterOption: false; onSearch: (value: string) => void } { // NOSONAR: 由子类通过 this.getShowSearch() 调用
+    getShowSearch(): { filterOption: false; onSearch: (value: string) => void } {
         return {
             filterOption: false,
             onSearch: this.handleSearch,
         };
     }
 
-    getNotFoundContent(): React.ReactNode { // NOSONAR: 由子类通过 this.getNotFoundContent() 调用
+    getNotFoundContent(): React.ReactNode {
         return this.state.loading ? <Spin size="small" /> : '数据为空';
     }
 }

package/src/framework/fields/FieldDateRange/index.tsx

@@ -11,7 +11,7 @@ import type {FieldProps} from '../types';
 const SP = StringUtils.ISO_SPLITTER;
 
 /** 日期范围值，形如 "2024-01-01/2024-01-31"（起止以 / 分隔） */
-export type FieldDateRangeValue = string; // NOSONAR: npm 包导出类型，业务项目引用
+export type FieldDateRangeValue = string;
 
 export interface FieldDateRangeProps extends FieldProps<FieldDateRangeValue> {
     /** 日期类型，如 YYYY-MM-DD、YYYY-MM、HH:mm:ss 等，默认 YYYY-MM-DD */

package/src/framework/fields/FieldDictSelect/index.tsx

@@ -12,7 +12,7 @@ export class FieldDictSelect extends React.Component<FieldDictSelectProps> {
     render() {
         const {value, typeCode} = this.props;
         const options = DictUtils.dictOptions(typeCode);
-        const strValue = value == null ? null : String(value); // NOSONAR: value 经 String() 显式转换，无隐式字符串化
+        const strValue = value == null ? null : String(value);
 
         return <Select value={strValue}
                        onChange={this.props.onChange}

package/src/framework/fields/FieldNumberRange/index.tsx

@@ -6,7 +6,7 @@ import type {FieldProps} from '../types';
 const SP = StringUtils.ISO_SPLITTER;
 
 /** 数字范围值，形如 "1/100"（起止以 / 分隔） */
-export type FieldNumberRangeValue = string; // NOSONAR: npm 包导出类型，业务项目引用
+export type FieldNumberRangeValue = string;
 
 export type RangePartValue = number | string | null;
 

package/src/framework/fields/FieldUploadImage/index.tsx

@@ -91,7 +91,7 @@ function readDims(url: string): Promise<Dims> {
 
 function compressToFile(source: Blob, options: {maxWidth?: number; maxHeight?: number; width?: number; height?: number; quality?: number}): Promise<File> {
     return new Promise((resolve, reject) => {
-        new Compressor(source, { // NOSONAR (typescript:S1848) — compressorjs 通过构造函数副作用异步压缩，回调内 resolve/reject，实例无需保留
+        new Compressor(source, {
             maxWidth: options.maxWidth,
             maxHeight: options.maxHeight,
             width: options.width,
@@ -139,9 +139,9 @@ async function compressToTarget(source: Blob, maxWidth: number | undefined, targ
     return best;
 }
 
-export class FieldUploadImage extends React.Component<FieldUploadImageProps, FieldUploadImageState> { // NOSONAR: state 构造器中按 props 初始化，无法全部 readonly
+export class FieldUploadImage extends React.Component<FieldUploadImageProps, FieldUploadImageState> {
 
-    state: FieldUploadImageState = { // NOSONAR: 构造器中按 props 初始化，无法 readonly
+    state: FieldUploadImageState = {
         // 传入的参数
         maxCount: 1,
         thumbWidth: 300,
@@ -170,7 +170,7 @@ export class FieldUploadImage extends React.Component<FieldUploadImageProps, Fie
         if (props.value) this.state.objectNames = props.value.split(',');
     }
 
-    componentDidUpdate(prevProps: FieldUploadImageProps, prevState: FieldUploadImageState) { // NOSONAR: 顺序同步多个 props 到 state，拆分反而更难读
+    componentDidUpdate(prevProps: FieldUploadImageProps, prevState: FieldUploadImageState) {
         const next: Partial<FieldUploadImageState> = {};
         if (this.props.maxCount !== prevProps.maxCount) next.maxCount = this.props.maxCount;
         if (this.props.thumbWidth !== prevProps.thumbWidth) next.thumbWidth = this.props.thumbWidth;

package/src/framework/utils/UrlUtils.ts

@@ -67,6 +67,6 @@ export class UrlUtils {
     static contextPath(path: string): string {
         const base = import.meta.env.VITE_SERVER_SERVLET_CONTEXT_PATH;
         if (base === '/' || base === '') return path;
-        return base.replace(/\/+$/, '') + path; // NOSONAR: 需去除尾部斜杠，正则已最简
+        return base.replace(/\/+$/, '') + path;
     }
 }

package/src/layouts/admin/index.jsx

@@ -112,7 +112,7 @@ export default class AdminLayout extends React.Component {
             this.setState({menuLoading: false})
         })
     }
-    actionRef = React.createRef() // NOSONAR: React ref 由父组件通过 ref 访问
+    actionRef = React.createRef()
 
     classifyMenus = (menuTree) => {
         const topMenus = [];

package/src/layouts/admin/index.less

@@ -95,7 +95,11 @@
       display: flex;
       align-items: center;
       gap: 8px;
-      padding: 12px 16px;
+      /* 与顶栏同高，保证 logo 基线与一级菜单对齐 */
+      height: 48px;
+      padding: 0 16px;
+      /* 底边线：与右侧顶栏/标签栏分隔线连成一线；色值由侧栏文字变量派生，避免硬编码 */
+      border-bottom: 1px solid color-mix(in srgb, var(--oa-sider-text, rgba(255, 255, 255, 0.85)) 14%, transparent);
 
       .logo-img {
         height: 36px;
@@ -115,10 +119,25 @@
         margin: 0;
         font-size: 14px;
         line-height: 1;
+        /* 允许在 flex 中收缩，长站点名省略号截断而不溢出侧栏 */
+        min-width: 0;
+        overflow: hidden;
         white-space: nowrap;
+
+        a {
+          display: block;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
       }
     }
 
+    /* 折叠态：logo 居中，去掉左侧内边距 */
+    &.ant-layout-sider-collapsed .sider-header {
+      justify-content: center;
+      padding-inline: 0;
+    }
+
     &.ant-layout-sider-collapsed .sider-header h3 {
       display: none;
     }
@@ -129,6 +148,11 @@
       scrollbar-width: thin;
       scrollbar-color: unset;
 
+      /* 菜单分隔线：加大上下间距，让不同菜单分组更清晰 */
+      .ant-menu-item-divider {
+        margin-block: 8px;
+      }
+
       .ant-menu-submenu-selected {
         &>div {
           color: var(--oa-sider-text, rgba(255, 255, 255, 0.85));

package/src/pages/article/$code.jsx

@@ -26,13 +26,13 @@ export default class ArticlePage extends React.Component {
         const {article, loading} = this.state
 
         if (loading) {
-            return <Page title="加载中...">
+            return <Page>
                 <div>加载中...</div>
             </Page>
         }
 
         if (!article) {
-            return <Page title="文章不存在">
+            return <Page>
                 <div>文章不存在或已禁用</div>
             </Page>
         }

package/src/pages/index.jsx

@@ -4,7 +4,7 @@ import {Page} from "../framework";
 
 export default class HomePage extends React.Component {
     render() {
-        return <Page title="首页" description="欢迎使用本系统">
+        return <Page>
             <Card>欢迎使用本系统</Card>
         </Page>
     }

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

@@ -1,5 +1,5 @@
-import {PlusOutlined} from '@ant-design/icons'
-import {Button, Form, Input, InputNumber} from 'antd'
+import {PlusOutlined, SearchOutlined} from '@ant-design/icons'
+import {Form, Input, InputNumber} from 'antd'
 import React from 'react'
 import {
     DictUtils,
@@ -106,26 +106,24 @@ export default class ArticleListPage extends React.Component {
     ]
 
     render() {
-        return <Page
-            title="文章管理"
-            description="管理系统文章，如关于、帮助等页面"
-        >
+        return <Page>
             <ProTable
                 actionRef={this.tableRef}
-                toolBarRender={() => ( // NOSONAR: AntD 渲染函数惯例
-                    <PermActions>
-                        <Button perm='article:create' type='primary' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>
-                    </PermActions>
+                searchInline
+                toolBarRightRender={() => (
+                    <PermActions actions={[
+                        {label: '新增', type: 'primary', icon: <PlusOutlined/>, perm: 'article:create', onClick: this.handleAdd},
+                    ]}/>
                 )}
                 request={(params) => HttpClient.get('admin/article/page', params)}
                 columns={this.columns}
-                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
+                searchFormRender={() => (
                     <>
-                        <Form.Item label='编码' name='code'>
-                            <Input/>
+                        <Form.Item name='code' noStyle>
+                            <Input prefix={<SearchOutlined/>} placeholder='文章编码' allowClear/>
                         </Form.Item>
-                        <Form.Item label='标题' name='title'>
-                            <Input/>
+                        <Form.Item name='title' noStyle>
+                            <Input placeholder='文章标题' allowClear/>
                         </Form.Item>
                     </>
                 )}

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

@@ -96,9 +96,7 @@ export default class CodegenPage extends React.Component {
 
     render() {
         const selected = this.selectedOption()
-        return <Page title='代码生成'
-                     description='扫描实体，生成 Repository / Service / Controller / 前端页面 / 菜单 代码并写入项目源码目录'
-                     actions={
+        return <Page actions={
                          <Space>
                              <Perm code='sys-codegen:generate'>
                                  <Button type='primary' loading={this.state.loading} onClick={this.handlePreview}>预览</Button>

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

@@ -164,7 +164,7 @@ export default class DictPage extends React.Component {
         const {selectedType, selectedTypeCode} = this.state
         const hasTypeSelected = selectedType != null && selectedTypeCode != null
 
-        return <Page title="数据字典" description="管理数据字典类型和字典项">
+        return <Page>
             <Splitter>
                 <Splitter.Panel defaultSize={300} style={{paddingRight: 8}}>
                     <Card loading={this.state.treeLoading}
@@ -269,7 +269,7 @@ export default class DictPage extends React.Component {
                         allowClear
                         maxLength={20}
                         options={COLOR_OPTIONS}
-                        filterOption={(input, option) => // NOSONAR: AntD AutoComplete 过滤回调惯例
+                        filterOption={(input, option) =>
                             (option.value + option.label).toLowerCase().includes(input.toLowerCase())
                         }
                         placeholder='如 SUCCESS、#ff0000'

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

@@ -32,7 +32,7 @@ export default class FilePage extends React.Component {
             title: '缩略图',
             dataIndex: 'objectName',
             width: 80,
-            render: (objectName, record) => { // NOSONAR: 返回元素或占位文本，类型不同属预期
+            render: (objectName, record) => {
                 if (record.type !== 'image') {
                     return '-'
                 }
@@ -151,7 +151,7 @@ export default class FilePage extends React.Component {
             <ProTable
                 actionRef={this.tableRef}
                 rowSelection={{}}
-                toolBarRender={(params, selection) => ( // NOSONAR: AntD 渲染函数惯例
+                toolBarRightRender={(params, selection) => (
                     <Space>
                         <Button type='primary' icon={<CloudUploadOutlined/>} onClick={() => this.setState({formOpen: true})}>上传文件</Button>
                         <PermActions
@@ -171,7 +171,7 @@ export default class FilePage extends React.Component {
                 }}
 
                 columns={this.columns}
-                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
+                searchFormRender={() => (
                     <>
                         <Form.Item label='文件名' name='originName'>
                             <Input/>

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

@@ -2,7 +2,6 @@ import React from 'react'
 import {
     Alert,
     AutoComplete,
-    Button,
     Divider,
     Form,
     Input,
@@ -12,7 +11,7 @@ import {
     Switch,
     Tag
 } from 'antd'
-import {PlusOutlined} from "@ant-design/icons";
+import {PlusOutlined, SearchOutlined} from "@ant-design/icons";
 import {FormModal, getMessageApi, HttpClient, Page, PermActions, ProTable, UrlUtils, ValueType} from "../../../framework";
 
 
@@ -200,21 +199,22 @@ export default class JobPage extends React.Component {
         return <Page>
             <ProTable
                 actionRef={this.tableRef}
-                toolBarRender={() => ( // NOSONAR: AntD 渲染函数惯例
-                    <PermActions>
-                        <Button type='primary' perm='job:create' icon={<PlusOutlined/>} onClick={() => this.handleAdd()}>新增</Button>
-                        <Button perm='job:read' onClick={this.showStatus}>查看状态</Button>
-                    </PermActions>
+                searchInline
+                toolBarRightRender={() => (
+                    <PermActions actions={[
+                        {label: '新增', type: 'primary', icon: <PlusOutlined/>, perm: 'job:create', onClick: () => this.handleAdd()},
+                        {label: '查看状态', perm: 'job:read', onClick: this.showStatus},
+                    ]}/>
                 )}
                 request={(params) => HttpClient.get('admin/job/page', params)}
                 columns={this.columns}
-                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
+                searchFormRender={() => (
                     <>
-                        <Form.Item label='名称' name='name'>
-                            <Input/>
+                        <Form.Item name='name' noStyle>
+                            <Input prefix={<SearchOutlined/>} placeholder='任务名称' allowClear/>
                         </Form.Item>
-                        <Form.Item label='执行类' name='jobClass'>
-                            <Input/>
+                        <Form.Item name='jobClass' noStyle>
+                            <Input placeholder='执行类' allowClear/>
                         </Form.Item>
                     </>
                 )}
@@ -348,7 +348,7 @@ export default class JobPage extends React.Component {
             const option = this.state.jobClassOptions.find(o => o.value === changed.jobClass)
             if (option) {
                 const {label} = option;
-                const match = label.match(/[（(](.*?)[）)]/); // NOSONAR: 匹配中英文括号内内容，已最简
+                const match = label.match(/[（(](.*?)[）)]/);
                 if (match) { // 取括号内中文描述设置为name
                     this.modalRef.current.formInstance.setFieldValue("name", match[1])
                 }

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

@@ -53,11 +53,11 @@ export default class LogPage extends React.Component {
 
 
     render() {
-        return <Page title="操作日志" description="查看系统操作日志">
+        return <Page>
             <ProTable
                 request={(params) => HttpClient.get('admin/sysLog/page', params)}
                 columns={this.columns}
-                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
+                searchFormRender={() => (
                     <>
                         <Form.Item label='操作' name='operation'>
                             <Input/>

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

@@ -94,13 +94,13 @@ export default class OrgPage extends React.Component {
         const params = this.state.params
         const canSort = PermUtils.hasPermission('sys-org:update')
 
-        return <Page title="组织机构" description="管理组织机构树" actions={
-            <Button type='primary' perm='sys-org:create' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>
-        }>
+        return <Page>
             <Splitter>
                 <Splitter.Panel defaultSize={400} style={{paddingRight: 8}}>
 
-                    <Card size='small' >
+
+                    <Card title="机构树" extra={<Button type='primary' perm='sys-org:create'
+                                              icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>}>
                         <div style={{display: 'flex', alignItems: 'center', gap: 4}}>
                             <Input.Search placeholder='搜索' value={params.searchText} onChange={e => {
                                 params.searchText = e.target.value
@@ -140,7 +140,7 @@ export default class OrgPage extends React.Component {
                                   onSelect={this.onSelect}
                                   showIcon
                                   blockNode
-                                  icon={item => <NamedIcon name={item.data.iconName}/>} // NOSONAR: AntD 渲染函数惯例
+                                  icon={item => <NamedIcon name={item.data.iconName}/>}
                                   draggable={this.state.draggable}
                                   onDrop={this.onDrop}
                                   showLine

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

@@ -1,5 +1,5 @@
-import {PlusOutlined} from '@ant-design/icons'
-import {Button, Form, Input, InputNumber} from 'antd'
+import {PlusOutlined, SearchOutlined} from '@ant-design/icons'
+import {Form, Input, InputNumber} from 'antd'
 import React from 'react'
 import {FieldBoolean, FormModal, HttpClient, Page, PageUtils, PermActions, ProTable, UserPicker, ViewText} from "../../../framework";
 
@@ -133,25 +133,24 @@ export default class RolePage extends React.Component {
 
     render() {
         return <Page
-            title="角色管理"
-            description="管理系统角色，包括角色权限分配、用户设置等"
         >
             <ProTable
                 actionRef={this.tableRef}
-                toolBarRender={() => ( // NOSONAR: AntD 渲染函数惯例
-                    <PermActions>
-                        <Button perm='sys-role:create' type='primary' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>
-                    </PermActions>
+                toolBarRightRender={() => (
+                    <PermActions actions={[
+                        {label: '新增', type: 'primary', icon: <PlusOutlined/>, perm: 'sys-role:create', onClick: this.handleAdd},
+                    ]}/>
                 )}
                 request={(params) => HttpClient.get('admin/sysRole/page', params)}
                 columns={this.columns}
-                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
+                searchInline
+                searchFormRender={() => (
                     <>
-                        <Form.Item label='角色名称' name='name'>
-                            <Input/>
+                        <Form.Item name='name' noStyle>
+                            <Input prefix={<SearchOutlined/>} placeholder='角色名称' allowClear/>
                         </Form.Item>
-                        <Form.Item label='角色编码' name='code'>
-                            <Input/>
+                        <Form.Item name='code' noStyle>
+                            <Input placeholder='角色编码' allowClear/>
                         </Form.Item>
                     </>
                 )}

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

@@ -93,7 +93,7 @@ export default class RolePermPage extends React.Component {
 
 
     render() {
-        return <Page title="角色权限设置" description="设置角色的菜单和权限">
+        return <Page>
             <Card title='角色权限设置' loading={this.state.loading}
                   variant={"borderless"}
                   extra={<Button type='primary' icon={<SaveOutlined/>} onClick={this.savePerms}>保存权限</Button>}>

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

@@ -152,9 +152,9 @@ export default class UserPage extends React.Component {
 
     render() {
 
-        return <Page title="用户管理" description="管理系统用户">
+        return <Page >
             <Splitter>
-                <Splitter.Panel defaultSize={240} style={{paddingRight: 8}}>
+                <Splitter.Panel defaultSize={340} style={{paddingRight: 8}}>
                     <Card size='small'>
                         <OrgTree onChange={this.onSelectOrg}/>
                     </Card>
@@ -163,17 +163,17 @@ export default class UserPage extends React.Component {
                     <ProTable
                         searchFormCols={3}
                         actionRef={this.tableRef}
-                        toolBarRender={() => ( // NOSONAR: AntD 渲染函数惯例
-                            <PermActions>
-                                <Button perm='sys-user:create' type='primary' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>
-                            </PermActions>
+                        toolBarRightRender={() => (
+                            <PermActions actions={[
+                                {label: '新增', type: 'primary', icon: <PlusOutlined/>, perm: 'sys-user:create', onClick: this.handleAdd},
+                            ]}/>
                         )}
                         request={(params) => {
                             params.orgId = this.state.currentOrgId
                             return HttpClient.get('admin/sysUser/page', params)
                         }}
                         columns={this.columns}
-                        searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
+                        searchFormRender={() => (
                             <>
                                 <Form.Item label='姓名' name='name'>
                                     <Input/>

package/src/pages/system/user/userPerm.jsx

@@ -15,9 +15,9 @@ export default class UserPerm extends React.Component {
             dataPermType: null
         },
     }
-    formRef = React.createRef() // NOSONAR: React ref，内部通过 this.formRef 使用
+    formRef = React.createRef()
 
-    show(item) { // NOSONAR: ref 暴露给父组件调用的公共 API
+    show(item) {
         this.setState({visible: true})
 
         HttpClient.get('admin/sysUser/get-perm-info', {id: item.id}).then(rs => {

package/src/pages/userCenter/permView.jsx

@@ -26,7 +26,7 @@ export default class PermView extends React.Component {
             },
             {
                 title: '状态', dataIndex: 'status', key: 'status', width: 140,
-                render: (status) => { // NOSONAR: 返回元素或占位文本，类型不同属预期
+                render: (status) => {
                     if (status === 'mine') {
                         return <Tag color='blue'>我的机构</Tag>;
                     }
@@ -48,7 +48,7 @@ export default class PermView extends React.Component {
             },
             {
                 title: '状态', dataIndex: 'status', key: 'status', width: 140,
-                render: (status) => { // NOSONAR: 返回元素或占位文本，类型不同属预期
+                render: (status) => {
                     if (status === 'all') {
                         return <Tag color='green'>已授权</Tag>;
                     }