@jiangood/springboot-admin-starter 0.0.8 → 0.1.0

package/package.json

@@ -29,10 +29,11 @@
   "description": "springboot-admin-starter",
   "files": [
     "src/*",
-    "config/dist/*"
+    "config/dist/*",
+    "!src/.umi"
   ],
   "main": "src/index.ts",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "scripts": {
     "dev": "umi dev",
     "build": "tsc --outDir config/dist --skipLibCheck --noEmitOnError false config/index.ts"

package/src/framework/components/view/ViewBooleanEnableDisable.tsx

@@ -15,6 +15,6 @@ export class ViewBooleanEnableDisable extends React.Component<ViewBooleanEnableD
             return null;
         }
 
-        return value ? <Tag color={"green"}>启动</Tag> : <Tag color={"red"}>禁用</Tag>;
+        return value ? <Tag color={"green"}>启用</Tag> : <Tag color={"red"}>禁用</Tag>;
     }
 }

package/src/framework/field-components/FieldDateRange.jsx

@@ -4,7 +4,9 @@
 import React from "react";
 import dayjs from "dayjs";
 import {DatePicker, TimePicker} from "antd";
+import {StringUtils} from "../utils";
 
+const SP = StringUtils.ISO_SPLITTER;
 
 export class FieldDateRange extends React.Component {
     static defaultProps = {
@@ -82,7 +84,7 @@ export class FieldDateRange extends React.Component {
             return null;
         }
 
-        const arr = v.split("/")
+        const arr = v.split(SP)
         let s1 = arr[0];
         let s2 = arr[1];
         return [dayjs(s1), dayjs(s2)]
@@ -95,7 +97,7 @@ export class FieldDateRange extends React.Component {
         const s1 = d1 ? d1.format(fmt) : ""
         const s2 = d2 ? d2.format(fmt) : "";
 
-        return s1 + '/' + s2
+        return s1 + SP + s2
     }
 
 }

package/src/framework/field-components/FieldNumberRange.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+
+export interface FieldNumberRangeProps {
+    value?: string;
+    onChange?: (value: string) => void;
+}
+
+/**
+ * 数字的百分数输入框
+ */
+export class FieldNumberRange extends React.Component<FieldNumberRangeProps, any> {
+}
+

package/src/framework/field-components/FieldNumberRange.jsx

@@ -0,0 +1,59 @@
+import React from "react";
+import {InputNumber} from "antd";
+import {StringUtils} from "../utils";
+
+
+const SP = StringUtils.ISO_SPLITTER;
+
+export class FieldNumberRange extends React.Component {
+
+
+    onChangeA = (a) => {
+        const {b} = this.parse(this.props.value)
+        this.props.onChange && this.props.onChange(this.merge(a, b))
+    }
+    onChangeB = (b) => {
+        const {a} = this.parse(this.props.value)
+        this.props.onChange && this.props.onChange(this.merge(a, b))
+    }
+
+    merge(a, b) {
+        if (a == null) {
+            a = ''
+        }
+        if (b == null) {
+            b = ''
+        }
+        return a + SP + b;
+    }
+
+    parse(v) {
+        if (v == null) {
+            return {a: null, b: null}
+        }
+        const arr = v.split(SP);
+        return {a: arr[0], b: arr[1]}
+    }
+
+    componentDidMount() {
+        let {value, defaultValue} = this.props
+        if (value == null) {
+            this.props.onChange && this.props.onChange(defaultValue)
+        }
+
+    }
+
+
+    render() {
+        let {value, defaultValue} = this.props
+        if (value == null) {
+            value = defaultValue
+        }
+        const {a, b} = this.parse(value)
+
+        return <div style={{display: 'flex', alignItems: 'center'}}>
+            <InputNumber value={a} onChange={this.onChangeA}/> - <InputNumber value={b} onChange={this.onChangeB}/>
+        </div>
+    }
+
+}

package/src/framework/field-components/index.ts

@@ -11,6 +11,7 @@ export * from './FieldRemoteTreeSelectMultiple'
 export * from './FieldBoolean';
 export * from './FieldDate';
 export * from './FieldDateRange';
+export * from './FieldNumberRange';
 export * from './FieldTable'
 export * from './FieldTableSelect'
 export * from './FieldSysOrgTreeSelect'

package/src/framework/field-components/system/OrgTree.tsx

@@ -15,7 +15,7 @@ export  class OrgTree  extends React.Component<any, any> {
 
 
     componentDidMount() {
-        HttpUtils.get('admin/sysOrg/unitTree').then(tree => {
+        HttpUtils.get('admin/sysOrg/deptTree').then(tree => {
             this.setState({treeData: tree,treeDataLoading: false})
         })
     }

package/src/framework/utils/MessageUtils.tsx

@@ -1,38 +1,35 @@
-import {Input, message, Modal, notification} from 'antd';
+import {Form, Input, InputNumber, message, Modal} from 'antd';
 import type {ModalFuncProps} from 'antd/es/modal/interface';
-import type {ArgsProps, NotificationPlacement} from 'antd/es/notification/interface';
 import React from 'react';
-import {ThemeUtils} from './system/ThemeUtils';
+import {MessageInstance} from "antd/lib/message/interface";
+import {HookAPI} from "antd/lib/modal/useModal";
 
 
-let color =  ThemeUtils.getColor('primary-color');
-const buttonStyles = {
-    root: {
-        backgroundColor: color
-    }
-}
 
 /**
  * 消息工具类 (MsgUtils)
  * 封装了 Ant Design 的 Modal, message, 和 notification 静态方法
  */
 export class MessageUtils {
-    // --- Antd Modal 封装 (Alert/Confirm/Prompt) ---
 
     /**
      * 弹出 Alert 提示框
      */
-    static alert(content: React.ReactNode, config?: Omit<ModalFuncProps, 'content' | 'icon' | 'onOk' | 'onCancel'>) {
-        Modal.info({
-            title: '提示',
-            content,
-            okText: '确定',
-            icon: null,
-            okButtonProps: {
-                styles: buttonStyles
-            },
-            ...config,
-        });
+    static alert(content: any, config?: Omit<ModalFuncProps, 'content' | 'icon' | 'onOk' | 'onCancel'>) {
+        return new Promise(resolve => {
+           this.modalApi.info({
+                title: '提示',
+                content,
+                okText: '确定',
+                onOk: (close)=>{
+                    close()
+                    resolve()
+                },
+                icon: null,
+                ...config,
+            });
+        })
+
     }
 
     /**
@@ -40,16 +37,13 @@ export class MessageUtils {
      */
     static confirm(content: React.ReactNode, config?: Omit<ModalFuncProps, 'content' | 'icon' | 'onOk' | 'onCancel'>) {
         return new Promise((resolve) => {
-            Modal.confirm({
+            this.modalApi.confirm({
                 title: '确认操作',
                 content,
                 okText: '确定',
                 cancelText: '取消',
                 onOk: () => resolve(true),
                 onCancel: () => resolve(false),
-                okButtonProps: {
-                    styles: buttonStyles
-                },
                 ...config,
             });
         })
@@ -57,32 +51,33 @@ export class MessageUtils {
     }
 
     /**
-     * 弹出 Prompt 输入框对话框
+     * 弹出 Prompt 输入框对话框, 如果默认值是数字, 则使用 InputNumber 输入框
      */
-    static prompt(message: React.ReactNode, initialValue?: string, placeholder?: string, config?: Omit<ModalFuncProps, 'content' | 'title' | 'icon' | 'onOk'>) {
+    static prompt(message: React.ReactNode, initialValue?: string|number, placeholder?: string, config?: Omit<ModalFuncProps, 'content' | 'title' | 'icon' | 'onOk'>) {
+        const isNumber = typeof initialValue === 'number';
         return new Promise((resolve) => {
             const ref = React.createRef()
-            Modal.confirm({
+            this.modalApi.confirm({
                 icon: null,
                 title: '提示',
                 content: <div>
                     <div style={{marginBottom: 4}}>{message}</div>
-                    <Input ref={ref} placeholder={placeholder}/>
+                    <Form ref={ref}>
+                        <Form.Item name='inputValue' initialValue={initialValue}>
+                            {isNumber ? <InputNumber placeholder={placeholder}/> : <Input  placeholder={placeholder}/>}
+                        </Form.Item>
+                    </Form>
                 </div>,
                 okText: '确定',
                 cancelText: '取消',
                 onOk: () => {
-                    const inputInstance = ref.current;
-                    const inputElement = inputInstance.input;
-                    const inputValue = inputElement.value;
-                    resolve(inputValue)
+                    const form = ref.current;
+                   const values= form.getFieldsValue()
+                    resolve(values.inputValue)
                 },
                 onCancel: () => {
                     resolve()
                 },
-                okButtonProps: {
-                    styles: buttonStyles
-                },
                 ...config,
             });
         })
@@ -94,89 +89,55 @@ export class MessageUtils {
      * 成功消息
      */
     static success(content: React.ReactNode, duration: number = 3) {
-        message.success(content, duration);
+        this.messageApi.success(content, duration);
     }
 
     /**
      * 错误消息
      */
     static error(content: React.ReactNode, duration: number = 3) {
-        message.error(content, duration);
+        this.messageApi.error(content, duration);
     }
 
     /**
      * 警告消息
      */
     static warning(content: React.ReactNode, duration: number = 3) {
-        message.warning(content, duration);
+        this.messageApi.warning(content, duration);
     }
 
     /**
      * 通用消息
      */
     static info(content: React.ReactNode, duration: number = 3) {
-        message.info(content, duration);
+        this.messageApi.info(content, duration);
     }
 
     /**
      * 弹出 Loading 提示
      */
     static loading(content: React.ReactNode = '正在加载...', duration?: number) {
-        return message.loading({content, duration: duration === undefined ? 0 : duration});
+        return this.messageApi.loading({content, duration: duration === undefined ? 0 : duration});
     }
 
-    /**
-     * 立即关闭所有 message 提示
-     */
-    static hideAll() {
-        message.destroy();
+    static config(messageApi: MessageInstance, modalApi: HookAPI) {
+        this.messageApi = messageApi;
+        this.modalApi = modalApi;
     }
 
-    // --- Antd Notification 封装 (通知提醒框) ---
-
-    /**
-     * 弹出右上角通知提醒框
-     */
-    static notify(
-        message: React.ReactNode,
-        description: React.ReactNode,
-        type: 'success' | 'error' | 'info' | 'warning' | 'open' | 'config' = 'open',
-        placement: NotificationPlacement = 'topRight',
-        config?: Omit<ArgsProps, 'message' | 'description' | 'placement'>,
-    ) {
-        const notifyFunc = notification[type];
-        notifyFunc({
-            message,
-            description,
-            placement,
-            ...config,
-        });
-    }
-
-    /**
-     * 弹出成功通知
-     */
-    static notifySuccess(message: React.ReactNode, description: React.ReactNode, placement?: NotificationPlacement, config?: Omit<ArgsProps, 'message' | 'description' | 'placement'>) {
-        MessageUtils.notify(message, description, 'success', placement, config);
-    }
-
-    /**
-     * 弹出失败通知
-     */
-    static notifyError(message: React.ReactNode, description: React.ReactNode, placement?: NotificationPlacement, config?: Omit<ArgsProps, 'message' | 'description' | 'placement'>) {
-        MessageUtils.notify(message, description, 'error', placement, config);
-    }
-
-    /**
-     * 弹出警告通知
-     */
-    static notifyWarning(
-        message: React.ReactNode,
-        description: React.ReactNode,
-        placement?: NotificationPlacement,
-        config?: Omit<ArgsProps, 'message' | 'description' | 'placement'>,
-    ) {
-        MessageUtils.notify(message, description, 'warning', placement, config);
-    }
+    private static modalApi:HookAPI = null;
+    private static messageApi:MessageInstance = null;
 }
 
+/**
+ * antd6 推荐使用这个hooks，这里统一设置， 供公共layout使用
+ * @constructor
+ */
+export function MessageHolder(){
+    const [modalApi, modalContextHolder] = Modal.useModal();
+    const [messageApi, messageContextHolder] = message.useMessage();
+    MessageUtils.config(messageApi,modalApi);
+    return <>
+        {modalContextHolder} {messageContextHolder}
+    </>
+}

package/src/framework/utils/StringUtils.ts

@@ -3,6 +3,8 @@
  */
 export class StringUtils {
 
+    static readonly ISO_SPLITTER = "/";
+
     /**
      * 移除字符串前缀
      * @param str 原始字符串
@@ -144,16 +146,16 @@ export class StringUtils {
 
     /**
      * 截取字符串，返回子字符串前面的部分。如果不包含，则原样返回
-     * @param s 原始字符串
+     * @param str 原始字符串
      * @param sub 分隔符
      * @returns 分隔符前面的字符串，或原字符串
      */
-    static subBefore(s: string | null | undefined, sub: string): string | null | undefined {
-        if (s == null) {
-            return s;
+    static subBefore(str: string | null | undefined, sub: string): string {
+        if (str == null) {
+            return "";
         }
-        const index = s.indexOf(sub);
-        return index === -1 ? s : s.substring(0, index);
+        const index = str.indexOf(sub);
+        return index === -1 ? str : str.substring(0, index);
     }
 
     /**
@@ -380,7 +382,7 @@ export class StringUtils {
      * @param str
      * @param sp
      */
-    static split(str: any, sp: string):null|string[] {
+    static split(str: any, sp: string):null|string[]|undefined {
         if(str == null || str.length === 0){
             return undefined
         }

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

@@ -1,6 +1,7 @@
-import { history } from "umi";
+import {history} from "umi";
 import {StringUtils} from "../StringUtils";
 import {UrlUtils} from "../UrlUtils";
+import {MessageUtils} from "../MessageUtils";
 
 /**
  * 页面相关的工具类，主要用于路由、URL参数和页面跳转操作。
@@ -111,43 +112,52 @@ export class PageUtils {
      * @param path 要跳转的路径。
      * @param label 可选，用于在 URL 中添加一个 '_label' 参数。
      */
-    static open(path: string, label: string ='临时'): void {
-    let targetPath = path;
-    if(label) {
-        // 假设 UrlUtil.setParam(url, key, value) 存在并返回设置参数后的 URL
-        targetPath = UrlUtils.setParam(targetPath, '_label', label);
+    static open(path: string, label: string = '临时'): void {
+        let targetPath = path;
+        if (label) {
+            // 假设 UrlUtil.setParam(url, key, value) 存在并返回设置参数后的 URL
+            targetPath = UrlUtils.setParam(targetPath, '_label', label);
+        }
+        history.push(targetPath);
     }
-    history.push(targetPath);
-}
 
-/**
- * 打开一个不带菜单、Header 等布局元素的页面。
- * 通过在 URL 中添加 '_noLayout=true' 参数实现。
- * @param path 要跳转的路径。
- */
-static openNoLayout(path: string): void {
-    // 假设 UrlUtil.setParam(url, key, value) 存在
-    const targetPath = UrlUtils.setParam(path, '_noLayout', true);
-    history.push(targetPath);
-}
 
-/**
- * 获取当前 URL 参数中名为 '_label' 的值。
- * @returns {string | undefined} '_label' 参数的值。
- */
-static currentLabel(): string | undefined {
-    // currentParams 返回 Record<string, string | undefined>
-    return this.currentParams()['_label'];
-}
+    /**
+     * 打开一个不带菜单、Header 等布局元素的页面。
+     * 通过在 URL 中添加 '_noLayout=true' 参数实现。
+     * @param path 要跳转的路径。
+     */
+    static openNoLayout(path: string): void {
+        // 假设 UrlUtil.setParam(url, key, value) 存在
+        const targetPath = UrlUtils.setParam(path, '_noLayout', true);
+        history.push(targetPath);
+    }
+
+    /**
+     * 获取当前 URL 参数中名为 '_label' 的值。
+     * @returns {string | undefined} '_label' 参数的值。
+     */
+    static currentLabel(): string | undefined {
+        // currentParams 返回 Record<string, string | undefined>
+        return this.currentParams()['_label'];
+    }
+
+    /**
+     * 发送一个自定义事件来关闭当前页面。
+     * 依赖外部监听 'close-page-event' 事件的处理机制。
+     */
+    static closeCurrent() {
+        const event = new CustomEvent<{ url: string }>('close-page-event', {
+            detail: {url: PageUtils.currentUrl()}
+        });
+        document.dispatchEvent(event);
+    }
+
+    static closeCurrentAndOpenPage(alertMessage:string,path:string,label:string){
+        MessageUtils.alert(alertMessage).then(()=>{
+            this.closeCurrent()
+            this.open(path,label)
+        })
+    }
 
-/**
- * 发送一个自定义事件来关闭当前页面。
- * 依赖外部监听 'close-page-event' 事件的处理机制。
- */
-static closeCurrent(): void {
-    const event = new CustomEvent<{ url: string }>('close-page-event', {
-        detail: { url: PageUtils.currentUrl() }
-    });
-    document.dispatchEvent(event);
-}
 }

package/src/framework/view-components/ViewApproveStatus.tsx

@@ -0,0 +1,26 @@
+import {DictUtils} from "../utils";
+import {Tag} from "antd";
+import {ViewStringProps} from "./ViewProps";
+
+interface ViewProps {
+    value: String;
+}
+
+/**
+ * 查看审批状态组件
+ * @param props
+ * @constructor
+ */
+export function ViewApproveStatus(props:ViewStringProps) {
+    let {value} = props;
+    let txt=   DictUtils.dictLabel('approveStatus', value)
+
+    const colorMap = {
+        'DRAFT': 'orange',
+        'PENDING': 'blue',
+        'APPROVED': 'green',
+        'REJECTED': 'red'
+    };
+    let color = colorMap[value]
+    return   <Tag color={color}>{txt}</Tag> ;
+}

package/src/framework/view-components/ViewBoolean.tsx

@@ -0,0 +1,6 @@
+import {ViewBooleanProps} from "./ViewProps";
+
+export function ViewBoolean(props: ViewBooleanProps) {
+    let {value} = props;
+    return value == null ? null : (value ? '是' : '否')
+}

package/src/framework/view-components/ViewFlowableInstanceProgress.d.ts

@@ -0,0 +1,12 @@
+// @ts-ignore
+import React from "react";
+import {ViewProps, ViewStringProps} from "./ViewProps";
+
+
+
+/**
+ * 业务标识businessKey
+ */
+export class ViewFlowableInstanceProgress extends React.Component<ViewStringProps, any> {
+}
+

package/src/framework/view-components/ViewFlowableInstanceProgress.jsx

@@ -0,0 +1,97 @@
+import React from "react";
+import {Empty, Modal, Skeleton, Table, Typography} from "antd";
+import {Gap, HttpUtils,} from "../../framework";
+
+/**
+ * 查看流程处理情况（不含表单）
+ */
+export class ViewFlowableInstanceProgress extends React.Component {
+
+    state = {
+        instanceCommentList: [],
+        vars: {},
+
+        id: null,
+        starter: null,
+        startTime: null,
+        name: null,
+
+        data: {
+            commentList: [],
+            img: null
+        },
+        loading: true,
+
+        errorMsg: null
+    }
+
+
+    componentDidMount() {
+        const {value} = this.props;
+        HttpUtils.get("admin/flowable/my/getInstanceInfo", {businessKey: value}).then(rs => {
+            this.setState(rs)
+            this.setState({data: rs})
+        }).catch(e => {
+            this.setState({errorMsg: e})
+        }).finally(() => {
+            this.setState({loading: false})
+        })
+
+    }
+
+    onImgClick = () => {
+        const {data} = this.state
+
+        const {img} = data
+        Modal.info({
+            title: '流程图',
+            width: '70vw',
+            content: <div style={{width: '100%', overflow: 'auto', maxHeight: '80vh'}}><img src={img}/></div>
+        })
+    };
+
+    render() {
+        if (this.state.errorMsg) {
+            return <Empty description={this.state.errorMsg}></Empty>
+        }
+
+        const {data, loading} = this.state
+        const {commentList, img} = data
+        if (loading) {
+            return <Skeleton/>
+        }
+
+
+        return <>
+            <Typography.Title level={4}>{data.name}</Typography.Title>
+            <Typography.Text type="secondary">{data.starter} &nbsp;&nbsp; {data.startTime}</Typography.Text>
+            <Gap></Gap>
+            <img src={img} style={{maxWidth: '100%'}}
+                 onClick={this.onImgClick}/>
+            <Gap></Gap>
+            <Table dataSource={commentList}
+
+                   size='small'
+                   pagination={false}
+                   rowKey='id'
+                   columns={[
+                       {
+                           dataIndex: 'content',
+                           title: '操作'
+                       },
+                       {
+                           dataIndex: 'user',
+                           title: '处理人'
+                       },
+                       {
+                           dataIndex: 'time',
+                           title: '处理时间'
+                       },
+                   ]}
+            />
+        </>
+
+    }
+
+}
+

package/src/framework/view-components/ViewFlowableInstanceProgressButton.tsx

@@ -0,0 +1,26 @@
+import React from "react";
+import {Button} from "antd";
+import {MessageUtils,} from "../utils";
+import {ViewStringProps} from "./ViewProps";
+import {ViewFlowableInstanceProgress} from "./ViewFlowableInstanceProgress";
+
+
+export class ViewFlowableInstanceProgressButton extends React.Component<ViewStringProps,any>{
+    state = {
+        open:false,
+    }
+
+    onClick = () => {
+        console.log('点击追踪流程')
+        let content = <ViewFlowableInstanceProgress value={this.props.value} />;
+        MessageUtils.alert(content,{
+            title:'流程审批信息',
+            width:800
+        })
+    };
+    render() {
+       return <Button onClick={this.onClick} size='small'>追踪流程</Button>
+    }
+
+
+}

package/src/framework/view-components/{ViewPassword.jsx → ViewPassword.tsx}

@@ -1,8 +1,9 @@
 import React from "react";
 import {Space} from "antd";
 import {EyeInvisibleOutlined, EyeOutlined} from "@ant-design/icons";
+import {ViewProps, ViewStringProps} from "./ViewProps";
 
-export class ViewPassword extends React.Component {
+export class ViewPassword extends React.Component<ViewStringProps,any> {
 
     state = {
         visible: false

package/src/framework/view-components/ViewProps.ts

@@ -0,0 +1,11 @@
+export interface ViewProps {
+    value?: any;
+}
+
+export interface ViewStringProps {
+    value: string;
+}
+
+export interface ViewBooleanProps {
+    value: boolean;
+}

package/src/framework/view-components/index.ts

@@ -0,0 +1,6 @@
+// 查看组件，主要是value 属性
+export * from './ViewPassword';
+export * from './ViewBoolean';
+export * from './ViewApproveStatus'
+export * from './ViewFlowableInstanceProgress'
+export * from './ViewFlowableInstanceProgressButton'

package/src/layouts/index.jsx

@@ -5,7 +5,7 @@ import {ConfigProvider} from "antd";
 
 import {Outlet, withRouter} from "umi";
 import zhCN from 'antd/locale/zh_CN';
-import {ArrUtils, HttpUtils, PageLoading, PageUtils, SysUtils, ThemeUtils,} from "../framework";
+import {ArrUtils, HttpUtils, MessageHolder, PageLoading, PageUtils, SysUtils, ThemeUtils,} from "../framework";
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
 
@@ -120,6 +120,8 @@ class _Layouts extends React.Component {
 
             {this.renderContent()}
 
+            <MessageHolder />
+
         </ConfigProvider>
     }
 
@@ -142,9 +144,7 @@ class _Layouts extends React.Component {
         return <AdminLayout path={this.state.path} logo={this.props.logo}/>
     };
 
-    renderMessages = () => {
 
-    };
 
 }
 

package/src/pages/flowable/InstanceInfo.jsx

@@ -117,16 +117,18 @@ export default class InstanceInfo extends React.Component {
     renderForm = () => {
         const {data} = this.state
         const {processDefinitionKey, businessKey} = data
+        const formKey = this.props.formKey || processDefinitionKey;
+        const formName = formKey + 'Form'
 
-        let formKey = this.props.formKey || processDefinitionKey + 'Form';
-        let ExForm = FormRegistryUtils.get(formKey);
+        // let formKey = this.props.formKey || processDefinitionKey + 'Form';
+        let ExForm = FormRegistryUtils.get(formName);
         if (!ExForm) {
             return <div>
                 <p>
-                未注册表单，请注册表单 {formKey}。
+                    未创建表单 {formName}。
                 </p>
                 <Typography.Text>
-                    表单路径：src/forms/{formKey}.jsx
+                    表单路径：src/forms/{formName}.jsx
                 </Typography.Text>
                 </div>
         }

package/src/pages/flowable/design/index.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import {Button, Card, message, Space, Splitter} from "antd";
+import {Button, Card, message, Modal, Space, Splitter} from "antd";
 
 import 'bpmn-js/dist/assets/diagram-js.css'
 import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'
@@ -9,7 +9,7 @@ import './index.css'
 import customTranslate from "./customTranslate/customTranslate";
 import contextPad from "./contextPad";
 import {CloudUploadOutlined, SaveOutlined} from "@ant-design/icons";
-import {HttpUtils, MessageUtils, PageUtils} from "../../../framework";
+import {HttpUtils, MessageUtils, PageUtils, ProTable} from "../../../framework";
 import 'bpmn-js/dist/assets/bpmn-js.css';
 import '@bpmn-io/properties-panel/assets/properties-panel.css';
 import {BpmnPropertiesPanelModule, BpmnPropertiesProviderModule} from 'bpmn-js-properties-panel';
@@ -24,17 +24,18 @@ export default class extends React.Component {
     state = {
         id: null,
         model: null,
+
+        deployedModal: false
     }
 
     bpmRef = React.createRef()
 
-    preXmlRef = React.createRef()
 
     async componentDidMount() {
         let params = PageUtils.currentParams()
         this.state.id = params.id
         const rs = await HttpUtils.get('admin/flowable/model/detail', {id: this.state.id})
-        this.setState({model:rs}, this.initBpmn)
+        this.setState({model: rs}, this.initBpmn)
     }
 
     initBpmn = () => {
@@ -52,7 +53,7 @@ export default class extends React.Component {
                 flowablePropertiesProviderModule
             ],
             moddleExtensions: {
-               flowable: flowableJson
+                flowable: flowableJson
             }
         });
 
@@ -103,6 +104,10 @@ export default class extends React.Component {
                          <Button onClick={this.showXML}>XML</Button>
                          <Button
                              onClick={() => PageUtils.open('/flowable/test?id=' + this.state.id, "流程测试")}> 测试 </Button>
+
+                         <Button title='查看已部署的历史版本' onClick={() => {
+                             this.setState({deployedModal: true})
+                         }}>历史版本</Button>
                      </Space>}>
 
 
@@ -117,6 +122,46 @@ export default class extends React.Component {
             </Splitter>
 
 
+            <Modal title='已部署版本' width={800} footer={null}
+                   open={this.state.deployedModal}
+                   destroyOnHidden
+                   onCancel={() => this.setState({deployedModal: false})}>
+
+                <ProTable
+                    columns={[
+                        {
+                            dataIndex: 'key',
+                            title: '编码'
+                        },
+                        {
+                            dataIndex: 'name',
+                            title: '名称'
+                        },
+                        {
+                            dataIndex: 'version',
+                            title: '版本号'
+                        }, {
+                            title: '操作',
+                            dataIndex:'id',
+                            render:(id)=> {
+                                return <Button type='primary' onClick={()=>{
+                                    HttpUtils.get('admin/flowable/model/getDefinitionContent',{id}).then(xml=>{
+                                        this.bpmnModeler.importXML(xml)
+                                        this.setState({deployedModal:false})
+                                    })
+                                }}>加载</Button>
+                            }
+                        }
+                    ]}
+                    request={params => {
+                        params.key = this.state.model.key
+                        return HttpUtils.get('admin/flowable/model/definitionPage', params)
+                    }}>
+
+                </ProTable>
+
+            </Modal>
+
         </Card>
     }
 

package/src/pages/flowable/instance/view.jsx

@@ -0,0 +1,15 @@
+import InstanceInfo from "../InstanceInfo";
+import {Page, PageUtils} from "../../../framework";
+import React from "react";
+
+export default class extends React.Component{
+
+    render() {
+        let params = PageUtils.currentParams();
+        const {businessKey} = params
+        return <Page padding>
+            <InstanceInfo businessKey={businessKey} />
+        </Page>
+    }
+
+}

package/src/pages/flowable/monitor/task.jsx

@@ -29,12 +29,20 @@ export default class extends React.Component {
                 actionRef={this.taskTableRef}
                 columns={[
                     {
-                        dataIndex: 'id',
-                        title: '任务标识',
+                        dataIndex: 'processInstanceName',
+                        title: '实例名称'
                     },
                     {
                         dataIndex: 'name',
-                        title: '名称',
+                        title: '任务名称',
+                    },
+                    {
+                        dataIndex: 'assigneeLabel',
+                        title: '处理人'
+                    },
+                    {
+                        dataIndex: 'id',
+                        title: '任务标识',
                     },
 
                     {
@@ -47,10 +55,7 @@ export default class extends React.Component {
                     },
 
 
-                    {
-                        dataIndex: 'assigneeLabel',
-                        title: '处理人'
-                    },
+
                     {
                         dataIndex: 'startTime',
                         title: '开始时间'

package/src/pages/flowable/task/index.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {Button, Modal, Tabs} from "antd";
-import {HttpUtils, LinkButton, Page, PageLoading, ProTable} from "../../../framework";
+import {HttpUtils, LinkButton, MessageUtils, Page, PageLoading, ProTable} from "../../../framework";
 import InstanceInfo from "../InstanceInfo";
 
 
@@ -186,12 +186,11 @@ export default class extends React.Component {
                 dataIndex: 'option',
                 render: (_, record) => (
                     <Button size='small' onClick={() => {
-
-                        Modal.info({
-                            title: '流程信息',
+                        MessageUtils.alert(<InstanceInfo id={record.id}/>, {
                             width: '80vw',
-                            content: <InstanceInfo id={record.id}/>
+                            title: '流程信息'
                         })
+
                     }}> 查看 </Button>
                 ),
             },

package/src/pages/index.jsx

@@ -1,5 +1,6 @@
 import React from "react";
 import {Card} from "antd";
+import {MessageUtils} from "../framework";
 
 
 export default class extends React.Component {
@@ -7,6 +8,7 @@ export default class extends React.Component {
     state = {}
 
     componentDidMount() {
+
     }
 
     render() {

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

@@ -100,15 +100,15 @@ export default class extends React.Component {
 
                 return (
                     <ButtonList>
-                        <Button size='small' perm='sysRole:save'
+                        <Button size='small' perm='sysRole:manage'
                                 onClick={() => this.handleEditUser(record)}>用户设置</Button>
 
-                        <Button size='small' perm='sysRole:save' disabled={record.builtin}
+                        <Button size='small' perm='sysRole:manage' disabled={record.builtin}
                                 onClick={() => PageUtils.open('/system/role/perm?id='+record.id, '角色权限设置')}>权限设置</Button>
 
-                        <Button size='small' perm='sysRole:save' disabled={record.builtin}
+                        <Button size='small' perm='sysRole:manage' disabled={record.builtin}
                                 onClick={() => this.handleEdit(record)}>编辑</Button>
-                        <Popconfirm perm='sysRole:delete' disabled={record.builtin} title='是否确定删除系统角色'
+                        <Popconfirm perm='sysRole:manage' disabled={record.builtin} title='是否确定删除系统角色'
                                     onConfirm={() => this.handleDelete(record)}>
                             <Button size='small'>删除</Button>
                         </Popconfirm>
@@ -183,12 +183,12 @@ export default class extends React.Component {
     }
 
     render() {
-        return <Page>
+        return <Page padding>
             <ProTable
                 actionRef={this.tableRef}
                 toolBarRender={() => {
                     return <ButtonList>
-                        <Button perm='sysRole:save' type='primary' onClick={this.handleAdd}>
+                        <Button perm='sysRole:manage' type='primary' onClick={this.handleAdd}>
                             <PlusOutlined/> 新增
                         </Button>
                     </ButtonList>
@@ -285,8 +285,6 @@ export default class extends React.Component {
                    onOk={this.handleGrantMenu}
                    loading={this.state.menuTreeLoading}
             >
-
-
                     <Tree
                         height={600}
                         treeData={this.state.menuTree}
@@ -300,11 +298,7 @@ export default class extends React.Component {
                         titleRender={node=>{
                             return <span title={node.perm} >{node.title}</span>
                         }}
-                    >
-                    </Tree>
-
-
-
+                    />
             </Modal>
         </Page>
 

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

@@ -157,7 +157,7 @@ export default class extends React.Component {
 
     render() {
 
-        return <Page>
+        return <Page >
             <Splitter >
                 <Splitter.Panel defaultSize={400}   >
                     <Tabs
@@ -192,6 +192,7 @@ export default class extends React.Component {
 
                             </ButtonList>
                         }}
+                        showToolbarSearch
                         request={(params) => {
                             params.orgId = this.state.currentOrgId
                             params.roleId = this.state.currentRoleId

package/src/pages/userCenter/index.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import {Avatar, Card, Col, Row, Tabs} from "antd";
 import ChangePassword from "./ChangePassword";
-import {Page} from "../../framework";
+import {HttpUtils, Page} from "../../framework";
 
 export default class extends React.Component {
 

package/src/.npmignore

@@ -1,6 +0,0 @@
-node_modules/
-
-.umi/
-
-.umi-production/
-.umi/

package/src/framework/view-components/ViewBoolean.jsx

@@ -1,4 +0,0 @@
-export function ViewBoolean(props) {
-    let {value} = props;
-    return value == null ? null : (value ? '是' : '否')
-}

package/src/framework/view-components/index.js

@@ -1,3 +0,0 @@
-// 查看组件，主要是value 属性
-export * from './ViewPassword';
-export * from './ViewBoolean';