@jiangood/open-admin 2.5.9 → 3.0.1

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

@@ -1,5 +1,5 @@
 import {PlusOutlined} from '@ant-design/icons';
-import {Button, Card, Form, Input, Modal, Popconfirm, Select, Splitter} from 'antd';
+import {Button, Card, Form, Input, Modal, Popconfirm, Select, Splitter, message} from 'antd';
 import React from 'react';
 import {
     PermActions,
@@ -7,36 +7,41 @@ import {
     FieldBoolean,
     FieldRemoteSelect,
     FieldSysOrgTreeSelect,
+    FormModal,
     HttpUtils,
     OrgTree,
     Page,
     ProTable,
+    ViewText,
 } from "../../../framework";
 import UserPerm from "./userPerm";
 
 export default class extends React.Component {
 
     state = {
-        showAddForm: false,
-        showEditForm: false,
-        formValues: {},
-
         currentOrgId: null,
+        addResultModal: { open: false, account: '', password: '' },
+        resetPwdUser: null,
     }
     permRef = React.createRef();
 
-    formRef = React.createRef()
+    modalRef = React.createRef()
     tableRef = React.createRef()
+    resetPwdRef = React.createRef()
 
     resetPwd(row) {
-        HttpUtils.post('admin/sysUser/reset-pwd', {id: row.id}).then(rs => {
-            Modal.success({
-                title: '重置密码成功',
-                content: rs
-            })
+        this.setState({resetPwdUser: row}, () => {
+            this.resetPwdRef.current.open()
         })
     }
 
+    onFinishResetPwd = async values => {
+        await HttpUtils.post('admin/sysUser/reset-pwd', {id: this.state.resetPwdUser.id, password: values.password})
+        message.success('重置密码成功')
+        this.setState({resetPwdUser: null})
+        this.tableRef.current?.reload()
+    }
+
     handleDelete = r => {
         HttpUtils.post('admin/sysUser/delete', {id: r.id}).then(rs => {
             this.tableRef.current.reload();
@@ -48,12 +53,11 @@ export default class extends React.Component {
     }
 
     handleAdd = () => {
-        this.setState({formOpen: true, formValues: {}})
+        this.modalRef.current.open({})
     }
 
     handleEdit = record => {
-        record.deptId = record.deptId || record.unitId
-        this.setState({formOpen: true, formValues: record})
+        this.modalRef.current.open({...record, deptId: record.deptId || record.unitId})
     }
 
     columns = [
@@ -125,9 +129,7 @@ export default class extends React.Component {
                     <Button size='small' perm='sys-user:grant-permission'
                             onClick={() => this.permRef.current.show(record)}> 授权 </Button>
 
-                    <Popconfirm perm='sys-user:reset-password' title='确认重置密码？' onConfirm={() => this.resetPwd(record)}>
-                        <Button size='small'>重置密码</Button>
-                    </Popconfirm>
+                    <Button size='small' perm='sys-user:reset-password' onClick={() => this.resetPwd(record)}>重置密码</Button>
 
                     <Popconfirm perm='sys-user:delete' title={'是否确定删除用户'}
                                 onConfirm={() => this.handleDelete(record)}>
@@ -138,18 +140,25 @@ export default class extends React.Component {
         },
     ];
 
-    onFinish = values => {
+    onFinish = async values => {
         const isNew = !values.id;
         const url = isNew ? 'admin/sysUser/create' : 'admin/sysUser/update';
-        HttpUtils.post(url, values).then(rs => {
-            this.setState({formOpen: false})
-            this.tableRef.current.reload()
-        })
+        const result = await HttpUtils.post(url, values)
+        if (result && result.password) {
+            this.setState({
+                addResultModal: {
+                    open: true,
+                    account: values.account,
+                    password: result.password,
+                }
+            })
+        }
+        this.tableRef.current.reload()
     }
 
     render() {
 
-        return <Page title="用户管理" description="管理系统用户" actions={<Button perm='sys-user:create' type="primary" icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>}>
+        return <Page title="用户管理" description="管理系统用户">
             <Splitter>
                 <Splitter.Panel defaultSize={350} style={{paddingRight: 8}}>
                     <Card size='small'>
@@ -158,75 +167,113 @@ export default class extends React.Component {
                 </Splitter.Panel>
                 <Splitter.Panel style={{paddingLeft: 8}}>
                     <ProTable
-                        searchColumns={3}
+                        searchFormCols={3}
                         actionRef={this.tableRef}
+                        toolBarRender={() => (
+                            <PermActions>
+                                <Button perm='sys-user:create' type='primary' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>
+                            </PermActions>
+                        )}
                         request={(params) => {
                             params.orgId = this.state.currentOrgId
                             return HttpUtils.get('admin/sysUser/page', params)
                         }}
                         columns={this.columns}
-                    >
-                        <Form.Item label='姓名' name='name'>
-                            <Input/>
-                        </Form.Item>
-                        <Form.Item label='登录账号' name='account'>
-                            <Input/>
-                        </Form.Item>
-                        <Form.Item label='手机号' name='phone'>
-                            <Input/>
-                        </Form.Item>
-                        <Form.Item label='角色' name='roleId'>
-                            <FieldRemoteSelect url='admin/sysRole/options' placeholder='请选择角色'/>
-                        </Form.Item>
-                        <Form.Item label='状态' name='enabled'>
-                            <Select allowClear placeholder='全部'>
-                                <Select.Option value={true}>启用</Select.Option>
-                                <Select.Option value={false}>停用</Select.Option>
-                            </Select>
-                        </Form.Item>
-                    </ProTable>
+                        searchFormRender={() => (
+                            <>
+                                <Form.Item label='姓名' name='name'>
+                                    <Input/>
+                                </Form.Item>
+                                <Form.Item label='登录账号' name='account'>
+                                    <Input/>
+                                </Form.Item>
+                                <Form.Item label='手机号' name='phone'>
+                                    <Input/>
+                                </Form.Item>
+                                <Form.Item label='角色' name='roleId'>
+                                    <FieldRemoteSelect url='admin/sysRole/options' placeholder='请选择角色'/>
+                                </Form.Item>
+                                <Form.Item label='状态' name='enabled'>
+                                    <Select allowClear placeholder='全部' options={[{value: true, label: '启用'}, {value: false, label: '停用'}]}/>
+                                </Form.Item>
+                            </>
+                        )}
+                    />
                 </Splitter.Panel>
             </Splitter>
 
 
-            <Modal title='系统用户'
-                   open={this.state.formOpen}
-                   onOk={() => this.formRef.current.submit()}
-                   onCancel={() => this.setState({formOpen: false})}
-                   destroyOnHidden
-            >
+            <FormModal ref={this.modalRef} title='系统用户' onFinish={this.onFinish}>
+
+                <Form.Item label='所属机构' name='deptId' rules={[{required: true}]}>
+                    <FieldSysOrgTreeSelect/>
+                </Form.Item>
+
+                <Form.Item label='姓名' name='name' rules={[{required: true}]}>
+                    <Input/>
+                </Form.Item>
+                <Form.Item label='账号' name='account' rules={[{required: true}]}>
+                    <Input/>
+                </Form.Item>
 
-                <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='phone'>
+                    <Input/>
+                </Form.Item>
+                <Form.Item label='邮箱' name='email'>
+                    <Input/>
+                </Form.Item>
 
-                    <Form.Item label='所属机构' name='deptId' rules={[{required: true}]}>
-                        <FieldSysOrgTreeSelect/>
-                    </Form.Item>
+                <Form.Item label='启用状态' name='enabled' rules={[{required: true}]}>
+                    <FieldBoolean/>
 
-                    <Form.Item label='姓名' name='name' rules={[{required: true}]}>
-                        <Input/>
-                    </Form.Item>
-                    <Form.Item label='账号' name='account' rules={[{required: true}]}>
-                        <Input/>
-                    </Form.Item>
+                </Form.Item>
 
 
-                    <Form.Item label='电话' name='phone'>
-                        <Input/>
-                    </Form.Item>
-                    <Form.Item label='邮箱' name='email'>
-                        <Input/>
-                    </Form.Item>
 
-                    <Form.Item label='启用状态' name='enabled' rules={[{required: true}]}>
-                        <FieldBoolean/>
-                    </Form.Item>
+            </FormModal>
 
-                </Form>
+
+            <Modal
+                title="添加用户成功"
+                open={this.state.addResultModal.open}
+                onOk={() => this.setState({addResultModal: {open: false, account: '', password: ''}})}
+                onCancel={() => this.setState({addResultModal: {open: false, account: '', password: ''}})}
+                width={420}
+                footer={
+                    <div style={{display: 'flex', justifyContent: 'flex-end', gap: 8}}>
+                        <Button onClick={() => {
+                            navigator.clipboard.writeText(`账号：${this.state.addResultModal.account}\n密码：${this.state.addResultModal.password}`);
+                            message.success('复制成功')
+                        }}>复制</Button>
+                        <Button type="primary" onClick={() => this.setState({addResultModal: {open: false, account: '', password: ''}})}>确定</Button>
+                    </div>
+                }
+            >
+                <div>
+                    <div style={{marginBottom: 8}}>
+                        账号：{this.state.addResultModal.account}
+                    </div>
+                    <div>
+                        密码：{this.state.addResultModal.password}
+                    </div>
+                </div>
             </Modal>
 
+            <FormModal ref={this.resetPwdRef} title='重置密码' onFinish={this.onFinishResetPwd} width={420}>
+                {this.state.resetPwdUser && (
+                    <>
+                        <Form.Item label="账号">
+                            <ViewText value={this.state.resetPwdUser.account}/>
+                        </Form.Item>
+                        <Form.Item label="姓名">
+                            <ViewText value={this.state.resetPwdUser.name}/>
+                        </Form.Item>
+                    </>
+                )}
+                <Form.Item label="新密码" name="password" rules={[{required: true, message: '请输入新密码'}]}>
+                    <Input.Password placeholder="请输入新密码"/>
+                </Form.Item>
+            </FormModal>
 
             <UserPerm ref={this.permRef} onOk={() => this.tableRef.current.reload()}/>
 

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

@@ -1,6 +1,6 @@
 import {Form, Modal} from 'antd';
 import React from 'react';
-import {FieldDictSelect, FieldRemoteSelectMultiple, FieldSysOrgTree, HttpUtils} from "../../../framework";
+import {FieldDictSelect, FieldRemoteSelect, FieldSysOrgTree, HttpUtils} from "../../../framework";
 
 
 export default class UserPerm extends React.Component {
@@ -70,7 +70,7 @@ export default class UserPerm extends React.Component {
             >
                 <Form.Item name='id' noStyle></Form.Item>
                 <Form.Item label='角色' name='roleIds' rules={[{required: true}]}>
-                    <FieldRemoteSelectMultiple url='admin/sysRole/options'/>
+                    <FieldRemoteSelect url='admin/sysRole/options' multiple />
                 </Form.Item>
                 <Form.Item label='数据权限' name='dataPermType' rules={[{required: true}]}>
                     <FieldDictSelect typeCode='dataPermType'/>

package/vite-plugin/index.js

@@ -0,0 +1,107 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
+const VIRTUAL_ID = 'virtual:open-admin/routes';
+const RESOLVED_ID = '\0open-admin:routes';
+
+function walk(dir, out = []) {
+    if (!fs.existsSync(dir)) return out;
+    for (const item of fs.readdirSync(dir)) {
+        const full = path.join(dir, item);
+        if (fs.statSync(full).isDirectory()) {
+            walk(full, out);
+        } else {
+            out.push(full.split(path.sep).join('/'));
+        }
+    }
+    return out;
+}
+
+/** 页面文件扩展名：支持 .jsx / .tsx */
+const PAGE_EXT_RE = /\.(jsx|tsx)$/;
+const PAGE_PATH_RE = /src\/pages\/(.+)\.(jsx|tsx)$/;
+
+/** 收集页面文件：业务项目 src/pages 优先，node_modules 中 @jiangood 框架包兜底 */
+function collectPageFiles(root) {
+    const business = walk(path.resolve(root, 'src/pages')).filter(f => PAGE_EXT_RE.test(f));
+    const framework = [];
+    const scopeDir = path.resolve(root, 'node_modules/@jiangood');
+    if (fs.existsSync(scopeDir)) {
+        for (const pkg of fs.readdirSync(scopeDir)) {
+            framework.push(...walk(path.join(scopeDir, pkg, 'src/pages')).filter(f => PAGE_PATH_RE.test(f)));
+        }
+    }
+    return [...business, ...framework];
+}
+
+/** 页面文件 → 路由路径；大写开头（组件文件）返回 null */
+function fileToRoutePath(file) {
+    const m = file.match(PAGE_PATH_RE);
+    if (!m) return null;
+    const mainName = m[1].split('/').pop();
+    if (mainName.charAt(0) !== mainName.charAt(0).toLowerCase()) return null;
+    let routePath = '/' + m[1].replaceAll('$', ':');
+    if (routePath.endsWith('/index')) routePath = routePath.substring(0, routePath.length - 6);
+    return routePath || '/';
+}
+
+/** 生成可被 Vite dev/build 解析的 import 路径 */
+function toImportPath(root, file) {
+    const nm = file.indexOf('/node_modules/');
+    if (nm !== -1) {
+        // 依赖框架包：bare specifier，如 @jiangood/open-admin/src/pages/login.jsx
+        return file.substring(nm + '/node_modules/'.length);
+    }
+    // 项目内页面：root 相对，如 /src/pages/login.jsx
+    return '/' + path.relative(root, file).split(path.sep).join('/');
+}
+
+function generateRoutesModule(root) {
+    const seen = new Set();
+    const imports = [];
+    const entries = [];
+    collectPageFiles(root).forEach((file, i) => {
+        const routePath = fileToRoutePath(file);
+        if (!routePath) return;
+        if (seen.has(routePath)) {
+            console.warn(`[open-admin] 路由 ${routePath} 被覆盖（来自 ${file}）`);
+            return;
+        }
+        seen.add(routePath);
+        imports.push(`import P${i} from ${JSON.stringify(toImportPath(root, file))};`);
+        entries.push(`    {path: ${JSON.stringify(routePath)}, component: P${i}},`);
+    });
+    return `${imports.join('\n')}\n\nexport default [\n${entries.join('\n')}\n];\n`;
+}
+
+export default function openAdmin() {
+    let root;
+    return {
+        name: 'open-admin',
+
+        configResolved(resolved) {
+            root = resolved.root;
+        },
+
+        resolveId(id) {
+            if (id === VIRTUAL_ID) return RESOLVED_ID;
+        },
+
+        load(id) {
+            if (id === RESOLVED_ID) return generateRoutesModule(root);
+        },
+
+        configureServer(server) {
+            const onPagesFileChange = (file) => {
+                if (!PAGE_PATH_RE.test(file.split(path.sep).join('/'))) return;
+                const mod = server.moduleGraph.getModuleById(RESOLVED_ID);
+                if (mod) {
+                    server.moduleGraph.invalidateModule(mod);
+                    server.ws.send({type: 'full-reload'});
+                }
+            };
+            server.watcher.on('add', onPagesFileChange);
+            server.watcher.on('unlink', onPagesFileChange);
+        },
+    };
+}

package/config/common-plugin.js

@@ -1,145 +0,0 @@
-import * as fs from "fs";
-import * as path from "path";
-import Utils from './utils.js';
-
-const pkgName = '@jiangood/open-admin';
-
-function convertFileToRoute(file) {
-    const absPath = file;
-    const mainName = Utils.getFileMainName(file);
-
-    if (mainName.charAt(0) !== mainName.charAt(0).toLowerCase()) {
-        return null;
-    }
-
-    let routePath = file.substring(file.indexOf('pages') + 6, file.length - 4);
-    routePath = routePath.replaceAll("$", ":");
-
-    let parentId = "@@/global-layout";
-
-    if (routePath.endsWith("/index")) {
-        routePath = routePath.substring(0, routePath.length - 6);
-    }
-
-    return {
-        absPath,
-        id: routePath,
-        path: routePath,
-        file,
-        parentId
-    };
-}
-
-export default (api) => {
-    api.describe({
-        key: 'open-admin',
-    });
-
-    // Inject build-time defines and UmiJS defaults from environment variables
-    const servletContext = process.env.SERVLET_CONTEXT || '/change-this-servlet-context';
-    const isProd = process.env.NODE_ENV === 'production';
-    const serverPort = process.env.SERVER_PORT || '8080';
-
-    const theme = {};
-    if (process.env.THEME_PRIMARY_COLOR) theme["primary-color"] = process.env.THEME_PRIMARY_COLOR;
-    if (process.env.THEME_SUCCESS_COLOR) theme["success-color"] = process.env.THEME_SUCCESS_COLOR;
-    if (process.env.THEME_WARNING_COLOR) theme["warning-color"] = process.env.THEME_WARNING_COLOR;
-    if (process.env.THEME_ERROR_COLOR) theme["error-color"] = process.env.THEME_ERROR_COLOR;
-    if (process.env.THEME_BACKGROUND_COLOR) theme["background-color"] = process.env.THEME_BACKGROUND_COLOR;
-
-    api.modifyConfig((memo) => {
-        memo.define = memo.define || {};
-
-        // Define globals
-        memo.define.SERVLET_CONTEXT = servletContext;
-        if (Object.keys(theme).length > 0) {
-            memo.define.OPEN_ADMIN_THEME = theme;
-        }
-        if (process.env.PUBLIC_PAGES) {
-            memo.define.OPEN_ADMIN_PUBLIC_PAGES = process.env.PUBLIC_PAGES;
-        }
-
-        // Build defaults (only if not explicitly set by project config.js)
-        if (memo.publicPath === undefined) {
-            memo.publicPath = isProd ? './' : '/';
-        }
-        if (memo.hash === undefined) memo.hash = true;
-        if (memo.history === undefined) memo.history = { type: 'hash' };
-        if (memo.mfsu === undefined) memo.mfsu = false;
-        if (memo.esbuildMinifyIIFE === undefined) memo.esbuildMinifyIIFE = true;
-
-        // Proxy dev server
-        if (memo.proxy === undefined) memo.proxy = {};
-        if (!memo.proxy[servletContext]) {
-            memo.proxy[servletContext] = {
-                target: `http://127.0.0.1:${serverPort}`,
-                changeOrigin: true,
-                ws: true, // WebSocket 代理支持（http-proxy-middleware）
-            };
-        }
-
-        return memo;
-    });
-
-    api.logger.info(`SERVLET_CONTEXT=${servletContext}, proxy→http://127.0.0.1:${serverPort}`);
-    if (Object.keys(theme).length > 0) {
-        api.logger.info('OPEN_ADMIN_THEME:', theme);
-    }
-
-    const isFramework = api.pkg.name === pkgName;
-
-    try {
-        let frameworkDirs = Utils.getDirs(api.paths.absNodeModulesPath + "/@jiangood");
-        frameworkDirs = frameworkDirs.reverse();
-
-        api.logger.info('依赖的框架：', frameworkDirs);
-
-        for (let frameworkDir of frameworkDirs) {
-            api.logger.info("正在解析文件夹", frameworkDir);
-
-            const routeFiles = Utils.findFilesSync(frameworkDir, /src\/pages\/.*\.jsx$/);
-            api.logger.info("找到的页面文件：", routeFiles);
-
-            api.modifyRoutes((routes) => {
-                for (let file of routeFiles) {
-                    const route = convertFileToRoute(file);
-                    if (route && !routes[route.id]) {
-                        api.logger.info("加入路由:", route.id, "路径:", route.absPath);
-                        routes[route.id] = route;
-                    }
-                }
-                api.logger.info("路由修改完成");
-                return routes;
-            });
-        }
-    } catch (error) {
-        api.logger.error('处理路由时出错:', error);
-    }
-
-    try {
-        let importFrom = path.join(api.paths.absSrcPath, 'framework');
-        if (!isFramework) {
-            importFrom = path.join(api.paths.absNodeModulesPath, pkgName);
-        }
-
-        api.logger.info('formRegistryPath', importFrom);
-        api.addEntryImports(() => ({
-            source: importFrom,
-            specifier: '{FormRegistry}'
-        }));
-
-        Utils.findFilesSync(api.paths.absSrcPath, /forms\/.*\.jsx$/).forEach(file => {
-            const name = Utils.getFileMainName(file);
-
-            api.addEntryImports(() => ({
-                source: file,
-                specifier: name
-            }));
-
-            api.addEntryCodeAhead(() => `FormRegistry.register("${name}", ${name});`);
-            api.logger.info('新版本 formRegistry.register: ', name, file);
-        });
-    } catch (error) {
-        api.logger.error('处理表单时出错:', error);
-    }
-};

package/config/config.js

@@ -1,5 +0,0 @@
-import {defineConfig} from 'umi';
-
-export default defineConfig({
-    plugins: ['./config/common-plugin'],
-});

package/config/utils.js

@@ -1,73 +0,0 @@
-import * as fs from "fs";
-import * as path from "path";
-
-class Utils {
-    /**
-     * 获取目录下的所有子目录
-     * @param dir
-     * @returns {string[]}  完整路径
-     */
-    static getDirs(dir) {
-        if (!fs.existsSync(dir)) {
-            return [];
-        }
-
-        return fs.readdirSync(dir)
-            .map(item => {
-                const fullPath = path.join(dir, item);
-                if (fs.statSync(fullPath).isDirectory()) {
-                    return path.join(dir, item);
-                }
-            })
-            .filter(Boolean);
-    }
-
-    /**
-     * 同步获取目录下所有文件
-     */
-    static getAllFilesSync(dir) {
-        if (!fs.existsSync(dir)) throw new Error(`目录不存在: ${dir}`);
-
-        const results = [];
-
-        function traverse(currentDir) {
-            fs.readdirSync(currentDir).forEach(item => {
-                const fullPath = path.join(currentDir, item);
-                if (fs.statSync(fullPath).isDirectory()) {
-                    traverse(fullPath);
-                } else {
-                    results.push(fullPath.split(path.sep).join('/'));
-                }
-            });
-        }
-
-        traverse(dir);
-        return results;
-    }
-
-    /**
-     * 同步查找匹配模式的文件
-     *
-     * @return 文件列表 全路径
-     */
-    static findFilesSync(dir, pattern) {
-        const files = this.getAllFilesSync(dir);
-        return files.filter(file => pattern.test(file));
-    }
-
-    /**
-     * 获取文件名（不含后缀）
-     * @param {string} filePath - 文件路径
-     * @returns {string} 文件名（不含后缀）
-     */
-    static getFileMainName(filePath) {
-        const fileName = path.basename(filePath);
-        const lastDotIndex = fileName.lastIndexOf('.');
-        if (lastDotIndex > 0) {
-            return fileName.substring(0, lastDotIndex);
-        }
-        return fileName;
-    }
-}
-
-export default Utils;