@jiangood/open-admin 3.0.15 → 3.1.1

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

@@ -4,16 +4,16 @@ import {BaseRemoteSelect} from '../BaseRemoteSelect';
 import type {SelectProps} from "antd/es/select";
 import type {FieldProps} from '../types';
 
-interface FieldRemoteSelectProps extends Omit<SelectProps, 'value' | 'onChange' | 'mode'>, FieldProps<any> {
+interface FieldRemoteSelectProps extends Omit<SelectProps, 'value' | 'onChange' | 'mode'>, FieldProps<unknown> {
     url: string;
     debounceTime?: number;
     multiple?: boolean;
-    paramsProcessor?: (params: any) => any;
-    responseProcessor?: (response: any) => any;
+    paramsProcessor?: (params: Record<string, unknown>) => Record<string, unknown>;
+    responseProcessor?: (response: unknown) => unknown;
 }
 
 export class FieldRemoteSelect extends BaseRemoteSelect<FieldRemoteSelectProps> {
-    static defaultProps = {
+    static readonly defaultProps = {
         placeholder: '请搜索选择',
     };
 

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

@@ -20,7 +20,7 @@ export class FieldRemoteTree extends BaseRemoteSelect {
             <Tree
                 multiple
                 checkable
-                onCheck={(checkedInfo) => this.props.onChange && this.props.onChange(checkedInfo.checked)}
+                onCheck={(checkedInfo) => this.props.onChange?.(checkedInfo.checked)}
                 checkedKeys={this.props.value}
                 treeData={this.state.data}
                 defaultExpandAll

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

@@ -28,7 +28,7 @@ export class FieldRemoteTreeCascader extends BaseRemoteSelect {
             <Cascader
                 options={data}
                 onChange={(arr) => {
-                    onChange && onChange(arr[arr.length - 1]);
+                    onChange?.(arr[arr.length - 1]);
                 }}
                 value={arr}
                 fieldNames={{ label: 'title', value: 'key' }}

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

@@ -4,7 +4,7 @@ import { StringUtils } from '../../utils';
 import { BaseRemoteSelect } from '../BaseRemoteSelect';
 
 export class FieldRemoteTreeSelect extends BaseRemoteSelect {
-    static defaultProps = {
+    static readonly defaultProps = {
         treeDefaultExpandAll: true,
     };
 

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

@@ -10,7 +10,7 @@ interface FieldSysOrgTreeProps extends FieldProps<string[]> {
 }
 
 export class FieldSysOrgTree extends React.Component<FieldSysOrgTreeProps> {
-  static defaultProps = {
+  static readonly defaultProps = {
     type: 'dept',
   };
 

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

@@ -8,7 +8,7 @@ interface FieldSysOrgTreeSelectProps extends FieldProps<string | string[]> {
 
 export class FieldSysOrgTreeSelect extends React.Component<FieldSysOrgTreeSelectProps> {
 
-    static defaultProps = {
+    static readonly defaultProps = {
         type: 'dept',
     };
 

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

@@ -16,12 +16,12 @@ export interface FieldTableColumn {
     /** 列宽 */
     width?: number | string;
     /** 自定义渲染（返回的组件会被注入 value/onChange） */
-    render?: (value: any, record: Record<string, any>, index: number) => React.ReactElement;
+    render?: (value: unknown, record: Record<string, unknown>, index: number) => React.ReactElement;
     /** 其余 antd Table 列属性 */
-    [key: string]: any;
+    [key: string]: unknown;
 }
 
-export interface FieldTableProps extends FieldProps<Record<string, any>[]> {
+export interface FieldTableProps extends FieldProps<Record<string, unknown>[]> {
     /** 列配置（操作列由组件自动追加） */
     columns: FieldTableColumn[];
     /** 容器样式 */
@@ -29,7 +29,7 @@ export interface FieldTableProps extends FieldProps<Record<string, any>[]> {
 }
 
 interface FieldTableState {
-    dataSource: Record<string, any>[];
+    dataSource: Record<string, unknown>[];
 }
 
 /**
@@ -84,13 +84,13 @@ export class FieldTable extends React.Component<FieldTableProps, FieldTableState
         dataSource: []
     };
 
-    onCellChange = (index: number, dataIndex: string | undefined, e: any) => {
+    onCellChange = (index: number, dataIndex: string | undefined, e: unknown) => {
         const {dataSource} = this.state;
         const row = dataSource[index];
 
-        let v = e;
+        let v: unknown = e;
         if (e != null && typeof e === 'object' && 'target' in e) {
-            v = e.target.value;
+            v = (e as {target: {value: unknown}}).target.value;
         }
 
         const next = [...dataSource];
@@ -104,25 +104,27 @@ export class FieldTable extends React.Component<FieldTableProps, FieldTableState
         this.setState({dataSource}, this.notifyParent);
     };
 
-    remove = (record: Record<string, any>) => {
+    remove = (record: Record<string, unknown>) => {
         const {dataSource} = this.state;
         this.setState({dataSource: dataSource.filter(item => item !== record)}, this.notifyParent);
     };
 
     notifyParent = () => {
         const {dataSource} = this.state;
-        this.props.onChange && this.props.onChange(dataSource);
+        this.props.onChange?.(dataSource);
     };
 
+    renderFooter = () => <Button type='dashed'
+                                 icon={<PlusOutlined/>}
+                                 onClick={this.add}>增加一行
+    </Button>;
+
     render() {
         return <div className='edit-table' style={this.props.style}>
             <Table columns={this.columns}
                    dataSource={this.state.dataSource}
                    size='small'
-                   footer={() => <Button type='dashed'
-                                         icon={<PlusOutlined/>}
-                                         onClick={this.add}>增加一行
-                   </Button>}
+                   footer={this.renderFooter}
                    pagination={false}
             >
 

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

@@ -2,14 +2,14 @@ import React from "react";
 import {Button, Select} from "antd";
 import type {TableColumnsType} from "antd";
 import {ProTable} from "../../components";
-import {HttpUtils} from "../../utils";
+import {HttpClient} from "../../utils";
 import type {FieldProps} from '../types';
 
 export interface FieldTableSelectProps extends FieldProps<string> {
     /** 数据加载地址 */
     url: string;
     /** 表格列配置（操作列由组件自动追加） */
-    columns: TableColumnsType<Record<string, any>>;
+    columns: TableColumnsType<Record<string, unknown>>;
     /** 占位文本，默认 请搜索选择 */
     placeholder?: string;
 }
@@ -26,7 +26,7 @@ interface FieldTableSelectState {
  */
 export class FieldTableSelect extends React.Component<FieldTableSelectProps, FieldTableSelectState> {
 
-    static defaultProps = {
+    static readonly defaultProps = {
         placeholder: '请搜索选择',
     };
 
@@ -62,13 +62,13 @@ export class FieldTableSelect extends React.Component<FieldTableSelectProps, Fie
                                 label: record.name,
                                 open: false
                             });
-                            this.props.onChange && this.props.onChange(record.id);
+                            this.props.onChange?.(record.id);
                         }}>选择</Button>;
                 }
             }]}
             request={(params) => {
                 params.selected = this.props.value;
-                return HttpUtils.get(this.props.url, params);
+                return HttpClient.get(this.props.url, params);
             }}>
         </ProTable>;
     };

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

@@ -88,7 +88,7 @@ export class FieldUploadFile extends React.Component<FieldUploadFileProps, Field
                 if (f.response) { // 新上传的
                     const ajaxResult = f.response;
                     if (ajaxResult.success) {
-                        const {objectName, name} = ajaxResult.data;
+                        const {objectName} = ajaxResult.data;
                         f.objectName = objectName;
                         objectNames.push(objectName);
                     } else {
@@ -102,9 +102,9 @@ export class FieldUploadFile extends React.Component<FieldUploadFileProps, Field
         return objectNames;
     }
 
-    handleChange = ({fileList, event, file}: UploadChangeParam<SysUploadFile>) => {
+    handleChange = ({fileList, file}: UploadChangeParam<SysUploadFile>) => {
         const rs = file.response;
-        if (rs != null && rs.success === false) {
+        if (rs?.success === false) {
             this.setState({errorTitle: '上传失败', errorContent: rs.message});
             return;
         }

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

@@ -4,9 +4,7 @@ import {DeleteOutlined, EyeOutlined, PlusOutlined} from "@ant-design/icons";
 import Compressor from "compressorjs";
 import Cropper from "cropperjs";
 import "cropperjs/dist/cropper.css";
-import {HttpUtils} from "../../utils";
-import {ObjectUtils} from "../../utils";
-import {UrlUtils} from "../../utils";
+import {HttpClient, ObjectUtils, UrlUtils} from "../../utils";
 import type {FieldProps} from '../types';
 
 export interface FieldUploadImageProps extends FieldProps<string> {
@@ -93,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, {
+        new Compressor(source, { // NOSONAR (typescript:S1848) — compressorjs 通过构造函数副作用异步压缩，回调内 resolve/reject，实例无需保留
             maxWidth: options.maxWidth,
             maxHeight: options.maxHeight,
             width: options.width,
@@ -141,9 +139,9 @@ async function compressToTarget(source: Blob, maxWidth: number | undefined, targ
     return best;
 }
 
-export class FieldUploadImage extends React.Component<FieldUploadImageProps, FieldUploadImageState> {
+export class FieldUploadImage extends React.Component<FieldUploadImageProps, FieldUploadImageState> { // NOSONAR: state 构造器中按 props 初始化，无法全部 readonly
 
-    state: FieldUploadImageState = {
+    state: FieldUploadImageState = { // NOSONAR: 构造器中按 props 初始化，无法 readonly
         // 传入的参数
         maxCount: 1,
         thumbWidth: 300,
@@ -169,10 +167,10 @@ export class FieldUploadImage extends React.Component<FieldUploadImageProps, Fie
     constructor(props: FieldUploadImageProps) {
         super(props);
         ObjectUtils.copyPropertyIfPresent(props, this.state);
-        if (this.props.value) this.state.objectNames = this.props.value.split(',');
+        if (props.value) this.state.objectNames = props.value.split(',');
     }
 
-    componentDidUpdate(prevProps: FieldUploadImageProps, prevState: FieldUploadImageState) {
+    componentDidUpdate(prevProps: FieldUploadImageProps, prevState: FieldUploadImageState) { // NOSONAR: 顺序同步多个 props 到 state，拆分反而更难读
         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;
@@ -199,7 +197,7 @@ export class FieldUploadImage extends React.Component<FieldUploadImageProps, Fie
         if (prevState.cropRatio !== this.state.cropRatio && this.cropperRef) {
             if (!this.state.cropRatio) {
                 const box = this.cropperRef.getCropBoxData();
-                this.cropperRef.setAspectRatio(NaN);
+                this.cropperRef.setAspectRatio(Number.NaN);
                 this.cropperRef.setCropBoxData(box);
             } else {
                 this.cropperRef.setAspectRatio(this.state.cropRatio.width / this.state.cropRatio.height);
@@ -229,7 +227,7 @@ export class FieldUploadImage extends React.Component<FieldUploadImageProps, Fie
         const init = () => {
             if (this.cropperRef) this.cropperRef.destroy();
             this.cropperRef = new Cropper(el, {
-                aspectRatio: this.state.cropRatio ? this.state.cropRatio.width / this.state.cropRatio.height : NaN,
+                aspectRatio: this.state.cropRatio ? this.state.cropRatio.width / this.state.cropRatio.height : Number.NaN,
                 viewMode: 1,
                 autoCropArea: 0.85,
                 dragMode: 'move',
@@ -293,7 +291,7 @@ export class FieldUploadImage extends React.Component<FieldUploadImageProps, Fie
             this.previewUrlsRef = [cUrl];
             this.setState({preview: {cUrl, cFile, cSize: cFile.size, cdims}, tool: undefined});
             message.success(`已压缩：${cdims.width} x ${cdims.height} / ${formatSize(cFile.size)}`);
-        } catch (e) {
+        } catch {
             message.error('压缩失败');
         }
     };
@@ -320,7 +318,7 @@ export class FieldUploadImage extends React.Component<FieldUploadImageProps, Fie
             this.setState({originalDims: dims});
             // 默认展示原图，不做压缩处理，用户可点击「压缩」按钮手动压缩
             await this.loadOriginalPreview(file, url, dims);
-        } catch (e) {
+        } catch {
             message.error('读取图片失败');
             this.closeModal();
             return;
@@ -365,22 +363,34 @@ export class FieldUploadImage extends React.Component<FieldUploadImageProps, Fie
             fd.append('file', this.state.preview.cFile);
             fd.append('thumb', tFile);
             fd.append('isPublic', String(this.state.isPublic));
-            const rs = await HttpUtils.post('admin/sysFile/uploadImage', fd);
-            const newNames = [...this.state.objectNames, rs.objectName];
-            this.setState({objectNames: newNames});
-            this.props.onChange?.(newNames.join(','));
+            const rs = await HttpClient.post('admin/sysFile/uploadImage', fd, null, {toastError: false});
+            this.setState(
+                (prevState) => ({objectNames: [...prevState.objectNames, rs.data.objectName]}),
+                () => this.props.onChange?.(this.state.objectNames.join(','))
+            );
             this.closeModal();
         } catch (e) {
-            message.error(HttpUtils.extractErrorMessage(e));
+            message.error(HttpClient.errToMsg(e));
         } finally {
             this.setState({uploading: false});
         }
     };
 
     private removeImage = (name: string) => {
-        const newNames = this.state.objectNames.filter((n) => n !== name);
-        this.setState({objectNames: newNames});
-        this.props.onChange?.(newNames.join(','));
+        this.setState(
+            (prevState) => ({objectNames: prevState.objectNames.filter((n) => n !== name)}),
+            () => this.props.onChange?.(this.state.objectNames.join(','))
+        );
+    };
+
+    private renderCanvas = (preview, canvasImg, originalUrl) => {
+        if (this.state.tool === 'crop') {
+            return <img key="crop-canvas" ref={this.imgRef} src={preview?.cUrl || originalUrl} style={{maxWidth: '100%', maxHeight: '100%'}} alt="待裁切"/>;
+        }
+        if (canvasImg?.url) {
+            return <img src={canvasImg.url} style={{maxWidth: '100%', maxHeight: '100%'}} alt="预览"/>;
+        }
+        return <div style={{color: '#999'}}>生成中...</div>;
     };
 
     render() {
@@ -479,13 +489,7 @@ export class FieldUploadImage extends React.Component<FieldUploadImageProps, Fie
                                 flex: 1, minHeight: 0, display: 'flex', alignItems: 'center', justifyContent: 'center',
                                 background: '#f5f5f5', borderRadius: 8, border: '1px dashed #d9d9d9', position: 'relative', overflow: 'hidden',
                             }}>
-                                {tool === 'crop' ? (
-                                    <img key="crop-canvas" ref={this.imgRef} src={preview?.cUrl || originalUrl} style={{maxWidth: '100%', maxHeight: '100%'}} alt="待裁切"/>
-                                ) : canvasImg?.url ? (
-                                    <img src={canvasImg.url} style={{maxWidth: '100%', maxHeight: '100%'}} alt="预览"/>
-                                ) : (
-                                    <div style={{color: '#999'}}>生成中...</div>
-                                )}
+                                {this.renderCanvas(preview, canvasImg, originalUrl)}
                             </div>
                         </div>
 
@@ -506,7 +510,6 @@ export class FieldUploadImage extends React.Component<FieldUploadImageProps, Fie
                                 {tool !== 'crop' && <Divider style={{margin: '0 0 12px'}}/>}
                                 <div style={{fontWeight: 600, marginBottom: 8}}>{tool === 'crop' ? '裁切信息' : '图片信息'}</div>
                                 {tool === 'crop' ? (
-                                    <>
                                         <Radio.Group
                                             value={cropRatio ? formatRatio(cropRatio.width, cropRatio.height) : 'free'}
                                             onChange={(e) => {
@@ -521,7 +524,6 @@ export class FieldUploadImage extends React.Component<FieldUploadImageProps, Fie
                                                 </Radio>
                                             ))}
                                         </Radio.Group>
-                                    </>
                                 ) : (
                                     <>
                                         {canvasImg && (

package/src/framework/fields/types.ts

@@ -1,5 +1,3 @@
-import React from 'react';
-
 /**
  * 通用字段组件属性接口
  * @template T - value 的类型

package/src/framework/router/PageFrame.tsx

@@ -10,7 +10,7 @@ interface PageFrameProps {
 }
 
 export class PageFrame extends React.Component<PageFrameProps> {
-    componentRef = React.createRef<any>();
+    componentRef = React.createRef<{onShow?: () => void}>();
 
     componentDidMount() {
         this.callOnShowIfActive();

package/src/framework/router/matcher.ts

@@ -6,7 +6,7 @@ function safeDecodeURIComponent(s: string): string {
 
 export interface RouteDef {
     path: string;
-    component: ComponentType<any>;
+    component: ComponentType<unknown>;
 }
 
 interface InternalRoute extends RouteDef {
@@ -14,7 +14,7 @@ interface InternalRoute extends RouteDef {
 }
 
 export interface MatchResult {
-    component: ComponentType<any>;
+    component: ComponentType<unknown>;
     params: Record<string, string>;
 }
 

package/src/framework/utils/ArrayUtils.ts

@@ -1,6 +1,6 @@
 export class ArrayUtils {
     static contains<T>(arr: T[], item: T): boolean {
-        return arr.indexOf(item) !== -1;
+        return arr.includes(item);
     }
 
     static containsAny<T>(arr: T[], ...items: T[]): boolean {
@@ -10,7 +10,7 @@ export class ArrayUtils {
         return false;
     }
 
-    static maxBy<T extends Record<K, any>, K extends keyof T>(arr: T[], key: K): T | undefined {
+    static maxBy<T extends Record<K, unknown>, K extends keyof T>(arr: T[], key: K): T | undefined {
         if (arr == null || arr.length === 0) return undefined;
         let maxElement: T | undefined = undefined;
         let maxValue = -Infinity;

package/src/framework/utils/DateUtils.ts

@@ -62,7 +62,7 @@ export class DateUtils {
     static friendlyTotalTime(time: number | string | null): string | null {
         if (time == null || time === '-') return null;
         let seconds: number;
-        if (typeof time === 'string') seconds = parseInt(time, 10) / 1000;
+        if (typeof time === 'string') seconds = Number.parseInt(time, 10) / 1000;
         else seconds = time / 1000;
         seconds = Math.floor(seconds);
         if (seconds < 60) return seconds + '秒';

package/src/framework/utils/{system/DictUtils.ts → DictUtils.ts}

@@ -1,4 +1,4 @@
-import {GlobalData} from '../../GlobalData';
+import {GlobalData} from '../GlobalData';
 import {Tag} from 'antd';
 import React from 'react';
 

package/src/framework/utils/EventBus.ts

@@ -1,14 +1,14 @@
-type EventCallback = (...args: any[]) => void;
+type EventCallback = (...args: unknown[]) => void;
 
 interface EventEntry {
     fn: EventCallback & { __callback?: EventCallback };
-    ctx?: any;
+    ctx?: unknown;
 }
 
 export class EventBus {
     private static __stack: Record<string, EventEntry[]> = {};
 
-    static on<T extends any[] = []>(name: string, callback: (...args: T) => void, ctx?: any): () => void {
+    static on<T extends unknown[] = []>(name: string, callback: (...args: T) => void, ctx?: unknown): () => void {
         if (!EventBus.__stack[name]) {
             EventBus.__stack[name] = [];
         }
@@ -16,9 +16,9 @@ export class EventBus {
         return () => EventBus.off(name, callback);
     }
 
-    static once<T extends any[] = []>(name: string, callback: (...args: T) => void, ctx?: any): () => void {
+    static once<T extends unknown[] = []>(name: string, callback: (...args: T) => void, ctx?: unknown): () => void {
         const unsubscribe = () => EventBus.off(name, callback);
-        const listener: EventEntry['fn'] = (...args: any[]) => {
+        const listener: EventEntry['fn'] = (...args: unknown[]) => {
             EventBus.off(name, listener);
             callback.apply(ctx, args);
         };
@@ -28,7 +28,7 @@ export class EventBus {
         return unsubscribe;
     }
 
-    static emit<T extends any[] = []>(name: string, ...args: T): void {
+    static emit<T extends unknown[] = []>(name: string, ...args: T): void {
         const list = EventBus.__stack[name];
         if (list !== undefined) {
             list.slice(0).forEach(entry => {
@@ -37,7 +37,7 @@ export class EventBus {
         }
     }
 
-    static off<T extends any[] = []>(name: string, callback?: (...args: T) => void): void {
+    static off<T extends unknown[] = []>(name: string, callback?: (...args: T) => void): void {
         const list = EventBus.__stack[name];
         if (list === undefined) return;
         if (callback === undefined) {