@jiangood/open-admin 3.1.6 → 3.1.7

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

@@ -1,6 +1,6 @@
-import {Button, Collapse, Drawer, Form, Input, message, Modal, Select, Space, Switch, Tag, Typography} from 'antd'
+import {Button, Card, Collapse, Drawer, Form, Input, Modal, Select, Space, Switch, Tag, Typography} from 'antd'
 import React from 'react'
-import {HttpClient, Page, Perm} from '../../../framework'
+import {HttpClient, getMessageApi, getToken, Page, Perm} from '../../../framework'
 
 /**
  * 代码生成：动态扫描实体，按实体生成常见 CRUD 代码并写入项目源码目录。
@@ -52,7 +52,7 @@ export default class CodegenPage extends React.Component {
 
     handlePreview = () => {
         if (!this.state.className) {
-            message.warning('请先选择实体')
+            getMessageApi().warning('请先选择实体')
             return
         }
         this.setState({loading: true})
@@ -60,13 +60,13 @@ export default class CodegenPage extends React.Component {
             this.setState({files: rs.data || [], previewOpen: true})
         }).catch(e => {
             console.error('[Codegen] 预览失败:', e)
-            message.error(e?.message || '预览失败')
+            getMessageApi().error(e?.message || '预览失败')
         }).finally(() => this.setState({loading: false}))
     }
 
     handleGenerate = () => {
         if (!this.state.className) {
-            message.warning('请先选择实体')
+            getMessageApi().warning('请先选择实体')
             return
         }
         this.setState({confirmOpen: true})
@@ -78,17 +78,17 @@ export default class CodegenPage extends React.Component {
             this.setState({result: rs.data, resultOpen: true, previewOpen: false})
         }).catch(e => {
             console.error('[Codegen] 生成失败:', e)
-            message.error(e?.message || '生成失败')
+            getMessageApi().error(e?.message || '生成失败')
         }).finally(() => this.setState({loading: false}))
     }
 
     copy = (text) => {
         if (navigator.clipboard) {
             navigator.clipboard.writeText(text)
-                .then(() => message.success('已复制'))
-                .catch(() => message.error('复制失败'))
+                .then(() => getMessageApi().success('已复制'))
+                .catch(() => getMessageApi().error('复制失败'))
         } else {
-            message.warning('当前浏览器不支持剪贴板')
+            getMessageApi().warning('当前浏览器不支持剪贴板')
         }
     }
 
@@ -96,47 +96,52 @@ export default class CodegenPage extends React.Component {
 
     render() {
         const selected = this.selectedOption()
-        return <Page title='代码生成' description='扫描实体，生成 Repository / Service / Controller / 前端页面 / 菜单 代码并写入项目源码目录'>
-            <Form layout='vertical' style={{maxWidth: 720}}>
-                <Form.Item label='实体' required>
-                    <Select
-                        showSearch
-                        optionFilterProp='label'
-                        placeholder='请选择实体'
-                        options={this.state.entities}
-                        value={this.state.className}
-                        onChange={this.handleEntityChange}
-                    />
-                </Form.Item>
-                {selected?.data?.frameworkEntity &&
-                    <Typography.Text type='warning'>
-                        该实体属于框架内置包（{selected.data.packageName}），生成的文件会写入同一包路径，请确认输出位置后再生成。
-                    </Typography.Text>
-                }
-                <Form.Item label='模块名（请求前缀 / 前端目录）'>
-                    <Input placeholder='如 customer'
-                           value={this.state.module}
-                           onChange={e => this.setState({module: e.target.value})}/>
-                </Form.Item>
-                <Form.Item label='中文名'>
-                    <Input value={this.state.label}
-                           onChange={e => this.setState({label: e.target.value})}/>
-                </Form.Item>
-                <Form.Item label='父菜单 id' tooltip='默认挂在系统管理（sys）下'>
-                    <Input value={this.state.parentMenu}
-                           onChange={e => this.setState({parentMenu: e.target.value})}/>
-                </Form.Item>
-                <Form.Item label='覆盖已存在文件'>
-                    <Switch checked={this.state.overwrite}
-                            onChange={checked => this.setState({overwrite: checked})}/>
-                </Form.Item>
-                <Space>
-                    <Perm code='sys-codegen:generate'>
-                        <Button type='primary' loading={this.state.loading} onClick={this.handlePreview}>预览</Button>
-                    </Perm>
-                    <Button onClick={this.loadEntities}>刷新实体</Button>
-                </Space>
-            </Form>
+        return <Page title='代码生成'
+                     description='扫描实体，生成 Repository / Service / Controller / 前端页面 / 菜单 代码并写入项目源码目录'
+                     actions={
+                         <Space>
+                             <Perm code='sys-codegen:generate'>
+                                 <Button type='primary' loading={this.state.loading} onClick={this.handlePreview}>预览</Button>
+                             </Perm>
+                             <Button onClick={this.loadEntities}>刷新实体</Button>
+                         </Space>
+                     }>
+            <Card size='small'>
+                <Form layout='vertical' style={{maxWidth: 720}}>
+                    <Form.Item label='实体' required>
+                        <Select
+                            showSearch
+                            optionFilterProp='label'
+                            placeholder='请选择实体'
+                            options={this.state.entities}
+                            value={this.state.className}
+                            onChange={this.handleEntityChange}
+                        />
+                    </Form.Item>
+                    {selected?.data?.frameworkEntity &&
+                        <Typography.Text type='warning'>
+                            该实体属于框架内置包（{selected.data.packageName}），生成的文件会写入同一包路径，请确认输出位置后再生成。
+                        </Typography.Text>
+                    }
+                    <Form.Item label='模块名（请求前缀 / 前端目录）'>
+                        <Input placeholder='如 customer'
+                               value={this.state.module}
+                               onChange={e => this.setState({module: e.target.value})}/>
+                    </Form.Item>
+                    <Form.Item label='中文名'>
+                        <Input value={this.state.label}
+                               onChange={e => this.setState({label: e.target.value})}/>
+                    </Form.Item>
+                    <Form.Item label='父菜单 id' tooltip='默认挂在系统管理（sys）下'>
+                        <Input value={this.state.parentMenu}
+                               onChange={e => this.setState({parentMenu: e.target.value})}/>
+                    </Form.Item>
+                    <Form.Item label='覆盖已存在文件'>
+                        <Switch checked={this.state.overwrite}
+                                onChange={checked => this.setState({overwrite: checked})}/>
+                    </Form.Item>
+                </Form>
+            </Card>
 
             <Drawer title='生成预览' width={960}
                     open={this.state.previewOpen}
@@ -164,7 +169,7 @@ export default class CodegenPage extends React.Component {
                                 <pre style={{
                                     maxHeight: 420,
                                     overflow: 'auto',
-                                    background: '#f6f8fa',
+                                    background: String(getToken().colorFillTertiary ?? '#f6f8fa'),
                                     padding: 12,
                                     borderRadius: 4,
                                 }}>{file.content}</pre>

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

@@ -6,14 +6,14 @@ import {
     Divider,
     Form,
     Input,
-    message,
     Modal,
     Select,
+    Spin,
     Switch,
     Tag
 } from 'antd'
 import {PlusOutlined} from "@ant-design/icons";
-import {FormModal, HttpClient, Page, PermActions, ProTable, UrlUtils, ValueType} from "../../../framework";
+import {FormModal, getMessageApi, HttpClient, Page, PermActions, ProTable, UrlUtils, ValueType} from "../../../framework";
 
 
 const cronOptions = [
@@ -53,6 +53,10 @@ export default class JobPage extends React.Component {
         status: null,
 
         executeRecordOpen: false,
+
+        logOpen: false,
+        logLoading: false,
+        logContent: '',
     }
     tableRef = React.createRef()
     modalRef = React.createRef()
@@ -91,7 +95,7 @@ export default class JobPage extends React.Component {
     }
 
     handleDelete = row => {
-        const hide = message.loading("删除任务中...")
+        const hide = getMessageApi().loading("删除任务中...")
         HttpClient.post('admin/job/delete', {id: row.id}, null, {toastError: false}).then(() => {
             hide();
             this.tableRef.current.reload();
@@ -178,6 +182,19 @@ export default class JobPage extends React.Component {
         this.setState({executeRecordOpen: true, selectedRecord: record})
     }
 
+    showLog = (record) => {
+        this.setState({logOpen: true, logLoading: true, logContent: '', selectedLogRecord: record})
+        HttpClient.get('admin/sys/log/job/' + record.id, null, {toastError: false}).then(content => {
+            this.setState({
+                logContent: typeof content === 'string' ? content : JSON.stringify(content),
+                logLoading: false
+            })
+        }).catch(e => {
+            console.error('[Job] 加载任务日志失败:', e)
+            this.setState({logContent: '日志加载失败：' + (e?.message || ''), logLoading: false})
+        })
+    }
+
 
     render() {
         return <Page>
@@ -291,10 +308,7 @@ export default class JobPage extends React.Component {
                     {
                         title: '操作',
                         dataIndex: 'option',
-                        render: (_, record) => {
-                            const url = UrlUtils.contextPath('/admin/sys/log/job/' + record.id);
-                            return <a href={url} target='_blank'>日志</a>;
-                        },
+                        render: (_, record) => <a onClick={() => this.showLog(record)}>日志</a>,
                     }
                 ]} request={(params) => {
                     params.jobId = this.state.selectedRecord.id
@@ -302,6 +316,29 @@ export default class JobPage extends React.Component {
                 }}></ProTable>
 
             </Modal>
+
+            <Modal title='任务日志'
+                   open={this.state.logOpen}
+                   onCancel={() => this.setState({logOpen: false})}
+                   width={1024}
+                   destroyOnHidden
+                   footer={this.state.selectedLogRecord ? (
+                       <a href={UrlUtils.contextPath('/admin/sys/log/job/' + this.state.selectedLogRecord.id)}
+                          target='_blank' rel='noreferrer'>在新窗口打开</a>
+                   ) : null}
+            >
+                <Spin spinning={this.state.logLoading}>
+                    <pre style={{
+                        margin: 0,
+                        maxHeight: '60vh',
+                        overflow: 'auto',
+                        whiteSpace: 'pre-wrap',
+                        wordBreak: 'break-all',
+                        fontSize: 12,
+                        lineHeight: 1.6
+                    }}>{this.state.logContent}</pre>
+                </Spin>
+            </Modal>
         </Page>
     }
 

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

@@ -1,19 +1,17 @@
 import {PlusOutlined} from '@ant-design/icons'
-import {Button, Form, Input, InputNumber, Modal, Transfer} from 'antd'
+import {Button, Form, Input, InputNumber} from 'antd'
 import React from 'react'
-import {FieldBoolean, FormModal, HttpClient, Page, PageUtils, PermActions, ProTable, ViewText} from "../../../framework";
+import {FieldBoolean, FormModal, HttpClient, Page, PageUtils, PermActions, ProTable, UserPicker, ViewText} from "../../../framework";
 
 
 export default class RolePage extends React.Component {
 
     state = {
-        usersModalOpen: false,
+        pickerOpen: false,
         usersModalLoading: false,
         selectedRecord: null,
 
-        userList: [],
         targetKeys: [],
-        selectedKeys: [],
     }
 
     modalRef = React.createRef()
@@ -28,9 +26,8 @@ export default class RolePage extends React.Component {
     }
 
     handleEditUser = record => {
-        this.setState({usersModalOpen: true, selectedRecord: record})
         HttpClient.get('admin/sysRole/user-list', {id: record.id}).then(rs => {
-            this.setState({userList: rs.data.list, targetKeys: rs.data.selectedKeys})
+            this.setState({pickerOpen: true, selectedRecord: record, targetKeys: rs.data?.selectedKeys || []})
         })
     }
 
@@ -121,14 +118,14 @@ export default class RolePage extends React.Component {
         },
     ]
 
-    handleSaveUsers = () => {
+    handleSaveUsers = userIdList => {
         this.setState({usersModalLoading: true})
         const params = {
             id: this.state.selectedRecord.id,
-            userIdList: this.state.targetKeys
+            userIdList
         }
         HttpClient.post('admin/sysRole/grant-users', params, null, {toastError: false}).then(() => {
-            this.setState({usersModalOpen: false, usersModalLoading: false})
+            this.setState({pickerOpen: false, usersModalLoading: false})
         }).catch(() => {
             this.setState({usersModalLoading: false})
         })
@@ -185,39 +182,16 @@ export default class RolePage extends React.Component {
             </FormModal>
 
 
-            <Modal title={'角色用户' + "【" + this.state.selectedRecord?.name + '】'}
-                   open={this.state.usersModalOpen}
-                   confirmLoading={this.state.usersModalLoading}
-                   destroyOnHidden
-                   mask={{ closable: false }}
-                   width={800}
-                   onCancel={() => this.setState({usersModalOpen: false})}
-                   onOk={this.handleSaveUsers}
-            >
-
-
-                <Transfer
-                    styles={{ section: { height: '60vh', width: 300 } }}
-
-                    dataSource={this.state.userList} titles={["未选择", "已选择"]}
-                    targetKeys={this.state.targetKeys}
-                    selectedKeys={this.state.selectedKeys}
-                    render={item => item.title}
-                    onChange={(nextTargetKeys, _direction, _moveKeys) => {
-                        this.setState({
-                            targetKeys: nextTargetKeys
-                        })
-                    }}
-                    onSelectChange={(sourceSelectedKeys, targetSelectedKeys) => {
-                        this.setState({
-                            selectedKeys: [...sourceSelectedKeys, ...targetSelectedKeys]
-                        })
-                    }}
-                    showSearch
-                />
-
-
-            </Modal>
+            <UserPicker
+                open={this.state.pickerOpen}
+                title={'为「' + (this.state.selectedRecord?.name || '') + '」角色分配用户'}
+                value={this.state.targetKeys}
+                confirmLoading={this.state.usersModalLoading}
+                requestUrl='admin/sysRole/user-page'
+                usersUrl='admin/sysRole/user-by-ids'
+                onOk={this.handleSaveUsers}
+                onCancel={() => this.setState({pickerOpen: false})}
+            />
         </Page>
 
 

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

@@ -80,10 +80,6 @@ export default class UserPage extends React.Component {
         },
 
 
-        {
-            title: '手机',
-            dataIndex: 'phone'
-        },
         {
             title: '邮箱',
             dataIndex: 'email'

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

@@ -1,6 +1,6 @@
-import {Form, Modal, message} from 'antd';
+import {Form, Modal} from 'antd';
 import React from 'react';
-import {FieldDictSelect, FieldRemoteSelect, FieldSysOrgTree, HttpClient} from "../../../framework";
+import {FieldDictSelect, FieldRemoteSelect, FieldSysOrgTree, getMessageApi, HttpClient} from "../../../framework";
 
 
 export default class UserPerm extends React.Component {
@@ -41,7 +41,7 @@ export default class UserPerm extends React.Component {
             })
             this.props.onOk()
         }).catch(e => {
-            message.error(HttpClient.errToMsg(e))
+            getMessageApi().error(HttpClient.errToMsg(e))
             this.setState({
                 confirmLoading: false
             })

package/src/style/global.less

@@ -6,29 +6,29 @@ table.oa-table {
   table-layout: fixed;
 
   th {
-    background-color: #f2f2f2; /* 背景色 */
-    color: #333; /* 文字颜色 */
+    background-color: var(--oa-color-fill, #fafafa); /* 背景色（跟随明暗主题） */
+    color: var(--oa-color-text, #333); /* 文字颜色 */
     font-weight: bold; /* 加粗 */
     padding: 12px 15px; /* 内边距 */
     text-align: left; /* 文字对齐 */
-    border-bottom: 2px solid #ddd; /* 底部边框 */
+    border-bottom: 2px solid var(--oa-color-border, #ddd); /* 底部边框 */
   }
 
   td {
     padding: 10px 15px; /* 内边距 */
-    border-bottom: 1px solid #ddd; /* 底部边框 */
+    border-bottom: 1px solid var(--oa-color-border, #ddd); /* 底部边框 */
     text-align: left; /* 文字对齐 */
   }
 
   /* 表格行悬停效果 */
 
   tr:hover {
-    background-color: #f5f5f5; /* 悬停背景色 */
+    background-color: var(--oa-color-fill, #f5f5f5); /* 悬停背景色 */
   }
 
   /* 斑马纹效果 - 交替行颜色 */
   tr:nth-child(even) {
-    background-color: #f9f9f9;
+    background-color: var(--oa-color-bg-layout, #f9f9f9);
   }
 
   /* 响应式表格 - 在小屏幕上添加水平滚动 */