@jiangood/open-admin 3.0.15 → 3.1.1

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

@@ -2,7 +2,7 @@ import React from "react";
 import {Button, Form, Table} from 'antd';
 import type {FormInstance, TableProps} from 'antd';
 
-import {StringUtils} from "../../utils";
+import {StringUtils, type AjaxBody} from "../../utils";
 
 import './index.less'
 
@@ -13,27 +13,32 @@ export interface ProTableActionRef {
 }
 
 /** request 返回结构（Spring Data Page 序列化 + 扩展数据） */
-export interface ProTableRequestResult<T = any> {
+export interface ProTableRequestResult<T = unknown> {
     content: T[];
     totalElements: number | string;
     size: number;
     extData?: {
         summary?: React.ReactNode;
-        [key: string]: any;
+        [key: string]: unknown;
     };
 }
 
-export interface ProTableProps<T = any> {
-    /** 数据请求，框架自动注入 page/size/sort 参数 */
-    request: (params: Record<string, any>) => Promise<ProTableRequestResult<T>>;
+export interface ProTableProps<T = unknown> {
+    /**
+     * 数据请求（Promise 式），框架自动注入 page/size/sort 参数。
+     * 返回 HttpClient 的 Promise：request = (params) => HttpClient.get(url, params)
+     * ProTable 自动取 AjaxResult 的 data（分页结构 {content, totalElements, extData}）。
+     * 失败时 HttpClient 默认自动弹错，ProTable 内部静默复位 loading。
+     */
+    request: (params: Record<string, unknown>) => Promise<AjaxBody<ProTableRequestResult<T>>>;
     /** antd Table 列定义 */
     columns: TableProps<T>['columns'];
     /** 获取表格操作句柄（reload） */
-    actionRef?: React.MutableRefObject<ProTableActionRef | undefined>;
+    actionRef?: React.RefObject<ProTableActionRef | undefined>;
     /** 获取搜索表单实例 */
-    formRef?: React.MutableRefObject<FormInstance | undefined>;
+    formRef?: React.RefObject<FormInstance | undefined>;
     /** 工具栏渲染，参数为当前搜索值与行选择状态 */
-    toolBarRender?: (params: Record<string, any>, selection: {
+    toolBarRender?: (params: Record<string, unknown>, selection: {
         selectedRows: T[];
         selectedRowKeys: React.Key[];
     }) => React.ReactNode;
@@ -54,12 +59,12 @@ export interface ProTableProps<T = any> {
     treeMode?: boolean;
 }
 
-interface ProTableState<T = any> {
+interface ProTableState<T = unknown> {
     selectedRowKeys: React.Key[];
     selectedRows: T[];
     tableSize: 'small' | 'middle' | 'large';
     loading: boolean;
-    params: Record<string, any>;
+    params: Record<string, unknown>;
     dataSource: T[];
     total: number;
     current: number;
@@ -70,12 +75,12 @@ interface ProTableState<T = any> {
     };
     extData: {
         summary?: React.ReactNode;
-        [key: string]: any;
+        [key: string]: unknown;
     };
     scrollY: number | string | null;
 }
 
-export class ProTable<T = any> extends React.Component<ProTableProps<T>, ProTableState<T>> {
+export class ProTable<T = unknown> extends React.Component<ProTableProps<T>, ProTableState<T>> {
 
 
     state: ProTableState<T> = {
@@ -150,23 +155,22 @@ export class ProTable<T = any> extends React.Component<ProTableProps<T>, ProTabl
         }
 
 
-        this.setState({loading: true})
-        request(params).then(rs => {
-            const {content, totalElements, size,extData} = rs;
+this.setState({loading: true})
+        request(params).then((rs: AjaxBody<ProTableRequestResult<T>>) => {
+            const {content, totalElements, size, extData} = rs.data;
 
-
-            this.setState({dataSource: content, total: Number(totalElements),pageSize:size})
+            this.setState({dataSource: content, total: Number(totalElements), pageSize: size})
             if (extData) {
                 this.setState({extData})
             }
             this.updateSelectedRows(content)
-
-        }).finally(() => {
+            this.setState({loading: false})
+        }).catch(() => {
+            // 错误提示已由 HttpClient 默认弹出，此处仅复位 loading
             this.setState({loading: false})
         })
     }
 
-
     // 数据重新加载后，更新toolbar需要的已选择数据行
     updateSelectedRows = list => {
         const {rowKey = "id"} = this.props
@@ -180,7 +184,6 @@ export class ProTable<T = any> extends React.Component<ProTableProps<T>, ProTabl
 
     render() {
         const {
-            actionRef,
             toolBarRender,
             columns,
             rowSelection,
@@ -215,7 +218,7 @@ export class ProTable<T = any> extends React.Component<ProTableProps<T>, ProTabl
                         showTotal: (total) => `共 ${total} 条`
                     }}
 
-                    onChange={(pagination, filters, sorter, extra) => {
+                    onChange={(pagination, filters, sorter) => {
                         if (this.props.treeMode) {
                             this.setState({sorter}, this.loadData)
                         } else {
@@ -298,11 +301,11 @@ export class ProTable<T = any> extends React.Component<ProTableProps<T>, ProTabl
         };
     };
 
-    onSearch = (values: Record<string, any>) => {
+    onSearch = (values: Record<string, unknown>) => {
         this.setState({params: values, current: 1, sorter: {}}, this.loadData)
     }
 
-    changeFormValues = (values: Record<string, any>) => {
+    changeFormValues = (values: Record<string, unknown>) => { // NOSONAR: ref 暴露给父组件/业务项目调用的公共 API
         if (this.formRef.current) {
             this.formRef.current.resetFields()
             this.formRef.current.setFieldsValue(values)

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

@@ -8,7 +8,7 @@ function getComponent(registry, type) {
     if (!type) {
         return
     }
-    for (let key in registry) {
+    for (const key in registry) {
         if (key.toLowerCase() === type.toLowerCase()) {
             return registry[key]
         }

package/src/framework/components/index.ts

@@ -10,3 +10,4 @@ export * from './DownloadModal'
 export * from './OrgSwitcher'
 export { default as ErrorBoundary } from './ErrorBoundary'
 export { default as FormModal } from './FormModal'
+export { default as FormDrawer } from './DrawerForm'

package/src/framework/config/themeConfig.ts

@@ -21,18 +21,18 @@ export const DEFAULT_COLORS: Required<ThemeColors> = {
 
 let overrideColors: Partial<ThemeColors> | null = null;
 let cachedConfig: ThemeConfig | null = null;
-let cachedToken: Record<string, any> | null = null;
+let cachedToken: Record<string, unknown> | null = null;
 
 function buildConfig(): ThemeConfig {
-    const token: Record<string, any> = { borderRadius: 4, ...DEFAULT_COLORS, ...overrideColors };
-    const components: Record<string, any> = {
+    const token: Record<string, unknown> = { borderRadius: 4, ...DEFAULT_COLORS, ...overrideColors };
+    const components: Record<string, unknown> = {
         Layout: { headerBg: 'white', triggerHeight: 32 },
     };
 
     return { token, components };
 }
 
-function syncCssVars(token: Record<string, any>) {
+function syncCssVars(token: Record<string, unknown>) {
     if (typeof document === 'undefined') return;
     const el = document.documentElement;
     el.style.setProperty('--primary-color', token.colorPrimary);
@@ -54,7 +54,7 @@ export function getThemeConfig(): ThemeConfig {
     return cachedConfig;
 }
 
-export function getToken(): Record<string, any> {
+export function getToken(): ThemeColors & Record<string, unknown> {
     if (!cachedToken) {
         cachedToken = getDesignToken(getThemeConfig());
     }

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

@@ -1,18 +1,18 @@
 import React from 'react';
 import { Spin } from 'antd';
 import { debounce } from 'lodash';
-import { HttpUtils } from '../../utils';
+import { HttpClient } from '../../utils';
 
 interface BaseRemoteSelectState {
-    data: any[];
+    data: Record<string, unknown>[];
     loading: boolean;
 }
 
 export interface BaseRemoteSelectProps {
     url?: string;
-    value?: any;
+    value?: unknown;
     debounceTime?: number;
-    [key: string]: any;
+    [key: string]: unknown;
 }
 
 /**
@@ -21,11 +21,11 @@ export interface BaseRemoteSelectProps {
  * 处理通用的数据加载、防抖搜索、竞态处理、错误提示逻辑。
  * 子类只需覆写 getLoadParams() 和 render()。
  */
-export class BaseRemoteSelect<P extends BaseRemoteSelectProps = BaseRemoteSelectProps> extends React.Component<P, BaseRemoteSelectState> {
-    private fetchIdRef: number = 0;
+export class BaseRemoteSelect<P extends BaseRemoteSelectProps = BaseRemoteSelectProps> extends React.Component<P, BaseRemoteSelectState> { // NOSONAR: state/防抖字段构造器赋值
+    private fetchIdRef: number = 0; // NOSONAR: 构造器中赋值
     private loadDataDebounce: ReturnType<typeof debounce>;
 
-    static defaultProps = {
+    static readonly defaultProps = {
         debounceTime: 300,
     };
 
@@ -35,7 +35,7 @@ export class BaseRemoteSelect<P extends BaseRemoteSelectProps = BaseRemoteSelect
             data: [],
             loading: false,
         };
-        this.loadDataDebounce = debounce(this._loadData, (props as any).debounceTime || 300);
+        this.loadDataDebounce = debounce(this._loadData, props.debounceTime || 300);
     }
 
     componentDidMount() {
@@ -56,7 +56,7 @@ export class BaseRemoteSelect<P extends BaseRemoteSelectProps = BaseRemoteSelect
     }
 
     /** 返回请求参数。searchText=undefined 表示初始加载 */
-    getLoadParams(searchText?: string): Record<string, any> {
+    getLoadParams(searchText?: string): Record<string, unknown> {
         return { searchText, selected: this.props.value };
     }
 
@@ -67,28 +67,30 @@ export class BaseRemoteSelect<P extends BaseRemoteSelectProps = BaseRemoteSelect
 
     // ========== 数据加载 ==========
 
-    private _loadData = async (searchText?: string) => {
+    private _loadData = (searchText?: string) => {
         const url = this.getUrl();
         const fetchId = ++this.fetchIdRef;
 
         this.setState({ loading: true });
 
-        try {
-            const data = await HttpUtils.get(url, this.getLoadParams(searchText));
+        const done = () => {
+            if (fetchId === this.fetchIdRef) {
+                this.setState({ loading: false });
+            }
+        };
 
+        HttpClient.get(url, this.getLoadParams(searchText), {toastError: false}).then((data) => {
             if (fetchId === this.fetchIdRef) {
-                this.setState({ data: data || [] });
+                this.setState({ data: data.data || [] });
             }
-        } catch (error) {
+            done();
+        }).catch((error) => {
             console.warn('[BaseRemoteSelect] 加载失败:', error);
             if (fetchId === this.fetchIdRef) {
                 this.setState({ data: [] });
             }
-        } finally {
-            if (fetchId === this.fetchIdRef) {
-                this.setState({ loading: false });
-            }
-        }
+            done();
+        });
     };
 
     /**
@@ -115,14 +117,14 @@ export class BaseRemoteSelect<P extends BaseRemoteSelectProps = BaseRemoteSelect
 
     // ========== Helper 方法 ==========
 
-    getShowSearch(): { filterOption: false; onSearch: (value: string) => void } {
+    getShowSearch(): { filterOption: false; onSearch: (value: string) => void } { // NOSONAR: 由子类通过 this.getShowSearch() 调用
         return {
             filterOption: false,
             onSearch: this.handleSearch,
         };
     }
 
-    getNotFoundContent(): React.ReactNode {
+    getNotFoundContent(): React.ReactNode { // NOSONAR: 由子类通过 this.getNotFoundContent() 调用
         return this.state.loading ? <Spin size="small" /> : '数据为空';
     }
 }

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

@@ -23,7 +23,7 @@ export interface FieldBooleanProps extends FieldProps<boolean> {
 
 export class FieldBoolean extends React.Component<FieldBooleanProps> {
 
-    static defaultProps = {
+    static readonly defaultProps = {
         type: 'select'
     };
 
@@ -34,7 +34,7 @@ export class FieldBoolean extends React.Component<FieldBooleanProps> {
 
         switch (type) {
             case 'radio':
-                return <Radio.Group value={v} onChange={e => onChange && onChange(e.target.value)}>
+                return <Radio.Group value={v} onChange={e => onChange?.(e.target.value)}>
                     <Radio value={true}>是</Radio>
                     <Radio value={false}>否</Radio>
                 </Radio.Group>;
@@ -42,7 +42,7 @@ export class FieldBoolean extends React.Component<FieldBooleanProps> {
                 return <Checkbox
                     checked={v}
                     onChange={(e) => {
-                        onChange && onChange(e.target.checked);
+                        onChange?.(e.target.checked);
                     }}
                 />;
             case 'select':
@@ -51,7 +51,7 @@ export class FieldBoolean extends React.Component<FieldBooleanProps> {
                     {value: false, label: '否'},
                 ]}
                                value={v}
-                               onChange={value => onChange && onChange(value)}
+                               onChange={value => onChange?.(value)}
                                style={{width: '100%'}}
                                allowClear={true}
                                placeholder={'请选择'}
@@ -59,7 +59,7 @@ export class FieldBoolean extends React.Component<FieldBooleanProps> {
             case 'switch':
                 return <Switch
                     checked={v}
-                    onChange={checked => onChange && onChange(checked)}
+                    onChange={checked => onChange?.(checked)}
                 />;
             default:
                 return null;
@@ -67,7 +67,7 @@ export class FieldBoolean extends React.Component<FieldBooleanProps> {
 
     }
 
-    parseBoolean(v: any): boolean | undefined {
+    parseBoolean(v: unknown): boolean | undefined {
         if (v === null || v === undefined) {
             return undefined;
         }

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

@@ -17,11 +17,11 @@ export interface FieldDateProps extends FieldProps<string> {
     /** 自定义样式 */
     style?: React.CSSProperties;
     /** 其余属性透传给 DatePicker/TimePicker */
-    [key: string]: any;
+    [key: string]: unknown;
 }
 
 export class FieldDate extends React.Component<FieldDateProps> {
-    static defaultProps = {
+    static readonly defaultProps = {
         type: 'YYYY-MM-DD'
     };
 
@@ -33,34 +33,34 @@ export class FieldDate extends React.Component<FieldDateProps> {
             case 'YYYY':
                 return <DatePicker
                     value={this.strToDate(value, formattedType)}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'YYYY'))}
+                    onChange={v => onChange?.(this.dateToStr(v, 'YYYY'))}
                     picker="year"
                     {...rest}
                 />;
             case 'YYYY-MM':
                 return <DatePicker
                     value={this.strToDate(value, 'YYYY-MM')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'YYYY-MM'))}
+                    onChange={v => onChange?.(this.dateToStr(v, 'YYYY-MM'))}
                     picker="month"
                     {...rest}
                 />;
             case 'YYYY-QQ':
                 return <DatePicker
                     value={this.strToDate(value, 'YYYY-QQ')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'YYYY-QQ'))}
+                    onChange={v => onChange?.(this.dateToStr(v, 'YYYY-QQ'))}
                     picker="quarter"
                     {...rest}
                 />;
             case 'YYYY-MM-DD':
                 return <DatePicker
                     value={this.strToDate(value, 'YYYY-MM-DD')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'YYYY-MM-DD'))}
+                    onChange={v => onChange?.(this.dateToStr(v, 'YYYY-MM-DD'))}
                     {...rest}
                 ></DatePicker>;
             case 'YYYY-MM-DD HH:mm':
                 return <DatePicker
                     value={this.strToDate(value, 'YYYY-MM-DD HH:mm')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'YYYY-MM-DD HH:mm'))}
+                    onChange={v => onChange?.(this.dateToStr(v, 'YYYY-MM-DD HH:mm'))}
                     format='YYYY-MM-DD HH:mm'
                     showTime
                     {...rest}
@@ -68,7 +68,7 @@ export class FieldDate extends React.Component<FieldDateProps> {
             case 'YYYY-MM-DD HH:mm:ss':
                 return <DatePicker
                     value={this.strToDate(value, 'YYYY-MM-DD HH:mm:ss')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'YYYY-MM-DD HH:mm:ss'))}
+                    onChange={v => onChange?.(this.dateToStr(v, 'YYYY-MM-DD HH:mm:ss'))}
                     showTime
                     {...rest}
                 ></DatePicker>;
@@ -76,13 +76,13 @@ export class FieldDate extends React.Component<FieldDateProps> {
                 return <TimePicker
                     format='HH:mm'
                     value={this.strToDate(value, 'HH:mm')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'HH:mm'))}
+                    onChange={v => onChange?.(this.dateToStr(v, 'HH:mm'))}
                     {...rest}
                 ></TimePicker>;
             case 'HH:mm:ss':
                 return <TimePicker
                     value={this.strToDate(value, 'HH:mm:ss')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'HH:mm:ss'))}
+                    onChange={v => onChange?.(this.dateToStr(v, 'HH:mm:ss'))}
                     {...rest}
                 ></TimePicker>;
             default:

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

@@ -10,7 +10,7 @@ import type {FieldProps} from '../types';
 const SP = StringUtils.ISO_SPLITTER;
 
 /** 日期范围值，形如 "2024-01-01/2024-01-31"（起止以 / 分隔） */
-export type FieldDateRangeValue = string;
+export type FieldDateRangeValue = string; // NOSONAR: npm 包导出类型，业务项目引用
 
 export interface FieldDateRangeProps extends FieldProps<FieldDateRangeValue> {
     /** 日期类型，如 YYYY-MM-DD、YYYY-MM、HH:mm:ss 等，默认 YYYY-MM-DD */
@@ -22,11 +22,11 @@ export interface FieldDateRangeProps extends FieldProps<FieldDateRangeValue> {
     /** 自定义样式 */
     style?: React.CSSProperties;
     /** 其余属性透传给 RangePicker */
-    [key: string]: any;
+    [key: string]: unknown;
 }
 
 export class FieldDateRange extends React.Component<FieldDateRangeProps> {
-    static defaultProps = {
+    static readonly defaultProps = {
         type: 'YYYY-MM-DD'
     };
 
@@ -37,57 +37,57 @@ export class FieldDateRange extends React.Component<FieldDateRangeProps> {
         switch (formattedType) {
             case 'YYYY':
                 return <DatePicker.RangePicker
-                    value={this.strToDate(value, 'YYYY')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'YYYY'))}
+                    value={this.strToDate(value)}
+                    onChange={v => onChange?.(this.dateToStr(v, 'YYYY'))}
                     picker="year"
                     {...rest}
                 />;
             case 'YYYY-MM':
                 return <DatePicker.RangePicker
-                    value={this.strToDate(value, 'YYYY-MM')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'YYYY-MM'))}
+                    value={this.strToDate(value)}
+                    onChange={v => onChange?.(this.dateToStr(v, 'YYYY-MM'))}
                     picker="month"
                     {...rest}
                 />;
             case 'YYYY-QQ':
                 return <DatePicker.RangePicker
-                    value={this.strToDate(value, 'YYYY-QQ')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'YYYY-QQ'))}
+                    value={this.strToDate(value)}
+                    onChange={v => onChange?.(this.dateToStr(v, 'YYYY-QQ'))}
                     picker="quarter"
                     {...rest}
                 />;
             case 'YYYY-MM-DD':
                 return <DatePicker.RangePicker
-                    value={this.strToDate(value, 'YYYY-MM-DD')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'YYYY-MM-DD'))}
+                    value={this.strToDate(value)}
+                    onChange={v => onChange?.(this.dateToStr(v, 'YYYY-MM-DD'))}
                     {...rest}
                 />;
             case 'YYYY-MM-DD HH:mm':
                 return <DatePicker.RangePicker
-                    value={this.strToDate(value, 'YYYY-MM-DD HH:mm')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'YYYY-MM-DD HH:mm'))}
+                    value={this.strToDate(value)}
+                    onChange={v => onChange?.(this.dateToStr(v, 'YYYY-MM-DD HH:mm'))}
                     format='YYYY-MM-DD HH:mm'
                     showTime
                     {...rest}
                 />;
             case 'YYYY-MM-DD HH:mm:ss':
                 return <DatePicker.RangePicker
-                    value={this.strToDate(value, 'YYYY-MM-DD HH:mm:ss')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'YYYY-MM-DD HH:mm:ss'))}
+                    value={this.strToDate(value)}
+                    onChange={v => onChange?.(this.dateToStr(v, 'YYYY-MM-DD HH:mm:ss'))}
                     showTime
                     {...rest}
                 />;
             case 'HH:mm':
                 return <TimePicker.RangePicker
                     format='HH:mm'
-                    value={this.strToDate(value, 'HH:mm')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'HH:mm'))}
+                    value={this.strToDate(value)}
+                    onChange={v => onChange?.(this.dateToStr(v, 'HH:mm'))}
                     {...rest}
                 />;
             case 'HH:mm:ss':
                 return <TimePicker.RangePicker
-                    value={this.strToDate(value, 'HH:mm:ss')}
-                    onChange={v => onChange && onChange(this.dateToStr(v, 'HH:mm:ss'))}
+                    value={this.strToDate(value)}
+                    onChange={v => onChange?.(this.dateToStr(v, 'HH:mm:ss'))}
                     {...rest}
                 />;
             default:
@@ -96,7 +96,7 @@ export class FieldDateRange extends React.Component<FieldDateRangeProps> {
 
     }
 
-    strToDate(v: string | null | undefined, fmt: string): [dayjs.Dayjs, dayjs.Dayjs] | null {
+    strToDate(v: string | null | undefined): [dayjs.Dayjs, dayjs.Dayjs] | null {
         if (!v) {
             return null;
         }

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

@@ -4,7 +4,7 @@ import {DictUtils} from "../../utils";
 import type {SelectProps} from "antd/es/select";
 import type {FieldProps} from '../types';
 
-interface FieldDictSelectProps extends Omit<SelectProps, 'options' | 'children' | 'mode' | 'value' | 'onChange'>, FieldProps<any> {
+interface FieldDictSelectProps extends Omit<SelectProps, 'options' | 'children' | 'mode' | 'value' | 'onChange'>, FieldProps<unknown> {
     typeCode: string;
 }
 
@@ -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);
+        const strValue = value == null ? null : String(value); // NOSONAR: value 经 String() 显式转换，无隐式字符串化
 
         return <Select value={strValue}
                        onChange={this.props.onChange}

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

@@ -69,7 +69,7 @@ export class FieldEditor extends React.Component<FieldEditorProps, {loading: boo
                     setup: function (editor) {
                         editor.on('OpenWindow', function(e) {
                             const dialog = e.dialog;
-                            if (dialog && dialog.getData().dimensions) {
+                            if (dialog?.getData().dimensions) {
                                 dialog.showTab("upload");
                             }
                         });

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

@@ -6,7 +6,9 @@ import type {FieldProps} from '../types';
 const SP = StringUtils.ISO_SPLITTER;
 
 /** 数字范围值，形如 "1/100"（起止以 / 分隔） */
-export type FieldNumberRangeValue = string;
+export type FieldNumberRangeValue = string; // NOSONAR: npm 包导出类型，业务项目引用
+
+export type RangePartValue = number | string | null;
 
 export interface FieldNumberRangeProps extends FieldProps<FieldNumberRangeValue> {
     /** 默认值（形如 "1/100"），value 为空时挂载后回填 */
@@ -14,23 +16,21 @@ export interface FieldNumberRangeProps extends FieldProps<FieldNumberRangeValue>
 }
 
 export class FieldNumberRange extends React.Component<FieldNumberRangeProps> {
-    onChangeA = (a: number | string | null) => {
+    onChangeA = (a: RangePartValue) => {
         const {b} = this.parse(this.props.value);
-        this.props.onChange && this.props.onChange(this.merge(a, b));
+        this.props.onChange?.(this.merge(this.toPart(a), this.toPart(b)));
     };
 
-    onChangeB = (b: number | string | null) => {
+    onChangeB = (b: RangePartValue) => {
         const {a} = this.parse(this.props.value);
-        this.props.onChange && this.props.onChange(this.merge(a, b));
+        this.props.onChange?.(this.merge(this.toPart(a), this.toPart(b)));
     };
 
-    merge(a: number | string | null, b: number | string | null): string {
-        if (a == null) {
-            a = '';
-        }
-        if (b == null) {
-            b = '';
-        }
+    private toPart(v: RangePartValue): number | string {
+        return v ?? '';
+    }
+
+    merge(a: number | string, b: number | string): string {
         return a + SP + b;
     }
 
@@ -45,15 +45,14 @@ export class FieldNumberRange extends React.Component<FieldNumberRangeProps> {
     componentDidMount() {
         const {value, defaultValue, onChange} = this.props;
         if (value == null && defaultValue) {
-            onChange && onChange(defaultValue);
+            onChange?.(defaultValue);
         }
     }
 
     render() {
-        let {value, defaultValue} = this.props;
-        if (value == null) {
-            value = defaultValue;
-        }
+        const {defaultValue} = this.props;
+        let {value} = this.props;
+        value = value ?? defaultValue;
         const {a, b} = this.parse(value);
 
         return <div style={{display: 'flex', alignItems: 'center'}}>

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

@@ -12,7 +12,7 @@ export interface FieldPercentProps extends Omit<InputNumberProps, 'value' | 'onC
  * 数字的百分数输入框
  */
 export class FieldPercent extends React.Component<FieldPercentProps> {
-    static defaultProps = {
+    static readonly defaultProps = {
         precision: 2,
     };
 
@@ -28,7 +28,7 @@ export class FieldPercent extends React.Component<FieldPercentProps> {
                     onChange={v => {
                         if (v != null) {
                             const percentValue = Number((v / 100).toFixed(precision));
-                            onChange && onChange(percentValue);
+                            onChange?.(percentValue);
                         }
                     }}
                     {...rest}