@jiangood/open-admin 2.5.5 → 2.5.7

package/src/framework/components/index.ts

@@ -1,14 +1,10 @@
-export * from './system'
 export * from './PageLoading'
 export * from './ProTable'
-export * from './DownloadFileButton'
 export * from './NamedIcon'
 export * from './LinkButton'
 export * from './Gap'
 export * from './Page'
 export * from './ValueType'
 export * from './ContextMenu'
-export * from './OrgTree'
-export * from './RoleTree'
-export * from './ViewRange'
-export { default as ErrorBoundary } from './ErrorBoundary'
+export * from './DownloadModal'
+export { default as ErrorBoundary } from './ErrorBoundary'

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Spin, message } from 'antd';
+import { Spin } from 'antd';
 import { debounce } from 'lodash';
 import { HttpUtils } from '../../utils';
 
@@ -80,8 +80,7 @@ export class BaseRemoteSelect<P extends BaseRemoteSelectProps = BaseRemoteSelect
                 this.setState({ data: data || [] });
             }
         } catch (error) {
-            console.error('远程加载失败:', error);
-            message.error('加载失败，请重试');
+            console.warn('[BaseRemoteSelect] 加载失败:', error);
             if (fetchId === this.fetchIdRef) {
                 this.setState({ data: [] });
             }

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

@@ -25,10 +25,9 @@ export class FieldBoolean extends React.Component {
 
         switch (type) {
             case 'radio':
-                return <Radio.Group value={v} onChange={onChange}>
+                return <Radio.Group value={v} onChange={e => onChange && onChange(e.target.value)}>
                     <Radio value={true}>是</Radio>
                     <Radio value={false}>否</Radio>
-                    <Radio value={undefined}>不确定</Radio>
                 </Radio.Group>;
             case 'checkbox':
                 return <Checkbox
@@ -43,7 +42,7 @@ export class FieldBoolean extends React.Component {
                     {value: false, label: '否'},
                 ]}
                                value={v}
-                               onChange={onChange}
+                               onChange={value => onChange && onChange(value)}
                                style={{width: '100%'}}
                                allowClear={true}
                                placeholder={'请选择'}
@@ -51,7 +50,7 @@ export class FieldBoolean extends React.Component {
             case 'switch':
                 return <Switch
                     checked={v}
-                    onChange={onChange}
+                    onChange={checked => onChange && onChange(checked)}
                 />;
             default:
                 return null;

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

@@ -77,27 +77,6 @@ export class FieldDate extends React.Component {
 
     }
 
-    static getDefaultValue(type) {
-        const year = dayjs().format("YYYY");
-        const month = dayjs().format("YYYY-MM");
-        const quarter = dayjs().format("YYYY-QQ");
-
-        switch (type) {
-            case 'YYYY':
-            case 'YEAR':
-                return year;
-            case 'YYYY-MM':
-            case 'YEAR_MONTH':
-                return month;
-            case 'YYYY-QQ':
-            case 'YEAR_QUARTER':
-                return quarter;
-            default:
-                return null;
-        }
-
-    }
-
     strToDate(value, fmt) {
         if (value != null && value !== '') {
             const type = typeof value;

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import {Editor as TinyMceEditor} from '@tinymce/tinymce-react';
-import {SysUtils} from '../../utils';
+import {UrlUtils} from '../../utils';
 
 /**
  * 富文本编辑器
@@ -9,52 +9,43 @@ import {SysUtils} from '../../utils';
  */
 export class FieldEditor extends React.Component {
     render() {
-        const uploadUrl = SysUtils.contextPath('/admin/sysFile/upload');
-        const jsUrl = SysUtils.contextPath('/admin/tinymce/tinymce.min.js');
+        const uploadUrl = UrlUtils.contextPath('/admin/sysFile/upload');
+        const jsUrl = UrlUtils.contextPath('/admin/tinymce/tinymce.min.js');
         const {value, onChange, height} = this.props;
 
         return (
-            <>
-                <TinyMceEditor
-                    initialValue={value}
-                    tinymceScriptSrc={jsUrl}
-                    init={{
-                        min_height: 300,
-                        language: 'zh_CN',
-                        height: height,
-
-                        // 上传图片
-                        images_upload_url: uploadUrl,
-                        promotion: false, // 不显示升级按钮（右上角）
-                        cache_suffix: '?v=v7.7',
-
-                        plugins: [
-                            'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview',
-                            'anchor', 'searchreplace', 'visualblocks', 'code', 'fullscreen',
-                            'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount',
-                            'emoticons'
-                        ],
-                        image_description: false,
-
-                        // 设置图片上传对话框默认选中上传Tab
-                        setup: function (editor) {
-                            editor.on('OpenWindow', function(e) {
-                                const dialog = e.dialog;
-                                // 包含 dimensions 属性应该就是 上传图片的对话框
-                                if (dialog && dialog.getData().dimensions) {
-                                    dialog.showTab("upload");
-                                }
-                            });
-                        },
-
-                    }}
-                    onChange={e => {
-                        if (onChange) {
-                            onChange(e.target.getContent());
-                        }
-                    }}
-                />
-            </>
+            <TinyMceEditor
+                value={value}
+                tinymceScriptSrc={jsUrl}
+                init={{
+                    min_height: 300,
+                    language: 'zh_CN',
+                    height: height,
+                    images_upload_url: uploadUrl,
+                    promotion: false,
+                    cache_suffix: '?v=v7.7',
+                    plugins: [
+                        'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview',
+                        'anchor', 'searchreplace', 'visualblocks', 'code', 'fullscreen',
+                        'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount',
+                        'emoticons'
+                    ],
+                    image_description: false,
+                    setup: function (editor) {
+                        editor.on('OpenWindow', function(e) {
+                            const dialog = e.dialog;
+                            if (dialog && dialog.getData().dimensions) {
+                                dialog.showTab("upload");
+                            }
+                        });
+                    },
+                }}
+                onEditorChange={content => {
+                    if (onChange) {
+                        onChange(content);
+                    }
+                }}
+            />
         );
     }
 }

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

@@ -34,9 +34,9 @@ export class FieldNumberRange extends React.Component {
     }
 
     componentDidMount() {
-        const {value, defaultValue} = this.props;
+        const {value, defaultValue, onChange} = this.props;
         if (value == null && defaultValue) {
-            this.props.onChange && this.props.onChange(defaultValue);
+            onChange && onChange(defaultValue);
         }
     }
 

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

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

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

@@ -2,7 +2,6 @@ import {Button, Input, Table} from 'antd'
 import React from 'react'
 import {DeleteOutlined, PlusOutlined} from "@ant-design/icons";
 import './styles.less'
-import {ArrayUtils} from "../../utils";
 
 /**
  * 可编辑表格
@@ -15,27 +14,27 @@ export class FieldTable extends React.Component {
         super(props);
 
         this.columns = this.props.columns.map(col => {
-            if (col.render == null) {
-                col.render = (v, record, index) => {
-                    return <Input value={v} onChange={(e) => this.onCellChange(index, col.dataIndex, e)}/>;
+            const newCol = { ...col };
+            const origRender = newCol.render;
+
+            if (origRender) {
+                newCol.render = (v, record, index) => {
+                    const cmp = origRender(v, record, index);
+                    return React.createElement(cmp.type, {
+                        ...cmp.props,
+                        value: v,
+                        onChange: (e) => {
+                            this.onCellChange(index, newCol.dataIndex, e);
+                        }
+                    });
                 };
             } else {
-                if (!col._oldRender) {
-                    col._oldRender = col.render;
-                    col.render = (v, record, index) => {
-                        const cmp = col._oldRender(v, record, index);
-                        return React.createElement(cmp.type,
-                            {
-                                ...cmp.props,
-                                value: v,
-                                onChange: (e) => {
-                                    this.onCellChange(index, col.dataIndex, e);
-                                }
-                            });
-                    };
-                }
+                newCol.render = (v, record, index) => {
+                    return <Input value={v} onChange={(e) => this.onCellChange(index, newCol.dataIndex, e)}/>;
+                };
             }
-            return col;
+
+            return newCol;
         });
 
         this.columns.push({
@@ -57,18 +56,17 @@ export class FieldTable extends React.Component {
     };
 
     onCellChange = (index, dataIndex, e) => {
-        let {dataSource} = this.state;
+        const {dataSource} = this.state;
         const row = dataSource[index];
 
         let v = e;
-        if (e != null && e.hasOwnProperty('target')) {
+        if (e != null && typeof e === 'object' && 'target' in e) {
             v = e.target.value;
         }
 
-        row[dataIndex] = v;
-
-        dataSource = [...dataSource];
-        this.setState({dataSource}, this.notifyParent);
+        const next = [...dataSource];
+        next[index] = {...row, [dataIndex]: v};
+        this.setState({dataSource: next}, this.notifyParent);
     };
 
     add = () => {
@@ -79,8 +77,7 @@ export class FieldTable extends React.Component {
 
     remove = (record) => {
         const {dataSource} = this.state;
-        ArrayUtils.remove(dataSource, record);
-        this.setState({dataSource: [...dataSource]}, this.notifyParent);
+        this.setState({dataSource: dataSource.filter(item => item !== record)}, this.notifyParent);
     };
 
     notifyParent = () => {

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

@@ -3,7 +3,7 @@ import ImgCrop from "antd-img-crop";
 import {Modal, Upload, message} from "antd";
 import { UploadOutlined } from "@ant-design/icons";
 import {ViewFile} from "../../views";
-import {ObjectUtils, SysUtils} from "../../utils";
+import {ObjectUtils, UrlUtils} from "../../utils";
 
 /**
  * 上传图片前裁切， 单张图片
@@ -28,12 +28,19 @@ export class FieldUploadFile extends React.Component {
         this.state.fileList = this.convertInputToComponentValue(this.state.value);
     }
 
+    componentDidUpdate(prevProps) {
+        const next = {};
+        if (this.props.maxCount !== prevProps.maxCount) next.maxCount = this.props.maxCount;
+        if (this.props.cropImage !== prevProps.cropImage) next.cropImage = this.props.cropImage;
+        if (Object.keys(next).length > 0) this.setState(next);
+    }
+
     convertInputToComponentValue(value) {
         const list = [];
         if (value && value.length > 0) {
             const arr = value.split(",");
             for (const id of arr) {
-                const url = SysUtils.contextPath('/admin/sysFile/preview/' + id);
+                const url = UrlUtils.contextPath('/admin/sysFile/preview/' + id);
                 const file = {id, url, uid: id, name: id, status: 'done', fileName: id};
                 list.push(file);
             }
@@ -113,7 +120,7 @@ export class FieldUploadFile extends React.Component {
         const {accept, fileList, maxCount} = this.state;
 
         return <Upload
-            action={SysUtils.contextPath('/admin/sysFile/upload')}
+            action={UrlUtils.contextPath('/admin/sysFile/upload')}
             listType={this.props.listType || 'picture-card'}
             fileList={fileList}
             onChange={this.handleChange}

package/src/framework/fields/index.ts

@@ -2,13 +2,11 @@
 export * from './types';
 export * from './FieldRemoteSelect';
 export * from './FieldRemoteSelectMultiple';
-export * from './FieldRemoteSelectMultipleInline';
 export * from './FieldRemoteTree';
 export * from './FieldDictSelect';
 export * from './FieldEditor'
 export * from './FieldRemoteTreeCascader'
 export * from './FieldRemoteTreeSelect'
-export * from './FieldRemoteTreeSelectMultiple'
 export * from './FieldBoolean';
 export * from './FieldDate';
 export * from './FieldDateRange';
@@ -19,4 +17,4 @@ export * from './FieldSysOrgTreeSelect'
 export * from './FieldSysOrgTree'
 export * from './FieldPercent'
 export * from './FieldUploadFile';
-export * from '../components/OrgTree';
+export * from '../biz/OrgTree';

package/src/framework/index.ts

@@ -1,4 +1,6 @@
+export * from './biz'
 export * from './components'
 export * from './utils'
 export * from './fields'
 export * from './views'
+export * from './GlobalData'

package/src/framework/utils/ArrayUtils.d.ts

@@ -0,0 +1,6 @@
+export class ArrayUtils {
+    static contains<T>(arr: T[], item: T): boolean;
+    static containsAny<T>(arr: T[], ...items: T[]): boolean;
+    static maxBy<T extends Record<K, any>, K extends keyof T>(arr: T[], key: K): T | undefined;
+    static unique<T>(arr: T[]): T[];
+}

package/src/framework/utils/ArrayUtils.js

@@ -0,0 +1,30 @@
+export class ArrayUtils {
+    static contains(arr, item) {
+        return arr.indexOf(item) !== -1;
+    }
+
+    static containsAny(arr, ...items) {
+        for (const item of items) {
+            if (ArrayUtils.contains(arr, item)) return true;
+        }
+        return false;
+    }
+
+    static maxBy(arr, key) {
+        if (arr == null || arr.length === 0) return undefined;
+        let maxElement = undefined;
+        let maxValue = -Infinity;
+        for (const element of arr) {
+            const value = element[key];
+            if (typeof value === 'number' && value > maxValue) {
+                maxValue = value;
+                maxElement = element;
+            }
+        }
+        return maxElement;
+    }
+
+    static unique(arr) {
+        return [...new Set(arr)];
+    }
+}

package/src/framework/utils/DateUtils.d.ts

@@ -0,0 +1,20 @@
+export class DateUtils {
+    static convertTypeToFormat(type: string): string;
+    static year(date: Date): number;
+    static month(date: Date): string;
+    static date(date: Date): string;
+    static hour(date: Date): string;
+    static minute(date: Date): string;
+    static second(date: Date): string;
+    static formatDate(d: Date): string;
+    static formatTime(d: Date): string;
+    static formatDateTime(d: Date): string;
+    static formatDateCn(d: Date): string;
+    static now(): string;
+    static today(): string;
+    static thisYear(): number;
+    static thisMonth(): string;
+    static friendlyTime(pastDate: Date | string | number): string | undefined;
+    static friendlyTotalTime(time: number | string | null): string | null;
+    static beginOfMonth(): string;
+}

package/src/framework/utils/DateUtils.js

@@ -0,0 +1,81 @@
+import {StringUtils} from './StringUtils';
+
+export class DateUtils {
+    static convertTypeToFormat(type) {
+        if (type === 'YEAR') type = 'YYYY';
+        else if (type === 'YEAR_MONTH') type = 'YYYY-MM';
+        else if (type === 'YEAR_QUARTER') type = 'YYYY-QQ';
+        else if (type === 'DAY') type = 'YYYY-MM-DD';
+        return type;
+    }
+
+    static year(date) { return date.getFullYear(); }
+    static month(date) { return StringUtils.pad(date.getMonth() + 1, 2); }
+    static date(date) { return StringUtils.pad(date.getDate(), 2); }
+    static hour(date) { return StringUtils.pad(date.getHours(), 2); }
+    static minute(date) { return StringUtils.pad(date.getMinutes(), 2); }
+    static second(date) { return StringUtils.pad(date.getSeconds(), 2); }
+
+    static formatDate(d) {
+        return this.year(d) + '-' + this.month(d) + '-' + this.date(d);
+    }
+
+    static formatTime(d) {
+        return this.hour(d) + ':' + this.minute(d) + ':' + this.second(d);
+    }
+
+    static formatDateTime(d) {
+        return this.formatDate(d) + ' ' + this.formatTime(d);
+    }
+
+    static formatDateCn(d) {
+        return this.year(d) + '年' + (d.getMonth() + 1) + '月' + d.getDate() + '日';
+    }
+
+    static now() { return this.formatDateTime(new Date()); }
+    static today() { return this.formatDate(new Date()); }
+    static thisYear() { return this.year(new Date()); }
+    static thisMonth() { return this.month(new Date()); }
+
+    static friendlyTime(pastDate) {
+        if (pastDate == null) return undefined;
+        if (!(pastDate instanceof Date)) pastDate = new Date(pastDate);
+        const currentDate = new Date();
+        let elapsedMilliseconds = currentDate.getTime() - pastDate.getTime();
+        const suffix = elapsedMilliseconds > 0 ? '前' : '后';
+        elapsedMilliseconds = Math.abs(elapsedMilliseconds);
+        const elapsedYears = Math.floor(elapsedMilliseconds / (1000 * 60 * 60 * 24 * 365));
+        const elapsedMonths = Math.floor(elapsedMilliseconds / (1000 * 60 * 60 * 24 * 30));
+        const elapsedDays = Math.floor(elapsedMilliseconds / (1000 * 60 * 60 * 24));
+        const elapsedHours = Math.floor(elapsedMilliseconds / (1000 * 60 * 60));
+        const elapsedMinutes = Math.floor(elapsedMilliseconds / (1000 * 60));
+        const elapsedSeconds = Math.floor(elapsedMilliseconds / 1000);
+        if (elapsedYears >= 1) return `${elapsedYears} 年${suffix}`;
+        if (elapsedMonths >= 1) return `${elapsedMonths} 个月${suffix}`;
+        if (elapsedDays >= 7) { const weeks = Math.floor(elapsedDays / 7); return `${weeks} 周${suffix}`; }
+        if (elapsedDays >= 1) return `${elapsedDays} 天${suffix}`;
+        if (elapsedHours >= 1) return `${elapsedHours} 小时${suffix}`;
+        if (elapsedMinutes >= 1) return `${elapsedMinutes} 分钟${suffix}`;
+        return `${elapsedSeconds} 秒${suffix}`;
+    }
+
+    static friendlyTotalTime(time) {
+        if (time == null || time === '-') return null;
+        let seconds;
+        if (typeof time === 'string') seconds = parseInt(time, 10) / 1000;
+        else seconds = time / 1000;
+        seconds = Math.floor(seconds);
+        if (seconds < 60) return seconds + '秒';
+        let min = seconds / 60;
+        seconds = seconds % 60;
+        min = Math.floor(min);
+        seconds = Math.floor(seconds);
+        return min + '分' + seconds + '秒';
+    }
+
+    static beginOfMonth() {
+        const d = new Date();
+        d.setDate(1);
+        return this.formatDate(d);
+    }
+}

package/src/framework/utils/DeviceUtils.d.ts

@@ -0,0 +1,3 @@
+export class DeviceUtils {
+    static isMobileDevice(): boolean;
+}

package/src/framework/utils/DeviceUtils.js

@@ -0,0 +1,10 @@
+export class DeviceUtils {
+
+    static isMobileDevice() {
+        const userAgent = navigator?.userAgent || navigator?.vendor || window?.opera || '';
+        if (/windows phone/i.test(userAgent)) return true;
+        if (/android/i.test(userAgent)) return true;
+        if (/iPad|iPhone|iPod/.test(userAgent) && !window.MSStream) return true;
+        return false;
+    }
+}

package/src/framework/utils/EventBus.d.ts

@@ -0,0 +1,6 @@
+export class EventBus {
+    static on<T extends any[] = []>(name: string, callback: (...args: T) => void, ctx?: any): void;
+    static once<T extends any[] = []>(name: string, callback: (...args: T) => void, ctx?: any): void;
+    static emit<T extends any[] = []>(name: string, ...args: T): void;
+    static off<T extends any[] = []>(name: string, callback?: (...args: T) => void): void;
+}

package/src/framework/utils/EventBus.js

@@ -0,0 +1,51 @@
+export class EventBus {
+    static __stack = {};
+
+    static on(name, callback, ctx) {
+        if (!EventBus.__stack[name]) {
+            EventBus.__stack[name] = [];
+        }
+        EventBus.__stack[name].push({ fn: callback, ctx });
+        return () => EventBus.off(name, callback);
+    }
+
+    static once(name, callback, ctx) {
+        const unsubscribe = () => EventBus.off(name, callback);
+        const listener = (...args) => {
+            EventBus.off(name, listener);
+            callback.apply(ctx, args);
+        };
+        listener.__callback = callback;
+        EventBus.__stack[name] = EventBus.__stack[name] || [];
+        EventBus.__stack[name].push({ fn: listener, ctx });
+        return unsubscribe;
+    }
+
+    static emit(name, ...args) {
+        const list = EventBus.__stack[name];
+        if (list !== undefined) {
+            list.slice(0).forEach(entry => {
+                entry.fn.apply(entry.ctx, args);
+            });
+        }
+    }
+
+    static off(name, callback) {
+        const list = EventBus.__stack[name];
+        if (list === undefined) return;
+        if (callback === undefined) {
+            delete EventBus.__stack[name];
+            return;
+        }
+        const liveEvents = list.filter(
+            entry =>
+                entry.fn !== callback &&
+                entry.fn.__callback !== callback
+        );
+        if (liveEvents.length !== 0) {
+            EventBus.__stack[name] = liveEvents;
+        } else {
+            delete EventBus.__stack[name];
+        }
+    }
+}

package/src/framework/utils/MessageUtils.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import type {ModalFuncProps} from 'antd/es/modal/interface';
+
+export class MessageUtils {
+    static alert(content: any, config?: Omit<ModalFuncProps, 'content' | 'icon' | 'onOk' | 'onCancel'>): Promise<void>;
+    static confirm(content: React.ReactNode, config?: Omit<ModalFuncProps, 'content' | 'icon' | 'onOk' | 'onCancel'>): Promise<boolean>;
+    static success(content: string, duration?: number): void;
+    static error(content: string, duration?: number): void;
+    static destroy(): void;
+}

package/src/framework/utils/MessageUtils.js

@@ -0,0 +1,43 @@
+import {message, Modal} from 'antd';
+
+export class MessageUtils {
+
+    static alert(content, config) {
+        return new Promise(resolve => {
+            Modal.info({
+                title: '提示',
+                content,
+                okText: '确定',
+                onOk: () => resolve(),
+                icon: null,
+                ...config,
+            });
+        });
+    }
+
+    static confirm(content, config) {
+        return new Promise((resolve) => {
+            Modal.confirm({
+                title: '确认操作',
+                content,
+                okText: '确定',
+                cancelText: '取消',
+                onOk: () => resolve(true),
+                onCancel: () => resolve(false),
+                ...config,
+            });
+        });
+    }
+
+    static success(content, duration = 3) {
+        message.success(content, duration);
+    }
+
+    static error(content, duration = 3) {
+        message.error(content, duration);
+    }
+
+    static destroy() {
+        message.destroy();
+    }
+}

package/src/framework/utils/ObjectUtils.d.ts

@@ -0,0 +1,14 @@
+import {ObjectUtils} from './ObjectUtils';
+
+declare module './ObjectUtils' {
+    interface ObjectUtils {
+        // Empty - no public methods to declare
+    }
+}
+
+export class ObjectUtils {
+    static copyPropertyIfPresent<TSource extends object, TTarget extends object>(
+        source: TSource | null | undefined,
+        target: TTarget | null | undefined
+    ): void;
+}