@jiangood/open-admin 2.0.1 → 2.2.5

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

@@ -5,7 +5,6 @@
       "@types/lodash": "^4.17.23",
       "@types/react": "^19.2.2",
       "@types/react-dom": "^19.0.0",
-      "@umijs/plugins": "^4.3.17",
       "babel-plugin-react-compiler": "^1.0.0",
       "typescript": "^6.0.3"
     },
@@ -24,6 +23,10 @@
       "umi": "^4.0.0"
     },
     "name": "@jiangood/open-admin",
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/jiangood/open-admin"
+    },
     "description": "open-admin",
     "files": [
       "src/*",
@@ -36,7 +39,7 @@
       "dev": "umi dev",
       "build": "umi build"
     },
-    "version": "2.0.1"
+    "version": "2.2.5"
   },
   "pkgPath": "/home/runner/work/open-admin/open-admin/web/package.json",
   "plugins": {
@@ -79,7 +82,7 @@
             0
           ]
         },
-        "register": 2
+        "register": 3
       },
       "enableBy": "register"
     },
@@ -93,7 +96,7 @@
       "time": {
         "hooks": {
           "onStart": [
-            1
+            0
           ]
         },
         "register": 2
@@ -113,7 +116,7 @@
             0
           ]
         },
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -140,10 +143,10 @@
       "time": {
         "hooks": {
           "modifyAppData": [
-            58
+            59
           ]
         },
-        "register": 21
+        "register": 23
       },
       "enableBy": "register"
     },
@@ -190,7 +193,7 @@
       "time": {
         "hooks": {
           "onCheck": [
-            1
+            0
           ]
         },
         "register": 1
@@ -223,7 +226,7 @@
             0
           ]
         },
-        "register": 5
+        "register": 6
       },
       "enableBy": "register"
     },
@@ -1089,7 +1092,7 @@
       "time": {
         "hooks": {
           "onStart": [
-            0
+            1
           ]
         },
         "register": 0
@@ -1118,7 +1121,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 98
+        "register": 100
       },
       "enableBy": "register"
     },
@@ -1158,7 +1161,7 @@
       "time": {
         "hooks": {
           "modifyAppData": [
-            0
+            1
           ]
         },
         "register": 0
@@ -1212,7 +1215,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "config"
     },
@@ -1421,7 +1424,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 3
+        "register": 2
       },
       "enableBy": "config"
     },
@@ -1434,7 +1437,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "config"
     },
@@ -1459,7 +1462,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 20
+        "register": 21
       },
       "enableBy": "config"
     },
@@ -1472,7 +1475,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/clickToComponent/clickToComponent": {
@@ -1563,7 +1566,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "config"
     },
@@ -1588,7 +1591,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 3
+        "register": 2
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/routePreloadOnLoad/routePreloadOnLoad": {
@@ -1612,7 +1615,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 2
+        "register": 1
       },
       "enableBy": "config"
     },
@@ -1638,7 +1641,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 3
+        "register": 4
       },
       "enableBy": "register"
     },
@@ -1651,7 +1654,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 45
+        "register": 44
       },
       "enableBy": "register"
     },
@@ -1664,7 +1667,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 16
+        "register": 17
       }
     },
     "./node_modules/@umijs/preset-umi/dist/commands/help": {
@@ -1702,7 +1705,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1715,7 +1718,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1728,7 +1731,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1741,7 +1744,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 2
       },
       "enableBy": "register"
     },
@@ -1754,7 +1757,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1767,7 +1770,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1780,7 +1783,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1793,7 +1796,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1819,7 +1822,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1832,7 +1835,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1845,7 +1848,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1858,7 +1861,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1910,7 +1913,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 20
+        "register": 22
       },
       "enableBy": "register"
     },
@@ -1961,8 +1964,12 @@
       "key": "open-admin",
       "config": {},
       "time": {
-        "hooks": {},
-        "register": 6
+        "hooks": {
+          "modifyConfig": [
+            0
+          ]
+        },
+        "register": 7
       },
       "enableBy": "register"
     }
@@ -1973,34 +1980,9 @@
     "_": []
   },
   "userConfig": {
-    "hash": true,
-    "history": {
-      "type": "hash"
-    },
-    "mfsu": false,
-    "esbuildMinifyIIFE": true,
     "plugins": [
       "./config/common-plugin"
-    ],
-    "proxy": {
-      "/admin": {
-        "target": "http://127.0.0.1:8080",
-        "changeOrigin": true
-      },
-      "/preview": {
-        "target": "http://127.0.0.1:8080",
-        "changeOrigin": true
-      },
-      "/ureport": {
-        "target": "http://127.0.0.1:8080",
-        "changeOrigin": true
-      },
-      "/admin/ws": {
-        "target": "ws://127.0.0.1:8080",
-        "changeOrigin": true,
-        "ws": true
-      }
-    }
+    ]
   },
   "mainConfigFile": "/home/runner/work/open-admin/open-admin/web/config/config.js",
   "config": {
@@ -2013,7 +1995,7 @@
     },
     "base": "/",
     "svgr": {},
-    "publicPath": "/",
+    "publicPath": "./",
     "mfsu": false,
     "ignoreMomentLocale": true,
     "externals": {},
@@ -2028,32 +2010,23 @@
       "@@": "/home/runner/work/open-admin/open-admin/web/src/.umi-production",
       "regenerator-runtime": "/home/runner/work/open-admin/open-admin/web/node_modules/regenerator-runtime"
     },
-    "hash": true,
-    "esbuildMinifyIIFE": true,
     "plugins": [
       "./config/common-plugin"
     ],
+    "targets": {
+      "chrome": 80
+    },
+    "define": {
+      "SERVLET_CONTEXT": "/change-this-servlet-context"
+    },
+    "hash": true,
+    "esbuildMinifyIIFE": true,
     "proxy": {
-      "/admin": {
-        "target": "http://127.0.0.1:8080",
-        "changeOrigin": true
-      },
-      "/preview": {
+      "/change-this-servlet-context": {
         "target": "http://127.0.0.1:8080",
-        "changeOrigin": true
-      },
-      "/ureport": {
-        "target": "http://127.0.0.1:8080",
-        "changeOrigin": true
-      },
-      "/admin/ws": {
-        "target": "ws://127.0.0.1:8080",
         "changeOrigin": true,
         "ws": true
       }
-    },
-    "targets": {
-      "chrome": 80
     }
   },
   "routes": {
@@ -2063,7 +2036,7 @@
       "parentId": "@@/global-layout",
       "file": "404.jsx",
       "absPath": "/*",
-      "__content": "import React from \"react\";\nimport {Result} from \"antd\";\n\nexport default class extends React.Component {\n\n    render() {\n        return <Result\n            status={404}\n            title='页面不存在'\n        />\n\n    }\n}\n",
+      "__content": "import React from \"react\";\nimport {Result} from \"antd\";\nimport {Page} from \"../framework\";\n\nexport default class extends React.Component {\n\n    render() {\n        return <Page>\n            <Result\n                status={404}\n                title='页面不存在'\n            />\n        </Page>\n    }\n}\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/404.jsx"
     },
@@ -2083,7 +2056,7 @@
       "parentId": "@@/global-layout",
       "file": "system/user/UserPerm.jsx",
       "absPath": "/system/user/UserPerm",
-      "__content": "import {Form, Modal} from 'antd';\nimport React from 'react';\nimport {FieldDictSelect, FieldRemoteSelectMultiple, FieldSysOrgTree, HttpUtils} from \"../../../framework\";\n\n\nexport default class UserPerm extends React.Component {\n\n\n    state = {\n        visible: false,\n\n        confirmLoading: false,\n\n        formValues: {\n            dataPermType: null\n        },\n    }\n    formRef = React.createRef()\n\n    show(item) {\n        this.setState({visible: true})\n\n        HttpUtils.get('admin/sysUser/get-perm-info', {id: item.id}).then(rs => {\n            this.setState({formValues: rs})\n            this.formRef.current.setFieldsValue(rs)\n        })\n    }\n\n    handleSave = (values) => {\n        values.grantOrgIdList = this.state.checked\n\n        this.setState({\n            confirmLoading: true\n        })\n\n\n        HttpUtils.post('admin/sysUser/grant-perm', values).then(rs => {\n            this.setState({\n                visible: false,\n                confirmLoading: false\n            })\n            this.props.onOk()\n        }).finally(() => {\n            this.setState({\n                confirmLoading: false\n            })\n\n        })\n    }\n\n    render() {\n        const {visible, confirmLoading} = this.state\n\n        return <Modal\n            title=\"授权\"\n            destroyOnClose\n            width={600}\n            open={visible}\n            confirmLoading={confirmLoading}\n            onCancel={() => this.setState({visible: false})}\n            onOk={() => this.formRef.current.submit()}\n        >\n\n            <Form ref={this.formRef}\n                  onFinish={this.handleSave}\n                  onValuesChange={(change, values) => {\n                      this.setState({formValues: values})\n                  }}\n                  labelCol={{flex: '100px'}}\n            >\n                <Form.Item name='id' noStyle></Form.Item>\n                <Form.Item label='角色' name='roleIds' rules={[{required: true}]}>\n                    <FieldRemoteSelectMultiple url='admin/sysRole/options'/>\n                </Form.Item>\n                <Form.Item label='数据权限' name='dataPermType' rules={[{required: true}]}>\n                    <FieldDictSelect typeCode='dataPermType'/>\n                </Form.Item>\n\n\n                {this.state.formValues.dataPermType === 'CUSTOM' && <>\n                    <Form.Item label='组织机构' name='orgIds'>\n                        <FieldSysOrgTree/>\n                    </Form.Item>\n                </>}\n\n\n            </Form>\n\n\n        </Modal>\n    }\n\n\n}\n",
+      "__content": "import {Form, Modal} from 'antd';\nimport React from 'react';\nimport {FieldDictSelect, FieldRemoteSelectMultiple, FieldSysOrgTree, HttpUtils} from \"../../../framework\";\n\n\nexport default class UserPerm extends React.Component {\n\n\n    state = {\n        visible: false,\n\n        confirmLoading: false,\n\n        formValues: {\n            dataPermType: null\n        },\n    }\n    formRef = React.createRef()\n\n    show(item) {\n        this.setState({visible: true})\n\n        HttpUtils.get('admin/sysUser/get-perm-info', {id: item.id}).then(rs => {\n            this.setState({formValues: rs})\n            this.formRef.current.setFieldsValue(rs)\n        })\n    }\n\n    handleSave = (values) => {\n        values.grantOrgIdList = this.state.checked\n\n        this.setState({\n            confirmLoading: true\n        })\n\n\n        HttpUtils.post('admin/sysUser/grant-perm', values).then(rs => {\n            this.setState({\n                visible: false,\n                confirmLoading: false\n            })\n            this.props.onOk()\n        }).finally(() => {\n            this.setState({\n                confirmLoading: false\n            })\n\n        })\n    }\n\n    render() {\n        const {visible, confirmLoading} = this.state\n\n        return <Modal\n            title=\"授权\"\n            destroyOnHidden\n            width={600}\n            open={visible}\n            confirmLoading={confirmLoading}\n            onCancel={() => this.setState({visible: false})}\n            onOk={() => this.formRef.current.submit()}\n        >\n\n            <Form ref={this.formRef}\n                  onFinish={this.handleSave}\n                  onValuesChange={(change, values) => {\n                      this.setState({formValues: values})\n                  }}\n                  labelCol={{flex: '100px'}}\n            >\n                <Form.Item name='id' noStyle></Form.Item>\n                <Form.Item label='角色' name='roleIds' rules={[{required: true}]}>\n                    <FieldRemoteSelectMultiple url='admin/sysRole/options'/>\n                </Form.Item>\n                <Form.Item label='数据权限' name='dataPermType' rules={[{required: true}]}>\n                    <FieldDictSelect typeCode='dataPermType'/>\n                </Form.Item>\n\n\n                {this.state.formValues.dataPermType === 'CUSTOM' && <>\n                    <Form.Item label='组织机构' name='orgIds'>\n                        <FieldSysOrgTree/>\n                    </Form.Item>\n                </>}\n\n\n            </Form>\n\n\n        </Modal>\n    }\n\n\n}\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/system/user/UserPerm.jsx"
     },
@@ -2093,7 +2066,7 @@
       "parentId": "@@/global-layout",
       "file": "system/manual/index.jsx",
       "absPath": "/system/manual",
-      "__content": "import {PlusOutlined} from '@ant-design/icons'\nimport {Button, Form, Input, Modal, Popconfirm} from 'antd'\nimport React from 'react'\nimport {ButtonList, FieldUploadFile, HttpUtils, Page, ProTable} from \"../../../framework\";\n\n\nexport default class extends React.Component {\n\n    state = {\n        formValues: {},\n        formOpen: false\n    }\n\n    formRef = React.createRef()\n    tableRef = React.createRef()\n\n    handleAdd = () => {\n        this.setState({formOpen: true, formValues: {}})\n    }\n\n    handleEdit = record => {\n        this.setState({formOpen: true, formValues: record})\n    }\n\n    onFinish = values => {\n        HttpUtils.post('admin/sysManual/save', values).then(rs => {\n            this.setState({formOpen: false})\n            this.tableRef.current.reload()\n        })\n    }\n\n    handleDelete = record => {\n        HttpUtils.post('admin/sysManual/delete', {id: record.id}).then(rs => {\n            this.tableRef.current.reload()\n        })\n    }\n\n    columns = [\n\n        {\n            title: '名称',\n            dataIndex: 'name',\n\n\n        },\n\n        {\n            title: '版本',\n            dataIndex: 'version',\n            render(version) {\n                return 'v' + version;\n            }\n        },\n\n        {\n            title: '文件',\n            dataIndex: 'fileId',\n            render(id) {\n                const url = 'admin/sysFile/preview/' + id;\n                return <a href={url} target='_blank'>查看文件</a>\n            }\n\n        },\n        {\n            title: '操作',\n            dataIndex: 'option',\n            render: (_, record) => (\n                <ButtonList>\n                    <Button size='small' perm='sysManual:save' onClick={() => this.handleEdit(record)}>编辑</Button>\n                    <Popconfirm perm='sysManual:delete' title='是否确定删除操作手册'\n                                onConfirm={() => this.handleDelete(record)}>\n                        <Button size='small'>删除</Button>\n                    </Popconfirm>\n                </ButtonList>\n            ),\n        },\n\n    ]\n\n    render() {\n        return <Page>\n            <ProTable\n                actionRef={this.tableRef}\n                toolBarRender={(params, {selectedRows, selectedRowKeys}) => {\n                    return <ButtonList>\n                        <Button perm='sysManual:save' type='primary' onClick={this.handleAdd}>\n                            <PlusOutlined/> 新增\n                        </Button>\n                    </ButtonList>\n                }}\n                request={(params) => HttpUtils.get('admin/sysManual/page', params)}\n                columns={this.columns}\n\n            />\n\n            <Modal title='操作手册'\n                   open={this.state.formOpen}\n                   onOk={() => this.formRef.current.submit()}\n                   onCancel={() => this.setState({formOpen: false})}\n                   destroyOnClose\n                   maskClosable={false}\n            >\n\n                <Form ref={this.formRef} labelCol={{flex: '100px'}}\n                      initialValues={this.state.formValues}\n                      onFinish={this.onFinish}\n                >\n                    <Form.Item name='id' noStyle></Form.Item>\n\n                    <Form.Item label='名称' name='name' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n\n                    <Form.Item label='文件' name='fileId' rules={[{required: true}]}>\n                        <FieldUploadFile accept=\".pdf\" maxCount={1}/>\n                    </Form.Item>\n\n                </Form>\n            </Modal>\n        </Page>\n\n\n    }\n}\n\n\n",
+      "__content": "import {PlusOutlined} from '@ant-design/icons'\nimport {Button, Form, Input, Modal, Popconfirm} from 'antd'\nimport React from 'react'\nimport {ButtonList, FieldUploadFile, HttpUtils, Page, ProTable} from \"../../../framework\";\n\n\nexport default class extends React.Component {\n\n    state = {\n        formValues: {},\n        formOpen: false\n    }\n\n    formRef = React.createRef()\n    tableRef = React.createRef()\n\n    handleAdd = () => {\n        this.setState({formOpen: true, formValues: {}})\n    }\n\n    handleEdit = record => {\n        this.setState({formOpen: true, formValues: record})\n    }\n\n    onFinish = values => {\n        const isNew = !values.id;\n        const url = isNew ? 'admin/sysManual/create' : 'admin/sysManual/update';\n        HttpUtils.post(url, values).then(rs => {\n            this.setState({formOpen: false})\n            this.tableRef.current.reload()\n        })\n    }\n\n    handleDelete = record => {\n        HttpUtils.post('admin/sysManual/delete', {id: record.id}).then(rs => {\n            this.tableRef.current.reload()\n        })\n    }\n\n    columns = [\n\n        {\n            title: '名称',\n            dataIndex: 'name',\n\n\n        },\n\n        {\n            title: '版本',\n            dataIndex: 'version',\n            render(version) {\n                return 'v' + version;\n            }\n        },\n\n        {\n            title: '文件',\n            dataIndex: 'fileId',\n            render(id) {\n                const url = 'admin/sysFile/preview/' + id;\n                return <a href={url} target='_blank'>查看文件</a>\n            }\n\n        },\n        {\n            title: '操作',\n            dataIndex: 'option',\n            render: (_, record) => (\n                <ButtonList>\n                    <Button size='small' perm='sys-manual:update' onClick={() => this.handleEdit(record)}>编辑</Button>\n                    <Popconfirm perm='sys-manual:delete' title='是否确定删除操作手册'\n                                onConfirm={() => this.handleDelete(record)}>\n                        <Button size='small'>删除</Button>\n                    </Popconfirm>\n                </ButtonList>\n            ),\n        },\n\n    ]\n\n    render() {\n        return <Page>\n            <ProTable\n                actionRef={this.tableRef}\n                toolBarRender={(params, {selectedRows, selectedRowKeys}) => {\n                    return <ButtonList>\n                        <Button perm='sys-manual:create' type='primary' onClick={this.handleAdd}>\n                            <PlusOutlined/> 新增\n                        </Button>\n                    </ButtonList>\n                }}\n                request={(params) => HttpUtils.get('admin/sysManual/page', params)}\n                columns={this.columns}\n\n            />\n\n            <Modal title='操作手册'\n                   open={this.state.formOpen}\n                   onOk={() => this.formRef.current.submit()}\n                   onCancel={() => this.setState({formOpen: false})}\n                   destroyOnHidden\n                   mask={{ closable: false }}\n            >\n\n                <Form ref={this.formRef} labelCol={{flex: '100px'}}\n                      initialValues={this.state.formValues}\n                      onFinish={this.onFinish}\n                >\n                    <Form.Item name='id' noStyle></Form.Item>\n\n                    <Form.Item label='名称' name='name' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n\n                    <Form.Item label='文件' name='fileId' rules={[{required: true}]}>\n                        <FieldUploadFile accept=\".pdf\" maxCount={1}/>\n                    </Form.Item>\n\n                </Form>\n            </Modal>\n        </Page>\n\n\n    }\n}\n\n\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/system/manual/index.jsx"
     },
@@ -2103,7 +2076,7 @@
       "parentId": "@@/global-layout",
       "file": "userCenter/message.jsx",
       "absPath": "/userCenter/message",
-      "__content": "import React from \"react\";\nimport {Button, Card, Tabs, Tag} from \"antd\";\nimport {ProTable} from \"../../framework\";\n\nexport default class extends React.Component {\n\n    tableRef = React.createRef()\n\n    read = (record) => {\n        HttpUtils.post(\"admin/user/msg/read\", record).then(rs => {\n            this.tableRef.current.reload()\n        })\n    }\n\n    columns = [\n        {\n            title: '时间',\n            dataIndex: 'createTime',\n            width: 150\n        },\n        {\n            title: '标题',\n            dataIndex: 'title',\n        },\n        {\n            title: '内容',\n            dataIndex: 'content',\n            render(content, row) {\n                return <div dangerouslySetInnerHTML={{__html: content}}/>\n            }\n        },\n        {\n            title: '已读时间',\n            dataIndex: 'readTime',\n            width: 150\n        },\n        {\n            title: '状态',\n            dataIndex: 'isRead',\n            render: (v, row) => {\n                return v == true ? <Tag color='green'>已读</Tag> : <Tag color='red'>未读</Tag>;\n            },\n            width: 80\n        },\n\n        {\n            title: '-',\n            dataIndex: 'option',\n            render: (read, row) => {\n                if (!row.isRead)\n                    return <Button size='small' onClick={() => this.read(row)}> 标记已读 </Button>\n            }, width: 80\n        }\n    ]\n\n    render() {\n        return <Card variant={\"borderless\"}>\n\n            <Tabs defaultActiveKey=\"0\" destroyOnClose\n            >\n                <Tabs.TabPane key='0' tab='所有消息'>\n                    <ProTable\n                        actionRef={this.tableRef}\n                        request={(params) => HttpUtils.get(\"admin/user/msg/page\", params)}\n                        columns={this.columns}\n                        toolbarOptions={{showSearch: false}}\n                        size='small'\n                    />\n                </Tabs.TabPane>\n                <Tabs.TabPane key='1' tab='未读消息'>\n                    <ProTable\n                        actionRef={this.tableRef}\n                        request={(params) => HttpUtils.get(\"admin/user/msg/page?read=false\", params)}\n                        columns={this.columns}\n                        rowSelection={false}\n                        rowKey='id'\n                        toolbarOptions={{showSearch: false}}\n                        size='small'\n                    />\n\n\n                </Tabs.TabPane>\n                <Tabs.TabPane key='2' tab='已读消息'>\n\n                    <ProTable\n                        actionRef={this.tableRef}\n                        request={(params) => HttpUtils.get(\"admin/user/msg/page?read=true\", params)}\n                        rowSelection={false}\n                        rowKey='id'\n                        toolbarOptions={{showSearch: false}}\n                        options={false}\n                        size='small'\n                        columns={this.columns}\n                    />\n\n\n                </Tabs.TabPane>\n\n            </Tabs>\n\n        </Card>\n    }\n}\n",
+      "__content": "import React from \"react\";\nimport {Button, Card, Tabs, Tag} from \"antd\";\nimport {HttpUtils, Page, ProTable} from \"../../framework\";\n\nexport default class extends React.Component {\n\n    tableRef = React.createRef()\n\n    read = (record) => {\n        HttpUtils.post(\"admin/user/msg/read\", record).then(rs => {\n            this.tableRef.current.reload()\n        })\n    }\n\n    columns = [\n        {\n            title: '时间',\n            dataIndex: 'createTime',\n            width: 150\n        },\n        {\n            title: '标题',\n            dataIndex: 'title',\n        },\n        {\n            title: '内容',\n            dataIndex: 'content',\n            render(content, row) {\n                return <div dangerouslySetInnerHTML={{__html: content}}/>\n            }\n        },\n        {\n            title: '已读时间',\n            dataIndex: 'readTime',\n            width: 150\n        },\n        {\n            title: '状态',\n            dataIndex: 'isRead',\n            render: (v, row) => {\n                return v == true ? <Tag color='green'>已读</Tag> : <Tag color='red'>未读</Tag>;\n            },\n            width: 80\n        },\n\n        {\n            title: '-',\n            dataIndex: 'option',\n            render: (read, row) => {\n                if (!row.isRead)\n                    return <Button size='small' onClick={() => this.read(row)}> 标记已读 </Button>\n            }, width: 80\n        }\n    ]\n\n    render() {\n        return <Page>\n            <Card variant={\"borderless\"}>\n\n            <Tabs defaultActiveKey=\"0\" destroyOnClose\n            >\n                <Tabs.TabPane key='0' tab='所有消息'>\n                    <ProTable\n                        actionRef={this.tableRef}\n                        request={(params) => HttpUtils.get(\"admin/user/msg/page\", params)}\n                        columns={this.columns}\n                        toolbarOptions={{showSearch: false}}\n                        size='small'\n                    />\n                </Tabs.TabPane>\n                <Tabs.TabPane key='1' tab='未读消息'>\n                    <ProTable\n                        actionRef={this.tableRef}\n                        request={(params) => HttpUtils.get(\"admin/user/msg/page?read=false\", params)}\n                        columns={this.columns}\n                        rowSelection={false}\n                        rowKey='id'\n                        toolbarOptions={{showSearch: false}}\n                        size='small'\n                    />\n\n\n                </Tabs.TabPane>\n                <Tabs.TabPane key='2' tab='已读消息'>\n\n                    <ProTable\n                        actionRef={this.tableRef}\n                        request={(params) => HttpUtils.get(\"admin/user/msg/page?read=true\", params)}\n                        rowSelection={false}\n                        rowKey='id'\n                        toolbarOptions={{showSearch: false}}\n                        options={false}\n                        size='small'\n                        columns={this.columns}\n                    />\n\n\n                </Tabs.TabPane>\n\n            </Tabs>\n\n        </Card>\n        </Page>\n    }\n}\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/userCenter/message.jsx"
     },
@@ -2113,7 +2086,7 @@
       "parentId": "@@/global-layout",
       "file": "system/dict/index.jsx",
       "absPath": "/system/dict",
-      "__content": "import React from \"react\";\nimport {Button, Form, Input, InputNumber, Modal, Popconfirm, Splitter, Tag, Tree, Typography} from \"antd\";\nimport {PlusOutlined} from \"@ant-design/icons\";\n\nimport {\n    ButtonList,\n    FieldBoolean, FieldDictSelect, FieldRemoteSelect,\n    HttpUtils,\n    Page,\n    ProTable,\n    ViewBooleanEnableDisable, ViewText\n} from \"../../../framework\";\n\nexport default class extends React.Component {\n\n    state = {\n        formValues: {},\n        formOpen: false\n    }\n\n    formRef = React.createRef()\n    tableRef = React.createRef()\n\n\n\n\n    handleAdd = () => {\n        this.setState({formOpen: true, formValues: {}})\n    }\n\n    handleEdit = record => {\n        this.setState({formOpen: true, formValues: record})\n    }\n\n    onFinish = values => {\n        HttpUtils.post('admin/dict/save', values).then(rs => {\n            this.setState({formOpen: false})\n            this.tableRef.current.reload()\n        })\n    }\n\n    handleDelete = row => {\n        HttpUtils.post('admin/dict/delete', row).then(rs => {\n            this.tableRef.current.reload()\n        })\n    }\n\n    columns = [\n        {\n            title: '类型标签',\n            dataIndex: 'typeLabel',\n        },\n        {\n            title: '类型编码',\n            dataIndex: 'typeCode',\n        },\n        {\n            title: '标签',\n            dataIndex: 'label',\n        },\n        {\n            title: '编码',\n            dataIndex: 'code',\n        },\n\n        {\n            title: '启用',\n            dataIndex: 'enabled',\n            render(v) {\n                return <ViewBooleanEnableDisable value={v}/>\n            }\n\n        },\n        {\n            title: '显示颜色',\n            dataIndex: 'color',\n            render(v) {\n                if (v) {\n                    return <Tag color={v.toLowerCase()}>{v}</Tag>\n                }\n\n            }\n        },\n\n        {\n            title: '序号',\n            dataIndex: 'seq',\n        },\n        {\n            title: '操作',\n            dataIndex: 'option',\n            render: (_, record) => {\n                if(!record.id){ // 非数据库定义的不让修改\n                    return\n                }\n\n                return (\n                    <ButtonList>\n                        <Button size='small' perm='sysDict:save'\n                                onClick={() => this.handleEdit(record)}> 编辑 </Button>\n                        <Popconfirm perm='sysDict:delete' title='是否确定删除字典项'\n                                    onConfirm={() => this.handleDelete(record)}>\n                            <Button size='small'>删除</Button>\n                        </Popconfirm>\n                    </ButtonList>\n                );\n            },\n        },\n    ]\n\n    render() {\n        return <Page padding>\n            <ProTable\n                rowKey='uid'\n                actionRef={this.tableRef}\n                toolBarRender={() => {\n                    return <ButtonList>\n                        <Button perm='sysDict:save' type='primary' onClick={this.handleAdd} >\n                            <PlusOutlined/> 新增\n                        </Button>\n                    </ButtonList>\n                }}\n                request={(params) => {\n                    params.typeCode = this.state.typeCode\n                    return HttpUtils.get('admin/dict/page', params);\n                }}\n                columns={this.columns}\n                showToolbarSearch={true}\n                scrollY={500}\n            />\n            <Modal\n                title='编辑数据字典项'\n                open={this.state.formOpen}\n                onOk={() => this.formRef.current.submit()}\n                onCancel={() => this.setState({formOpen: false})}\n                destroyOnClose\n            >\n\n                <Form ref={this.formRef} labelCol={{flex: '100px'}}\n                      initialValues={this.state.formValues}\n                      onFinish={this.onFinish}>\n                    <Form.Item name='id' noStyle></Form.Item>\n                    <Form.Item label='类型' name='color' rules={[{required: true}]} >\n                       <ViewText />\n                    </Form.Item>\n                    <Form.Item label='类型' name='typeCode' rules={[{required: true}]} >\n                        <FieldRemoteSelect url='/admin/dict/type-options' />\n                    </Form.Item>\n                    <Form.Item label='编码' name='code' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n                    <Form.Item label='标签' name='label' rules={[{required: true}]} help='显示文本'>\n                        <Input/>\n                    </Form.Item>\n                    <Form.Item label='颜色' name='color' rules={[{required: true}]}>\n                        <FieldDictSelect typeCode='statusColor' />\n                    </Form.Item>\n                    <Form.Item label='序号' name='seq' rules={[{required: true}]}>\n                        <InputNumber/>\n                    </Form.Item>\n\n                    <Form.Item label='启用' name='enabled' rules={[{required: true}]}>\n                        <FieldBoolean/>\n                    </Form.Item>\n\n                </Form>\n            </Modal>\n        </Page>\n\n\n    }\n\n\n}\n",
+      "__content": "import React from \"react\";\nimport {Button, Form, Input, InputNumber, Modal, Popconfirm, Splitter, Tag, Tree, Typography} from \"antd\";\nimport {PlusOutlined} from \"@ant-design/icons\";\n\nimport {\n    ButtonList,\n    FieldBoolean, FieldDictSelect, FieldRemoteSelect,\n    HttpUtils,\n    Page,\n    ProTable,\n    ViewBooleanEnableDisable, ViewText\n} from \"../../../framework\";\n\nexport default class extends React.Component {\n\n    state = {\n        formValues: {},\n        formOpen: false\n    }\n\n    formRef = React.createRef()\n    tableRef = React.createRef()\n\n\n\n\n    handleAdd = () => {\n        this.setState({formOpen: true, formValues: {}})\n    }\n\n    handleEdit = record => {\n        this.setState({formOpen: true, formValues: record})\n    }\n\n    onFinish = values => {\n        const isNew = !values.id;\n        const url = isNew ? 'admin/dict/create' : 'admin/dict/update';\n        HttpUtils.post(url, values).then(rs => {\n            this.setState({formOpen: false})\n            this.tableRef.current.reload()\n        })\n    }\n\n    handleDelete = row => {\n        HttpUtils.post('admin/dict/delete', row).then(rs => {\n            this.tableRef.current.reload()\n        })\n    }\n\n    columns = [\n        {\n            title: '类型标签',\n            dataIndex: 'typeLabel',\n        },\n        {\n            title: '类型编码',\n            dataIndex: 'typeCode',\n        },\n        {\n            title: '标签',\n            dataIndex: 'label',\n        },\n        {\n            title: '编码',\n            dataIndex: 'code',\n        },\n\n        {\n            title: '启用',\n            dataIndex: 'enabled',\n            render(v) {\n                return <ViewBooleanEnableDisable value={v}/>\n            }\n\n        },\n        {\n            title: '显示颜色',\n            dataIndex: 'color',\n            render(v) {\n                if (v) {\n                    return <Tag color={v.toLowerCase()}>{v}</Tag>\n                }\n\n            }\n        },\n\n        {\n            title: '序号',\n            dataIndex: 'seq',\n        },\n        {\n            title: '操作',\n            dataIndex: 'option',\n            render: (_, record) => {\n                return (\n                    <ButtonList>\n                        <Button size='small' perm='sys-dict:update'\n                                onClick={() => this.handleEdit(record)}> 编辑 </Button>\n                        <Popconfirm perm='sys-dict:delete' title='是否确定删除字典项'\n                                    onConfirm={() => this.handleDelete(record)}>\n                            <Button size='small'>删除</Button>\n                        </Popconfirm>\n                    </ButtonList>\n                );\n            },\n        },\n    ]\n\n    render() {\n        return <Page>\n            <ProTable\n                rowKey='uid'\n                actionRef={this.tableRef}\n                toolBarRender={() => {\n                    return <ButtonList>\n                        <Button perm='sys-dict:create' type='primary' onClick={this.handleAdd} >\n                            <PlusOutlined/> 新增\n                        </Button>\n                    </ButtonList>\n                }}\n                request={(params) => {\n                    params.typeCode = this.state.typeCode\n                    return HttpUtils.get('admin/dict/page', params);\n                }}\n                columns={this.columns}\n                showToolbarSearch={true}\n            />\n            <Modal\n                title='编辑数据字典项'\n                open={this.state.formOpen}\n                onOk={() => this.formRef.current.submit()}\n                onCancel={() => this.setState({formOpen: false})}\n                destroyOnHidden\n            >\n\n                <Form ref={this.formRef} labelCol={{flex: '100px'}}\n                      initialValues={this.state.formValues}\n                      onFinish={this.onFinish}>\n                    <Form.Item name='id' noStyle></Form.Item>\n                    <Form.Item label='类型' name='color' rules={[{required: true}]} >\n                       <ViewText />\n                    </Form.Item>\n                    <Form.Item label='类型' name='typeCode' rules={[{required: true}]} >\n                        <FieldRemoteSelect url='/admin/dict/type-options' />\n                    </Form.Item>\n                    <Form.Item label='编码' name='code' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n                    <Form.Item label='标签' name='label' rules={[{required: true}]} help='显示文本'>\n                        <Input/>\n                    </Form.Item>\n                    <Form.Item label='颜色' name='color' rules={[{required: true}]}>\n                        <FieldDictSelect typeCode='statusColor' />\n                    </Form.Item>\n                    <Form.Item label='序号' name='seq' rules={[{required: true}]}>\n                        <InputNumber/>\n                    </Form.Item>\n\n                    <Form.Item label='启用' name='enabled' rules={[{required: true}]}>\n                        <FieldBoolean/>\n                    </Form.Item>\n\n                </Form>\n            </Modal>\n        </Page>\n\n\n    }\n\n\n}\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/system/dict/index.jsx"
     },
@@ -2123,7 +2096,7 @@
       "parentId": "@@/global-layout",
       "file": "system/file/index.jsx",
       "absPath": "/system/file",
-      "__content": "import React from 'react'\nimport {Button, Form, Input, Modal, Popconfirm} from 'antd'\nimport {CloudUploadOutlined} from \"@ant-design/icons\";\n\nimport {ButtonList, FieldDateRange, FieldDictSelect, FieldUploadFile, HttpUtils, ProTable} from \"../../../framework\";\n\nexport default class extends React.Component {\n\n    state = {\n        formOpen: false,\n        formValues: {}\n    }\n\n    tableRef = React.createRef()\n    formRef = React.createRef()\n\n    handleDelete = row => {\n        HttpUtils.post('admin/sysFile/delete', row).then(rs => {\n            this.tableRef.current.reload()\n        })\n    }\n\n    columns = [\n        {\n            title: '原始名称',\n            tooltip: '上传时候的文件名',\n            dataIndex: 'originName',\n            width: 200,\n        },\n        {\n            title: '存储名称',\n            dataIndex: 'objectName',\n            tooltip: '文件唯一标识id'\n        },\n\n        {\n            title: '文件大小',\n            dataIndex: 'sizeInfo',\n        },\n\n        {\n            title: 'mime',\n            dataIndex: 'mimeType',\n        },\n        {\n            title: '扩展名',\n            dataIndex: 'suffix',\n        },\n\n        {\n            title: '上传时间',\n            dataIndex: 'createTime',\n        },\n        {\n            title: '上传者',\n            dataIndex: 'createUserLabel',\n        },\n        {\n            title: '预览',\n            dataIndex: 'id',\n            render(id, record) {\n                const nodes = [<a href={'/admin/sysFile/preview/' + record.id} target='_blank'>预览</a>]\n\n\n                if (record.imageUrls?.length > 0) {\n                    for (let item of record.imageUrls) {\n                        const url = item.url;\n                        const label = item.label;\n                        nodes.push(<a href={(url)} target='_blank' style={{marginLeft: 8}}>{label}</a>)\n                    }\n                }\n\n                return nodes;\n\n            }\n        },\n        {\n            title: '操作',\n            dataIndex: 'option',\n            render: (_, record) => (\n                <ButtonList>\n                    <Popconfirm perm='sysFile:delete' title='是否确定删除文件信息'\n                                onConfirm={() => this.handleDelete(record)}>\n                        <a>删除</a>\n                    </Popconfirm>\n                </ButtonList>\n            ),\n        },\n    ]\n\n    render() {\n        return <>\n            <ProTable\n                actionRef={this.tableRef}\n                toolBarRender={() => {\n                    return <Button type='primary' icon={<CloudUploadOutlined/>}\n                                   onClick={() => this.setState({formOpen: true})}>\n                        上传文件\n                    </Button>\n                }}\n                request={(params) => {\n                    return HttpUtils.get('admin/sysFile/page', params);\n                }}\n\n                columns={this.columns}\n\n            >\n                <Form.Item label='文件名' name='originName'>\n                    <Input/>\n                </Form.Item>\n                <Form.Item label='对象名称' name='objectName'>\n                    <Input/>\n                </Form.Item>\n                <Form.Item label='类型' name='type'>\n                    <FieldDictSelect typeCode='materialType'/>\n                </Form.Item>\n\n                <Form.Item label='上传时间' name='dateRange'>\n                    <FieldDateRange/>\n                </Form.Item>\n            </ProTable>\n\n            <Modal open={this.state.formOpen} title='上传文件'\n                   width={800}\n                   onCancel={() => {\n                       this.setState({formOpen: false})\n                       this.tableRef.current.reload()\n                   }}\n                   footer={null}\n                   destroyOnClose\n            >\n                <Form ref={this.formRef}\n                      initialValues={this.state.formValues}\n                >\n                    <Form.Item name='文件'>\n                        <FieldUploadFile accept=\"*/*\"/>\n                    </Form.Item>\n\n\n                </Form>\n            </Modal>\n\n        </>\n    }\n}\n\n\n\n",
+      "__content": "import React from 'react'\nimport {Button, Form, Input, Modal, Popconfirm} from 'antd'\nimport {CloudUploadOutlined} from \"@ant-design/icons\";\n\nimport {ButtonList, FieldDateRange, FieldDictSelect, FieldUploadFile, HttpUtils, Page, ProTable, SysUtils} from \"../../../framework\";\n\nexport default class extends React.Component {\n\n    state = {\n        formOpen: false,\n        formValues: {}\n    }\n\n    tableRef = React.createRef()\n    formRef = React.createRef()\n\n    handleDelete = row => {\n        HttpUtils.post('admin/sysFile/delete', row).then(rs => {\n            this.tableRef.current.reload()\n        })\n    }\n\n    columns = [\n        {\n            title: '原始名称',\n            tooltip: '上传时候的文件名',\n            dataIndex: 'originName',\n            width: 200,\n        },\n        {\n            title: '存储名称',\n            dataIndex: 'objectName',\n            tooltip: '文件唯一标识id'\n        },\n\n        {\n            title: '文件大小',\n            dataIndex: 'sizeInfo',\n        },\n\n        {\n            title: 'mime',\n            dataIndex: 'mimeType',\n        },\n        {\n            title: '扩展名',\n            dataIndex: 'suffix',\n        },\n\n        {\n            title: '上传时间',\n            dataIndex: 'createTime',\n        },\n        {\n            title: '上传者',\n            dataIndex: 'createUserLabel',\n        },\n        {\n            title: '预览',\n            dataIndex: 'id',\n            render(id, record) {\n                const nodes = [<a href={SysUtils.contextPath('/admin/sysFile/preview/' + record.id)} target='_blank'>预览</a>]\n\n\n                if (record.imageUrls?.length > 0) {\n                    for (let item of record.imageUrls) {\n                        const url = item.url;\n                        const label = item.label;\n                        nodes.push(<a href={(url)} target='_blank' style={{marginLeft: 8}}>{label}</a>)\n                    }\n                }\n\n                return nodes;\n\n            }\n        },\n        {\n            title: '操作',\n            dataIndex: 'option',\n            render: (_, record) => (\n                <ButtonList>\n                    <Popconfirm perm='sys-file:delete' title='是否确定删除文件信息'\n                                onConfirm={() => this.handleDelete(record)}>\n                        <a>删除</a>\n                    </Popconfirm>\n                </ButtonList>\n            ),\n        },\n    ]\n\n    render() {\n        return <Page>\n            <ProTable\n                actionRef={this.tableRef}\n                toolBarRender={() => {\n                    return <Button type='primary' icon={<CloudUploadOutlined/>}\n                                   onClick={() => this.setState({formOpen: true})}>\n                        上传文件\n                    </Button>\n                }}\n                request={(params) => {\n                    return HttpUtils.get('admin/sysFile/page', params);\n                }}\n\n                columns={this.columns}\n\n            >\n                <Form.Item label='文件名' name='originName'>\n                    <Input/>\n                </Form.Item>\n                <Form.Item label='对象名称' name='objectName'>\n                    <Input/>\n                </Form.Item>\n                <Form.Item label='类型' name='type'>\n                    <FieldDictSelect typeCode='materialType'/>\n                </Form.Item>\n\n                <Form.Item label='上传时间' name='dateRange'>\n                    <FieldDateRange/>\n                </Form.Item>\n            </ProTable>\n\n            <Modal open={this.state.formOpen} title='上传文件'\n                   width={800}\n                   onCancel={() => {\n                       this.setState({formOpen: false})\n                       this.tableRef.current.reload()\n                   }}\n                   footer={null}\n                   destroyOnHidden\n            >\n                <Form ref={this.formRef}\n                      initialValues={this.state.formValues}\n                >\n                    <Form.Item name='文件'>\n                        <FieldUploadFile accept=\"*/*\"/>\n                    </Form.Item>\n\n\n                </Form>\n            </Modal>\n\n        </Page>\n    }\n}\n\n\n\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/system/file/index.jsx"
     },
@@ -2133,7 +2106,7 @@
       "parentId": "@@/global-layout",
       "file": "system/role/index.jsx",
       "absPath": "/system/role",
-      "__content": "import {PlusOutlined} from '@ant-design/icons'\nimport {Button, Form, Input, InputNumber, Modal, Popconfirm, Transfer, Tree} from 'antd'\nimport React from 'react'\nimport {ButtonList, FieldBoolean, HttpUtils, Page, PageUtils, ProTable, ViewText} from \"../../../framework\";\n\n\nexport default class extends React.Component {\n\n    state = {\n        formValues: {},\n        formOpen: false,\n\n        usersModalOpen: false,\n\n\n        userList: [],\n        targetKeys: [],\n        selectedKeys: [],\n\n        menuOpen: false,\n        menuTree: [],\n        menuTreeLoading: false,\n        menuChecked: [],\n        menuHalfChecked: []\n    }\n\n    formRef = React.createRef()\n    tableRef = React.createRef()\n\n    handleAdd = () => {\n        this.setState({formOpen: true, formValues: {}})\n    }\n\n    handleEdit = record => {\n        this.setState({formOpen: true, formValues: record}, () => {\n\n        })\n    }\n\n    handleEditUser = record => {\n        this.setState({usersModalOpen: true, formValues: record})\n        HttpUtils.get('admin/sysRole/user-list', {id: record.id}).then(rs => {\n            this.setState({userList: rs.list, targetKeys: rs.selectedKeys})\n        })\n    }\n\n    onFinish = values => {\n        HttpUtils.post('admin/sysRole/save', values).then(rs => {\n            this.setState({formOpen: false})\n            this.tableRef.current.reload()\n        })\n    }\n\n    handleDelete = record => {\n        HttpUtils.post('admin/sysRole/delete', {id: record.id}).then(rs => {\n            this.tableRef.current.reload()\n        })\n    }\n\n    columns = [\n\n        {\n            title: '名称',\n            dataIndex: 'name',\n\n\n        },\n\n        {\n            title: '编号',\n            dataIndex: 'code',\n\n\n        },\n\n        {\n            title: '排序',\n            dataIndex: 'seq',\n\n\n        },\n\n        {\n            title: '备注',\n            dataIndex: 'remark',\n\n\n        },\n\n        {\n            title: '启用',\n            dataIndex: 'enabled',\n\n\n            render(v) {\n                return v == null ? null : (v ? '是' : '否')\n            },\n\n\n        },\n        {\n            title: '是否内置',\n            dataIndex: 'builtin',\n\n\n            render(v) {\n                return v == null ? null : (v ? '是' : '否')\n            },\n\n\n        },\n\n        {\n            title: '权限码',\n            dataIndex: 'perms',\n            width: 300,\n            render(v) {\n                if (v) {\n                    return <ViewText value={v.join(',')} ellipsis={true} />\n                }\n            }\n\n        },\n\n\n        {\n            title: '操作',\n            dataIndex: 'option',\n            render: (_, record) => {\n\n                return (\n                    <ButtonList>\n                        <Button size='small' perm='sysRole:manage'\n                                onClick={() => this.handleEditUser(record)}>用户设置</Button>\n\n                        <Button size='small' perm='sysRole:manage' disabled={record.builtin}\n                                onClick={() => PageUtils.open('/system/role/perm?id=' + record.id, '角色权限设置')}>权限设置</Button>\n\n                        <Button size='small' perm='sysRole:manage' disabled={record.builtin}\n                                onClick={() => this.handleEdit(record)}>编辑</Button>\n                        <Popconfirm perm='sysRole:manage' disabled={record.builtin} title='是否确定删除系统角色'\n                                    onConfirm={() => this.handleDelete(record)}>\n                            <Button size='small'>删除</Button>\n                        </Popconfirm>\n                    </ButtonList>\n                );\n            },\n        },\n    ]\n\n    handleSaveUsers = () => {\n        const params = {\n            id: this.state.formValues.id,\n            userIdList: this.state.targetKeys\n        }\n        HttpUtils.post('admin/sysRole/grant-users', params).then(rs => {\n            this.setState({usersModalOpen: false})\n        })\n    }\n\n    handleEditMenu = (record) => {\n        this.setState({menuOpen: true, formValues: record, menuTreeLoading: true})\n        HttpUtils.get('admin/sysRole/ownMenu', {id: record.id}).then(rs => {\n            this.setState({menuChecked: rs.checked, menuHalfChecked: rs.halfChecked})\n        })\n        HttpUtils.get('admin/sysRole/menuTree').then(rs => {\n            this.setState({menuTree: rs, menuTreeLoading: false})\n        })\n    }\n    handleGrantMenu = () => {\n        const params = {\n            id: this.state.formValues.id,\n            menuIds: [...this.state.menuChecked, ...this.state.menuHalfChecked]\n        }\n        HttpUtils.post('admin/sysRole/grantMenu', params).then(rs => {\n            this.setState({menuOpen: false})\n        })\n    }\n\n    render() {\n        return <Page padding>\n            <ProTable\n                actionRef={this.tableRef}\n                toolBarRender={() => {\n                    return <ButtonList>\n                        <Button perm='sysRole:manage' type='primary' onClick={this.handleAdd}>\n                            <PlusOutlined/> 新增\n                        </Button>\n                    </ButtonList>\n                }}\n                request={(params) => HttpUtils.get('admin/sysRole/page', params)}\n                columns={this.columns}\n\n            />\n\n            <Modal title='系统角色'\n                   open={this.state.formOpen}\n                   onOk={() => this.formRef.current.submit()}\n                   onCancel={() => this.setState({formOpen: false})}\n                   destroyOnClose\n                   maskClosable={false}\n                   width={600}\n            >\n\n                <Form ref={this.formRef} labelCol={{flex: '100px'}}\n                      initialValues={this.state.formValues}\n                      onFinish={this.onFinish}\n                >\n                    <Form.Item name='id' noStyle></Form.Item>\n\n\n                    <Form.Item label='名称' name='name' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n\n                    <Form.Item label='编码' name='code' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n\n\n                    <Form.Item label='排序' name='seq'>\n                        <InputNumber/>\n                    </Form.Item>\n\n\n                    <Form.Item label='备注' name='remark'>\n                        <Input/>\n                    </Form.Item>\n\n                    <Form.Item label='启用' name='enabled' rules={[{required: true}]}>\n                        <FieldBoolean/>\n                    </Form.Item>\n\n\n                </Form>\n            </Modal>\n\n\n            <Modal title={'角色用户' + \"【\" + this.state.formValues?.name + '】'}\n                   open={this.state.usersModalOpen}\n                   destroyOnClose\n                   maskClosable={false}\n                   width={800}\n                   onCancel={() => this.setState({usersModalOpen: false})}\n                   onOk={this.handleSaveUsers}\n            >\n\n\n                <Transfer\n                    listStyle={{height: '60vh', width: 300}}\n\n                    dataSource={this.state.userList} titles={[\"未选择\", \"已选择\"]}\n                    targetKeys={this.state.targetKeys}\n                    selectedKeys={this.state.selectedKeys}\n                    render={item => item.title}\n                    onChange={(nextTargetKeys, direction, moveKeys) => {\n                        this.setState({\n                            targetKeys: nextTargetKeys\n                        })\n                    }}\n                    onSelectChange={(sourceSelectedKeys, targetSelectedKeys) => {\n                        this.setState({\n                            selectedKeys: [...sourceSelectedKeys, ...targetSelectedKeys]\n                        })\n                    }}\n                    showSearch\n                />\n\n\n            </Modal>\n\n            <Modal title={'角色授权菜单权限' + \"【\" + this.state.formValues?.name + '】'}\n                   open={this.state.menuOpen}\n                   destroyOnClose\n                   maskClosable={false}\n                   width={800}\n                   onCancel={() => this.setState({menuOpen: false})}\n                   onOk={this.handleGrantMenu}\n                   loading={this.state.menuTreeLoading}\n            >\n                <Tree\n                    height={600}\n                    treeData={this.state.menuTree}\n                    multiple\n                    checkable\n                    checkedKeys={{checked: this.state.menuChecked}}\n                    onCheck={(keys, e) => {\n                        this.setState({menuChecked: keys, menuHalfChecked: e.halfCheckedKeys})\n                    }}\n                    defaultExpandAll\n                    titleRender={node => {\n                        return <span title={node.perm}>{node.title}</span>\n                    }}\n                />\n            </Modal>\n        </Page>\n\n\n    }\n}\n\n",
+      "__content": "import {PlusOutlined} from '@ant-design/icons'\nimport {Button, Form, Input, InputNumber, Modal, Popconfirm, Transfer, Tree} from 'antd'\nimport React from 'react'\nimport {ButtonList, FieldBoolean, HttpUtils, Page, PageUtils, ProTable, ViewText} from \"../../../framework\";\n\n\nexport default class extends React.Component {\n\n    state = {\n        formValues: {},\n        formOpen: false,\n\n        usersModalOpen: false,\n\n\n        userList: [],\n        targetKeys: [],\n        selectedKeys: [],\n\n        menuOpen: false,\n        menuTree: [],\n        menuTreeLoading: false,\n        menuChecked: [],\n        menuHalfChecked: []\n    }\n\n    formRef = React.createRef()\n    tableRef = React.createRef()\n\n    handleAdd = () => {\n        this.setState({formOpen: true, formValues: {}})\n    }\n\n    handleEdit = record => {\n        this.setState({formOpen: true, formValues: record}, () => {\n\n        })\n    }\n\n    handleEditUser = record => {\n        this.setState({usersModalOpen: true, formValues: record})\n        HttpUtils.get('admin/sysRole/user-list', {id: record.id}).then(rs => {\n            this.setState({userList: rs.list, targetKeys: rs.selectedKeys})\n        })\n    }\n\n    onFinish = values => {\n        const isNew = !values.id;\n        const url = isNew ? 'admin/sysRole/create' : 'admin/sysRole/update';\n        HttpUtils.post(url, values).then(rs => {\n            this.setState({formOpen: false})\n            this.tableRef.current.reload()\n        })\n    }\n\n    handleDelete = record => {\n        HttpUtils.post('admin/sysRole/delete', {id: record.id}).then(rs => {\n            this.tableRef.current.reload()\n        })\n    }\n\n    columns = [\n\n        {\n            title: '名称',\n            dataIndex: 'name',\n\n\n        },\n\n        {\n            title: '编号',\n            dataIndex: 'code',\n\n\n        },\n\n        {\n            title: '排序',\n            dataIndex: 'seq',\n\n\n        },\n\n        {\n            title: '备注',\n            dataIndex: 'remark',\n\n\n        },\n\n        {\n            title: '启用',\n            dataIndex: 'enabled',\n\n\n            render(v) {\n                return v == null ? null : (v ? '是' : '否')\n            },\n\n\n        },\n        {\n            title: '是否内置',\n            dataIndex: 'builtin',\n\n\n            render(v) {\n                return v == null ? null : (v ? '是' : '否')\n            },\n\n\n        },\n\n        {\n            title: '权限码',\n            dataIndex: 'perms',\n            width: 300,\n            render(v) {\n                if (v) {\n                    return <ViewText value={v.join(',')} ellipsis={true} />\n                }\n            }\n\n        },\n\n\n        {\n            title: '操作',\n            dataIndex: 'option',\n            render: (_, record) => {\n\n                return (\n                    <ButtonList>\n                        <Button size='small' perm='sys-role:grant-permission'\n                                onClick={() => this.handleEditUser(record)}>用户设置</Button>\n\n                        <Button size='small' perm='sys-role:grant-permission' disabled={record.builtin}\n                                onClick={() => PageUtils.open('/system/role/perm?id=' + record.id, '角色权限设置')}>权限设置</Button>\n\n                        <Button size='small' perm='sys-role:update' disabled={record.builtin}\n                                onClick={() => this.handleEdit(record)}>编辑</Button>\n                        <Popconfirm perm='sys-role:delete' disabled={record.builtin} title='是否确定删除系统角色'\n                                    onConfirm={() => this.handleDelete(record)}>\n                            <Button size='small'>删除</Button>\n                        </Popconfirm>\n                    </ButtonList>\n                );\n            },\n        },\n    ]\n\n    handleSaveUsers = () => {\n        const params = {\n            id: this.state.formValues.id,\n            userIdList: this.state.targetKeys\n        }\n        HttpUtils.post('admin/sysRole/grant-users', params).then(rs => {\n            this.setState({usersModalOpen: false})\n        })\n    }\n\n    handleEditMenu = (record) => {\n        this.setState({menuOpen: true, formValues: record, menuTreeLoading: true})\n        HttpUtils.get('admin/sysRole/ownMenu', {id: record.id}).then(rs => {\n            this.setState({menuChecked: rs.checked, menuHalfChecked: rs.halfChecked})\n        })\n        HttpUtils.get('admin/sysRole/menuTree').then(rs => {\n            this.setState({menuTree: rs, menuTreeLoading: false})\n        })\n    }\n    handleGrantMenu = () => {\n        const params = {\n            id: this.state.formValues.id,\n            menuIds: [...this.state.menuChecked, ...this.state.menuHalfChecked]\n        }\n        HttpUtils.post('admin/sysRole/grantMenu', params).then(rs => {\n            this.setState({menuOpen: false})\n        })\n    }\n\n    render() {\n        return <Page>\n            <ProTable\n                actionRef={this.tableRef}\n                toolBarRender={() => {\n                    return <ButtonList>\n                        <Button perm='sys-role:create' type='primary' onClick={this.handleAdd}>\n                            <PlusOutlined/> 新增\n                        </Button>\n                    </ButtonList>\n                }}\n                request={(params) => HttpUtils.get('admin/sysRole/page', params)}\n                columns={this.columns}\n\n            />\n\n            <Modal title='系统角色'\n                   open={this.state.formOpen}\n                   onOk={() => this.formRef.current.submit()}\n                   onCancel={() => this.setState({formOpen: false})}\n                   destroyOnHidden\n                   mask={{ closable: false }}\n                   width={600}\n            >\n\n                <Form ref={this.formRef} labelCol={{flex: '100px'}}\n                      initialValues={this.state.formValues}\n                      onFinish={this.onFinish}\n                >\n                    <Form.Item name='id' noStyle></Form.Item>\n\n\n                    <Form.Item label='名称' name='name' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n\n                    <Form.Item label='编码' name='code' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n\n\n                    <Form.Item label='排序' name='seq'>\n                        <InputNumber/>\n                    </Form.Item>\n\n\n                    <Form.Item label='备注' name='remark'>\n                        <Input/>\n                    </Form.Item>\n\n                    <Form.Item label='启用' name='enabled' rules={[{required: true}]}>\n                        <FieldBoolean/>\n                    </Form.Item>\n\n\n                </Form>\n            </Modal>\n\n\n            <Modal title={'角色用户' + \"【\" + this.state.formValues?.name + '】'}\n                   open={this.state.usersModalOpen}\n                   destroyOnHidden\n                   mask={{ closable: false }}\n                   width={800}\n                   onCancel={() => this.setState({usersModalOpen: false})}\n                   onOk={this.handleSaveUsers}\n            >\n\n\n                <Transfer\n                    styles={{ section: { height: '60vh', width: 300 } }}\n\n                    dataSource={this.state.userList} titles={[\"未选择\", \"已选择\"]}\n                    targetKeys={this.state.targetKeys}\n                    selectedKeys={this.state.selectedKeys}\n                    render={item => item.title}\n                    onChange={(nextTargetKeys, direction, moveKeys) => {\n                        this.setState({\n                            targetKeys: nextTargetKeys\n                        })\n                    }}\n                    onSelectChange={(sourceSelectedKeys, targetSelectedKeys) => {\n                        this.setState({\n                            selectedKeys: [...sourceSelectedKeys, ...targetSelectedKeys]\n                        })\n                    }}\n                    showSearch\n                />\n\n\n            </Modal>\n\n            <Modal title={'角色授权菜单权限' + \"【\" + this.state.formValues?.name + '】'}\n                   open={this.state.menuOpen}\n                   destroyOnHidden\n                   mask={{ closable: false }}\n                   width={800}\n                   onCancel={() => this.setState({menuOpen: false})}\n                   onOk={this.handleGrantMenu}\n                   loading={this.state.menuTreeLoading}\n            >\n                <Tree\n                    height={600}\n                    treeData={this.state.menuTree}\n                    multiple\n                    checkable\n                    checkedKeys={{checked: this.state.menuChecked}}\n                    onCheck={(keys, e) => {\n                        this.setState({menuChecked: keys, menuHalfChecked: e.halfCheckedKeys})\n                    }}\n                    defaultExpandAll\n                    titleRender={node => {\n                        return <span title={node.perm}>{node.title}</span>\n                    }}\n                />\n            </Modal>\n        </Page>\n\n\n    }\n}\n\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/system/role/index.jsx"
     },
@@ -2143,7 +2116,7 @@
       "parentId": "@@/global-layout",
       "file": "system/user/index.jsx",
       "absPath": "/system/user",
-      "__content": "import {PlusOutlined} from '@ant-design/icons';\nimport {Button, Form, Input, Modal, Popconfirm, Splitter, Tabs} from 'antd';\nimport React from 'react';\nimport {\n    ButtonList,\n    DictUtils,\n    FieldBoolean,\n    FieldSysOrgTreeSelect,\n    HttpUtils,\n    OrgTree,\n    Page,\n    ProTable,\n    RoleTree\n} from \"../../../framework\";\nimport UserPerm from \"./UserPerm\";\n\nexport default class extends React.Component {\n\n    state = {\n        showAddForm: false,\n        showEditForm: false,\n        formValues: {},\n\n        currentOrgId: null,\n        currentRoleId: null,\n    }\n    permRef = React.createRef();\n\n    formRef = React.createRef()\n    tableRef = React.createRef()\n\n    resetPwd(row) {\n        HttpUtils.post('admin/sysUser/reset-pwd', {id: row.id}).then(rs => {\n            Modal.success({\n                title: '重置密码成功',\n                content: rs\n            })\n        })\n    }\n\n    handleDelete = r => {\n        HttpUtils.post('admin/sysUser/delete', {id: r.id}).then(rs => {\n            this.tableRef.current.reload();\n        })\n    }\n\n    onSelectOrg = (key) => {\n        this.setState({currentOrgId: key}, () => this.tableRef.current.reload())\n    }\n\n    onSelectRole = (key) => {\n        this.setState({currentRoleId: key}, () => this.tableRef.current.reload())\n    }\n\n    handleAdd = () => {\n        this.setState({formOpen: true, formValues: {}})\n    }\n\n    handleEdit = record => {\n        record.deptId = record.deptId || record.unitId\n        this.setState({formOpen: true, formValues: record})\n    }\n\n    columns = [\n        {\n            title: '单位',\n            dataIndex: 'unitLabel',\n        },\n        {\n            title: '部门',\n            dataIndex: 'deptLabel',\n        },\n        {\n            title: '姓名',\n            dataIndex: 'name',\n            sorter: true\n        },\n        {\n            title: '登录账号',\n            dataIndex: 'account',\n            sorter: true\n        },\n\n\n        {\n            title: '手机',\n            dataIndex: 'phone'\n        },\n        {\n            title: '邮箱',\n            dataIndex: 'email'\n        },\n\n        {\n            title: '角色',\n            dataIndex: 'roleIds',\n            render: (_, row) => {\n                if (row.roleNames) {\n                    return row.roleNames.join(',')\n                }\n            },\n        },\n        {\n            title: '状态',\n            dataIndex: 'enabled',\n            render(v) {\n                return v == null ? null : (v ? '是' : '否')\n            },\n        },\n        {\n            title: '数据权限',\n            dataIndex: 'dataPermType',\n            render(v) {\n                return DictUtils.dictTag('dataPermType', v)\n            }\n        },\n\n        {\n            title: '创建时间',\n            dataIndex: 'createTime',\n        },\n        {\n            title: '操作',\n            dataIndex: 'option',\n            fixed: 'right',\n            render: (_, record) => {\n                return <ButtonList>\n                    <Button size='small' perm='sysUser:save' onClick={() => this.handleEdit(record)}> 编辑 </Button>\n\n                    <Button size='small' perm='sysUser:grantPerm'\n                            onClick={() => this.permRef.current.show(record)}> 授权 </Button>\n\n                    <Popconfirm perm='sysUser:resetPwd' title='确认重置密码？' onConfirm={() => this.resetPwd(record)}>\n                        <Button size='small'>重置密码</Button>\n                    </Popconfirm>\n\n                    <Popconfirm perm='sysUser:delete' title={'是否确定删除用户'}\n                                onConfirm={() => this.handleDelete(record)}>\n                        <Button size='small'>删除</Button>\n                    </Popconfirm>\n                </ButtonList>;\n            },\n        },\n    ];\n\n    onFinish = values => {\n        HttpUtils.post('admin/sysUser/save', values).then(rs => {\n            this.setState({formOpen: false})\n            this.tableRef.current.reload()\n        })\n    }\n\n    render() {\n\n        return <Page>\n            <Splitter>\n                <Splitter.Panel defaultSize={400}>\n                    <Tabs\n                        type='card'\n                        size='small'\n                        items={[\n                            {\n                                key: 'org',\n                                label: '按组织机构',\n                                children: <OrgTree onChange={this.onSelectOrg}/>\n                            },\n                            {\n                                key: 'role',\n                                label: '按角色',\n                                children: <RoleTree onSelect={this.onSelectRole}/>\n                            }\n                        ]}/>\n\n                </Splitter.Panel>\n                <Splitter.Panel style={{paddingLeft: 16}}>\n                    <ProTable\n                        actionRef={this.tableRef}\n                        toolBarRender={() => {\n                            return <ButtonList>\n                                <Button\n                                    perm='sysUser:save'\n                                    type=\"primary\"\n                                    onClick={this.handleAdd}>\n                                    <PlusOutlined/> 新增\n                                </Button>\n\n\n                            </ButtonList>\n                        }}\n                        showToolbarSearch\n                        request={(params) => {\n                            params.orgId = this.state.currentOrgId\n                            params.roleId = this.state.currentRoleId\n                            return HttpUtils.get('admin/sysUser/page', params)\n                        }\n                        }\n                        columns={this.columns}\n                    >\n\n                    </ProTable>\n                </Splitter.Panel>\n            </Splitter>\n\n\n            <Modal title='系统用户'\n                   open={this.state.formOpen}\n                   onOk={() => this.formRef.current.submit()}\n                   onCancel={() => this.setState({formOpen: false})}\n                   destroyOnClose\n            >\n\n                <Form ref={this.formRef} labelCol={{flex: '100px'}}\n                      initialValues={this.state.formValues}\n                      onFinish={this.onFinish}>\n                    <Form.Item name='id' noStyle></Form.Item>\n\n                    <Form.Item label='所属机构' name='deptId' rules={[{required: true}]}>\n                        <FieldSysOrgTreeSelect/>\n                    </Form.Item>\n\n                    <Form.Item label='姓名' name='name' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n                    <Form.Item label='账号' name='account' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n\n\n                    <Form.Item label='电话' name='phone'>\n                        <Input/>\n                    </Form.Item>\n                    <Form.Item label='邮箱' name='email'>\n                        <Input/>\n                    </Form.Item>\n\n                    <Form.Item label='启用状态' name='enabled' rules={[{required: true}]}>\n                        <FieldBoolean/>\n                    </Form.Item>\n\n                </Form>\n            </Modal>\n\n\n            <UserPerm ref={this.permRef} onOk={() => this.tableRef.current.reload()}/>\n\n        </Page>\n    }\n\n\n}\n\n\n\n",
+      "__content": "import {PlusOutlined} from '@ant-design/icons';\nimport {Button, Form, Input, Modal, Popconfirm, Splitter, Tabs} from 'antd';\nimport React from 'react';\nimport {\n    ButtonList,\n    DictUtils,\n    FieldBoolean,\n    FieldSysOrgTreeSelect,\n    HttpUtils,\n    OrgTree,\n    Page,\n    ProTable,\n    RoleTree\n} from \"../../../framework\";\nimport UserPerm from \"./UserPerm\";\n\nexport default class extends React.Component {\n\n    state = {\n        showAddForm: false,\n        showEditForm: false,\n        formValues: {},\n\n        currentOrgId: null,\n        currentRoleId: null,\n    }\n    permRef = React.createRef();\n\n    formRef = React.createRef()\n    tableRef = React.createRef()\n\n    resetPwd(row) {\n        HttpUtils.post('admin/sysUser/reset-pwd', {id: row.id}).then(rs => {\n            Modal.success({\n                title: '重置密码成功',\n                content: rs\n            })\n        })\n    }\n\n    handleDelete = r => {\n        HttpUtils.post('admin/sysUser/delete', {id: r.id}).then(rs => {\n            this.tableRef.current.reload();\n        })\n    }\n\n    onSelectOrg = (key) => {\n        this.setState({currentOrgId: key}, () => this.tableRef.current.reload())\n    }\n\n    onSelectRole = (key) => {\n        this.setState({currentRoleId: key}, () => this.tableRef.current.reload())\n    }\n\n    handleAdd = () => {\n        this.setState({formOpen: true, formValues: {}})\n    }\n\n    handleEdit = record => {\n        record.deptId = record.deptId || record.unitId\n        this.setState({formOpen: true, formValues: record})\n    }\n\n    columns = [\n        {\n            title: '单位',\n            dataIndex: 'unitLabel',\n        },\n        {\n            title: '部门',\n            dataIndex: 'deptLabel',\n        },\n        {\n            title: '姓名',\n            dataIndex: 'name',\n            sorter: true\n        },\n        {\n            title: '登录账号',\n            dataIndex: 'account',\n            sorter: true\n        },\n\n\n        {\n            title: '手机',\n            dataIndex: 'phone'\n        },\n        {\n            title: '邮箱',\n            dataIndex: 'email'\n        },\n\n        {\n            title: '角色',\n            dataIndex: 'roleIds',\n            render: (_, row) => {\n                if (row.roleNames) {\n                    return row.roleNames.join(',')\n                }\n            },\n        },\n        {\n            title: '状态',\n            dataIndex: 'enabled',\n            render(v) {\n                return v == null ? null : (v ? '是' : '否')\n            },\n        },\n        {\n            title: '数据权限',\n            dataIndex: 'dataPermType',\n            render(v) {\n                return DictUtils.dictTag('dataPermType', v)\n            }\n        },\n\n        {\n            title: '创建时间',\n            dataIndex: 'createTime',\n        },\n        {\n            title: '操作',\n            dataIndex: 'option',\n            fixed: 'right',\n            render: (_, record) => {\n                return <ButtonList>\n                    <Button size='small' perm='sys-user:update' onClick={() => this.handleEdit(record)}> 编辑 </Button>\n\n                    <Button size='small' perm='sys-user:grant-permission'\n                            onClick={() => this.permRef.current.show(record)}> 授权 </Button>\n\n                    <Popconfirm perm='sys-user:reset-password' title='确认重置密码？' onConfirm={() => this.resetPwd(record)}>\n                        <Button size='small'>重置密码</Button>\n                    </Popconfirm>\n\n                    <Popconfirm perm='sys-user:delete' title={'是否确定删除用户'}\n                                onConfirm={() => this.handleDelete(record)}>\n                        <Button size='small'>删除</Button>\n                    </Popconfirm>\n                </ButtonList>;\n            },\n        },\n    ];\n\n    onFinish = values => {\n        const isNew = !values.id;\n        const url = isNew ? 'admin/sysUser/create' : 'admin/sysUser/update';\n        HttpUtils.post(url, values).then(rs => {\n            this.setState({formOpen: false})\n            this.tableRef.current.reload()\n        })\n    }\n\n    render() {\n\n        return <Page>\n            <Splitter>\n                <Splitter.Panel defaultSize={400}>\n                    <Tabs\n                        type='card'\n                        size='small'\n                        items={[\n                            {\n                                key: 'org',\n                                label: '按组织机构',\n                                children: <OrgTree onChange={this.onSelectOrg}/>\n                            },\n                            {\n                                key: 'role',\n                                label: '按角色',\n                                children: <RoleTree onSelect={this.onSelectRole}/>\n                            }\n                        ]}/>\n\n                </Splitter.Panel>\n                <Splitter.Panel style={{paddingLeft: 16}}>\n                    <ProTable\n                        actionRef={this.tableRef}\n                        toolBarRender={() => {\n                            return <ButtonList>\n                                <Button\n                                    perm='sys-user:create'\n                                    type=\"primary\"\n                                    onClick={this.handleAdd}>\n                                    <PlusOutlined/> 新增\n                                </Button>\n\n\n                            </ButtonList>\n                        }}\n                        showToolbarSearch\n                        request={(params) => {\n                            params.orgId = this.state.currentOrgId\n                            params.roleId = this.state.currentRoleId\n                            return HttpUtils.get('admin/sysUser/page', params)\n                        }\n                        }\n                        columns={this.columns}\n                    >\n\n                    </ProTable>\n                </Splitter.Panel>\n            </Splitter>\n\n\n            <Modal title='系统用户'\n                   open={this.state.formOpen}\n                   onOk={() => this.formRef.current.submit()}\n                   onCancel={() => this.setState({formOpen: false})}\n                   destroyOnHidden\n            >\n\n                <Form ref={this.formRef} labelCol={{flex: '100px'}}\n                      initialValues={this.state.formValues}\n                      onFinish={this.onFinish}>\n                    <Form.Item name='id' noStyle></Form.Item>\n\n                    <Form.Item label='所属机构' name='deptId' rules={[{required: true}]}>\n                        <FieldSysOrgTreeSelect/>\n                    </Form.Item>\n\n                    <Form.Item label='姓名' name='name' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n                    <Form.Item label='账号' name='account' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n\n\n                    <Form.Item label='电话' name='phone'>\n                        <Input/>\n                    </Form.Item>\n                    <Form.Item label='邮箱' name='email'>\n                        <Input/>\n                    </Form.Item>\n\n                    <Form.Item label='启用状态' name='enabled' rules={[{required: true}]}>\n                        <FieldBoolean/>\n                    </Form.Item>\n\n                </Form>\n            </Modal>\n\n\n            <UserPerm ref={this.permRef} onOk={() => this.tableRef.current.reload()}/>\n\n        </Page>\n    }\n\n\n}\n\n\n\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/system/user/index.jsx"
     },
@@ -2163,7 +2136,7 @@
       "parentId": "@@/global-layout",
       "file": "system/job/index.jsx",
       "absPath": "/system/job",
-      "__content": "import React from 'react'\nimport {\n    Alert,\n    AutoComplete,\n    Button,\n    Divider,\n    Form,\n    Input,\n    message,\n    Modal,\n    Popconfirm,\n    Select,\n    Space,\n    Switch,\n    Tag\n} from 'antd'\nimport {PlusOutlined} from \"@ant-design/icons\";\n\nimport {ButtonList, HttpUtils, Page, ProTable, StringUtils, ValueType} from \"../../../framework\";\n\n\nconst cronOptions = [\n    {\n        label: '*/5 * * * * ? 每隔5秒',\n        value: '*/5 * * * * ?'\n    },\n    {\n        label: '0 */5 * * * ? 每隔5分钟',\n        value: '0 */5 * * * ?'\n    },\n    {\n        label: '0 0 22 * * ? 每天22点',\n        value: '0 0 22 * * ?'\n    },\n    {\n        label: '0 0 1 * * ? 每天1点',\n        value: '0 0 1 * * ?'\n    },\n    {\n        label: '0 0 1 1 * ? 每月1号凌晨1点',\n        value: '0 0 1 1 * ?'\n    }\n]\n\n\nexport default class extends React.Component {\n\n    state = {\n        formValues: {},\n        formOpen: false,\n\n        selectedRowKeys: [],\n\n        jobClassOptions: [],\n\n        paramList: [],\n\n        statusOpen: false,\n        status: null,\n\n        executeRecordOpen: false,\n    }\n    tableRef = React.createRef()\n    formRef = React.createRef()\n\n    componentDidMount() {\n        HttpUtils.get('admin/job/job-class-options').then(rs => {\n            this.setState({jobClassOptions: rs})\n        })\n    }\n\n    handleAdd = () => {\n        this.setState({formOpen: true, formValues: {}, paramList: []})\n    }\n\n    handleEdit = (record) => {\n        this.loadJobParamFields(record.jobClass, record.jobData)\n        this.setState({formOpen: true, formValues: record,})\n    }\n\n    loadJobParamFields(className, jobData) {\n        HttpUtils.post(\"admin/job/get-job-param-fields\", jobData || {}, {className}).then(rs => {\n            this.setState({paramList: rs})\n        })\n    }\n\n    onFinish = (values) => {\n        HttpUtils.post('admin/job/save', values).then(rs => {\n            this.setState({formOpen: false})\n            this.tableRef.current.reload();\n        })\n    }\n\n    handleDelete = row => {\n        const hide = message.loading(\"删除作业中...\")\n        HttpUtils.post('admin/job/delete', {id: row.id}).then(rs => {\n            this.tableRef.current.reload();\n        }).catch(hide)\n    }\n\n    handleTriggerJob = row => {\n        HttpUtils.get('admin/job/trigger-job', {id: row.id}).then(rs => {\n            this.tableRef.current.reload();\n        })\n    }\n\n    columns = [\n        {\n            title: '名称',\n            dataIndex: 'name',\n\n        },\n        {\n            title: '执行类',\n            dataIndex: 'jobClass',\n\n        },\n\n        {\n            title: 'cron',\n            dataIndex: 'cron',\n        },\n\n\n        {\n            title: '参数',\n            dataIndex: 'jobData',\n            render(list) {\n                if (list)\n                    return JSON.stringify(list)\n            }\n        },\n\n\n        {\n            title: '启用状态',\n            dataIndex: 'enabled',\n            render: (v, record) => {\n                return record.enabled ? <Tag color='green'>启用</Tag> : <Tag color='red'>停用</Tag>\n            },\n        },\n\n        {\n            title: '操作',\n            dataIndex: 'option',\n            fixed: 'right',\n            render: (_, record) => {\n\n                return (\n                    <Space>\n                        <Button size='small' onClick={() => this.showExecuteRecord(record)}>执行记录</Button>\n                        <Button size='small' onClick={() => this.handleTriggerJob(record)}>执行一次</Button>\n                        <Button size='small' onClick={() => this.handleEdit(record)}> 编辑 </Button>\n                        <Popconfirm title='是否确定删除?' onConfirm={() => this.handleDelete(record)}>\n                            <Button size='small'>删除</Button>\n                        </Popconfirm>\n                    </Space>\n                );\n            },\n        },\n\n    ]\n\n    showStatus = () => {\n        this.setState({statusOpen: true})\n        HttpUtils.get('admin/job/status').then(rs => {\n            this.setState({status: rs})\n        })\n    };\n\n    showExecuteRecord(record) {\n        this.setState({executeRecordOpen: true, formValues: record})\n    }\n\n\n    render() {\n        return <Page padding>\n            <ProTable\n                actionRef={this.tableRef}\n                toolBarRender={() => {\n                    return <ButtonList>\n                        <Button type='primary' onClick={() => this.handleAdd()} icon={<PlusOutlined/>}>\n                            新增\n                        </Button>\n                        <Button onClick={this.showStatus}>\n                            查看状态\n                        </Button>\n                    </ButtonList>\n                }}\n                request={(params) => HttpUtils.get('admin/job/page', params)}\n                columns={this.columns}\n                showToolbarSearch\n            />\n\n\n            <Modal title='作业调度'\n                   open={this.state.formOpen}\n                   destroyOnClose\n                   width={800}\n                   onOk={() => this.formRef.current.submit()}\n                   onCancel={() => this.setState({formOpen: false})}\n            >\n\n                <Form ref={this.formRef} labelCol={{flex: '100px'}}\n                      initialValues={this.state.formValues}\n                      onValuesChange={this.onValuesChange}\n                      onFinish={this.onFinish}>\n                    <Form.Item name='id' noStyle>\n                    </Form.Item>\n                    <Form.Item label='执行类' name='jobClass' rules={[{required: true}]}\n                               tooltip='org.quartz.Job接口，参考io.tmgg.job.builtin.DemoJob'>\n                        <Select options={this.state.jobClassOptions}/>\n                    </Form.Item>\n                    <Form.Item label='名称' name='name' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n\n                    <Form.Item label='cron表达式' name='cron' help='格式：秒分时日月周,留空表示手动执行'\n                               rules={[{required: true}]}>\n                        <AutoComplete placeholder='如 0 */5 * * * ?' options={cronOptions}/>\n                    </Form.Item>\n\n                    <Form.Item label='启用' name='enabled' valuePropName='checked' rules={[{required: true}]}>\n                        <Switch/>\n                    </Form.Item>\n\n\n                    {this.state.paramList?.map(p => (\n                        <div key={p.name}>\n                            <Divider>作业参数</Divider>\n                            <Form.Item label={p.label}\n                                       name={['jobData', p.name]}\n                                       key={p.name}\n                                       rules={[{required: p.required}]}>\n                                {ValueType.renderField(p.componentType, p.componentProps)}\n                            </Form.Item>\n                        </div>\n                    ))}\n                </Form>\n            </Modal>\n\n            <Modal title='作业调度状态'\n                   open={this.state.statusOpen}\n                   onCancel={() => this.setState({statusOpen: false})}\n                   footer={null}\n                   width={1024}\n            >\n                <Alert message={<pre>{this.state.status}</pre>}></Alert>\n\n            </Modal>\n\n            <Modal title='作业调度记录'\n                   open={this.state.executeRecordOpen}\n                   onCancel={() => this.setState({executeRecordOpen: false})}\n                   footer={null}\n                   width={1024}\n                   destroyOnClose\n            >\n                <ProTable columns={[{\n                    title: '开始时间',\n                    dataIndex: 'beginTime',\n                },\n                    {\n                        title: '结束时间',\n                        dataIndex: 'endTime',\n                    },\n                    {\n                        title: '耗时',\n                        dataIndex: 'jobRunTimeLabel',\n\n                    },\n                    {\n                        title: '是否成功',\n                        dataIndex: 'success',\n                        width: 200,\n                        render: v => {\n                            if (v != null) {\n                                return v ? '成功' : '异常'\n                            }\n                        }\n                    },\n                    {\n                        title: '返回结果',\n                        dataIndex: 'result',\n                        width: 300\n                    },\n\n                    {\n                        title: '操作',\n                        dataIndex: 'option',\n                        render: (_, record) => {\n                            const url = '/admin/sys/log/' + record.id;\n                            return <a href={url} target='_blank'>日志</a>;\n                        },\n                    }\n                ]} request={params => {\n                    params.jobId = this.state.formValues.id\n                    return HttpUtils.get('admin/job/execute-record', params);\n                }}></ProTable>\n\n            </Modal>\n        </Page>\n    }\n\n    onValuesChange = (changed, values) => {\n        if (changed.jobClass) {\n            this.loadJobParamFields(values.jobClass)\n            const option = this.state.jobClassOptions.find(o => o.value === changed.jobClass)\n            if (option) {\n                const {label} = option;\n                if (StringUtils.contains(label, \" \")) { // 取中文名部门设置为name\n                    this.formRef.current.setFieldValue(\"name\", label.split(\" \")[1])\n                }\n            }\n        }\n\n        if (changed.jobData) {\n            this.loadJobParamFields(values.jobClass, values.jobData)\n        }\n\n    };\n}\n\n\n\n",
+      "__content": "import React from 'react'\nimport {\n    Alert,\n    AutoComplete,\n    Button,\n    Divider,\n    Form,\n    Input,\n    message,\n    Modal,\n    Popconfirm,\n    Select,\n    Space,\n    Switch,\n    Tag\n} from 'antd'\nimport {PlusOutlined} from \"@ant-design/icons\";\n\nimport {ButtonList, HttpUtils, Page, ProTable, StringUtils, SysUtils, ValueType} from \"../../../framework\";\n\n\nconst cronOptions = [\n    {\n        label: '*/5 * * * * ? 每隔5秒',\n        value: '*/5 * * * * ?'\n    },\n    {\n        label: '0 */5 * * * ? 每隔5分钟',\n        value: '0 */5 * * * ?'\n    },\n    {\n        label: '0 0 22 * * ? 每天22点',\n        value: '0 0 22 * * ?'\n    },\n    {\n        label: '0 0 1 * * ? 每天1点',\n        value: '0 0 1 * * ?'\n    },\n    {\n        label: '0 0 1 1 * ? 每月1号凌晨1点',\n        value: '0 0 1 1 * ?'\n    }\n]\n\n\nexport default class extends React.Component {\n\n    state = {\n        formValues: {},\n        formOpen: false,\n\n        selectedRowKeys: [],\n\n        jobClassOptions: [],\n\n        paramList: [],\n\n        statusOpen: false,\n        status: null,\n\n        executeRecordOpen: false,\n    }\n    tableRef = React.createRef()\n    formRef = React.createRef()\n\n    componentDidMount() {\n        HttpUtils.get('admin/job/job-class-options').then(rs => {\n            this.setState({jobClassOptions: rs})\n        }).catch(e => {\n            console.error('[Job] 加载作业类选项失败:', e);\n        })\n    }\n\n    handleAdd = () => {\n        this.setState({formOpen: true, formValues: {}, paramList: []})\n    }\n\n    handleEdit = (record) => {\n        this.loadJobParamFields(record.jobClass, record.jobData)\n        this.setState({formOpen: true, formValues: record,})\n    }\n\n    loadJobParamFields(className, jobData) {\n        HttpUtils.post(\"admin/job/get-job-param-fields\", jobData || {}, {className}).then(rs => {\n            this.setState({paramList: rs})\n        }).catch(e => {\n            console.error('[Job] 加载作业参数字段失败:', e);\n        })\n    }\n\n    onFinish = (values) => {\n        const isNew = !values.id;\n        const url = isNew ? 'admin/job/create' : 'admin/job/update';\n        HttpUtils.post(url, values).then(rs => {\n            this.setState({formOpen: false})\n            this.tableRef.current.reload();\n        }).catch(e => {\n            console.error('[Job] 保存作业失败:', e);\n        })\n    }\n\n    handleDelete = row => {\n        const hide = message.loading(\"删除作业中...\")\n        HttpUtils.post('admin/job/delete', {id: row.id}).then(rs => {\n            this.tableRef.current.reload();\n        }).catch(e => {\n            console.error('[Job] 删除作业失败:', e);\n            hide();\n        })\n    }\n\n    handleTriggerJob = row => {\n        HttpUtils.get('admin/job/trigger-job', {id: row.id}).then(rs => {\n            this.tableRef.current.reload();\n        }).catch(e => {\n            console.error('[Job] 触发作业失败:', e);\n        })\n    }\n\n    columns = [\n        {\n            title: '名称',\n            dataIndex: 'name',\n\n        },\n        {\n            title: '执行类',\n            dataIndex: 'jobClass',\n\n        },\n\n        {\n            title: 'cron',\n            dataIndex: 'cron',\n        },\n\n\n        {\n            title: '参数',\n            dataIndex: 'jobData',\n            render(list) {\n                if (list)\n                    return JSON.stringify(list)\n            }\n        },\n\n\n        {\n            title: '启用状态',\n            dataIndex: 'enabled',\n            render: (v, record) => {\n                return record.enabled ? <Tag color='green'>启用</Tag> : <Tag color='red'>停用</Tag>\n            },\n        },\n\n        {\n            title: '操作',\n            dataIndex: 'option',\n            fixed: 'right',\n            render: (_, record) => {\n\n                return (\n                    <Space>\n                        <Button size='small' onClick={() => this.showExecuteRecord(record)}>执行记录</Button>\n                        <Button size='small' perm='job:trigger' onClick={() => this.handleTriggerJob(record)}>执行一次</Button>\n                        <Button size='small' perm='job:update' onClick={() => this.handleEdit(record)}> 编辑 </Button>\n                        <Popconfirm perm='job:delete' title='是否确定删除?' onConfirm={() => this.handleDelete(record)}>\n                            <Button size='small'>删除</Button>\n                        </Popconfirm>\n                    </Space>\n                );\n            },\n        },\n\n    ]\n\n    showStatus = () => {\n        this.setState({statusOpen: true})\n        HttpUtils.get('admin/job/status').then(rs => {\n            this.setState({status: rs})\n        }).catch(e => {\n            console.error('[Job] 加载状态失败:', e);\n        })\n    };\n\n    showExecuteRecord(record) {\n        this.setState({executeRecordOpen: true, formValues: record})\n    }\n\n\n    render() {\n        return <Page>\n            <ProTable\n                actionRef={this.tableRef}\n                toolBarRender={() => {\n                    return <ButtonList>\n                        <Button type='primary' onClick={() => this.handleAdd()} icon={<PlusOutlined/>}>\n                            新增\n                        </Button>\n                        <Button onClick={this.showStatus}>\n                            查看状态\n                        </Button>\n                    </ButtonList>\n                }}\n                request={(params) => HttpUtils.get('admin/job/page', params)}\n                columns={this.columns}\n                showToolbarSearch\n            />\n\n\n            <Modal title='作业调度'\n                   open={this.state.formOpen}\n                   destroyOnHidden\n                   width={800}\n                   onOk={() => this.formRef.current.submit()}\n                   onCancel={() => this.setState({formOpen: false})}\n            >\n\n                <Form ref={this.formRef} labelCol={{flex: '100px'}}\n                      initialValues={this.state.formValues}\n                      onValuesChange={this.onValuesChange}\n                      onFinish={this.onFinish}>\n                    <Form.Item name='id' noStyle>\n                    </Form.Item>\n                    <Form.Item label='执行类' name='jobClass' rules={[{required: true}]}\n                               tooltip='org.quartz.Job接口，参考io.tmgg.job.builtin.DemoJob'>\n                        <Select options={this.state.jobClassOptions}/>\n                    </Form.Item>\n                    <Form.Item label='名称' name='name' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n\n                    <Form.Item label='cron表达式' name='cron' help='格式：秒分时日月周,留空表示手动执行'\n                               rules={[{required: true}]}>\n                        <AutoComplete placeholder='如 0 */5 * * * ?' options={cronOptions}/>\n                    </Form.Item>\n\n                    <Form.Item label='启用' name='enabled' valuePropName='checked' rules={[{required: true}]}>\n                        <Switch/>\n                    </Form.Item>\n\n\n                    {this.state.paramList?.map(p => (\n                        <div key={p.name}>\n                            <Divider>作业参数</Divider>\n                            <Form.Item label={p.label}\n                                       name={['jobData', p.name]}\n                                       key={p.name}\n                                       rules={[{required: p.required}]}>\n                                {ValueType.renderField(p.componentType, p.componentProps)}\n                            </Form.Item>\n                        </div>\n                    ))}\n                </Form>\n            </Modal>\n\n            <Modal title='作业调度状态'\n                   open={this.state.statusOpen}\n                   onCancel={() => this.setState({statusOpen: false})}\n                   footer={null}\n                   width={1024}\n            >\n                <Alert title={<pre>{this.state.status}</pre>}></Alert>\n\n            </Modal>\n\n            <Modal title='作业调度记录'\n                   open={this.state.executeRecordOpen}\n                   onCancel={() => this.setState({executeRecordOpen: false})}\n                   footer={null}\n                   width={1024}\n                   destroyOnHidden\n            >\n                <ProTable columns={[{\n                    title: '开始时间',\n                    dataIndex: 'beginTime',\n                },\n                    {\n                        title: '结束时间',\n                        dataIndex: 'endTime',\n                    },\n                    {\n                        title: '耗时',\n                        dataIndex: 'jobRunTimeLabel',\n\n                    },\n                    {\n                        title: '是否成功',\n                        dataIndex: 'success',\n                        width: 200,\n                        render: v => {\n                            if (v != null) {\n                                return v ? '成功' : '异常'\n                            }\n                        }\n                    },\n                    {\n                        title: '返回结果',\n                        dataIndex: 'result',\n                        width: 300\n                    },\n\n                    {\n                        title: '操作',\n                        dataIndex: 'option',\n                        render: (_, record) => {\n                            const url = SysUtils.contextPath('/admin/sys/log/' + record.id);\n                            return <a href={url} target='_blank'>日志</a>;\n                        },\n                    }\n                ]} request={params => {\n                    params.jobId = this.state.formValues.id\n                    return HttpUtils.get('admin/job/execute-record', params);\n                }}></ProTable>\n\n            </Modal>\n        </Page>\n    }\n\n    onValuesChange = (changed, values) => {\n        if (changed.jobClass) {\n            this.loadJobParamFields(values.jobClass)\n            const option = this.state.jobClassOptions.find(o => o.value === changed.jobClass)\n            if (option) {\n                const {label} = option;\n                if (StringUtils.contains(label, \" \")) { // 取中文名部门设置为name\n                    this.formRef.current.setFieldValue(\"name\", label.split(\" \")[1])\n                }\n            }\n        }\n\n        if (changed.jobData) {\n            this.loadJobParamFields(values.jobClass, values.jobData)\n        }\n\n    };\n}\n\n\n\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/system/job/index.jsx"
     },
@@ -2173,7 +2146,7 @@
       "parentId": "@@/global-layout",
       "file": "system/log/index.jsx",
       "absPath": "/system/log",
-      "__content": "import React, {Fragment} from 'react';\nimport {Form, Input, Tag} from \"antd\";\nimport {ViewText, FieldDateRange, HttpUtils, ProTable} from \"../../../framework\";\n\nexport default class extends React.Component {\n\n\n    columns = [\n        {\n            title: '操作',\n            dataIndex: 'operation',\n        },\n        {\n            title: '操作者',\n            dataIndex: 'username'\n        },\n\n        {\n            title: 'ip',\n            dataIndex: 'ip',\n        },\n\n\n        {\n            title: '时间',\n            dataIndex: 'operationTime',\n            sorter: true,\n        },\n        {\n            title: '参数',\n            dataIndex: 'params',\n            render(v) {\n                return <ViewText value={v} ellipsis={true} />\n            }\n\n        },\n        {\n            title: '结果',\n            dataIndex: 'success',\n            render(v) {\n                return <>\n                    <Tag color={v ? 'green' : 'red'}>{v ? '成功' : '失败'}</Tag>\n                </>\n            }\n        },\n        {\n            title: '错误消息',\n            dataIndex: 'error',\n            render(v) {\n                return <ViewText value={v} ellipsis={true} />\n            }\n        },\n    ];\n\n\n    render() {\n        return <>\n            <ProTable\n                request={(params) => HttpUtils.get('admin/sysLog/page', params)}\n                columns={this.columns}\n            >\n                <Form.Item label='操作' name='operation'>\n                    <Input/>\n                </Form.Item>\n                <Form.Item label='时间' name='dateRange'>\n                    <FieldDateRange/>\n                </Form.Item>\n            </ProTable>\n\n        </>\n    }\n\n\n}\n\n\n\n",
+      "__content": "import React from 'react';\nimport {Form, Input, Tag} from \"antd\";\nimport {ViewText, FieldDateRange, HttpUtils, Page, ProTable} from \"../../../framework\";\n\nexport default class extends React.Component {\n\n\n    columns = [\n        {\n            title: '操作',\n            dataIndex: 'operation',\n        },\n        {\n            title: '操作者',\n            dataIndex: 'username'\n        },\n\n        {\n            title: 'ip',\n            dataIndex: 'ip',\n        },\n\n\n        {\n            title: '时间',\n            dataIndex: 'operationTime',\n            sorter: true,\n        },\n        {\n            title: '参数',\n            dataIndex: 'params',\n            render(v) {\n                return <ViewText value={v} ellipsis={true} />\n            }\n\n        },\n        {\n            title: '结果',\n            dataIndex: 'success',\n            render(v) {\n                return <>\n                    <Tag color={v ? 'green' : 'red'}>{v ? '成功' : '失败'}</Tag>\n                </>\n            }\n        },\n        {\n            title: '错误消息',\n            dataIndex: 'error',\n            render(v) {\n                return <ViewText value={v} ellipsis={true} />\n            }\n        },\n    ];\n\n\n    render() {\n        return <Page>\n            <ProTable\n                request={(params) => HttpUtils.get('admin/sysLog/page', params)}\n                columns={this.columns}\n            >\n                <Form.Item label='操作' name='operation'>\n                    <Input/>\n                </Form.Item>\n                <Form.Item label='时间' name='dateRange'>\n                    <FieldDateRange/>\n                </Form.Item>\n            </ProTable>\n        </Page>\n    }\n\n\n}\n\n\n\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/system/log/index.jsx"
     },
@@ -2183,7 +2156,7 @@
       "parentId": "@@/global-layout",
       "file": "system/org/index.jsx",
       "absPath": "/system/org",
-      "__content": "import {DeleteOutlined, EditOutlined, PlusOutlined, SyncOutlined} from '@ant-design/icons';\nimport {Button, Card, Checkbox, Empty, Form, Input, Popconfirm, Space, Splitter, Switch, Tree} from 'antd';\nimport React from 'react';\nimport {\n    FieldBoolean,\n    FieldDictSelect,\n    FieldRemoteTreeSelect,\n    FieldUserSelect,\n    Gap,\n    HttpUtils,\n    NamedIcon,\n    Page\n} from \"../../../framework\";\n\n\nexport default class extends React.Component {\n\n    state = {\n        formLoading: false,\n        formValues: undefined,\n        submitLoading: false,\n        formEditing: false,\n\n\n        params: {\n            onlyShowEnabled: true,\n            onlyShowUnit: false,\n            searchText: null\n        },\n\n        treeData: [],\n        treeLoading: false,\n        draggable: false,\n    }\n    actionRef = React.createRef();\n    treeRef = React.createRef();\n\n    componentDidMount() {\n        this.loadTree()\n    }\n\n    loadTree = () => {\n        this.setState({treeLoading: true})\n\n        const {params} = this.state\n        HttpUtils.get('admin/sysOrg/tree', params).then(rs => {\n            const treeData = rs;\n            this.setState({treeData})\n        }).finally(() => {\n            this.setState({treeLoading: false});\n        })\n    }\n\n    handleDelete = record => {\n        HttpUtils.post('admin/sysOrg/delete', {id: record.id})\n            .then(rs => {\n                this.setState({formValues: null})\n                this.loadTree()\n            })\n    }\n\n\n    onSelect = (selectedKeys) => {\n        if (selectedKeys.length === 0) {\n            this.setState({formValues: null})\n            return\n        }\n\n        const key = selectedKeys[0]\n        this.setState({formLoading: true, formEditing: false})\n        HttpUtils.get(\"admin/sysOrg/detail\", {id: key}).then(rs => {\n            this.setState({formValues: rs})\n        }).finally(() => {\n            this.setState({formLoading: false})\n        })\n    }\n\n    onFinish = (values) => {\n        this.setState({submitLoading: true, formEditing: false})\n        HttpUtils.post('admin/sysOrg/save', values).then(rs => {\n            this.loadTree()\n        }).finally(() => {\n            this.setState({submitLoading: false})\n        })\n    }\n\n\n    onDraggableChange = e => {\n        this.setState({draggable: e})\n    };\n\n\n    render() {\n        const {formValues} = this.state;\n        const disabled = formValues == null;\n        const params = this.state.params;\n        return <Page padding>\n            <Card>\n                <Space>\n\n                    <Input.Search placeholder='搜索' value={params.searchText} onChange={e => {\n                        params.searchText = e.target.value\n                        this.setState({params}, this.loadTree)\n                    }}/>\n                    <Checkbox checked={params.onlyShowEnabled}\n                              onChange={e => {\n                                  params.onlyShowEnabled = e.target.checked;\n                                  this.setState({params}, this.loadTree);\n                              }}>仅显示启用</Checkbox>\n\n                    <Checkbox checked={params.onlyShowUnit}\n                              onChange={e => {\n                                  params.onlyShowUnit = e.target.checked;\n                                  this.setState({params}, this.loadTree);\n                              }}>仅显示单位</Checkbox>\n\n\n                </Space>\n            </Card>\n            <Gap/>\n            <Splitter>\n                <Splitter.Panel defaultSize={500}>\n                    <Card loading={this.state.treeLoading}\n                          title='组织机构'\n                          extra={<Space>\n\n                              <div>\n                                  拖拽排序&nbsp;<Switch\n                                  value={this.state.draggable}\n                                  onChange={this.onDraggableChange}/>\n                              </div>\n                              <Button size='small' shape={\"round\"} icon={<SyncOutlined/>}\n                                      onClick={this.loadTree}></Button>\n                          </Space>}>\n\n\n                        <Tree ref={this.treeRef}\n                              treeData={this.state.treeData}\n                              onSelect={this.onSelect}\n                              showIcon\n                              blockNode\n                              icon={item => {\n                                  return <NamedIcon name={item.data.iconName}/>;\n                              }}\n                              draggable={this.state.draggable}\n                              onDrop={this.onDrop}\n                              showLine\n                              defaultExpandAll\n                        />\n                        {this.state.treeData.length === 0 && <Empty/>}\n                    </Card>\n                </Splitter.Panel>\n\n                <Splitter>\n                    <Card\n                        loading={this.state.formLoading}\n                        extra={<Space>\n                            <Button type='primary' onClick={() => {\n                                this.setState({\n                                    formLoading: true,\n                                    formEditing: true,\n                                    formValues: {\n                                        pid: formValues?.id,\n                                    }\n                                }, () => {\n                                    this.setState({formLoading: false})\n                                })\n                            }}>\n                                <PlusOutlined/> 新增\n                            </Button>\n                            <Button disabled={disabled} onClick={() => {\n                                this.setState({\n                                    formEditing: true\n                                })\n                            }}>\n                                <EditOutlined/> 编辑\n                            </Button>\n\n                            <Popconfirm title={'是否确定删除组织机构'} disabled={disabled}\n                                        onConfirm={() => this.handleDelete(formValues)}>\n                                <Button icon={<DeleteOutlined/>} disabled={disabled}>删除</Button>\n                            </Popconfirm>\n\n\n                        </Space>}\n                    >\n\n                        {formValues == null ? <Empty description='未选择机构'/> : <Form\n                            disabled={!this.state.formEditing}\n                            labelCol={{flex: '150px'}}\n                            wrapperCol={{flex: '400px'}}\n                            initialValues={formValues}\n                            onFinish={this.onFinish}\n                        >\n                            <Form.Item noStyle name='id'>\n                            </Form.Item>\n                            <Form.Item label='父节点' name='pid'>\n                                <FieldRemoteTreeSelect url='admin/sysOrg/tree'/>\n                            </Form.Item>\n                            <Form.Item label='名称' name='name' rules={[{required: true}]}>\n                                <Input/>\n                            </Form.Item>\n\n\n                            <Form.Item label='类型' name='type' rules={[{required: true}]}>\n                                <FieldDictSelect typeCode='orgType'/>\n                            </Form.Item>\n\n                            <Form.Item label='部门领导' name={['leader', 'id']}>\n                                <FieldUserSelect/>\n                            </Form.Item>\n                            <Form.Item label='启用' name='enabled' rules={[{required: true}]}>\n                                <FieldBoolean/>\n                            </Form.Item>\n                            <Form.Item label='扩展字段1' name='extra1'>\n                                <Input/>\n                            </Form.Item>\n                            <Form.Item label='扩展字段2' name='extra2'>\n                                <Input/>\n                            </Form.Item>\n                            <Form.Item label='扩展字段3' name='extra3'>\n                                <Input/>\n                            </Form.Item>\n\n\n                            <Form.Item label=' ' colon={false}>\n                                <Button type=\"primary\" htmlType='submit'\n                                        loading={this.state.submitLoading}>保存</Button>\n                            </Form.Item>\n\n                        </Form>\n                        }\n\n\n                    </Card>\n                </Splitter>\n\n            </Splitter>\n\n\n        </Page>\n    }\n\n    onDrop = (e) => {\n        const {dragNode, dropToGap, node} = e;\n        const dropKey = node.key;\n        const dragKey = dragNode.key;\n\n        const dropPos = e.node.pos.split('-');\n        const dropPosition = e.dropPosition - Number(dropPos[dropPos.length - 1]); // the drop position relative to the drop node, inside 0, top -1, bottom 1\n\n\n        HttpUtils.post('admin/sysOrg/sort', {dropPosition, dropToGap, dropKey, dragKey}).then(this.loadTree)\n    };\n}\n\n\n\n",
+      "__content": "import {DeleteOutlined, EditOutlined, PlusOutlined, SyncOutlined} from '@ant-design/icons';\nimport {Button, Card, Checkbox, Empty, Form, Input, Popconfirm, Space, Splitter, Switch, Tree} from 'antd';\nimport React from 'react';\nimport {\n    FieldBoolean,\n    FieldDictSelect,\n    FieldRemoteTreeSelect,\n    FieldUserSelect,\n    Gap,\n    HttpUtils,\n    NamedIcon,\n    Page\n} from \"../../../framework\";\n\n\nexport default class extends React.Component {\n\n    state = {\n        formLoading: false,\n        formValues: undefined,\n        submitLoading: false,\n        formEditing: false,\n\n\n        params: {\n            onlyShowEnabled: true,\n            onlyShowUnit: false,\n            searchText: null\n        },\n\n        treeData: [],\n        treeLoading: false,\n        draggable: false,\n    }\n    actionRef = React.createRef();\n    treeRef = React.createRef();\n\n    componentDidMount() {\n        this.loadTree()\n    }\n\n    loadTree = () => {\n        this.setState({treeLoading: true})\n\n        const {params} = this.state\n        HttpUtils.get('admin/sysOrg/tree', params).then(rs => {\n            const treeData = rs;\n            this.setState({treeData})\n        }).finally(() => {\n            this.setState({treeLoading: false});\n        })\n    }\n\n    handleDelete = record => {\n        HttpUtils.post('admin/sysOrg/delete', {id: record.id})\n            .then(rs => {\n                this.setState({formValues: null})\n                this.loadTree()\n            })\n    }\n\n\n    onSelect = (selectedKeys) => {\n        if (selectedKeys.length === 0) {\n            this.setState({formValues: null})\n            return\n        }\n\n        const key = selectedKeys[0]\n        this.setState({formLoading: true, formEditing: false})\n        HttpUtils.get(\"admin/sysOrg/detail\", {id: key}).then(rs => {\n            this.setState({formValues: rs})\n        }).finally(() => {\n            this.setState({formLoading: false})\n        })\n    }\n\n    onFinish = (values) => {\n        this.setState({submitLoading: true, formEditing: false})\n        const isNew = !values.id;\n        const url = isNew ? 'admin/sysOrg/create' : 'admin/sysOrg/update';\n        HttpUtils.post(url, values).then(rs => {\n            this.loadTree()\n        }).finally(() => {\n            this.setState({submitLoading: false})\n        })\n    }\n\n\n    onDraggableChange = e => {\n        this.setState({draggable: e})\n    };\n\n\n    render() {\n        const {formValues} = this.state;\n        const disabled = formValues == null;\n        const params = this.state.params;\n        return <Page>\n            <Card>\n                <Space>\n\n                    <Input.Search placeholder='搜索' value={params.searchText} onChange={e => {\n                        params.searchText = e.target.value\n                        this.setState({params}, this.loadTree)\n                    }}/>\n                    <Checkbox checked={params.onlyShowEnabled}\n                              onChange={e => {\n                                  params.onlyShowEnabled = e.target.checked;\n                                  this.setState({params}, this.loadTree);\n                              }}>仅显示启用</Checkbox>\n\n                    <Checkbox checked={params.onlyShowUnit}\n                              onChange={e => {\n                                  params.onlyShowUnit = e.target.checked;\n                                  this.setState({params}, this.loadTree);\n                              }}>仅显示单位</Checkbox>\n\n\n                </Space>\n            </Card>\n            <Gap/>\n            <Splitter>\n                <Splitter.Panel defaultSize={500}>\n                    <Card loading={this.state.treeLoading}\n                          title='组织机构'\n                          extra={<Space>\n\n                              <div>\n                                  拖拽排序&nbsp;<Switch\n                                  value={this.state.draggable}\n                                  onChange={this.onDraggableChange}/>\n                              </div>\n                              <Button size='small' shape={\"round\"} icon={<SyncOutlined/>}\n                                      onClick={this.loadTree}></Button>\n                          </Space>}>\n\n\n                        <Tree ref={this.treeRef}\n                              treeData={this.state.treeData}\n                              onSelect={this.onSelect}\n                              showIcon\n                              blockNode\n                              icon={item => {\n                                  return <NamedIcon name={item.data.iconName}/>;\n                              }}\n                              draggable={this.state.draggable}\n                              onDrop={this.onDrop}\n                              showLine\n                              defaultExpandAll\n                        />\n                        {this.state.treeData.length === 0 && <Empty/>}\n                    </Card>\n                </Splitter.Panel>\n\n                <Splitter>\n                    <Card\n                        loading={this.state.formLoading}\n                        extra={<Space>\n                            <Button type='primary' onClick={() => {\n                                this.setState({\n                                    formLoading: true,\n                                    formEditing: true,\n                                    formValues: {\n                                        pid: formValues?.id,\n                                    }\n                                }, () => {\n                                    this.setState({formLoading: false})\n                                })\n                            }}>\n                                <PlusOutlined/> 新增\n                            </Button>\n                            <Button disabled={disabled} onClick={() => {\n                                this.setState({\n                                    formEditing: true\n                                })\n                            }}>\n                                <EditOutlined/> 编辑\n                            </Button>\n\n                            <Popconfirm title={'是否确定删除组织机构'} disabled={disabled}\n                                        onConfirm={() => this.handleDelete(formValues)}>\n                                <Button icon={<DeleteOutlined/>} disabled={disabled}>删除</Button>\n                            </Popconfirm>\n\n\n                        </Space>}\n                    >\n\n                        {formValues == null ? <Empty description='未选择机构'/> : <Form\n                            disabled={!this.state.formEditing}\n                            labelCol={{flex: '150px'}}\n                            wrapperCol={{flex: '400px'}}\n                            initialValues={formValues}\n                            onFinish={this.onFinish}\n                        >\n                            <Form.Item noStyle name='id'>\n                            </Form.Item>\n                            <Form.Item label='父节点' name='pid'>\n                                <FieldRemoteTreeSelect url='admin/sysOrg/tree'/>\n                            </Form.Item>\n                            <Form.Item label='名称' name='name' rules={[{required: true}]}>\n                                <Input/>\n                            </Form.Item>\n\n\n                            <Form.Item label='类型' name='type' rules={[{required: true}]}>\n                                <FieldDictSelect typeCode='orgType'/>\n                            </Form.Item>\n\n                            <Form.Item label='部门领导' name={['leader', 'id']}>\n                                <FieldUserSelect/>\n                            </Form.Item>\n                            <Form.Item label='启用' name='enabled' rules={[{required: true}]}>\n                                <FieldBoolean/>\n                            </Form.Item>\n                            <Form.Item label='扩展字段1' name='extra1'>\n                                <Input/>\n                            </Form.Item>\n                            <Form.Item label='扩展字段2' name='extra2'>\n                                <Input/>\n                            </Form.Item>\n                            <Form.Item label='扩展字段3' name='extra3'>\n                                <Input/>\n                            </Form.Item>\n\n\n                            <Form.Item label=' ' colon={false}>\n                                <Button type=\"primary\" htmlType='submit'\n                                        loading={this.state.submitLoading}>保存</Button>\n                            </Form.Item>\n\n                        </Form>\n                        }\n\n\n                    </Card>\n                </Splitter>\n\n            </Splitter>\n\n\n        </Page>\n    }\n\n    onDrop = (e) => {\n        const {dragNode, dropToGap, node} = e;\n        const dropKey = node.key;\n        const dragKey = dragNode.key;\n\n        const dropPos = e.node.pos.split('-');\n        const dropPosition = e.dropPosition - Number(dropPos[dropPos.length - 1]); // the drop position relative to the drop node, inside 0, top -1, bottom 1\n\n\n        HttpUtils.post('admin/sysOrg/sort', {dropPosition, dropToGap, dropKey, dragKey}).then(this.loadTree)\n    };\n}\n\n\n\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/system/org/index.jsx"
     },
@@ -2193,7 +2166,7 @@
       "parentId": "@@/global-layout",
       "file": "system/role/perm.jsx",
       "absPath": "/system/role/perm",
-      "__content": "import React from \"react\";\nimport {Button, Card, Checkbox, Table, Typography} from \"antd\";\nimport {SaveOutlined} from \"@ant-design/icons\";\nimport {ArrayUtils, HttpUtils, PageUtils} from \"../../../framework\";\nexport default class extends React.Component {\n\n\n    state = {\n        loading: false,\n        roleInfo: {},\n\n        dataSource: [],\n        rowSelectedKeys: {},\n    }\n\n    columns = [\n        {\n            title: '菜单',\n            dataIndex: 'name',\n        },\n\n        {\n            title: '权限',\n            dataIndex: 'permCodes',\n            render: (permCodes, record) => {\n                if (permCodes == null) {\n                    return\n                }\n                const {permNames} = record\n                const options = [];\n                for (let i = 0; i < permCodes.length; i++) {\n                    const label = permNames[i];\n                    const value = permCodes[i];\n                    options.push({label, value});\n                }\n\n\n                const rowSelectedKey = this.state.rowSelectedKeys[record.id];\n                return <Checkbox.Group options={options}\n                                       value={rowSelectedKey}\n                                       onChange={(ks) => {\n                                           const rowSelectedKeys = this.state.rowSelectedKeys;\n                                           rowSelectedKeys[record.id] = ks;\n                                           this.setState({rowSelectedKeys})\n                                       }}/>\n            }\n        }\n    ]\n\n    componentDidMount() {\n        this.roleId = PageUtils.currentParams().id;\n        this.loadData();\n    }\n\n\n    loadData() {\n        this.setState({loading: true})\n        Promise.all([\n            HttpUtils.get('admin/sysRole/get', {id: this.roleId}).then(rs => {\n                this.setState({roleInfo: rs})\n            }),\n            HttpUtils.get('admin/sysRole/perm-tree-table', {id: this.roleId}).then(rs => {\n                this.setState({dataSource: rs})\n            }),\n            HttpUtils.get('admin/sysRole/own-perms', {id: this.roleId}).then(rs => {\n                this.setState({rowSelectedKeys: rs})\n            })\n        ]).then(rs => {\n            this.setState({loading: false})\n        })\n    }\n\n    savePerms = () => {\n        const {rowSelectedKeys} = this.state;\n        const perms = [];\n        const menus = []\n        for (let menuId in rowSelectedKeys) {\n            const ks = rowSelectedKeys[menuId];\n            if (ks == null || ks.length === 0) {\n                continue;\n            }\n            menus.push(menuId)\n            ArrayUtils.addAll(perms, ks)\n        }\n        HttpUtils.post('admin/sysRole/save-perms', {id: this.roleId, perms, menus}).then(rs => {\n            //  Page.open(PageUtils.currentPathname(), PageUtils.currentLabel())\n        })\n    };\n\n\n    render() {\n        return <>\n\n\n            <Card title='角色权限设置' loading={this.state.loading}\n                  variant={\"borderless\"}\n                  extra={<Button type='primary' icon={<SaveOutlined/>} onClick={this.savePerms}>保存权限</Button>}>\n                <Typography.Text>角色名称：{this.state.roleInfo.name}， 编码：{this.state.roleInfo.code} </Typography.Text>\n                <Table dataSource={this.state.dataSource}\n                       columns={this.columns}\n                       size='small' bordered pagination={false} rowKey='id'\n                       expandable={{defaultExpandAllRows: true}}\n                ></Table>\n            </Card>\n        </>\n    }\n}\n",
+      "__content": "import React from \"react\";\nimport {Button, Card, Checkbox, Table, Typography} from \"antd\";\nimport {SaveOutlined} from \"@ant-design/icons\";\nimport {ArrayUtils, HttpUtils, Page, PageUtils} from \"../../../framework\";\nexport default class extends React.Component {\n\n\n    state = {\n        loading: false,\n        roleInfo: {},\n\n        dataSource: [],\n        rowSelectedKeys: {},\n    }\n\n    columns = [\n        {\n            title: '菜单',\n            dataIndex: 'name',\n        },\n\n        {\n            title: '权限',\n            dataIndex: 'permCodes',\n            render: (permCodes, record) => {\n                if (permCodes == null) {\n                    return\n                }\n                const {permNames} = record\n                const options = [];\n                for (let i = 0; i < permCodes.length; i++) {\n                    const label = permNames[i];\n                    const value = permCodes[i];\n                    options.push({label, value});\n                }\n\n\n                const rowSelectedKey = this.state.rowSelectedKeys[record.id];\n                return <Checkbox.Group options={options}\n                                       value={rowSelectedKey}\n                                       onChange={(ks) => {\n                                           const rowSelectedKeys = this.state.rowSelectedKeys;\n                                           rowSelectedKeys[record.id] = ks;\n                                           this.setState({rowSelectedKeys})\n                                       }}/>\n            }\n        }\n    ]\n\n    componentDidMount() {\n        this.roleId = PageUtils.currentParams().id;\n        this.loadData();\n    }\n\n\n    loadData() {\n        this.setState({loading: true})\n        Promise.all([\n            HttpUtils.get('admin/sysRole/get', {id: this.roleId}).then(rs => {\n                this.setState({roleInfo: rs})\n            }),\n            HttpUtils.get('admin/sysRole/perm-tree-table', {id: this.roleId}).then(rs => {\n                this.setState({dataSource: rs})\n            }),\n            HttpUtils.get('admin/sysRole/own-perms', {id: this.roleId}).then(rs => {\n                this.setState({rowSelectedKeys: rs})\n            })\n        ]).then(rs => {\n            this.setState({loading: false})\n        })\n    }\n\n    savePerms = () => {\n        const {rowSelectedKeys} = this.state;\n        const perms = [];\n        const menus = []\n        for (let menuId in rowSelectedKeys) {\n            const ks = rowSelectedKeys[menuId];\n            if (ks == null || ks.length === 0) {\n                continue;\n            }\n            menus.push(menuId)\n            ArrayUtils.addAll(perms, ks)\n        }\n        HttpUtils.post('admin/sysRole/save-perms', {id: this.roleId, perms, menus}).then(rs => {\n            //  Page.open(PageUtils.currentPathname(), PageUtils.currentLabel())\n        })\n    };\n\n\n    render() {\n        return <Page>\n\n            <Card title='角色权限设置' loading={this.state.loading}\n                  variant={\"borderless\"}\n                  extra={<Button type='primary' icon={<SaveOutlined/>} onClick={this.savePerms}>保存权限</Button>}>\n                <Typography.Text>角色名称：{this.state.roleInfo.name}， 编码：{this.state.roleInfo.code} </Typography.Text>\n                <Table dataSource={this.state.dataSource}\n                       columns={this.columns}\n                       size='small' bordered pagination={false} rowKey='id'\n                       expandable={{defaultExpandAllRows: true}}\n                ></Table>\n            </Card>\n        </Page>\n    }\n}\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/system/role/perm.jsx"
     },
@@ -2203,7 +2176,7 @@
       "parentId": "@@/global-layout",
       "file": "userCenter/index.jsx",
       "absPath": "/userCenter",
-      "__content": "import React from \"react\";\nimport {Avatar, Card, Col, Row, Tabs} from \"antd\";\nimport ChangePassword from \"./ChangePassword\";\nimport {HttpUtils, Page} from \"../../framework\";\n\nexport default class extends React.Component {\n\n    state = {\n        info: {}\n    }\n\n    componentDidMount() {\n        HttpUtils.get('admin/userCenter/info').then(rs => {\n            this.setState({info: rs})\n        })\n    }\n\n    render() {\n        const {info} = this.state;\n        return <Page padding backgroundGray>\n            <Row gutter={[16, 16]}>\n                <Col md={6} sm={24}>\n                    <Card title='个人信息'>\n\n                        <div className='flex-center' style={{marginBottom: 32}}>\n                            <Avatar size={128} title='点击修改头像'/>\n                        </div>\n\n\n                        <table className='tmgg-table'>\n                            <tbody>\n                            <tr>\n                                <td>用户名称</td>\n                                <td align='right'>{info.name}</td>\n                            </tr>\n                            <tr>\n                                <td>账号</td>\n                                <td align='right'>{info.account}</td>\n                            </tr>\n                            <tr>\n                                <td>手机号码</td>\n                                <td>{info.phone}</td>\n                            </tr>\n                            <tr>\n                                <td>用户邮箱</td>\n                                <td>{info.email}</td>\n                            </tr>\n                            <tr>\n                                <td>所属部门</td>\n                                <td>{info.unit} {info.dept}</td>\n                            </tr>\n                            <tr>\n                                <td>所属角色</td>\n                                <td>{info.roles}</td>\n                            </tr>\n                            <tr>\n                                <td>创建日期</td>\n                                <td>{info.createTime}</td>\n                            </tr>\n                            </tbody>\n                        </table>\n                    </Card>\n                </Col>\n                <Col md={18} sm={24}>\n                    <Card title='个人设置'>\n                        <Tabs\n                            items={[\n                                {\n                                    label: '修改密码', key: 'pwd', children: <div>\n                                        <ChangePassword/>\n                                    </div>\n                                },\n                                {\n                                    label: '消息订阅', key: 'topic', children: <div>\n                                        当账号管理邮箱后，系统消息会发送邮件给您\n                                    </div>\n                                }\n                            ]}\n                            tabPosition='left'\n                        >\n                        </Tabs>\n                    </Card>\n                </Col>\n            </Row>\n\n\n        </Page>\n\n    }\n}\n",
+      "__content": "import React from \"react\";\nimport {Avatar, Card, Col, Row, Tabs} from \"antd\";\nimport ChangePassword from \"./ChangePassword\";\nimport {HttpUtils, Page} from \"../../framework\";\n\nexport default class extends React.Component {\n\n    state = {\n        info: {}\n    }\n\n    componentDidMount() {\n        HttpUtils.get('admin/userCenter/info').then(rs => {\n            this.setState({info: rs})\n        })\n    }\n\n    render() {\n        const {info} = this.state;\n        return <Page backgroundGray>\n            <Row gutter={[16, 16]}>\n                <Col md={6} sm={24}>\n                    <Card title='个人信息'>\n\n                        <div className='flex-center' style={{marginBottom: 32}}>\n                            <Avatar size={128} title='点击修改头像'/>\n                        </div>\n\n\n                        <table className='tmgg-table'>\n                            <tbody>\n                            <tr>\n                                <td>用户名称</td>\n                                <td align='right'>{info.name}</td>\n                            </tr>\n                            <tr>\n                                <td>账号</td>\n                                <td align='right'>{info.account}</td>\n                            </tr>\n                            <tr>\n                                <td>手机号码</td>\n                                <td>{info.phone}</td>\n                            </tr>\n                            <tr>\n                                <td>用户邮箱</td>\n                                <td>{info.email}</td>\n                            </tr>\n                            <tr>\n                                <td>所属部门</td>\n                                <td>{info.unit} {info.dept}</td>\n                            </tr>\n                            <tr>\n                                <td>所属角色</td>\n                                <td>{info.roles}</td>\n                            </tr>\n                            <tr>\n                                <td>创建日期</td>\n                                <td>{info.createTime}</td>\n                            </tr>\n                            </tbody>\n                        </table>\n                    </Card>\n                </Col>\n                <Col md={18} sm={24}>\n                    <Card title='个人设置'>\n                        <Tabs\n                            items={[\n                                {\n                                    label: '修改密码', key: 'pwd', children: <div>\n                                        <ChangePassword/>\n                                    </div>\n                                },\n                                {\n                                    label: '消息订阅', key: 'topic', children: <div>\n                                        当账号管理邮箱后，系统消息会发送邮件给您\n                                    </div>\n                                }\n                            ]}\n                            tabPlacement='left'\n                        >\n                        </Tabs>\n                    </Card>\n                </Col>\n            </Row>\n\n\n        </Page>\n\n    }\n}\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/userCenter/index.jsx"
     },
@@ -2213,7 +2186,7 @@
       "parentId": "@@/global-layout",
       "file": "about.jsx",
       "absPath": "/about",
-      "__content": "import React from \"react\";\n\nexport default class extends React.Component {\n\n\n    render() {\n        return <>\n            <h1>关于</h1>\n        </>\n\n    }\n}\n",
+      "__content": "import React from \"react\";\nimport {Page} from \"../framework\";\n\nexport default class extends React.Component {\n\n\n    render() {\n        return <Page>\n            <h1>关于</h1>\n        </Page>\n    }\n}\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/about.jsx"
     },
@@ -2223,7 +2196,7 @@
       "parentId": "@@/global-layout",
       "file": "index.jsx",
       "absPath": "/",
-      "__content": "import React from \"react\";\nimport {Card} from \"antd\";\n\n\nexport default function () {\n\n    return <Card>\n        欢迎使用本系统\n    </Card>\n}\n",
+      "__content": "import React from \"react\";\nimport {Card} from \"antd\";\nimport {Page} from \"../framework\";\n\nexport default function () {\n    return <Page>\n        <Card>欢迎使用本系统</Card>\n    </Page>\n}\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/index.jsx"
     },
@@ -2233,7 +2206,7 @@
       "parentId": "@@/global-layout",
       "file": "login.jsx",
       "absPath": "/login",
-      "__content": "import React from 'react';\nimport {Button, Form, Input, message, Space} from 'antd';\nimport {LockOutlined, SafetyCertificateOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';\nimport {JSEncrypt} from \"jsencrypt\";\nimport {history} from 'umi';\nimport {EventBusUtils, HttpUtils, PageUtils, MessageUtils, SysUtils} from \"../framework/utils\";\n\nimport \"./login.less\"\n\nfunction getRedirect() {\n    let redirect = PageUtils.currentParams()['redirect'];\n    if (redirect) {\n        redirect = decodeURIComponent(redirect)\n    } else {\n        redirect = '/'\n    }\n    return redirect;\n}\n\nfunction postLogin(values) {\n    return new Promise((resolve, reject) => {\n        HttpUtils.post('/admin/auth/login', values).then(rs => {\n            EventBusUtils.emit('loginSuccess')\n            history.push(getRedirect())\n            resolve(rs)\n        }).catch(e => {\n            reject(e)\n        })\n    })\n}\n\nexport default class extends React.Component {\n\n    state = {\n        logging: false,\n        siteInfo: {},\n        random: Math.random()\n    }\n\n    async componentDidMount() {\n        if (localStorage.length === 0) {\n            MessageUtils.alert('站点数据缺失，刷新当前页面...')\n            window.location.reload()\n            return\n        }\n\n        const siteInfo = SysUtils.getSiteInfo()\n        this.setState({siteInfo})\n    }\n\n    submit = values => {\n        this.setState({logging: true})\n\n        const pubkey = this.state.siteInfo.rsaPublicKey;\n        if (!pubkey) {\n            message.error(\"未获取密钥，请刷新浏览器再试\")\n            this.setState({logging: false})\n            return\n        }\n        const crypt = new JSEncrypt();\n        crypt.setPublicKey(pubkey);\n        values.password = crypt.encrypt(values.password)\n\n        postLogin(values).finally(() => {\n            this.setState({logging: false})\n        })\n    }\n\n    render() {\n        const {siteInfo} = this.state\n\n        const pageStyle = {}\n        if (siteInfo.loginBackground) {\n            const url = 'admin/sysFile/preview/' + siteInfo.loginBackground;\n            pageStyle.backgroundImage = 'url(\"' + url + '\")'\n        }\n\n        return (\n            <section className='login-page' style={pageStyle}>\n                <div className=\"login-content\">\n                    <h1>{siteInfo.title}</h1>\n                    {this.getForm(siteInfo)}\n                    {this.renderFormBottom()}\n                </div>\n            </section>\n        );\n    }\n\n    getForm = siteInfo => {\n        const form = (\n            <Form\n                name=\"normal_login\"\n                className=\"login-form\"\n                initialValues={{remember: true}}\n                onFinish={this.submit}\n                requiredMark={false}\n                colon={false}\n            >\n                <Form.Item name=\"username\" rules={[{required: true, message: '请输入用户名!'}]}>\n                    <Input size='large' prefix={<UserOutlined/>} placeholder=\"用户名\" autoComplete=\"off\"/>\n                </Form.Item>\n                <Form.Item name=\"password\" rules={[{required: true, message: '请输入密码!'}]}>\n                    <Input autoComplete=\"off\" prefix={<LockOutlined/>} type=\"password\" placeholder=\"密码\"\n                           size='large'\n                    />\n                </Form.Item>\n\n                {siteInfo.captcha && (\n                    <Form.Item name='captchaCode' rules={[{required: true}]}>\n                        <Space style={{alignItems: 'center'}}>\n                            <Input size='large' placeholder='验证码' prefix={<SafetyCertificateOutlined/>}/>\n                            <img height={36} width={100}\n                                 src={\"/admin/auth/captcha-image?_random=\" + this.state.random}\n                                 onClick={() => this.setState({random: Math.random()})}/>\n                        </Space>\n                    </Form.Item>\n                )}\n\n                <Form.Item style={{marginTop: 10}}>\n                    <Button loading={this.state.logging} type=\"primary\" htmlType=\"submit\"\n                            block size='large'>\n                        登录\n                    </Button>\n                </Form.Item>\n            </Form>\n        );\n\n        if (this.props.formRender) {\n            return this.props.formRender(form);\n        }\n        return form;\n    };\n\n    renderFormBottom() {\n        const siteInfo = this.state.siteInfo;\n        if (siteInfo.loginBoxBottomTip) {\n            return (\n                <div style={{color: 'white', marginTop: 50, fontSize: '14px', textAlign: 'center'}}>\n                    <WarningOutlined/> {siteInfo.loginBoxBottomTip}\n                </div>\n            )\n        }\n    }\n}\n",
+      "__content": "import React from 'react';\nimport {Button, Form, Input, message, Space} from 'antd';\nimport {LockOutlined, SafetyCertificateOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';\nimport {JSEncrypt} from \"jsencrypt\";\nimport {history} from 'umi';\nimport {EventBusUtils, HttpUtils, PageUtils, MessageUtils, SysUtils} from \"../framework/utils\";\n\nimport \"./login.less\"\n\nfunction getRedirect() {\n    let redirect = PageUtils.currentParams()['redirect'];\n    if (redirect) {\n        redirect = decodeURIComponent(redirect)\n    } else {\n        redirect = '/'\n    }\n    return redirect;\n}\n\nfunction postLogin(values) {\n    return new Promise((resolve, reject) => {\n        HttpUtils.post('/admin/auth/login', values).then(rs => {\n            EventBusUtils.emit('loginSuccess')\n            history.push(getRedirect())\n            resolve(rs)\n        }).catch(e => {\n            console.error('[Login] 登录失败:', e);\n            reject(e)\n        })\n    })\n}\n\nexport default class extends React.Component {\n\n    state = {\n        logging: false,\n        siteInfo: {},\n        random: Math.random()\n    }\n\n    async componentDidMount() {\n        const siteInfo = SysUtils.getSiteInfo()\n        if (siteInfo && siteInfo.rsaPublicKey) {\n            this.setState({siteInfo})\n            return\n        }\n        // localStorage 中无站点信息，从服务端重新加载\n        try {\n            const rs = await HttpUtils.get('/admin/public/site-info')\n            SysUtils.setSiteInfo(rs)\n            this.setState({siteInfo: rs})\n        } catch (e) {\n            console.error('[Login] 加载站点信息失败:', e);\n            message.error('加载站点信息失败，请刷新页面重试')\n        }\n    }\n\n    submit = values => {\n        this.setState({logging: true})\n\n        const pubkey = this.state.siteInfo.rsaPublicKey;\n        if (!pubkey) {\n            message.error(\"未获取密钥，请刷新浏览器再试\")\n            this.setState({logging: false})\n            return\n        }\n        const crypt = new JSEncrypt();\n        crypt.setPublicKey(pubkey);\n        values.password = crypt.encrypt(values.password)\n\n        postLogin(values).finally(() => {\n            this.setState({logging: false})\n        })\n    }\n\n    render() {\n        const {siteInfo} = this.state\n\n        const pageStyle = {\n            backgroundImage: `url(\"${SysUtils.contextPath('/admin/public/login_bg.jpg')}\")`\n        }\n        if (siteInfo.loginBackground) {\n            const url = SysUtils.contextPath('/admin/sysFile/preview/' + siteInfo.loginBackground);\n            pageStyle.backgroundImage = 'url(\"' + url + '\")'\n        }\n\n        return (\n            <section className='login-page' style={pageStyle}>\n                <div className=\"login-content\">\n                    <h1>{siteInfo.title}</h1>\n                    {this.getForm(siteInfo)}\n                    {this.renderFormBottom()}\n                </div>\n            </section>\n        );\n    }\n\n    getForm = siteInfo => {\n        const form = (\n            <Form\n                name=\"normal_login\"\n                className=\"login-form\"\n                initialValues={{remember: true}}\n                onFinish={this.submit}\n                requiredMark={false}\n                colon={false}\n            >\n                <Form.Item name=\"username\" rules={[{required: true, message: '请输入用户名!'}]}>\n                    <Input size='large' prefix={<UserOutlined/>} placeholder=\"用户名\" autoComplete=\"off\"/>\n                </Form.Item>\n                <Form.Item name=\"password\" rules={[{required: true, message: '请输入密码!'}]}>\n                    <Input autoComplete=\"off\" prefix={<LockOutlined/>} type=\"password\" placeholder=\"密码\"\n                           size='large'\n                    />\n                </Form.Item>\n\n                {siteInfo.captcha && (\n                    <Form.Item name='captchaCode' rules={[{required: true}]}>\n                        <Space style={{alignItems: 'center'}}>\n                            <Input size='large' placeholder='验证码' prefix={<SafetyCertificateOutlined/>}/>\n                            <img height={36} width={100}\n                                 src={SysUtils.contextPath(\"/admin/auth/captcha-image?_random=\" + this.state.random)}\n                                 onClick={() => this.setState({random: Math.random()})}/>\n                        </Space>\n                    </Form.Item>\n                )}\n\n                <Form.Item style={{marginTop: 10}}>\n                    <Button loading={this.state.logging} type=\"primary\" htmlType=\"submit\"\n                            block size='large'>\n                        登录\n                    </Button>\n                </Form.Item>\n            </Form>\n        );\n\n        if (this.props.formRender) {\n            return this.props.formRender(form);\n        }\n        return form;\n    };\n\n    renderFormBottom() {\n        const siteInfo = this.state.siteInfo;\n        if (siteInfo.loginBoxBottomTip) {\n            return (\n                <div style={{color: 'white', marginTop: 50, fontSize: '14px', textAlign: 'center'}}>\n                    <WarningOutlined/> {siteInfo.loginBoxBottomTip}\n                </div>\n            )\n        }\n    }\n}\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/login.jsx"
     },
@@ -2250,7 +2223,7 @@
   "hasSrcDir": true,
   "npmClient": "cnpm",
   "umi": {
-    "version": "4.6.55",
+    "version": "4.6.57",
     "name": "Umi",
     "importSource": "umi",
     "cliName": "umi"