@jiangood/open-admin 1.0.1 → 1.1.0

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

@@ -2,9 +2,11 @@ import {PlusOutlined} from '@ant-design/icons';
 import {Button, Form, Input, Modal, Popconfirm, Splitter, Tabs} from 'antd';
 import React from 'react';
 import {
-    ButtonList, DictUtils,
+    ButtonList,
+    DictUtils,
     FieldBoolean,
-    FieldSysOrgTreeSelect, HttpUtils,
+    FieldSysOrgTreeSelect,
+    HttpUtils,
     OrgTree,
     Page,
     ProTable,
@@ -20,13 +22,45 @@ export default class extends React.Component {
         formValues: {},
 
         currentOrgId: null,
-        currentRoleId:null,
+        currentRoleId: null,
     }
     permRef = React.createRef();
 
     formRef = React.createRef()
     tableRef = React.createRef()
 
+    resetPwd(row) {
+        HttpUtils.post('admin/sysUser/resetPwd', {id: row.id}).then(rs => {
+            Modal.success({
+                title: '重置密码成功',
+                content: rs
+            })
+        })
+    }
+
+    handleDelete = r => {
+        HttpUtils.get('admin/sysUser/delete', {id: r.id}).then(rs => {
+            this.tableRef.current.reload();
+        })
+    }
+
+    onSelectOrg = (key) => {
+        this.setState({currentOrgId: key}, () => this.tableRef.current.reload())
+    }
+
+    onSelectRole = (key) => {
+        this.setState({currentRoleId: key}, () => this.tableRef.current.reload())
+    }
+
+    handleAdd = () => {
+        this.setState({formOpen: true, formValues: {}})
+    }
+
+    handleEdit = record => {
+        record.deptId = record.deptId || record.unitId
+        this.setState({formOpen: true, formValues: record})
+    }
+
     columns = [
         {
             title: '单位',
@@ -88,7 +122,7 @@ export default class extends React.Component {
         {
             title: '操作',
             dataIndex: 'option',
-            fixed:'right',
+            fixed: 'right',
             render: (_, record) => {
                 return <ButtonList>
                     <Button size='small' perm='sysUser:save' onClick={() => this.handleEdit(record)}> 编辑 </Button>
@@ -97,57 +131,18 @@ export default class extends React.Component {
                             onClick={() => this.permRef.current.show(record)}> 授权 </Button>
 
                     <Popconfirm perm='sysUser:resetPwd' title='确认重置密码？' onConfirm={() => this.resetPwd(record)}>
-                        <Button  size='small' >重置密码</Button>
+                        <Button size='small'>重置密码</Button>
                     </Popconfirm>
 
                     <Popconfirm perm='sysUser:delete' title={'是否确定删除用户'}
                                 onConfirm={() => this.handleDelete(record)}>
-                        <Button  size='small' >删除</Button>
+                        <Button size='small'>删除</Button>
                     </Popconfirm>
                 </ButtonList>;
             },
         },
     ];
 
-
-
-
-    resetPwd(row) {
-        HttpUtils.post('admin/sysUser/resetPwd', {id: row.id}).then(rs => {
-            Modal.success({
-                title: '重置密码成功',
-                content: rs
-            })
-        })
-    }
-
-
-    handleDelete = r => {
-        HttpUtils.get('admin/sysUser/delete', {id: r.id}).then(rs => {
-            this.tableRef.current.reload();
-        })
-    }
-
-
-
-    onSelectOrg = (key) => {
-        this.setState({currentOrgId: key}, () => this.tableRef.current.reload())
-    }
-    onSelectRole = (key) => {
-        this.setState({currentRoleId: key}, () => this.tableRef.current.reload())
-    }
-
-
-    handleAdd = () => {
-        this.setState({formOpen: true, formValues: {}})
-    }
-
-    handleEdit = record => {
-        record.deptId = record.deptId || record.unitId
-        this.setState({formOpen: true, formValues: record})
-    }
-
-
     onFinish = values => {
         HttpUtils.post('admin/sysUser/save', values).then(rs => {
             this.setState({formOpen: false})
@@ -157,9 +152,9 @@ export default class extends React.Component {
 
     render() {
 
-        return <Page >
-            <Splitter >
-                <Splitter.Panel defaultSize={400}   >
+        return <Page>
+            <Splitter>
+                <Splitter.Panel defaultSize={400}>
                     <Tabs
                         type='card'
                         size='small'
@@ -167,7 +162,7 @@ export default class extends React.Component {
                             {
                                 key: 'org',
                                 label: '按组织机构',
-                                children:  <OrgTree onChange={this.onSelectOrg}/>
+                                children: <OrgTree onChange={this.onSelectOrg}/>
                             },
                             {
                                 key: 'role',
@@ -177,7 +172,7 @@ export default class extends React.Component {
                         ]}/>
 
                 </Splitter.Panel>
-                <Splitter.Panel style={{paddingLeft:16}}>
+                <Splitter.Panel style={{paddingLeft: 16}}>
                     <ProTable
                         actionRef={this.tableRef}
                         toolBarRender={() => {
@@ -220,7 +215,7 @@ export default class extends React.Component {
                     <Form.Item name='id' noStyle></Form.Item>
 
                     <Form.Item label='所属机构' name='deptId' rules={[{required: true}]}>
-                        <FieldSysOrgTreeSelect />
+                        <FieldSysOrgTreeSelect/>
                     </Form.Item>
 
                     <Form.Item label='姓名' name='name' rules={[{required: true}]}>

package/src/pages/test/views.jsx

@@ -0,0 +1,95 @@
+import {ViewText, ViewBoolean, ViewBooleanEnableDisable, ViewFile, ViewFileButton, ViewImage, ViewPassword, ViewApproveStatus, ViewProcessInstanceProgress, ViewProcessInstanceProgressButton} from "../../framework";
+
+export function ViewTextTest() {
+    return <ViewText value='你好'  />
+}
+
+export function ViewBooleanTest() {
+    return <ViewBoolean value={true}  />
+}
+
+export function ViewBooleanEnableDisableTest() {
+    return <ViewBooleanEnableDisable value={true}  />
+}
+
+export function ViewTextEllipsisTest() {
+    return <ViewText value='这是一段很长的文本，用于测试省略显示功能' ellipsis={true} maxLength={10}  />
+}
+
+export function ViewFileTest() {
+    return <ViewFile value='file123' height='200px'  />
+}
+
+export function ViewFileButtonTest() {
+    return <ViewFileButton value='file123' height='200px'  />
+}
+
+export function ViewImageTest() {
+    return <ViewImage value='https://via.placeholder.com/150'  />
+}
+
+export function ViewPasswordTest() {
+    return <ViewPassword value='password123'  />
+}
+
+export function ViewApproveStatusTest() {
+    return <ViewApproveStatus value='approved'  />
+}
+
+export function ViewProcessInstanceProgressTest() {
+    return <ViewProcessInstanceProgress value='process123'  />
+}
+
+export function ViewProcessInstanceProgressButtonTest() {
+    return <ViewProcessInstanceProgressButton value='process123'  />
+}
+
+export default function () {
+    return <>
+        <h1>View 组件测试</h1>
+        <div style={{marginBottom: '20px'}}>
+            <h2>ViewText</h2>
+            <ViewTextTest/>
+        </div>
+        <div style={{marginBottom: '20px'}}>
+            <h2>ViewBoolean</h2>
+            <ViewBooleanTest/>
+        </div>
+        <div style={{marginBottom: '20px'}}>
+            <h2>ViewBooleanEnableDisable</h2>
+            <ViewBooleanEnableDisableTest/>
+        </div>
+        <div style={{marginBottom: '20px'}}>
+            <h2>ViewText (with ellipsis)</h2>
+            <ViewTextEllipsisTest/>
+        </div>
+        <div style={{marginBottom: '20px'}}>
+            <h2>ViewFile</h2>
+            <ViewFileTest/>
+        </div>
+        <div style={{marginBottom: '20px'}}>
+            <h2>ViewFileButton</h2>
+            <ViewFileButtonTest/>
+        </div>
+        <div style={{marginBottom: '20px'}}>
+            <h2>ViewImage</h2>
+            <ViewImageTest/>
+        </div>
+        <div style={{marginBottom: '20px'}}>
+            <h2>ViewPassword</h2>
+            <ViewPasswordTest/>
+        </div>
+        <div style={{marginBottom: '20px'}}>
+            <h2>ViewApproveStatus</h2>
+            <ViewApproveStatusTest/>
+        </div>
+        <div style={{marginBottom: '20px'}}>
+            <h2>ViewProcessInstanceProgress</h2>
+            <ViewProcessInstanceProgressTest/>
+        </div>
+        <div style={{marginBottom: '20px'}}>
+            <h2>ViewProcessInstanceProgressButton</h2>
+            <ViewProcessInstanceProgressButtonTest/>
+        </div>
+    </>
+}

package/src/pages/ureport/index.jsx

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

package/src/pages/userCenter/ChangePassword.jsx

@@ -3,6 +3,7 @@ import {Button, Form, Input, Modal} from "antd";
 
 
 import {history} from 'umi'
+import {HttpUtils} from "../../framework";
 
 export default class extends React.Component {
 
@@ -22,7 +23,7 @@ export default class extends React.Component {
 
     validator = (rule, value) => {
         return new Promise((resolve, reject) => {
-            HttpUtils.create().get("admin/sysUser/pwdStrength", {password: value}).then(response => {
+            HttpUtils.get("admin/sysUser/pwdStrength", {password: value}).then(response => {
                 const rs = response.data
                 if (!rs.success) {
                     reject(rs.message)

package/src/pages/userCenter/index.jsx

@@ -6,24 +6,24 @@ import {HttpUtils, Page} from "../../framework";
 export default class extends React.Component {
 
     state = {
-        info :{}
+        info: {}
     }
 
     componentDidMount() {
-        HttpUtils.get('admin/userCenter/info').then(rs=>{
-            this.setState({info:rs})
+        HttpUtils.get('admin/userCenter/info').then(rs => {
+            this.setState({info: rs})
         })
     }
 
     render() {
-const {info} = this.state;
+        const {info} = this.state;
         return <Page padding backgroundGray>
-            <Row gutter={[16,16]}>
+            <Row gutter={[16, 16]}>
                 <Col md={6} sm={24}>
                     <Card title='个人信息'>
 
-                        <div className='flex-center' style={{marginBottom:32}}>
-                            <Avatar size={128} title='点击修改头像' />
+                        <div className='flex-center' style={{marginBottom: 32}}>
+                            <Avatar size={128} title='点击修改头像'/>
                         </div>
 
 
@@ -61,7 +61,7 @@ const {info} = this.state;
                         </table>
                     </Card>
                 </Col>
-                <Col md={18}  sm={24}>
+                <Col md={18} sm={24}>
                     <Card title='个人设置'>
                         <Tabs
                             items={[

package/src/pages/userCenter/manual.jsx

@@ -20,15 +20,15 @@ export default class extends React.Component {
             title: '版本',
             dataIndex: 'version',
             render(version) {
-                return 'v' +version;
+                return 'v' + version;
             }
         },
 
         {
             title: '文件',
             dataIndex: 'fileId',
-            render(id){
-               const url = ('admin/sysFile/preview/' + id);
+            render(id) {
+                const url = ('admin/sysFile/preview/' + id);
                 return <a href={url} target='_blank'>查看文件</a>
             }
 
@@ -41,8 +41,6 @@ export default class extends React.Component {
     ]
 
 
-
-
     render() {
         return <Page>
             <ProTable

package/src/pages/userCenter/message.jsx

@@ -2,10 +2,16 @@ import React from "react";
 import {Button, Card, Tabs, Tag} from "antd";
 import {ProTable} from "../../framework";
 
-export default class  extends React.Component {
+export default class extends React.Component {
 
     tableRef = React.createRef()
 
+    read = (record) => {
+        HttpUtils.post("admin/user/msg/read", record).then(rs => {
+            this.tableRef.current.reload()
+        })
+    }
+
     columns = [
         {
             title: '时间',
@@ -41,31 +47,23 @@ export default class  extends React.Component {
             title: '-',
             dataIndex: 'option',
             render: (read, row) => {
-                if(!row.isRead)
-                 return <Button size='small' onClick={() => this.read(row)}> 标记已读 </Button>
-            },   width: 80
+                if (!row.isRead)
+                    return <Button size='small' onClick={() => this.read(row)}> 标记已读 </Button>
+            }, width: 80
         }
     ]
 
-    read = (record) => {
-        HttpUtils.post("admin/user/msg/read", record).then(rs => {
-            this.tableRef.current.reload()
-        })
-    }
-
-
-
     render() {
         return <Card variant={"borderless"}>
 
             <Tabs defaultActiveKey="0" destroyOnHidden
-                >
+            >
                 <Tabs.TabPane key='0' tab='所有消息'>
                     <ProTable
                         actionRef={this.tableRef}
                         request={(params) => HttpUtils.get("admin/user/msg/page", params)}
                         columns={this.columns}
-                        toolbarOptions={{showSearch:false}}
+                        toolbarOptions={{showSearch: false}}
                         size='small'
                     />
                 </Tabs.TabPane>
@@ -76,7 +74,7 @@ export default class  extends React.Component {
                         columns={this.columns}
                         rowSelection={false}
                         rowKey='id'
-                        toolbarOptions={{showSearch:false}}
+                        toolbarOptions={{showSearch: false}}
                         size='small'
                     />
 
@@ -89,7 +87,7 @@ export default class  extends React.Component {
                         request={(params) => HttpUtils.get("admin/user/msg/page?read=true", params)}
                         rowSelection={false}
                         rowKey='id'
-                        toolbarOptions={{showSearch:false}}
+                        toolbarOptions={{showSearch: false}}
                         options={false}
                         size='small'
                         columns={this.columns}

package/config/dist/common-plugin.js

@@ -1,149 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var fs = require("fs");
-var path = require("path");
-var pkgName = '@jiangood/open-admin';
-exports.default = (function (api) {
-    api.describe({
-        key: 'open-admin',
-    });
-    var isFramework = api.pkg.name === pkgName;
-    var frameworkDirs = Utils.getDirs(api.paths.absNodeModulesPath + "/@jiangood");
-    // ==================== 处理路由 ========================
-    // 让名字长的在最前面，插件名称通常时open-admin-xxx, 这样就能保证先解析插件的路由
-    frameworkDirs = frameworkDirs.reverse();
-    api.logger.info('依赖的框架：', frameworkDirs);
-    var _loop_1 = function (frameworkDir) {
-        api.logger.info("正在解析文件夹", frameworkDir);
-        // 处理路由
-        var routeFiles = Utils.findFilesSync(frameworkDir, /src\/pages\/.*\.jsx$/); // src/pages/**
-        api.logger.info("找到的页面文件：", routeFiles);
-        api.modifyRoutes(function (routes) {
-            for (var _i = 0, routeFiles_1 = routeFiles; _i < routeFiles_1.length; _i++) {
-                var file = routeFiles_1[_i];
-                var route = convertFileToRoute(file);
-                if (route) {
-                    if (routes[route.id] == null) { //  如果用户项目没有这个路由，则加入。否则以用户项目为准
-                        api.logger.info("加入路由:", route.id, "路径:", route.absPath);
-                        routes[route.id] = route;
-                    }
-                }
-            }
-            api.logger.info("路由修改完成");
-            return routes;
-        });
-    };
-    for (var _i = 0, frameworkDirs_1 = frameworkDirs; _i < frameworkDirs_1.length; _i++) {
-        var frameworkDir = frameworkDirs_1[_i];
-        _loop_1(frameworkDir);
-    }
-    // =============== 处理表单 ========================
-    { // 导入工具类 FormRegistryUtils
-        var importFrom_1 = path.join(api.paths.absSrcPath, 'framework');
-        if (!isFramework) {
-            importFrom_1 = path.join(api.paths.absNodeModulesPath, pkgName);
-        }
-        api.logger.info('formRegistryPath', importFrom_1);
-        api.addEntryImports(function () { return ({
-            source: importFrom_1,
-            specifier: '{FormRegistryUtils}'
-        }); });
-    }
-    Utils.findFilesSync(api.paths.absSrcPath, /forms\/.*\.jsx$/).forEach(function (file) {
-        var name = Utils.getFileMainName(file);
-        api.addEntryImports(function () { return ({
-            source: file,
-            specifier: name
-        }); });
-        // register form
-        api.addEntryCodeAhead(function () { return "FormRegistryUtils.register(\"".concat(name, "\",").concat(name, " );"); });
-        api.logger.info('新版本 formRegistry.register: ', name, file);
-    });
-});
-function convertFileToRoute(file) {
-    var absPath = file;
-    var mainName = Utils.getFileMainName(file);
-    // 只添加小写开头的文件页面，大写的默认为组件
-    if (mainName.charAt(0) !== mainName.charAt(0).toLowerCase()) {
-        return;
-    }
-    var routePath = file.substring(file.indexOf('pages') + 6, file.length - 4);
-    routePath = routePath.replaceAll("\$", ":"); // 文件$开头的会替换为路径变量 如$id 变为 :id
-    var parentId = "@@/global-layout";
-    if (routePath.endsWith("/index")) {
-        routePath = routePath.substring(0, routePath.length - 6);
-    }
-    return {
-        absPath: absPath,
-        id: routePath,
-        path: routePath,
-        file: file,
-        parentId: parentId
-    };
-}
-var Utils = /** @class */ (function () {
-    function Utils() {
-    }
-    /**
-     * 获取目录下的所有子目录
-     * @param dir
-     * @returns {string[]}  完整路径
-     */
-    Utils.getDirs = function (dir) {
-        console.log('获取dir....', dir);
-        if (!fs.existsSync(dir))
-            throw new Error("\u76EE\u5F55\u4E0D\u5B58\u5728: ".concat(dir));
-        return fs.readdirSync(dir).map(function (item) {
-            var fullPath = path.join(dir, item);
-            if (fs.statSync(fullPath).isDirectory()) {
-                return path.join(dir, item);
-            }
-        });
-    };
-    /**
-     * 同步获取目录下所有文件
-     */
-    Utils.getAllFilesSync = function (dir) {
-        if (!fs.existsSync(dir))
-            throw new Error("\u76EE\u5F55\u4E0D\u5B58\u5728: ".concat(dir));
-        var results = [];
-        function traverse(currentDir) {
-            fs.readdirSync(currentDir).forEach(function (item) {
-                var 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 文件列表 全路径
-     */
-    Utils.findFilesSync = function (dir, pattern) {
-        var files = this.getAllFilesSync(dir);
-        return files.filter(function (file) { return pattern.test(file); }).map(function (file) { return file.split(path.sep).join('/'); });
-    };
-    /**
-     * 获取文件名（不含后缀）
-     * @param {string} filePath - 文件路径
-     * @returns {string} 文件名（不含后缀）
-     */
-    Utils.getFileMainName = function (filePath) {
-        // 从路径中提取文件名
-        var fileName = path.basename(filePath);
-        // 移除扩展名
-        var lastDotIndex = fileName.lastIndexOf('.');
-        if (lastDotIndex > 0) {
-            return fileName.substring(0, lastDotIndex);
-        }
-        return fileName; // 没有扩展名的情况
-    };
-    return Utils;
-}());

package/config/dist/config.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var umi_1 = require("umi");
-var fs = require("fs");
-var path = require("path");
-//https://umijs.org/docs/api/config
-console.log('i am config.ts');
-console.log('__dirname', __dirname);
-console.log('process.cwd()', process.cwd());
-var isFramework = fs.existsSync(path.join(process.cwd(), 'config/common-plugin.ts'));
-console.log('isFramework', isFramework);
-var pluginDir = isFramework ? './config' : '@jiangood/open-admin/config/dist';
-console.log('pluginDir', pluginDir);
-var host = '127.0.0.1:8080';
-exports.default = (0, umi_1.defineConfig)({
-    // 配置是否让生成的文件包含 hash 后缀，通常用于增量发布和避免浏览器加载缓存。
-    hash: true,
-    history: { type: 'hash' },
-    // 复杂，还得设置忽略、编译等，先关掉
-    mfsu: false,
-    esbuildMinifyIIFE: true,
-    plugins: [
-        pluginDir + '/common-plugin',
-    ],
-    proxy: {
-        '/admin': {
-            target: 'http://' + host,
-            changeOrigin: true,
-        },
-        '/preview': {
-            target: 'http://' + host,
-            changeOrigin: true,
-        },
-        '/ureport': {
-            target: 'http://' + host,
-            changeOrigin: true,
-            pathRewrite: { '^/ureport': '/ureport' },
-        },
-        '/admin/ws': {
-            target: 'ws://' + host,
-            changeOrigin: true,
-            ws: true,
-        },
-    }
-});

package/config/dist/index.js

@@ -1,18 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./config"), exports);
-__exportStar(require("./common-plugin"), exports);

package/src/app.js

@@ -1 +0,0 @@
-console.log('i am app.js')

package/src/forms/demoForm.jsx

@@ -1,16 +0,0 @@
-import {Form, Input, InputNumber} from "antd";
-
-export default function (){
-
-    return <div>
-        demo表单示例
-        <Form>
-            <Form.Item label="事由">
-                <Input/>
-            </Form.Item>
-            <Form.Item label="请假天数" name='days'>
-                <InputNumber/>
-            </Form.Item>
-        </Form>
-    </div>
-}