@jiangood/open-admin 2.4.7 → 2.5.0

package/src/layouts/admin/index.less

@@ -2,31 +2,17 @@
   height: 100vh;
   overflow: hidden;
   .header {
-    padding: 0 20px;
+    padding: 0 12px;
     height: 48px;
     display: flex;
     align-items: center;
-    border-bottom: 1px solid rgb(233, 237, 240);
-    background-color: rgb(246, 248, 250);
-
-    .header-left {
-
-      display: flex;
-      align-items: center;
-      gap: 8px;
-      flex-shrink: 0;
-
-      .logo-img {
-        height: 38px;
-        cursor: pointer;
-      }
-    }
+    background-color: #fff;
 
     .top-nav {
       flex: 1;
       display: flex;
       align-items: center;
-      margin: 0 16px;
+      margin: 0;
       height: 100%;
       overflow: hidden;
 
@@ -73,7 +59,34 @@
 
 
   #left-sider {
+    display: flex;
+    flex-direction: column;
+
+    .sider-header {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      padding: 12px 16px;
+
+      .logo-img {
+        height: 38px;
+        cursor: pointer;
+      }
+
+      h3 {
+        margin: 0;
+        font-size: 14px;
+        line-height: 1;
+        white-space: nowrap;
+      }
+    }
+
+    &.ant-layout-sider-collapsed .sider-header h3 {
+      display: none;
+    }
+
     .left-menu {
+      flex: 1;
       overflow: auto;
       scrollbar-width: thin;
       scrollbar-color: unset;
@@ -83,9 +96,7 @@
           color: white;
         }
       }
-      .ant-menu-item-group-title {
-        color: #5E8CD6; /* 主色透明 */
-      }
+
     }
 
   }

package/src/layouts/index.jsx

@@ -27,16 +27,7 @@ const configProps = {
             borderRadius: 4,
         },
         components: {
-            Menu: {
-                darkItemBg: ThemeUtils.getColor("primary-color"),
-                darkPopupBg: ThemeUtils.getColor("primary-color"),
-                darkItemSelectedBg: ThemeUtils.getColor("primary-color-click"),
-                darkItemHoverBg: ThemeUtils.getColor("primary-color-hover"),
-                darkSubMenuItemBg: ThemeUtils.getColor("primary-color"),
-            },
             Layout: {
-                siderBg: ThemeUtils.getColor("primary-color"),
-                triggerBg: ThemeUtils.getColor("primary-color-click"),
                 headerBg: 'white',
                 triggerHeight: 32,
             },

package/src/pages/about.jsx

@@ -5,7 +5,7 @@ export default class extends React.Component {
 
 
     render() {
-        return <Page>
+        return <Page title="关于" description="了解系统版本与相关信息">
             <h1>关于</h1>
         </Page>
     }

package/src/pages/index.jsx

@@ -3,7 +3,7 @@ import {Card} from "antd";
 import {Page} from "../framework";
 
 export default function () {
-    return <Page>
+    return <Page title="首页" description="欢迎使用本系统">
         <Card>欢迎使用本系统</Card>
     </Page>
 }

package/src/pages/login.jsx

@@ -72,11 +72,7 @@ export default class extends React.Component {
         const {siteInfo} = this.state
 
         const pageStyle = {
-            backgroundImage: `url("${SysUtils.contextPath('/admin/public/login_bg.jpg')}")`
-        }
-        if (siteInfo.loginBackground) {
-            const url = SysUtils.contextPath('/admin/sysFile/preview/' + siteInfo.loginBackground);
-            pageStyle.backgroundImage = 'url("' + url + '")'
+            backgroundImage: `url("./login_bg.jpg")`
         }
 
         return (

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

@@ -1,11 +1,10 @@
-import {DeleteOutlined, EditOutlined, PlusOutlined, SyncOutlined} from '@ant-design/icons';
-import {Button, Card, Empty, Form, Input, InputNumber, Modal, Popconfirm, Space, Splitter, Tree, Tag, TreeSelect} from 'antd';
+import {DeleteOutlined, EditOutlined, PlusOutlined} from '@ant-design/icons';
+import {Button, Card, Descriptions, Empty, Form, Input, InputNumber, Modal, Popconfirm, Splitter, Tree, Tag, TreeSelect, Typography} from 'antd';
 import React from 'react';
 import {
     ButtonList,
     FieldBoolean,
     FieldDictSelect,
-    Gap,
     HttpUtils,
     Page,
     ProTable,
@@ -24,6 +23,7 @@ export default class extends React.Component {
         formValues: {},
         typeFormOpen: false,
         typeFormValues: {},
+
     }
 
     formRef = React.createRef();
@@ -74,22 +74,30 @@ export default class extends React.Component {
         })
     }
 
+    findNode = (nodes, key) => {
+        for (const n of nodes) {
+            if (n.id === key) return n
+            if (n.children) {
+                const found = this.findNode(n.children, key)
+                if (found) return found
+            }
+        }
+        return null
+    }
+
+    getParentLabel = () => {
+        const {selectedType, typeTree} = this.state
+        if (!selectedType?.pid) return null
+        const parent = this.findNode(typeTree, selectedType.pid)
+        return parent?.typeLabel || null
+    }
+
     onTreeSelect = (selectedKeys) => {
         if (selectedKeys.length === 0) {
             this.setState({selectedType: null, selectedTypeCode: null})
             return
         }
-        const findNode = (nodes, key) => {
-            for (const n of nodes) {
-                if (n.id === key) return n
-                if (n.children) {
-                    const found = findNode(n.children, key)
-                    if (found) return found
-                }
-            }
-            return null
-        }
-        const node = findNode(this.state.typeTree, selectedKeys[0])
+        const node = this.findNode(this.state.typeTree, selectedKeys[0])
         this.setState({
             selectedType: node,
             selectedTypeCode: node?.typeCode || null
@@ -156,32 +164,14 @@ export default class extends React.Component {
         const {selectedType, selectedTypeCode} = this.state
         const hasTypeSelected = selectedType != null && selectedTypeCode != null
 
-        return <Page>
+        return <Page title="数据字典" description="管理数据字典类型和字典项"
+                    actions={<Button perm='sys-dict:create' icon={<PlusOutlined/>} onClick={this.handleTypeAdd}>新增类型</Button>}>
             <Splitter>
-                <Splitter.Panel defaultSize={300}>
+                <Splitter.Panel defaultSize={300} style={{paddingRight: 8}}>
                     <Card loading={this.state.treeLoading}
-                          title='字典类型'
-                          extra={<Space>
-                              <Button size='small' shape='round' icon={<SyncOutlined/>}
-                                      onClick={this.loadTree}/>
-                          </Space>}
+                          size='small'
                     >
-                        <ButtonList>
-                            <Button type='primary' size='small' onClick={this.handleTypeAdd}>
-                                <PlusOutlined/> 新增类型
-                            </Button>
-                            <Button size='small' disabled={!selectedType} onClick={this.handleTypeEdit}>
-                                <EditOutlined/> 编辑
-                            </Button>
-                            <Popconfirm title='是否确定删除此类型及其所有子类型和字典项？'
-                                        disabled={!selectedType}
-                                        onConfirm={this.handleTypeDelete}>
-                                <Button size='small' disabled={!selectedType}>
-                                    <DeleteOutlined/> 删除
-                                </Button>
-                            </Popconfirm>
-                        </ButtonList>
-                        <Gap/>
+                        <Typography.Text strong style={{marginBottom: 8, display: 'block'}}>字典类型</Typography.Text>
                         <Tree
                             treeData={this.state.typeTree}
                             onSelect={this.onTreeSelect}
@@ -191,24 +181,38 @@ export default class extends React.Component {
                             blockNode
                         />
                         {this.state.typeTree.length === 0 && <Empty/>}
-
-
                     </Card>
                 </Splitter.Panel>
 
-                <Splitter.Panel>
-                    <Card title={hasTypeSelected ? `${selectedType.typeLabel} 的字典项` : '字典项'}
-                          extra={
-                              hasTypeSelected
-                                  ? <Button type='primary' onClick={this.handleItemAdd}>
-                                      <PlusOutlined/> 新增
-                                  </Button>
-                                  : null
-                          }
-                    >
-                        {!hasTypeSelected
-                            ? <Empty description='请在左侧选择一个字典类型'/>
-                            : <ProTable
+                <Splitter.Panel style={{paddingLeft: 8}}>
+                    <Card size='small' style={{marginBottom: 8}}>
+                        <div style={{display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 8}}>
+                            <Typography.Text strong>类型信息</Typography.Text>
+                            {hasTypeSelected && (
+                                <span>
+                                    <Button size='small' icon={<EditOutlined/>} perm='sys-dict:update'
+                                            onClick={this.handleTypeEdit} style={{marginRight: 4}}>编辑</Button>
+                                    <Popconfirm perm='sys-dict:delete' title='是否确定删除此类型及其所有子类型和字典项？'
+                                                onConfirm={this.handleTypeDelete}>
+                                        <Button size='small' icon={<DeleteOutlined/>}>删除</Button>
+                                    </Popconfirm>
+                                </span>
+                            )}
+                        </div>
+                        {hasTypeSelected && <Descriptions size='small' column={3}>
+                            <Descriptions.Item label="名称">{selectedType.typeLabel}</Descriptions.Item>
+                            <Descriptions.Item label="类型编码">{selectedType.typeCode}</Descriptions.Item>
+                            <Descriptions.Item label="分类">{this.getParentLabel() || '-'}</Descriptions.Item>
+                            <Descriptions.Item label="序号">{selectedType.seq}</Descriptions.Item>
+                            <Descriptions.Item label="启用"><ViewBooleanEnableDisable value={selectedType.enabled}/></Descriptions.Item>
+                        </Descriptions>}
+                    </Card>
+                    <Card size='small'>
+                        <div style={{display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 8}}>
+                            <Typography.Text strong>字典项</Typography.Text>
+                            {hasTypeSelected && <Button type='primary' icon={<PlusOutlined/>} onClick={this.handleItemAdd}>新增字典项</Button>}
+                        </div>
+                        {hasTypeSelected && <ProTable
                                 rowKey='uid'
                                 actionRef={this.tableRef}
                                 request={(params) => {
@@ -216,7 +220,6 @@ export default class extends React.Component {
                                     return HttpUtils.get('admin/dict/page', params)
                                 }}
                                 columns={this.columns}
-                                showToolbarSearch
                             />
                         }
                     </Card>

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

@@ -89,15 +89,9 @@ export default class extends React.Component {
     ]
 
     render() {
-        return <Page>
+        return <Page title="文件管理" description="管理系统上传文件" actions={<Button type='primary' icon={<CloudUploadOutlined/>} onClick={() => this.setState({formOpen: true})}>上传文件</Button>}>
             <ProTable
                 actionRef={this.tableRef}
-                toolBarRender={() => {
-                    return <Button type='primary' icon={<CloudUploadOutlined/>}
-                                   onClick={() => this.setState({formOpen: true})}>
-                        上传文件
-                    </Button>
-                }}
                 request={(params) => {
                     return HttpUtils.get('admin/sysFile/page', params);
                 }}

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

@@ -15,7 +15,6 @@ import {
     Tag
 } from 'antd'
 import {PlusOutlined} from "@ant-design/icons";
-
 import {ButtonList, HttpUtils, Page, ProTable, StringUtils, SysUtils, ValueType} from "../../../framework";
 
 
@@ -189,23 +188,19 @@ export default class extends React.Component {
 
 
     render() {
-        return <Page>
+        return <Page title="作业调度" description="管理定时作业任务" actions={<><Button type='primary' icon={<PlusOutlined/>} onClick={() => this.handleAdd()}>新增</Button><Button onClick={this.showStatus}>查看状态</Button></>}>
             <ProTable
                 actionRef={this.tableRef}
-                toolBarRender={() => {
-                    return <ButtonList>
-                        <Button type='primary' onClick={() => this.handleAdd()} icon={<PlusOutlined/>}>
-                            新增
-                        </Button>
-                        <Button onClick={this.showStatus}>
-                            查看状态
-                        </Button>
-                    </ButtonList>
-                }}
                 request={(params) => HttpUtils.get('admin/job/page', params)}
                 columns={this.columns}
-                showToolbarSearch
-            />
+            >
+                <Form.Item label='名称' name='name'>
+                    <Input/>
+                </Form.Item>
+                <Form.Item label='执行类' name='jobClass'>
+                    <Input/>
+                </Form.Item>
+            </ProTable>
 
 
             <Modal title='作业调度'

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

@@ -55,7 +55,7 @@ export default class extends React.Component {
 
 
     render() {
-        return <Page>
+        return <Page title="操作日志" description="查看系统操作日志">
             <ProTable
                 request={(params) => HttpUtils.get('admin/sysLog/page', params)}
                 columns={this.columns}