@jiangood/open-admin 1.1.0 → 1.1.2

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

@@ -19,14 +19,13 @@ 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/sysManual/index":{"path":"system/sysManual","id":"system/sysManual/index","parentId":"@@/global-layout"},"system/dict/DictItem":{"path":"system/dict/DictItem","id":"system/dict/DictItem","parentId":"@@/global-layout"},"system/user/UserPerm":{"path":"system/user/UserPerm","id":"system/user/UserPerm","parentId":"@@/global-layout"},"userCenter/message":{"path":"userCenter/message","id":"userCenter/message","parentId":"@@/global-layout"},"system/api/ApiDoc":{"path":"system/api/ApiDoc","id":"system/api/ApiDoc","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/dict/Dict":{"path":"system/dict/Dict","id":"system/dict/Dict","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"},"system/api/perm":{"path":"system/api/perm","id":"system/api/perm","parentId":"@@/global-layout"},"ureport/index":{"path":"ureport","id":"ureport/index","parentId":"@@/global-layout"},"test/views":{"path":"test/views","id":"test/views","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/sysManual/index":{"path":"system/sysManual","id":"system/sysManual/index","parentId":"@@/global-layout"},"system/user/UserPerm":{"path":"system/user/UserPerm","id":"system/user/UserPerm","parentId":"@@/global-layout"},"userCenter/message":{"path":"userCenter/message","id":"userCenter/message","parentId":"@@/global-layout"},"system/api/ApiDoc":{"path":"system/api/ApiDoc","id":"system/api/ApiDoc","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"},"system/api/perm":{"path":"system/api/perm","id":"system/api/perm","parentId":"@@/global-layout"},"test/views":{"path":"test/views","id":"test/views","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: {
 '404': React.lazy(() => import(/* webpackChunkName: "src__pages__404" */'../../../src/pages/404.jsx')),
 'userCenter/ChangePassword': React.lazy(() => import(/* webpackChunkName: "src__pages__userCenter__ChangePassword" */'../../../src/pages/userCenter/ChangePassword.jsx')),
 'system/sysManual/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__sysManual__index" */'../../../src/pages/system/sysManual/index.jsx')),
-'system/dict/DictItem': React.lazy(() => import(/* webpackChunkName: "src__pages__system__dict__DictItem" */'../../../src/pages/system/dict/DictItem.jsx')),
 'system/user/UserPerm': React.lazy(() => import(/* webpackChunkName: "src__pages__system__user__UserPerm" */'../../../src/pages/system/user/UserPerm.jsx')),
 'userCenter/message': React.lazy(() => import(/* webpackChunkName: "src__pages__userCenter__message" */'../../../src/pages/userCenter/message.jsx')),
 'system/api/ApiDoc': React.lazy(() => import(/* webpackChunkName: "src__pages__system__api__ApiDoc" */'../../../src/pages/system/api/ApiDoc.jsx')),
@@ -36,14 +35,12 @@ export async function getRoutes() {
 '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/dict/Dict': React.lazy(() => import(/* webpackChunkName: "src__pages__system__dict__Dict" */'../../../src/pages/system/dict/Dict.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')),
 'system/role/perm': React.lazy(() => import(/* webpackChunkName: "src__pages__system__role__perm" */'../../../src/pages/system/role/perm.jsx')),
 'userCenter/index': React.lazy(() => import(/* webpackChunkName: "src__pages__userCenter__index" */'../../../src/pages/userCenter/index.jsx')),
 'system/api/perm': React.lazy(() => import(/* webpackChunkName: "src__pages__system__api__perm" */'../../../src/pages/system/api/perm.jsx')),
-'ureport/index': React.lazy(() => import(/* webpackChunkName: "src__pages__ureport__index" */'../../../src/pages/ureport/index.jsx')),
 'test/views': React.lazy(() => import(/* webpackChunkName: "src__pages__test__views" */'../../../src/pages/test/views.jsx')),
 'about': React.lazy(() => import(/* webpackChunkName: "src__pages__about" */'../../../src/pages/about.jsx')),
 'index': React.lazy(() => import(/* webpackChunkName: "src__pages__index" */'../../../src/pages/index.jsx')),

package/src/framework/fields/FieldDictSelect/index.jsx

@@ -6,7 +6,8 @@ export function FieldDictSelect(props) {
     const {value, onChange, typeCode, ...rest} = props;
     const options = DictUtils.dictOptions(typeCode);
 
-    return <Select value={value}
+
+    return <Select value={String(value)}
                    onChange={onChange}
                    style={{width: '100%', minWidth: 200}}
                    options={options}

package/src/framework/utils/system/DictUtils.ts

@@ -1,5 +1,10 @@
 // 假设的类型定义，你需要确保与你的实际数据结构匹配
 import {SysUtils} from "./SysUtils";
+// 假设 SysUtil 和 StrUtil 的引入和类型
+// 实际使用时需要确保路径和模块存在
+import {Tag} from 'antd';
+import React from 'react';
+import {StringUtils} from "../StringUtils";
 
 export interface DictItem {
     value: string | number;
@@ -8,15 +13,9 @@ export interface DictItem {
 }
 
 
-// 假设 SysUtil 和 StrUtil 的引入和类型
-// 实际使用时需要确保路径和模块存在
-import {Tag} from 'antd';
-import React from 'react';
-import {StringUtils} from "../StringUtils";
-
 // 字典选项的格式
 export interface DictOption {
-    value: string|number;
+    value: string | number;
     label: string;
 }
 
@@ -76,7 +75,7 @@ export class DictUtils {
      * @param code 字典项编码
      * @returns Antd Tag 元素或纯字符串名称或空字符串
      */
-    public static dictTag(typeCode: string, code: string | number ): React.ReactElement | string {
+    public static dictTag(typeCode: string, code: string | number): React.ReactElement | string {
         if (typeCode == null || code == null) {
             return null;
         }

package/src/layouts/index.jsx

@@ -33,8 +33,7 @@ function checkIsSimplePage(pathname) {
     if(pathname.startsWith("/test/")){
         return true
     }
-    let count = StringUtils.count(pathname,'/');
-    return ArrUtils.contains(SIMPLE_URLS, pathname) || count === 1;
+    return ArrUtils.contains(SIMPLE_URLS, pathname) ;
 }
 
 function checkIsPurePage(pathname){

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

@@ -41,7 +41,7 @@ export default class extends React.Component {
     }
 
     handleDelete = record => {
-        HttpUtils.get('admin/apiAccount/delete', {id: record.id}).then(rs => {
+        HttpUtils.post('admin/apiAccount/delete', {id: record.id}).then(rs => {
             this.tableRef.current.reload()
         })
     }

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

@@ -1,25 +1,201 @@
 import React from "react";
-import Dict from "./Dict";
-import DictItem from "./DictItem";
-import {Splitter} from "antd";
+import {Button, Form, Input, InputNumber, Modal, Popconfirm, Splitter, Tag, Tree, Typography} from "antd";
+import {
+    ButtonList,
+    FieldBoolean, FieldDictSelect,
+    HttpUtils,
+    Page,
+    PageLoading,
+    ProTable,
+    ViewBooleanEnableDisable
+} from "../../../framework";
+import {PlusOutlined} from "@ant-design/icons";
 
 export default class extends React.Component {
 
     state = {
-        selectedKey: null
+        treeData: [],
+        treeLoading: true,
+        typeCode: null,
+        formValues: {},
+        formOpen: false
     }
 
+    formRef = React.createRef()
+    tableRef = React.createRef()
+
+    async componentDidMount() {
+        const treeData = await HttpUtils.get('admin/dict/tree');
+        this.setState({treeData, treeLoading: false});
+    }
+
+    onSelect = (selectedKeys) => {
+        const key = selectedKeys.length === 1 ? selectedKeys[0] : null;
+        this.setState({typeCode: key}, () => {
+            this.tableRef.current.reload()
+        })
+    }
+    handleAdd = () => {
+        this.setState({formOpen: true, formValues: {}})
+    }
+
+    handleEdit = record => {
+        this.setState({formOpen: true, formValues: record})
+    }
+
+    onFinish = values => {
+        values.sysDict = {id: this.props.sysDictId}
+        HttpUtils.post('admin/dict/save', values).then(rs => {
+            this.setState({formOpen: false})
+            this.tableRef.current.reload()
+        })
+    }
+
+    handleDelete = row => {
+        HttpUtils.post('admin/dict/delete', row).then(rs => {
+            this.tableRef.current.reload()
+        })
+    }
+
+    columns = [
+        {
+            title: '文本',
+            dataIndex: 'name',
+        },
+        {
+            title: '编码',
+            dataIndex: 'code',
+        },
+
+        {
+            title: '启用',
+            dataIndex: 'enabled',
+            render(v) {
+                return <ViewBooleanEnableDisable value={v}/>
+            }
+
+        },
+        {
+            title: '显示颜色',
+            dataIndex: 'color',
+            render(v) {
+                if (v) {
+                    return <Tag color={v.toLowerCase()}>{v}</Tag>
+                }
+
+            }
+        },
+
+        {
+            title: '序号',
+            dataIndex: 'seq',
+        },
+        {
+            title: '操作',
+            dataIndex: 'option',
+            render: (_, record) => {
+
+                return (
+                    <ButtonList>
+                        <Button size='small' perm='sysDict:save'
+                                onClick={() => this.handleEdit(record)}> 编辑 </Button>
+                        <Popconfirm perm='sysDict:delete' title='是否确定删除字典项'
+                                    onConfirm={() => this.handleDelete(record)}>
+                            <Button size='small'>删除</Button>
+                        </Popconfirm>
+                    </ButtonList>
+                );
+            },
+        },
+    ]
 
     render() {
-        return <Splitter>
-            <Splitter.Panel defaultSize={600} style={{paddingRight: 16}}>
-                <Dict onChange={selectedKey => this.setState({selectedKey})}/>
-            </Splitter.Panel>
-            <Splitter.Panel style={{paddingLeft: 16}}>
-                <DictItem sysDictId={this.state.selectedKey}/>
-            </Splitter.Panel>
-        </Splitter>
+        if (this.state.treeLoading) {
+            return <PageLoading/>
+        }
+
+        return <Page>
+            <Splitter>
+                <Splitter.Panel defaultSize={600} style={{paddingRight: 16}}>
+                    <Tree
+                        treeData={this.state.treeData}
+                        onSelect={this.onSelect}
 
+                        showIcon
+                        blockNode
+                        showLine
+                        defaultExpandAll
+                    >
+                    </Tree>
+                </Splitter.Panel>
+                <Splitter.Panel style={{paddingLeft: 16}}>
+                    {this.renderTypeInfo()}
+                    <ProTable
+                        rowKey='code'
+                        actionRef={this.tableRef}
+                        toolBarRender={() => {
+                            return <ButtonList>
+                                <Button perm='sysDict:save' type='primary' onClick={this.handleAdd} disabled={!this.state.typeCode}>
+                                    <PlusOutlined/> 新增
+                                </Button>
+                            </ButtonList>
+                        }}
+                        request={(params) => {
+                            params.typeCode = this.state.typeCode
+                            return HttpUtils.get('admin/dict/page', params);
+                        }}
+                        columns={this.columns}
+                        search={false}
+                    />
+                </Splitter.Panel>
+            </Splitter>
+            <Modal
+                title='编辑数据字典项'
+                open={this.state.formOpen}
+                onOk={() => this.formRef.current.submit()}
+                onCancel={() => this.setState({formOpen: false})}
+                destroyOnHidden
+            >
+
+                <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='typeCode' rules={[{required: true}]} initialValue={this.state.typeCode}>
+                        <Input/>
+                    </Form.Item>
+                    <Form.Item label='编码' name='code' rules={[{required: true}]}>
+                        <Input/>
+                    </Form.Item>
+                    <Form.Item label='文本' name='name' rules={[{required: true}]} >
+                        <Input/>
+                    </Form.Item>
+                    <Form.Item label='颜色' name='color' rules={[{required: true}]}>
+                        <FieldDictSelect typeCode='statusColor' />
+                    </Form.Item>
+                    <Form.Item label='序号' name='seq' rules={[{required: true}]}>
+                        <InputNumber/>
+                    </Form.Item>
+
+                    <Form.Item label='启用' name='enabled' rules={[{required: true}]}>
+                        <FieldBoolean/>
+                    </Form.Item>
+
+                </Form>
+            </Modal>
+        </Page>
+
+
+    }
 
+    renderTypeInfo() {
+        if(this.state.typeCode){
+            return <>
+                <Typography.Text italic> 类型：</Typography.Text>
+                <Typography.Text copyable>
+                    {this.state.typeCode}
+                </Typography.Text>
+            </>;
+        }
     }
 }

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

@@ -14,7 +14,7 @@ export default class extends React.Component {
     formRef = React.createRef()
 
     handleDelete = row => {
-        HttpUtils.get('admin/sysFile/delete', row).then(rs => {
+        HttpUtils.post('admin/sysFile/delete', row).then(rs => {
             this.tableRef.current.reload()
         })
     }

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

@@ -92,7 +92,7 @@ export default class extends React.Component {
 
     handleDelete = row => {
         const hide = message.loading("删除作业中...")
-        HttpUtils.get('admin/job/delete', {id: row.id}).then(rs => {
+        HttpUtils.post('admin/job/delete', {id: row.id}).then(rs => {
             this.tableRef.current.reload();
         }).catch(hide)
     }

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

@@ -52,7 +52,7 @@ export default class extends React.Component {
     }
 
     handleDelete = record => {
-        HttpUtils.get('admin/sysOrg/delete', {id: record.id})
+        HttpUtils.post('admin/sysOrg/delete', {id: record.id})
             .then(rs => {
                 this.setState({formValues: null})
                 this.loadTree()
@@ -146,8 +146,7 @@ export default class extends React.Component {
                               onDrop={this.onDrop}
                               showLine
                               defaultExpandAll
-                        >
-                        </Tree>
+                        />
                         {this.state.treeData.length === 0 && <Empty/>}
                     </Card>
                 </Splitter.Panel>

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

@@ -52,7 +52,7 @@ export default class extends React.Component {
     }
 
     handleDelete = record => {
-        HttpUtils.get('admin/sysRole/delete', {id: record.id}).then(rs => {
+        HttpUtils.post('admin/sysRole/delete', {id: record.id}).then(rs => {
             this.tableRef.current.reload()
         })
     }

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

@@ -30,7 +30,7 @@ export default class extends React.Component {
     }
 
     handleDelete = record => {
-        HttpUtils.get('admin/sysManual/delete', {id: record.id}).then(rs => {
+        HttpUtils.post('admin/sysManual/delete', {id: record.id}).then(rs => {
             this.tableRef.current.reload()
         })
     }

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

@@ -39,7 +39,7 @@ export default class extends React.Component {
     }
 
     handleDelete = r => {
-        HttpUtils.get('admin/sysUser/delete', {id: r.id}).then(rs => {
+        HttpUtils.post('admin/sysUser/delete', {id: r.id}).then(rs => {
             this.tableRef.current.reload();
         })
     }

package/src/pages/system/dict/Dict.jsx

@@ -1,67 +0,0 @@
-import React from 'react'
-import {HttpUtils, ProTable} from "../../../framework";
-
-
-export default class extends React.Component {
-
-    state = {
-        formValues: {},
-        formOpen: false,
-        selectedRowKeys: []
-    }
-
-    formRef = React.createRef()
-    tableRef = React.createRef()
-
-    columns = [
-
-
-        {
-            title: '编码',
-            dataIndex: 'code',
-
-
-        },
-        {
-            title: '文本',
-            dataIndex: 'text',
-        },
-
-
-    ]
-
-
-    render() {
-        return <>
-            <ProTable
-                actionRef={this.tableRef}
-
-                request={(params) => HttpUtils.get('admin/sysDict/page', params)}
-                columns={this.columns}
-                rowKey='id'
-
-                rowSelection={{
-                    type: 'radio',
-                    selectedRowKeys: this.state.selectedRowKeys,
-                    onChange: (selectedRowKeys, selectedRows) => {
-                        this.setState({selectedRowKeys: selectedRowKeys})
-                        this.props.onChange(selectedRowKeys[0])
-                    }
-                }}
-                onRow={(record) => ({
-                    onClick: () => {
-                        this.setState({selectedRowKeys: [record.id]})
-                        this.props.onChange(record.id)
-                    }
-                })}
-            />
-
-
-        </>
-
-
-    }
-}
-
-
-

package/src/pages/system/dict/DictItem.jsx

@@ -1,175 +0,0 @@
-import {PlusOutlined} from '@ant-design/icons'
-import {Button, Col, Form, Input, InputNumber, Modal, Popconfirm, Row, Tag} from 'antd'
-import React from 'react'
-
-import {ButtonList, FieldBoolean, HttpUtils, ProTable} from '../../../framework'
-
-
-export default class extends React.Component {
-
-    state = {
-        formValues: {},
-        formOpen: false
-    }
-
-    formRef = React.createRef()
-    tableRef = React.createRef()
-
-    componentDidUpdate(prevProps, prevState, snapshot) {
-        if (prevProps.sysDictId !== this.props.sysDictId) {
-            this.tableRef.current.reload()
-        }
-    }
-
-    handleAdd = () => {
-        this.setState({formOpen: true, formValues: {}})
-    }
-
-    handleEdit = record => {
-        this.setState({formOpen: true, formValues: record})
-    }
-
-    onFinish = values => {
-        values.sysDict = {id: this.props.sysDictId}
-        HttpUtils.post('admin/sysDictItem/save', values).then(rs => {
-            this.setState({formOpen: false})
-            this.tableRef.current.reload()
-        })
-    }
-
-    handleDelete = row => {
-        HttpUtils.get('admin/sysDictItem/delete', row).then(rs => {
-            this.tableRef.current.reload()
-        })
-    }
-
-    columns = [
-        {
-            title: '文本',
-            dataIndex: 'text',
-        },
-        {
-            title: '编码',
-            dataIndex: 'code',
-        },
-
-        {
-            title: '启用',
-            dataIndex: 'enabled',
-            render(v) {
-                return v ? '是' : '否'
-            }
-
-        },
-        {
-            title: '显示颜色',
-            dataIndex: 'color',
-            render(v) {
-                return <Tag color={v}>COLOR</Tag>
-            }
-        },
-        {
-            title: '系统内置',
-            dataIndex: 'builtin',
-            render(v) {
-                return v ? '是' : '否'
-            }
-
-        },
-        {
-            title: '序号',
-            dataIndex: 'seq',
-        },
-        {
-            title: '操作',
-            dataIndex: 'option',
-            render: (_, record) => {
-
-                return (
-                    <ButtonList>
-                        <Button size='small' perm='sysDict:save'
-                                onClick={() => this.handleEdit(record)}> 编辑 </Button>
-                        <Popconfirm perm='sysDict:delete' title='是否确定删除字典项'
-                                    onConfirm={() => this.handleDelete(record)}>
-                            <Button size='small'>删除</Button>
-                        </Popconfirm>
-                    </ButtonList>
-                );
-            },
-        },
-    ]
-
-    render() {
-        return <>
-            <ProTable
-                headerTitle='字典项列表'
-                actionRef={this.tableRef}
-                toolBarRender={() => {
-                    return <ButtonList>
-                        <Button perm='sysDictItem:save' type='primary' onClick={this.handleAdd}>
-                            <PlusOutlined/> 新增
-                        </Button>
-                    </ButtonList>
-                }}
-                request={(params) => {
-                    params.sysDictId = this.props.sysDictId
-                    return HttpUtils.get('admin/sysDictItem/page', params);
-                }}
-                columns={this.columns}
-                rowKey='id'
-                search={false}
-            />
-
-            <Modal
-                title='编辑数据字典项'
-                open={this.state.formOpen}
-                onOk={() => this.formRef.current.submit()}
-                onCancel={() => this.setState({formOpen: false})}
-                destroyOnHidden
-            >
-
-                <Form ref={this.formRef} labelCol={{flex: '100px'}}
-                      initialValues={this.state.formValues}
-                      onFinish={this.onFinish}>
-                    <Form.Item name='id' noStyle></Form.Item>
-
-                    <Row>
-                        <Col span={12}>
-                            <Form.Item label='编码' name='code' rules={[{required: true}]}>
-                                <Input/>
-                            </Form.Item>
-                        </Col>
-                        <Col span={12}>
-                            <Form.Item label='文本' name='text' rules={[{required: true}]}>
-                                <Input/>
-                            </Form.Item>
-                        </Col>
-                    </Row>
-
-                    <Row>
-                        <Col span={12}>
-                            <Form.Item label='颜色' name='color' rules={[{required: true}]}>
-                                <Input/>
-                            </Form.Item>
-                        </Col>
-                        <Col span={12}>
-                            <Form.Item label='序号' name='seq' rules={[{required: true}]}>
-                                <InputNumber/>
-                            </Form.Item>
-                        </Col>
-                    </Row>
-
-                    <Form.Item label='启用' name='enabled' rules={[{required: true}]}>
-                        <FieldBoolean/>
-                    </Form.Item>
-
-                </Form>
-            </Modal>
-        </>
-
-
-    }
-}
-
-
-

package/src/pages/ureport/index.jsx

@@ -1,16 +0,0 @@
-import React from 'react'
-import {Button} from "antd";
-
-export default class extends React.Component {
-
-    render() {
-        return <div style={{display: 'flex', alignItems: 'center', justifyContent: 'center'}}>
-            <Button type='primary' href='/ureport/designer'>打开设计器</Button>
-        </div>
-    }
-
-
-}
-
-
-