@jiangood/open-admin 2.5.6 → 2.5.8

package/config/common-plugin.js

@@ -125,7 +125,7 @@ export default (api) => {
         api.logger.info('formRegistryPath', importFrom);
         api.addEntryImports(() => ({
             source: importFrom,
-            specifier: '{FormRegistryUtils}'
+            specifier: '{FormRegistry}'
         }));
 
         Utils.findFilesSync(api.paths.absSrcPath, /forms\/.*\.jsx$/).forEach(file => {
@@ -136,7 +136,7 @@ export default (api) => {
                 specifier: name
             }));
 
-            api.addEntryCodeAhead(() => `FormRegistryUtils.register("${name}", ${name});`);
+            api.addEntryCodeAhead(() => `FormRegistry.register("${name}", ${name});`);
             api.logger.info('新版本 formRegistry.register: ', name, file);
         });
     } catch (error) {

package/package.json

@@ -36,5 +36,5 @@
     "dev": "umi dev",
     "build": "umi build"
   },
-  "version": "2.5.6"
+  "version": "2.5.8"
 }

package/src/.umi-production/appData.json

@@ -38,7 +38,7 @@
       "dev": "umi dev",
       "build": "umi build"
     },
-    "version": "2.5.6"
+    "version": "2.5.8"
   },
   "pkgPath": "/home/runner/work/open-admin/open-admin/web/package.json",
   "plugins": {
@@ -115,7 +115,7 @@
             0
           ]
         },
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -142,10 +142,10 @@
       "time": {
         "hooks": {
           "modifyAppData": [
-            67
+            72
           ]
         },
-        "register": 22
+        "register": 20
       },
       "enableBy": "register"
     },
@@ -158,7 +158,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -175,7 +175,7 @@
             0
           ],
           "onCheck": [
-            1
+            0
           ]
         },
         "register": 1
@@ -1077,7 +1077,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "config"
     },
@@ -1091,10 +1091,10 @@
       "time": {
         "hooks": {
           "onStart": [
-            0
+            1
           ]
         },
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1120,7 +1120,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 94
+        "register": 103
       },
       "enableBy": "register"
     },
@@ -1133,7 +1133,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 27
+        "register": 30
       },
       "enableBy": "config"
     },
@@ -1146,7 +1146,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 9
+        "register": 10
       },
       "enableBy": "config"
     },
@@ -1202,7 +1202,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 31
+        "register": 39
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/mpa/mpa": {
@@ -1239,7 +1239,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1252,7 +1252,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "config"
     },
@@ -1269,7 +1269,7 @@
             0
           ]
         },
-        "register": 2
+        "register": 1
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/polyfill/publicPathPolyfill": {
@@ -1281,7 +1281,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1384,7 +1384,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 2
+        "register": 1
       },
       "enableBy": "config"
     },
@@ -1410,7 +1410,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 3
+        "register": 4
       },
       "enableBy": "register"
     },
@@ -1423,7 +1423,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 3
+        "register": 4
       },
       "enableBy": "config"
     },
@@ -1449,7 +1449,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 3
+        "register": 4
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/monorepo/redirect": {
@@ -1461,7 +1461,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 22
+        "register": 26
       },
       "enableBy": "config"
     },
@@ -1553,7 +1553,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 2
+        "register": 3
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/mako/mako": {
@@ -1565,7 +1565,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "config"
     },
@@ -1590,7 +1590,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 3
+        "register": 2
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/routePreloadOnLoad/routePreloadOnLoad": {
@@ -1602,7 +1602,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 27
+        "register": 32
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/forget/forget": {
@@ -1627,7 +1627,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 2
       },
       "enableBy": "register"
     },
@@ -1653,7 +1653,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 41
+        "register": 46
       },
       "enableBy": "register"
     },
@@ -1666,7 +1666,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 17
+        "register": 16
       }
     },
     "./node_modules/@umijs/preset-umi/dist/commands/help": {
@@ -1678,7 +1678,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1691,7 +1691,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1769,7 +1769,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1782,7 +1782,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1808,7 +1808,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1860,7 +1860,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1873,7 +1873,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1938,7 +1938,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 2
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1951,7 +1951,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1968,7 +1968,7 @@
             0
           ]
         },
-        "register": 6
+        "register": 5
       },
       "enableBy": "register"
     }
@@ -2165,7 +2165,7 @@
       "parentId": "@@/global-layout",
       "file": "about.jsx",
       "absPath": "/about",
-      "__content": "import React from \"react\";\nimport {HttpUtils, Page} from \"../framework\";\n\nexport default class extends React.Component {\n\n    state = {\n        buildInfo: null,\n    }\n\n    componentDidMount() {\n        HttpUtils.get('/admin/lib-info').then(data => {\n            this.setState({buildInfo: data})\n        }).catch(e => {\n            console.error('[About] 加载版本信息失败:', e);\n        })\n    }\n\n    render() {\n        const {buildInfo} = this.state;\n\n        return (\n            <Page title=\"关于\" description=\"了解系统版本与相关信息\">\n                <h1>关于</h1>\n                {buildInfo && (\n                    <div style={{marginTop: '3em', color: 'rgba(0,0,0,0.45)', fontSize: 12}}>\n                        依赖库版本 v{buildInfo.version} / {buildInfo.buildTime}\n                    </div>\n                )}\n            </Page>\n        );\n    }\n}\n",
+      "__content": "import React from \"react\";\nimport {Page} from \"../framework\";\n\nexport default class extends React.Component {\n\n    render() {\n        return <Page title=\"关于\" description=\"了解系统版本与相关信息\">\n            <h1>关于</h1>\n        </Page>\n    }\n}\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/about.jsx"
     },

package/src/.umi-production/umi.ts

@@ -9,7 +9,7 @@ import { createPluginManager } from './core/plugin';
 import { createHistory } from './core/history';
 import Loading from '/home/runner/work/open-admin/open-admin/web/src/loading.jsx';
 import { ApplyPluginsType } from 'umi';
-import {FormRegistryUtils} from '/home/runner/work/open-admin/open-admin/web/src/framework';
+import {FormRegistry} from '/home/runner/work/open-admin/open-admin/web/src/framework';
 
 const publicPath = "./";
 const runtimePublicPath = false;

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

@@ -21,17 +21,25 @@ export const ContextMenu: React.FC<ContextMenuProps> = ({ x, y, items, onClick,
     const ref = useRef<HTMLDivElement>(null);
 
     useEffect(() => {
-        const handler = (e: MouseEvent) => {
+        const handleMouseDown = (e: MouseEvent) => {
             if (ref.current && !ref.current.contains(e.target as Node)) {
                 onClose();
             }
         };
+        const handleScroll = () => onClose();
+        const handleKeyDown = (e: KeyboardEvent) => {
+            if (e.key === 'Escape') onClose();
+        };
         const timer = setTimeout(() => {
-            document.addEventListener('mousedown', handler);
+            document.addEventListener('mousedown', handleMouseDown);
+            document.addEventListener('scroll', handleScroll, true);
+            document.addEventListener('keydown', handleKeyDown);
         }, 0);
         return () => {
             clearTimeout(timer);
-            document.removeEventListener('mousedown', handler);
+            document.removeEventListener('mousedown', handleMouseDown);
+            document.removeEventListener('scroll', handleScroll, true);
+            document.removeEventListener('keydown', handleKeyDown);
         };
     }, [onClose]);
 

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

@@ -15,7 +15,7 @@ export class FieldEditor extends React.Component {
 
         return (
             <TinyMceEditor
-                initialValue={value}
+                value={value}
                 tinymceScriptSrc={jsUrl}
                 init={{
                     min_height: 300,
@@ -40,9 +40,9 @@ export class FieldEditor extends React.Component {
                         });
                     },
                 }}
-                onChange={e => {
+                onEditorChange={content => {
                     if (onChange) {
-                        onChange(e.target.getContent());
+                        onChange(content);
                     }
                 }}
             />

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

@@ -56,7 +56,7 @@ 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;
@@ -64,10 +64,9 @@ export class FieldTable extends React.Component {
             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 = () => {

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

@@ -28,6 +28,13 @@ 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) {

package/src/framework/utils/TreeUtils.js

@@ -20,11 +20,12 @@ export class TreeUtils {
         return undefined;
     }
 
-    static _getChild(treeNode, buffer) {
+    /** @private */
+    static getChildRecursive(treeNode, buffer) {
         if (treeNode.children != null && treeNode.children.length > 0) {
             treeNode.children.forEach((c) => {
                 buffer.push(c);
-                TreeUtils._getChild(c, buffer);
+                TreeUtils.getChildRecursive(c, buffer);
             });
         }
         return buffer;
@@ -35,7 +36,7 @@ export class TreeUtils {
         if (treeNodeList != null) {
             treeNodeList.forEach((t) => {
                 buffer.push(t);
-                TreeUtils._getChild(t, buffer);
+                TreeUtils.getChildRecursive(t, buffer);
             });
         }
         return buffer;

package/src/framework/views/ViewFile/index.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import {Carousel, Empty} from 'antd';
+import {UrlUtils} from '../../utils';
 
 
 export class ViewFile extends React.Component {
@@ -14,7 +15,7 @@ export class ViewFile extends React.Component {
 
         const arr = fileId.split(',');
 
-        const urlList = arr.map(id => 'admin/sysFile/preview/' + id);
+        const urlList = arr.map(id => UrlUtils.contextPath('/admin/sysFile/preview/' + id));
         const height = this.props.height;
 
         if(urlList.length === 1){

package/src/layouts/admin/HeaderRight.jsx

@@ -1,10 +1,8 @@
 import {Avatar, Dropdown} from "antd";
 import React from "react";
 import {history} from "umi";
-import {DeviceUtils, HttpUtils, MessageUtils,  PageUtils, GlobalData} from "../../framework";
+import {DeviceUtils, HttpUtils, MessageUtils, PageUtils, GlobalData} from "../../framework";
 
-
-const ID = 'header-right';
 export class HeaderRight extends React.Component {
 
     state = {
@@ -12,7 +10,6 @@ export class HeaderRight extends React.Component {
     };
 
     componentDidMount() {
-        document.dispatchEvent(new CustomEvent('componentDidMount', {detail: ID}))
         if (DeviceUtils.isMobileDevice()) {
             this.setState({isMobileDevice: true})
         }

package/src/layouts/index.jsx

@@ -61,7 +61,8 @@ function isPublicPage(pathname, search) {
 }
 
 export function Layouts() {
-    const {pathname, search} = useLocation();
+    const location = useLocation();
+    const {pathname, search} = location;
     const [siteInfoLoaded, setSiteInfoLoaded] = useState(false);
     const [loginChecked, setLoginChecked] = useState(false);
 
@@ -96,7 +97,7 @@ export function Layouts() {
             console.error('[Layout] 初始化应用失败');
             PageUtils.redirectToLogin();
         });
-    }, [pathname]);
+    }, [location]);
 
     if (isPublic) return <ErrorBoundary minimal><AppWrapper><Outlet/></AppWrapper></ErrorBoundary>;
 

package/src/pages/about.jsx

@@ -1,32 +1,11 @@
 import React from "react";
-import {HttpUtils, Page} from "../framework";
+import {Page} from "../framework";
 
 export default class extends React.Component {
 
-    state = {
-        buildInfo: null,
-    }
-
-    componentDidMount() {
-        HttpUtils.get('/admin/lib-info').then(data => {
-            this.setState({buildInfo: data})
-        }).catch(e => {
-            console.error('[About] 加载版本信息失败:', e);
-        })
-    }
-
     render() {
-        const {buildInfo} = this.state;
-
-        return (
-            <Page title="关于" description="了解系统版本与相关信息">
-                <h1>关于</h1>
-                {buildInfo && (
-                    <div style={{marginTop: '3em', color: 'rgba(0,0,0,0.45)', fontSize: 12}}>
-                        依赖库版本 v{buildInfo.version} / {buildInfo.buildTime}
-                    </div>
-                )}
-            </Page>
-        );
+        return <Page title="关于" description="了解系统版本与相关信息">
+            <h1>关于</h1>
+        </Page>
     }
 }