@jiangood/open-admin 2.0.0 → 2.0.1

package/config/config.js

@@ -32,14 +32,6 @@ const proxyConfig = {
         target: `http://${host}`,
         changeOrigin: true,
     },
-    '/swagger-ui': {
-        target: `http://${host}`,
-        changeOrigin: true,
-    },
-    '/v3/api-docs': {
-        target: `http://${host}`,
-        changeOrigin: true,
-    },
     '/admin/ws': {
         target: `ws://${host}`,
         changeOrigin: true,

package/package.json

@@ -34,5 +34,5 @@
     "dev": "umi dev",
     "build": "umi build"
   },
-  "version": "2.0.0"
+  "version": "2.0.1"
 }

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

@@ -36,7 +36,7 @@
       "dev": "umi dev",
       "build": "umi build"
     },
-    "version": "2.0.0"
+    "version": "2.0.1"
   },
   "pkgPath": "/home/runner/work/open-admin/open-admin/web/package.json",
   "plugins": {
@@ -93,7 +93,7 @@
       "time": {
         "hooks": {
           "onStart": [
-            0
+            1
           ]
         },
         "register": 2
@@ -113,7 +113,7 @@
             0
           ]
         },
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -140,7 +140,7 @@
       "time": {
         "hooks": {
           "modifyAppData": [
-            65
+            58
           ]
         },
         "register": 21
@@ -190,7 +190,7 @@
       "time": {
         "hooks": {
           "onCheck": [
-            0
+            1
           ]
         },
         "register": 1
@@ -206,7 +206,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "config"
     },
@@ -1089,10 +1089,10 @@
       "time": {
         "hooks": {
           "onStart": [
-            1
+            0
           ]
         },
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1105,7 +1105,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1118,7 +1118,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 96
+        "register": 98
       },
       "enableBy": "register"
     },
@@ -1131,7 +1131,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 29
+        "register": 28
       },
       "enableBy": "config"
     },
@@ -1161,7 +1161,7 @@
             0
           ]
         },
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1174,7 +1174,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1212,7 +1212,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "config"
     },
@@ -1305,7 +1305,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "config"
     },
@@ -1318,7 +1318,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "config"
     },
@@ -1331,7 +1331,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1370,7 +1370,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/ssr/ssr": {
@@ -1395,7 +1395,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 2
       },
       "enableBy": "register"
     },
@@ -1447,7 +1447,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 3
+        "register": 4
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/monorepo/redirect": {
@@ -1600,7 +1600,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 28
+        "register": 27
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/forget/forget": {
@@ -1612,7 +1612,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 2
       },
       "enableBy": "config"
     },
@@ -1651,7 +1651,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 44
+        "register": 45
       },
       "enableBy": "register"
     },
@@ -1676,7 +1676,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1754,7 +1754,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1767,7 +1767,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1780,7 +1780,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1793,7 +1793,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1845,7 +1845,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1858,7 +1858,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1884,7 +1884,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1910,7 +1910,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 21
+        "register": 20
       },
       "enableBy": "register"
     },
@@ -1936,7 +1936,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 2
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1949,7 +1949,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1962,7 +1962,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 7
+        "register": 6
       },
       "enableBy": "register"
     }
@@ -1995,14 +1995,6 @@
         "target": "http://127.0.0.1:8080",
         "changeOrigin": true
       },
-      "/swagger-ui": {
-        "target": "http://127.0.0.1:8080",
-        "changeOrigin": true
-      },
-      "/v3/api-docs": {
-        "target": "http://127.0.0.1:8080",
-        "changeOrigin": true
-      },
       "/admin/ws": {
         "target": "ws://127.0.0.1:8080",
         "changeOrigin": true,
@@ -2054,14 +2046,6 @@
         "target": "http://127.0.0.1:8080",
         "changeOrigin": true
       },
-      "/swagger-ui": {
-        "target": "http://127.0.0.1:8080",
-        "changeOrigin": true
-      },
-      "/v3/api-docs": {
-        "target": "http://127.0.0.1:8080",
-        "changeOrigin": true
-      },
       "/admin/ws": {
         "target": "ws://127.0.0.1:8080",
         "changeOrigin": true,
@@ -2173,16 +2157,6 @@
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/userCenter/manual.jsx"
     },
-    "system/api/index": {
-      "path": "system/api",
-      "id": "system/api/index",
-      "parentId": "@@/global-layout",
-      "file": "system/api/index.jsx",
-      "absPath": "/system/api",
-      "__content": "import {PlusOutlined} from '@ant-design/icons'\nimport {Button, Form, Input, message, Modal, Popconfirm, Switch, Table, Tabs} from 'antd'\nimport React from 'react'\nimport {\n    ArrayUtils,\n    ButtonList,\n    FieldBoolean,\n    FieldDate,\n    HttpUtils, ObjectUtils,\n    Page,\n    ProTable,\n    StringUtils,\n    ViewPassword\n} from \"../../../framework\";\n\n\nexport default class extends React.Component {\n\n    state = {\n        formValues: {},\n        formOpen: false,\n\n        list: [],\n        grantFormOpen: false\n    }\n\n    formRef = React.createRef()\n    tableRef = React.createRef()\n\n    componentDidMount() {\n        HttpUtils.get(\"/admin/apiAccount/perm-list\").then(rs => {\n            this.setState({list: rs})\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/apiAccount/save', values).then(rs => {\n            this.setState({formOpen: false})\n            this.tableRef.current.reload()\n        })\n    }\n\n    handleDelete = record => {\n        HttpUtils.post('admin/apiAccount/delete', {id: record.id}).then(rs => {\n            this.tableRef.current.reload()\n        })\n    }\n\n    columns = [\n        {\n            title: '账户名称',\n            dataIndex: 'name',\n        },\n        {\n            title: 'appSecret',\n            dataIndex: 'appSecret',\n            render(v) {\n                return <ViewPassword value={v}></ViewPassword>;\n            }\n        },\n        {\n            title: '准入IP',\n            dataIndex: 'accessIp',\n        },\n        {\n            title: '有效期',\n            dataIndex: 'endTime',\n        },\n        {\n            title: '启用',\n            dataIndex: 'enabled',\n            render(v) {\n                return v == null ? null : (v ? '是' : '否')\n            },\n        },\n        {\n            title: '权限',\n            dataIndex: 'perms',\n            render(perms) {\n                if (!perms) {\n                    return\n                }\n                return perms.join(', ')\n            }\n        },\n        {\n            title: '操作',\n            dataIndex: 'option',\n            render: (_, record) => (\n                <ButtonList>\n                    <Button size='small' perm='api'\n                            onClick={() => {\n                                this.handlePreGrant(record);\n                            }}\n                            type='primary'>授权</Button>\n                    <Button size='small' perm='api' onClick={() => this.handleEdit(record)}>编辑</Button>\n                    <Popconfirm perm='api' title='是否确定删除接口访客' onConfirm={() => this.handleDelete(record)}>\n                        <Button size='small'>删除</Button>\n                    </Popconfirm>\n                    <Button size='small' perm='api' href={'/admin/apiAccount/export/' + record.id} target={'_blank'}>下载文档</Button>\n                </ButtonList>\n            ),\n        },\n    ]\n\n    handlePreGrant(record) {\n        this.setState({grantFormOpen: true, formValues: ObjectUtils.clone(record)})\n    }\n\n    randomAppSecret = () => {\n        const appSecret = StringUtils.random(32)\n        this.formRef.current.setFieldsValue({appSecret})\n    }\n\n    onGrantItemChange = (id, checked) => {\n        const perms = this.state.formValues.perms\n        if (checked) {\n            ArrayUtils.add(perms, id)\n        } else {\n            ArrayUtils.remove(perms, id)\n        }\n        this.setState({formValues: this.state.formValues})\n    }\n\n    onGrant = () => {\n        const hide = message.loading('授权中...', 0)\n        const accountId = this.state.formValues.id;\n        HttpUtils.post('admin/apiAccount/grant/'+accountId,  this.state.formValues.perms).then(rs => {\n            this.setState({grantFormOpen: false})\n            this.tableRef.current.reload()\n        }).finally(hide)\n    };\n\n\n    render() {\n        return <Page padding>\n            <Tabs items={[\n                {\n                    label: '接口文档',\n                    key: 'doc',\n                    children: <iframe src={'/admin/swagger-ui/index.html'} width=\"100%\" height=\"1000px\"></iframe>\n                },\n                {\n                    label: '账号管理',\n                    key: '1',\n                    children: <ProTable\n                        actionRef={this.tableRef}\n                        toolBarRender={() => {\n                            return <ButtonList>\n                                <Button perm='api' type='primary' onClick={this.handleAdd}>\n                                    <PlusOutlined/> 新增\n                                </Button>\n                            </ButtonList>\n                        }}\n                        request={(params) => HttpUtils.get('admin/apiAccount/page', params)}\n                        columns={this.columns}\n                    />\n                },\n                {\n                    label: '访问记录',\n                    key: 'log',\n                    children: <ProTable\n                        request={(params) => HttpUtils.get('admin/apiLog/page', params)}\n                        columns={[\n                            {\n                                title: '接口',\n                                dataIndex: 'url',\n                            },\n                            {\n                                title: 'ip',\n                                dataIndex: 'ip',\n                            },\n                            {\n                                title: 'ipLocation',\n                                dataIndex: 'ipLocation',\n                            },\n                            {\n                                title: '执行时间',\n                                dataIndex: 'executionTime',\n                            },\n                            {\n                                title: '接口账户',\n                                dataIndex: 'accountName',\n                            }\n                        ]}\n                    />\n                },\n\n            ]}>\n\n            </Tabs>\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                   mask={{closable:false}}\n            >\n\n                <Form ref={this.formRef} labelCol={{flex: '100px'}}\n                      initialValues={this.state.formValues}\n                      onFinish={this.onFinish}\n\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\n                    <Form.Item label='appId' name='appId'>\n                        <Input placeholder='多个用逗号分隔'/>\n                    </Form.Item>\n                    <Form.Item label='appSecret' name='appSecret' rules={[{required: true}, {len: 32}]}\n                               help={<Button size='small' type='link' onClick={this.randomAppSecret}>随机生成</Button>}\n                    >\n                        <Input/>\n                    </Form.Item>\n\n                    <Form.Item label='准入IP' name='accessIp'>\n                        <Input placeholder='多个用逗号分隔'/>\n                    </Form.Item>\n                    <Form.Item label='有效期' name='endTime' style={{marginTop: 32}}>\n                        <FieldDate type='YYYY-MM-DD'/>\n                    </Form.Item>\n                    <Form.Item label='启用' name='enabled' rules={[{required: true}]}>\n                        <FieldBoolean/>\n                    </Form.Item>\n\n                </Form>\n            </Modal>\n\n\n            <Modal title='权限列表' destroyOnClose={true} width={800}\n                   open={this.state.grantFormOpen}\n                   onCancel={() => this.setState({grantFormOpen: false, formValues: null})}\n                   onOk={this.onGrant}\n            >\n                <Table\n                    dataSource={this.state.list}\n                    pagination={false}\n                    rowKey='id'\n                    size={'small'}\n                    columns={[\n                        {dataIndex: 'id', title: '标识'},\n                        {dataIndex: 'name', title: '名称'},\n                        {dataIndex: 'description', title: '描述'},\n                        {dataIndex: 'path', title: '路径'},\n                        {\n                            dataIndex: 'option', title: '操作',\n                            render: (_, record) => {\n                                const id = record.id;\n                                return <Switch checked={this.state.formValues.perms.includes(id)}\n                                               onChange={(checked) => {\n                                                   this.onGrantItemChange(id, checked)\n                                               }} />\n                            }\n                        }\n                    ]}\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/api/index.jsx"
-    },
     "system/job/index": {
       "path": "system/job",
       "id": "system/job/index",

package/src/.umi-production/core/route.tsx

@@ -19,7 +19,7 @@ if (process.env.NODE_ENV === 'development') {
 import React from 'react';
 
 export async function getRoutes() {
-  const routes = {"404":{"path":"*","id":"404","parentId":"@@/global-layout"},"userCenter/ChangePassword":{"path":"userCenter/ChangePassword","id":"userCenter/ChangePassword","parentId":"@@/global-layout"},"system/user/UserPerm":{"path":"system/user/UserPerm","id":"system/user/UserPerm","parentId":"@@/global-layout"},"system/manual/index":{"path":"system/manual","id":"system/manual/index","parentId":"@@/global-layout"},"userCenter/message":{"path":"userCenter/message","id":"userCenter/message","parentId":"@@/global-layout"},"system/dict/index":{"path":"system/dict","id":"system/dict/index","parentId":"@@/global-layout"},"system/file/index":{"path":"system/file","id":"system/file/index","parentId":"@@/global-layout"},"system/role/index":{"path":"system/role","id":"system/role/index","parentId":"@@/global-layout"},"system/user/index":{"path":"system/user","id":"system/user/index","parentId":"@@/global-layout"},"userCenter/manual":{"path":"userCenter/manual","id":"userCenter/manual","parentId":"@@/global-layout"},"system/api/index":{"path":"system/api","id":"system/api/index","parentId":"@@/global-layout"},"system/job/index":{"path":"system/job","id":"system/job/index","parentId":"@@/global-layout"},"system/log/index":{"path":"system/log","id":"system/log/index","parentId":"@@/global-layout"},"system/org/index":{"path":"system/org","id":"system/org/index","parentId":"@@/global-layout"},"system/role/perm":{"path":"system/role/perm","id":"system/role/perm","parentId":"@@/global-layout"},"userCenter/index":{"path":"userCenter","id":"userCenter/index","parentId":"@@/global-layout"},"about":{"path":"about","id":"about","parentId":"@@/global-layout"},"index":{"path":"/","id":"index","parentId":"@@/global-layout"},"login":{"path":"login","id":"login","parentId":"@@/global-layout"},"@@/global-layout":{"id":"@@/global-layout","path":"/","isLayout":true}} as const;
+  const routes = {"404":{"path":"*","id":"404","parentId":"@@/global-layout"},"userCenter/ChangePassword":{"path":"userCenter/ChangePassword","id":"userCenter/ChangePassword","parentId":"@@/global-layout"},"system/user/UserPerm":{"path":"system/user/UserPerm","id":"system/user/UserPerm","parentId":"@@/global-layout"},"system/manual/index":{"path":"system/manual","id":"system/manual/index","parentId":"@@/global-layout"},"userCenter/message":{"path":"userCenter/message","id":"userCenter/message","parentId":"@@/global-layout"},"system/dict/index":{"path":"system/dict","id":"system/dict/index","parentId":"@@/global-layout"},"system/file/index":{"path":"system/file","id":"system/file/index","parentId":"@@/global-layout"},"system/role/index":{"path":"system/role","id":"system/role/index","parentId":"@@/global-layout"},"system/user/index":{"path":"system/user","id":"system/user/index","parentId":"@@/global-layout"},"userCenter/manual":{"path":"userCenter/manual","id":"userCenter/manual","parentId":"@@/global-layout"},"system/job/index":{"path":"system/job","id":"system/job/index","parentId":"@@/global-layout"},"system/log/index":{"path":"system/log","id":"system/log/index","parentId":"@@/global-layout"},"system/org/index":{"path":"system/org","id":"system/org/index","parentId":"@@/global-layout"},"system/role/perm":{"path":"system/role/perm","id":"system/role/perm","parentId":"@@/global-layout"},"userCenter/index":{"path":"userCenter","id":"userCenter/index","parentId":"@@/global-layout"},"about":{"path":"about","id":"about","parentId":"@@/global-layout"},"index":{"path":"/","id":"index","parentId":"@@/global-layout"},"login":{"path":"login","id":"login","parentId":"@@/global-layout"},"@@/global-layout":{"id":"@@/global-layout","path":"/","isLayout":true}} as const;
   return {
     routes,
     routeComponents: {
@@ -33,7 +33,6 @@ export async function getRoutes() {
 'system/role/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__role__index" */'../../../src/pages/system/role/index.jsx')),
 'system/user/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__user__index" */'../../../src/pages/system/user/index.jsx')),
 'userCenter/manual': React.lazy(() => import(/* webpackChunkName: "src__pages__userCenter__manual" */'../../../src/pages/userCenter/manual.jsx')),
-'system/api/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__api__index" */'../../../src/pages/system/api/index.jsx')),
 'system/job/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__job__index" */'../../../src/pages/system/job/index.jsx')),
 'system/log/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__log__index" */'../../../src/pages/system/log/index.jsx')),
 'system/org/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__org__index" */'../../../src/pages/system/org/index.jsx')),

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

@@ -1,46 +1,42 @@
 import React from "react";
 
+const SizeMap = {
+  xs: 4,
+  sm: 8,
+  md: 16,
+  lg: 24,
+  xl: 32,
+  xxl: 40,
+};
+
+type GapProps = {
+  size?: keyof typeof SizeMap;
+  direction?: "horizontal" | "vertical";
+} & React.HTMLAttributes<HTMLDivElement>;
+
 /**
  * 上下间隔
  */
-export class Gap extends React.Component {
-
-    static defaultProps = {
-        size: 'middle',
-        direction: 'vertical',
-    };
-
-    render() {
-        const {n = 0, size, direction} = this.props;
-        if (n) {
-            console.warn('参数 n 已经不被支持')
-            return
-        }
-
-        const SizeMap = {
-            x: 4,
-            small: 8,
-            middle: 16,
-            large: 24,
-            xLarge: 32,
-            xxLarge: 40,
-        };
-
-
-        const sizePx = SizeMap[size];
-        const isHorizontal = direction === 'horizontal';
-
-
-        // 水平间隔：有宽度，无高度
-        // 垂直间隔：有高度，无宽度
-        const width = isHorizontal ? sizePx : 0;
-        const height = isHorizontal ? 0 : sizePx;
-
-        // 水平间隔用 inline-block（避免换行），垂直间隔用 block
-        const display = isHorizontal ? 'inline-block' : 'block';
-
-        const style = {display, height, width}
-
-        return <div style={style}></div>
-    }
-}
+export const Gap: React.FC<GapProps> = ({
+  size = "md",
+  direction = "vertical",
+  ...rest
+}) => {
+  if (size && !Object.hasOwn(SizeMap, size)) {
+    throw new Error(
+      `Gap: size 属性必须为 [${Object.keys(SizeMap).join(", ")}] 之一，当前传入：${size}`
+    );
+  }
+
+  const sizePx = SizeMap[size];
+  const isHorizontal = direction === "horizontal";
+
+  const style: React.CSSProperties = {
+    display: isHorizontal ? "inline-block" : "block",
+    width: isHorizontal ? sizePx : 0,
+    height: isHorizontal ? 0 : sizePx,
+    ...rest.style,
+  };
+
+  return <div style={style} {...rest} />;
+};

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

@@ -1,20 +1,15 @@
 import React from "react";
 
-export class ViewRange extends React.Component {
-
-    static  defaultProps = {
-         min : '未知',max : '未知'
-    }
-
-    render() {
-        let {min,max}  = this.props
-        if(min == null && max == null){
-            return null;
-        }
-        min = min == null ? '未知': min;
-        max = max == null ? '未知': max;
-
-        return min + ' - ' + max;
-
-    }
+interface ViewRangeProps {
+  min?: string;
+  max?: string;
 }
+
+export const ViewRange: React.FC<ViewRangeProps> = ({ min, max }) => {
+  if ((min == null || min === "") && (max == null || max === "")) {
+    return null;
+  }
+  const showMin = min ?? '未知';
+  const showMax = max ?? '未知';
+  return <>{showMin} - {showMax}</>;
+};

package/src/framework/components/system/ButtonList.tsx

@@ -1,42 +1,22 @@
 import React from 'react';
-import {Space} from 'antd';
-import {PermUtils} from "../../utils";
-
+import { Space } from 'antd';
+import { PermUtils } from '../../utils';
 
 /**
  * 带权限的按钮列表
  * @param maxNum: 显示子节点的个数， 超过的为收缩起来
- *
  */
-export class ButtonList extends React.Component {
-
-
-    render() {
-        const {children} = this.props;
-
-        // 单节点的情况
-        if (!Array.isArray(children)) {
-            if (this.checkPerm(children)) {
-                return children;
-            }
-            return null
-        }
+export function ButtonList(props) {
+  const { children } = props;
 
-        const menus = [];
-        for (let child of children) {
-            if (child === null || child === undefined) {
-                continue;
-            }
-            if (this.checkPerm(child)) {
-                menus.push(child);
-            }
-        }
-        return <Space>{menus}</Space>;
-    }
+  const checkPerm = (element) => {
+    const _props = element?.props;
+    return !_props?.perm || PermUtils.hasPermission(_props.perm);
+  };
 
-    checkPerm = element => {
-        const props = element.props;
-        return props == null || props.perm == null || PermUtils.hasPermission(props.perm);
+  const nodes = React.Children.toArray(children).filter(
+    (child) => child != null && checkPerm(child)
+  );
 
-    };
+  return <Space>{nodes}</Space>;
 }

package/src/loading.jsx

@@ -1,18 +1,19 @@
 import React from "react";
-import {Spin} from "antd";
-import {ThemeUtils} from "./framework";
+import { Spin } from "antd";
+import { ThemeUtils } from "./framework";
 
-export default class extends React.Component {
-    render() {
-        return <div
-            style={{
-                display: 'flex',
-                alignItems: 'center',
-                justifyContent: 'center',
-                height: '100vh',
-                background: ThemeUtils.getColor("background-color")
-            }}>
-            <Spin size='large'/>
-        </div>
-    }
-}
+const Loading = () => (
+  <div
+    style={{
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      height: '100vh',
+      background: ThemeUtils.getColor("background-color")
+    }}
+  >
+    <Spin size='large' />
+  </div>
+);
+
+export default Loading;

package/src/pages/system/api/index.jsx

@@ -1,279 +0,0 @@
-import {PlusOutlined} from '@ant-design/icons'
-import {Button, Form, Input, message, Modal, Popconfirm, Switch, Table, Tabs} from 'antd'
-import React from 'react'
-import {
-    ArrayUtils,
-    ButtonList,
-    FieldBoolean,
-    FieldDate,
-    HttpUtils, ObjectUtils,
-    Page,
-    ProTable,
-    StringUtils,
-    ViewPassword
-} from "../../../framework";
-
-
-export default class extends React.Component {
-
-    state = {
-        formValues: {},
-        formOpen: false,
-
-        list: [],
-        grantFormOpen: false
-    }
-
-    formRef = React.createRef()
-    tableRef = React.createRef()
-
-    componentDidMount() {
-        HttpUtils.get("/admin/apiAccount/perm-list").then(rs => {
-            this.setState({list: rs})
-        })
-    }
-
-    handleAdd = () => {
-        this.setState({formOpen: true, formValues: {}})
-    }
-
-    handleEdit = record => {
-        this.setState({formOpen: true, formValues: record})
-    }
-
-    onFinish = values => {
-        HttpUtils.post('admin/apiAccount/save', values).then(rs => {
-            this.setState({formOpen: false})
-            this.tableRef.current.reload()
-        })
-    }
-
-    handleDelete = record => {
-        HttpUtils.post('admin/apiAccount/delete', {id: record.id}).then(rs => {
-            this.tableRef.current.reload()
-        })
-    }
-
-    columns = [
-        {
-            title: '账户名称',
-            dataIndex: 'name',
-        },
-        {
-            title: 'appSecret',
-            dataIndex: 'appSecret',
-            render(v) {
-                return <ViewPassword value={v}></ViewPassword>;
-            }
-        },
-        {
-            title: '准入IP',
-            dataIndex: 'accessIp',
-        },
-        {
-            title: '有效期',
-            dataIndex: 'endTime',
-        },
-        {
-            title: '启用',
-            dataIndex: 'enabled',
-            render(v) {
-                return v == null ? null : (v ? '是' : '否')
-            },
-        },
-        {
-            title: '权限',
-            dataIndex: 'perms',
-            render(perms) {
-                if (!perms) {
-                    return
-                }
-                return perms.join(', ')
-            }
-        },
-        {
-            title: '操作',
-            dataIndex: 'option',
-            render: (_, record) => (
-                <ButtonList>
-                    <Button size='small' perm='api'
-                            onClick={() => {
-                                this.handlePreGrant(record);
-                            }}
-                            type='primary'>授权</Button>
-                    <Button size='small' perm='api' onClick={() => this.handleEdit(record)}>编辑</Button>
-                    <Popconfirm perm='api' title='是否确定删除接口访客' onConfirm={() => this.handleDelete(record)}>
-                        <Button size='small'>删除</Button>
-                    </Popconfirm>
-                    <Button size='small' perm='api' href={'/admin/apiAccount/export/' + record.id} target={'_blank'}>下载文档</Button>
-                </ButtonList>
-            ),
-        },
-    ]
-
-    handlePreGrant(record) {
-        this.setState({grantFormOpen: true, formValues: ObjectUtils.clone(record)})
-    }
-
-    randomAppSecret = () => {
-        const appSecret = StringUtils.random(32)
-        this.formRef.current.setFieldsValue({appSecret})
-    }
-
-    onGrantItemChange = (id, checked) => {
-        const perms = this.state.formValues.perms
-        if (checked) {
-            ArrayUtils.add(perms, id)
-        } else {
-            ArrayUtils.remove(perms, id)
-        }
-        this.setState({formValues: this.state.formValues})
-    }
-
-    onGrant = () => {
-        const hide = message.loading('授权中...', 0)
-        const accountId = this.state.formValues.id;
-        HttpUtils.post('admin/apiAccount/grant/'+accountId,  this.state.formValues.perms).then(rs => {
-            this.setState({grantFormOpen: false})
-            this.tableRef.current.reload()
-        }).finally(hide)
-    };
-
-
-    render() {
-        return <Page padding>
-            <Tabs items={[
-                {
-                    label: '接口文档',
-                    key: 'doc',
-                    children: <iframe src={'/admin/swagger-ui/index.html'} width="100%" height="1000px"></iframe>
-                },
-                {
-                    label: '账号管理',
-                    key: '1',
-                    children: <ProTable
-                        actionRef={this.tableRef}
-                        toolBarRender={() => {
-                            return <ButtonList>
-                                <Button perm='api' type='primary' onClick={this.handleAdd}>
-                                    <PlusOutlined/> 新增
-                                </Button>
-                            </ButtonList>
-                        }}
-                        request={(params) => HttpUtils.get('admin/apiAccount/page', params)}
-                        columns={this.columns}
-                    />
-                },
-                {
-                    label: '访问记录',
-                    key: 'log',
-                    children: <ProTable
-                        request={(params) => HttpUtils.get('admin/apiLog/page', params)}
-                        columns={[
-                            {
-                                title: '接口',
-                                dataIndex: 'url',
-                            },
-                            {
-                                title: 'ip',
-                                dataIndex: 'ip',
-                            },
-                            {
-                                title: 'ipLocation',
-                                dataIndex: 'ipLocation',
-                            },
-                            {
-                                title: '执行时间',
-                                dataIndex: 'executionTime',
-                            },
-                            {
-                                title: '接口账户',
-                                dataIndex: 'accountName',
-                            }
-                        ]}
-                    />
-                },
-
-            ]}>
-
-            </Tabs>
-
-
-            <Modal title='接口访客'
-                   open={this.state.formOpen}
-                   onOk={() => this.formRef.current.submit()}
-                   onCancel={() => this.setState({formOpen: false})}
-                   destroyOnClose
-                   mask={{closable:false}}
-            >
-
-                <Form ref={this.formRef} labelCol={{flex: '100px'}}
-                      initialValues={this.state.formValues}
-                      onFinish={this.onFinish}
-
-                >
-                    <Form.Item name='id' noStyle></Form.Item>
-
-                    <Form.Item label='名称' name='name' rules={[{required: true}]}>
-                        <Input/>
-                    </Form.Item>
-
-
-                    <Form.Item label='appId' name='appId'>
-                        <Input placeholder='多个用逗号分隔'/>
-                    </Form.Item>
-                    <Form.Item label='appSecret' name='appSecret' rules={[{required: true}, {len: 32}]}
-                               help={<Button size='small' type='link' onClick={this.randomAppSecret}>随机生成</Button>}
-                    >
-                        <Input/>
-                    </Form.Item>
-
-                    <Form.Item label='准入IP' name='accessIp'>
-                        <Input placeholder='多个用逗号分隔'/>
-                    </Form.Item>
-                    <Form.Item label='有效期' name='endTime' style={{marginTop: 32}}>
-                        <FieldDate type='YYYY-MM-DD'/>
-                    </Form.Item>
-                    <Form.Item label='启用' name='enabled' rules={[{required: true}]}>
-                        <FieldBoolean/>
-                    </Form.Item>
-
-                </Form>
-            </Modal>
-
-
-            <Modal title='权限列表' destroyOnClose={true} width={800}
-                   open={this.state.grantFormOpen}
-                   onCancel={() => this.setState({grantFormOpen: false, formValues: null})}
-                   onOk={this.onGrant}
-            >
-                <Table
-                    dataSource={this.state.list}
-                    pagination={false}
-                    rowKey='id'
-                    size={'small'}
-                    columns={[
-                        {dataIndex: 'id', title: '标识'},
-                        {dataIndex: 'name', title: '名称'},
-                        {dataIndex: 'description', title: '描述'},
-                        {dataIndex: 'path', title: '路径'},
-                        {
-                            dataIndex: 'option', title: '操作',
-                            render: (_, record) => {
-                                const id = record.id;
-                                return <Switch checked={this.state.formValues.perms.includes(id)}
-                                               onChange={(checked) => {
-                                                   this.onGrantItemChange(id, checked)
-                                               }} />
-                            }
-                        }
-                    ]}
-
-                />
-            </Modal>
-        </Page>
-
-
-    }
-}
-