@jiangood/open-admin 3.0.11 → 3.0.13

package/package.json

@@ -14,8 +14,9 @@
     "@ant-design/icons": "^6.0.0",
     "@tinymce/tinymce-react": "^6.0.0",
     "antd": "^6.0.0",
-    "antd-img-crop": "^4.23.0",
     "axios": "^1.13.2",
+    "compressorjs": "^1.2.1",
+    "cropperjs": "^1.6.2",
     "dayjs": "^1.11.13",
     "lodash": "^4.17.23",
     "qs": "^6.14.0",
@@ -48,5 +49,5 @@
     "test:e2e": "playwright test",
     "test:e2e:ui": "playwright test --ui"
   },
-  "version": "3.0.11"
+  "version": "3.0.13"
 }

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

@@ -281,8 +281,7 @@ export class DownloadModal extends React.Component<DownloadModalProps, ModalStat
         <div style={{padding: '20px 0'}}>
           {/* 文件名 */}
           <div style={{marginBottom: 16, fontSize: 15, fontWeight: 500, color: '#333'}}>
-            <DownloadOutlined style={{marginRight: 8}}/>
-            {fileName || '未知文件'}
+            文件名：{fileName || '未知文件'}
           </div>
 
           {/* 下载中 */}

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

@@ -9,6 +9,7 @@ import './index.less'
 /** 通过 actionRef 暴露的表格操作 */
 export interface ProTableActionRef {
     reload: () => void;
+    clearSelection: () => void;
 }
 
 /** request 返回结构（Spring Data Page 序列化 + 扩展数据） */
@@ -122,7 +123,8 @@ export class ProTable<T = any> extends React.Component<ProTableProps<T>, ProTabl
         this.loadData()
         if (this.props.actionRef) {
             this.props.actionRef.current = {
-                reload: () => this.loadData()
+                reload: () => this.loadData(),
+                clearSelection: () => this.setState({selectedRowKeys: [], selectedRows: []})
             }
         }
 

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

@@ -1,3 +1,4 @@
+import {Spin} from 'antd';
 import React from 'react';
 import {Editor as TinyMceEditor} from '@tinymce/tinymce-react';
 import {UrlUtils} from '../../utils';
@@ -6,8 +7,8 @@ import type {FieldProps} from '../types';
 export interface FieldEditorProps extends FieldProps<string> {
     /** 编辑器高度，默认 300 */
     height?: number;
-    /** 图片上传可见性，默认 public（富文本图片需公开访问） */
-    visibility?: 'public' | 'private';
+    /** 是否公开免登录访问，默认 true（富文本图片需公开访问） */
+    isPublic?: boolean;
 }
 
 /**
@@ -15,18 +16,42 @@ export interface FieldEditorProps extends FieldProps<string> {
  *
  * 图片上传相关配置 https://www.tiny.cloud/docs/tinymce/7/image/
  */
-export class FieldEditor extends React.Component<FieldEditorProps> {
+export class FieldEditor extends React.Component<FieldEditorProps, {loading: boolean}> {
+    state = {loading: false};
+    private timer: number | undefined;
+
+    componentDidMount() {
+        this.timer = window.setTimeout(() => {
+            this.setState({loading: true});
+        }, 200);
+    }
+
+    componentWillUnmount() {
+        if (this.timer != null) {
+            window.clearTimeout(this.timer);
+        }
+    }
+
     render() {
-        const visibility = this.props.visibility || 'public';
-        const uploadUrl = UrlUtils.contextPath('/admin/sysFile/upload') + '?visibility=' + visibility;
+        const {loading} = this.state;
+        const isPublic = this.props.isPublic ?? true;
+        const uploadUrl = UrlUtils.contextPath('/admin/sysFile/upload') + '?isPublic=' + isPublic;
         const jsUrl = UrlUtils.contextPath('/admin/tinymce/tinymce.min.js');
         const {value, onChange, height} = this.props;
+        const editorHeight = height || 300;
 
         return (
-            <TinyMceEditor
-                value={value}
-                tinymceScriptSrc={jsUrl}
-                init={{
+            <div style={{position: 'relative', minHeight: loading ? editorHeight + 44 : undefined}}>
+                <TinyMceEditor
+                    value={value}
+                    tinymceScriptSrc={jsUrl}
+                    onInit={() => {
+                        if (this.timer != null) {
+                            window.clearTimeout(this.timer);
+                        }
+                        this.setState({loading: false});
+                    }}
+                    init={{
                     min_height: 300,
                     language: 'zh_CN',
                     height: height,
@@ -54,7 +79,28 @@ export class FieldEditor extends React.Component<FieldEditorProps> {
                         onChange(content);
                     }
                 }}
-            />
+                />
+                {loading && (
+                    <div style={{
+                        position: 'absolute',
+                        top: 0,
+                        left: 0,
+                        right: 0,
+                        bottom: 0,
+                        minHeight: editorHeight + 44,
+                        display: 'flex',
+                        flexDirection: 'column',
+                        alignItems: 'center',
+                        justifyContent: 'center',
+                        gap: 8,
+                        background: '#fff',
+                        zIndex: 1,
+                    }}>
+                        <Spin/>
+                        <span style={{color: '#999'}}>编辑器加载中...</span>
+                    </div>
+                )}
+            </div>
         );
     }
 }

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

@@ -1,6 +1,4 @@
 import React from "react";
-import ImgCrop from "antd-img-crop";
-import type {ImgCropProps} from "antd-img-crop";
 import {message, Modal, Upload} from "antd";
 import type {UploadChangeParam, UploadFile, UploadProps} from "antd";
 import { UploadOutlined } from "@ant-design/icons";
@@ -14,42 +12,34 @@ export type SysUploadFile = UploadFile & { objectName?: string };
 export interface FieldUploadFileProps extends FieldProps<string> {
     /** 最大上传数量，默认 1 */
     maxCount?: number;
-    /** 是否启用上传前裁切图片 */
-    cropImage?: boolean;
-    /** 裁切配置（antd-img-crop 的 cropperProps） */
-    cropperProps?: ImgCropProps['cropperProps'];
     /** 上传列表的内建样式，默认 picture-card */
     listType?: UploadProps['listType'];
     /** 接受的文件类型，如 image/* */
     accept?: string;
-    /** 文件可见性，默认 public */
-    visibility?: 'public' | 'private';
+    /** 是否公开免登录访问，默认 true（private 需登录） */
+    isPublic?: boolean;
     /** 文件列表变化回调（新增文件上传成功后才触发） */
     onFileChange?: (fileList: SysUploadFile[]) => void;
 }
 
 interface FieldUploadFileState {
     maxCount: number;
-    cropImage: boolean;
     fileList: SysUploadFile[];
     /** 逗号分隔的文件 objectName */
     value: string | null;
     accept?: string;
-    visibility?: 'public' | 'private';
+    isPublic?: boolean;
 }
 
 /**
- * 上传图片前裁切， 单张图片
- *
- * 可参考 react-easy-crop
+ * 通用文件上传（不含图片压缩/裁切，图片上传请使用 FieldUploadImage）
  */
 export class FieldUploadFile extends React.Component<FieldUploadFileProps, FieldUploadFileState & { errorTitle?: string; errorContent?: string; previewObjectName?: string }> {
 
     state: FieldUploadFileState & { errorTitle?: string; errorContent?: string; previewObjectName?: string } = {
         // 传入的参数
         maxCount: 1,
-        cropImage: false,
-        visibility: 'public',
+        isPublic: true,
 
         // 内部参数
         fileList: [],
@@ -65,8 +55,7 @@ export class FieldUploadFile extends React.Component<FieldUploadFileProps, Field
     componentDidUpdate(prevProps: FieldUploadFileProps) {
         const next: Partial<FieldUploadFileState> = {};
         if (this.props.maxCount !== prevProps.maxCount) next.maxCount = this.props.maxCount;
-        if (this.props.cropImage !== prevProps.cropImage) next.cropImage = this.props.cropImage;
-        if (this.props.visibility !== prevProps.visibility) next.visibility = this.props.visibility;
+        if (this.props.isPublic !== prevProps.isPublic) next.isPublic = this.props.isPublic;
 
         const prevValue = prevProps.value ?? null;
         const curValue = this.props.value ?? null;
@@ -142,12 +131,6 @@ export class FieldUploadFile extends React.Component<FieldUploadFileProps, Field
     };
 
     render() {
-        if (this.state.cropImage) {
-            return <ImgCrop cropperProps={this.props.cropperProps} modalTitle={'裁剪图片'} fillColor={null}>
-                {this.getUpload()}
-            </ImgCrop>;
-        }
-
         return <>
             {this.getUpload()}
             <Modal open={!!this.state.errorTitle} title={this.state.errorTitle} okText="确定"
@@ -167,7 +150,7 @@ export class FieldUploadFile extends React.Component<FieldUploadFileProps, Field
 
         return <Upload
             action={UrlUtils.contextPath('/admin/sysFile/upload')}
-            data={{visibility: this.state.visibility}}
+            data={{isPublic: this.state.isPublic}}
             listType={this.props.listType || 'picture-card'}
             fileList={fileList}
             onChange={this.handleChange}