@jiangood/admin-spring-boot-starter 0.2.7 → 0.2.8

package/package.json

@@ -33,7 +33,7 @@
     "!src/.umi"
   ],
   "main": "src/index.ts",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "scripts": {
     "dev": "umi dev",
     "build": "tsc --outDir config/dist --skipLibCheck --noEmitOnError false config/index.ts"

package/src/framework/components/system/ButtonList.d.ts

@@ -2,7 +2,6 @@
 import React from "react";
 
 declare type ButtonListProps = {
-   maxNum?:number
 };
 
 export class ButtonList extends React.Component<ButtonListProps, any> {

package/src/framework/components/system/ButtonList.jsx

@@ -13,23 +13,30 @@ export class ButtonList extends React.Component {
 
     render() {
         let {children} = this.props;
-        const menus = [];
 
-        // 判断是否数组
-        if (Array.isArray(children)) {
-            for (let child of children) {
-                if (child === null || child === undefined) {
-                    continue;
-                }
-                if (child.props == null || child.props.perm == null || PermUtils.hasPermission(child.props.perm)) {
-                    menus.push(child);
-                }
+        // 单节点的情况
+        if (!Array.isArray(children)) {
+            if (this.checkPerm(children)) {
+                return children;
             }
-        } else {
-            menus.push(children)
+            return null
         }
 
-
+        const menus = [];
+        for (let child of children) {
+            if (child === null || child === undefined) {
+                continue;
+            }
+            if (this.checkPerm(child)) {
+                menus.push(child);
+            }
+        }
         return <Space>{menus}</Space>;
     }
+
+    checkPerm = element => {
+        let props = element.props;
+        return props == null || props.perm == null || PermUtils.hasPermission(props.perm);
+
+    };
 }

package/src/framework/utils/StringUtils.ts

@@ -31,6 +31,15 @@ export class StringUtils {
         return str;
     }
 
+    static removePrefixAndSuffix(str: string , prefix: string, suffix: string): string  {
+        if (str != null) {
+            str = StringUtils.removePrefix(str, prefix);
+            str = StringUtils.removeSuffix(str, suffix);
+        }
+        return str;
+    }
+
+
     /**
      * 生成指定长度的随机字符串
      * @param length 随机字符串的长度
@@ -67,6 +76,14 @@ export class StringUtils {
         return str.includes(subStr);
     }
 
+    static containsAll(str: string | null | undefined, subStr: string, subStr2: string): boolean {
+        if (!str) {
+            return false;
+        }
+        return str.includes(subStr) && str.includes(subStr2);
+    }
+
+
     /**
      * 统计子字符串在原始字符串中出现的次数
      * @param str 原始字符串
@@ -382,16 +399,23 @@ export class StringUtils {
      * @param str
      * @param sp
      */
-    static split(str: any, sp: string):null|string[]|undefined {
+    static split(str: any, sp: string):string[] {
         if(str == null || str.length === 0){
-            return undefined
+            return []
         }
         if(Array.isArray(str)){
-            return str;
+            return str as string[];
         }
 
         return str.split(sp)
     }
+    static splitTrim(str: any, sp: string):string[] {
+        const arr = StringUtils.split(str, sp).map(item => item.trim())
+        for (let i = 0; i < arr.length; i++) {
+            arr[i] = arr[i].trim()
+        }
+        return arr;
+    }
 
     /**
      * 连接字符串

package/src/pages/flowable/design/provider/properties/ConditionDesign.jsx

@@ -1,51 +1,125 @@
 import {Button, Input, InputNumber, Modal, Select} from "antd";
-import React, {Component} from "react";
-import {FieldBoolean, FieldTable, HttpUtils, StringUtils, ThemeUtils} from "../../../../../framework";
-
-const metaInfo = {
-    STRING: {
-        ops: {
-            '==': '等于',
-            '!=': '不等于',
-            contains: '包含',
-            '!contains': '不包含',
-            startWith: '开头等于',
-            endWith: '结尾等于',
-        },
-        render() {
-            return <Input/>;
-        },
+import {Component} from "react";
+import {FieldBoolean, FieldTable, HttpUtils, ObjectUtils, StringUtils, ThemeUtils} from "../../../../../framework";
+import {ConditionExpressionUtils} from "./ConditionExpressionUtils";
+
+
+// 字符串的双引号
+const QUOTE = '"';
+
+
+const OPERATOR_DEFINITIONS = [
+    {
+        type: 'STRING',
+        label: '等于',
+        key: '==',
+        component: Input,
     },
-    NUMBER: {
-        ops: {
-            '==': '等于',
-            '!=': '不等于',
-            '>': '大于',
-            '<': '小于',
-            '>=': '大于等于',
-            '<=': '小于等于',
-            between: '介于',
-        },
-        render(op) {
-            if (op !== 'between') return <InputNumber/>;
-
-            return (
-                <Input.Group>
-                    <InputNumber placeholder="最小值"></InputNumber>
-                    <InputNumber placeholder="最大值"></InputNumber>
-                </Input.Group>
-            );
-        },
+    {
+        type: 'STRING',
+        label: '不等于',
+        key: '!=',
+        component: Input,
     },
-    BOOLEAN: {
-        ops: {
-            '==': '等于',
-        },
-        render() {
-            return <FieldBoolean/>;
-        },
+    {
+        type: 'STRING',
+        label: '包含',
+        key: '.contains',
+        component: Input,
+    },
+    {
+        type: 'STRING',
+        label: '开头等于',
+        key: '.startWith',
+        component: Input,
+    },
+    {
+        type: 'STRING',
+        label: '结尾等于',
+        key: '.endWith',
+        component: Input,
+    },
+
+    // =================== 数字 ================
+
+    {
+        type: 'NUMBER',
+        label: '等于',
+        key: '==',
+        component: Input,
+    },
+    {
+        type: 'NUMBER',
+        label: '不等于',
+        key: '!=',
+        component: Input,
     },
-};
+
+    {
+        type: 'NUMBER',
+        label: '大于',
+        key: '>',
+        component: InputNumber,
+    },
+    {
+        type: 'NUMBER',
+        label: '小于',
+        key: '<',
+        component: InputNumber,
+    },
+    {
+        type: 'NUMBER',
+        label: '大于等于',
+        key: '>=',
+        component: InputNumber,
+    },
+    {
+        type: 'NUMBER',
+        label: '小于等于',
+        key: '<=',
+        component: InputNumber,
+    },
+
+
+    // ===================== 布尔值 =======================
+
+    {
+        type: 'BOOLEAN',
+        label: '等于',
+        key: '==',
+        component: FieldBoolean,
+    },
+
+]
+
+
+function encode(data) {
+    let {left, op, right} = data;
+    if (left == null || op == null || right == null) {
+        return null
+    }
+
+    const isFun = op.startsWith('.')
+    if (isFun) {
+        return left + op + '("' + right + '")';
+    }
+    const isStr = right.startsWith('"')
+    if (isStr) {
+        right = '"' + right + '"';
+    }
+
+    return left + op + right;
+}
+
+function decode(expression) {
+    const isFun = ConditionExpressionUtils.isFunction(expression);
+    if (isFun) {
+        return ConditionExpressionUtils.parseStrFunction(expression)
+    }
+
+    return ConditionExpressionUtils.parse(expression)
+}
+
 
 export class ConditionDesignButton extends Component {
 
@@ -60,7 +134,6 @@ export class ConditionDesignButton extends Component {
         console.log('流程id', processId)
 
         HttpUtils.get('admin/flowable/model/varList', {code: processId}).then(rs => {
-
             const options = rs.map(r => {
                 return {
                     label: r.label,
@@ -76,34 +149,41 @@ export class ConditionDesignButton extends Component {
         this.props.setValue(str, this.props.element, this.props.modeling, this.props.bpmnFactory)
     };
 
+    getOptionsByItem = (record) => {
+        let options = []
+        let {varList} = this.state;
+        let varItem = varList.find(t => t.name === record.left)
+
+        if (varItem) {
+            const {valueType} = varItem;
+            const os = OPERATOR_DEFINITIONS.filter(o => o.type === valueType)
+            for (let o of os) {
+                options.push({
+                    label: o.label,
+                    value: o.key
+                })
+            }
+        }
+
+        return options;
+    }
+
     columns = [
         {
-            dataIndex: 'key', title: '变量名称',
+            dataIndex: 'left', title: '变量名称',
             render: () => {
                 return <Select options={this.state.varOptions} style={{width: 200}}></Select>
             }
         },
         {
-            dataIndex: 'op', title: '操作符', render: (v, record) => {
-                let options = []
-                let {varList} = this.state;
-                let varItem = varList.find(t => t.name === record.key)
-
-                if (varItem) {
-                    const {valueType} = varItem;
-                    const ops = metaInfo[valueType].ops;
-                    options = Object.keys(ops).map(key => {
-                        return {
-                            label: ops[key],
-                            value: key
-                        }
-                    })
-                }
+            dataIndex: 'op', title: '操作符',
+            render: (v, record) => {
+                const options = this.getOptionsByItem(record)
 
                 return <Select options={options} style={{width: 100}}></Select>
             }
         },
-        {dataIndex: 'value', title: '值'},
+        {dataIndex: 'right', title: '值', width: 200},
     ];
 
     render() {
@@ -111,65 +191,53 @@ export class ConditionDesignButton extends Component {
         let arrValue = this.convertStrToArr(value);
 
         return <div style={{display: 'flex', justifyContent: 'right', padding: 8}}>
-            <Button type='primary' size='small'
+            <Button type='primary'
+                    size='small'
+
                     styles={{
-                        root: {backgroundColor: ThemeUtils.getColor('primary-color')}
+                        root: {
+                            backgroundColor: ThemeUtils.getColor('primary-color')
+                        }
                     }}
+
                     onClick={() => this.setState({open: true})}
+
             >条件编辑器</Button>
 
 
-            <Modal title='条件编辑器 (复杂表达式暂不支持)' open={this.state.open}
+            <Modal title='条件编辑器 (复杂表达式暂不支持)' open={this.state.open} width={600}
                    onCancel={() => this.setState({open: false})}
                    footer={null}
                    mask={{blur: false}}
                    destroyOnHidden
             >
-                <FieldTable columns={this.columns}
-                            value={arrValue}
-                            onChange={this.onChange}
-                ></FieldTable>
+                <FieldTable
+                    columns={this.columns}
+                    value={arrValue}
+                    onChange={this.onChange}
+                />
             </Modal>
 
         </div>
     }
 
     convertStrToArr(value) {
-
-        let arrValue = []
         if (value) {
-
-
-            value = StringUtils.removePrefix(value, "${")
-            value = StringUtils.removeSuffix(value, "}")
+            value = StringUtils.removePrefixAndSuffix(value, "${", "}")
             const strArr = StringUtils.split(value, '&&');
-
-            const regex = /(\w+)([<>=!]+)(\w+)/;
-
-            strArr.forEach(expression => {
-                const parts = expression.match(regex);
-                // parts[0] 是整个匹配的字符串
-                // parts[1] 是第一个捕获组 (左操作数)
-                // parts[2] 是第二个捕获组 (操作符)
-                // parts[3] 是第三个捕获组 (右操作数)
-                arrValue.push({
-                    key: parts[1],
-                    op: parts[2],
-                    value: parts[3],
-                })
-            })
+            return strArr.map(decode).filter(t => t != null)
         }
-        return arrValue;
+        return [];
     }
 
+
     convertArrToStr = arrValue => {
-        const str = arrValue.map(i => {
-            const {key, op, value} = i;
-            return `${key}${op}${value}`
-        }).join('&&')
+        const str = arrValue.map(encode).join('&&')
 
         return "${" + str + "}"
     };
+
+
 }
 
 

package/src/pages/flowable/design/provider/properties/ConditionExpressionUtils.js

@@ -0,0 +1,53 @@
+import {StringUtils} from "../../../../../framework";
+
+
+export class ConditionExpressionUtils {
+
+    /**
+     * 判断表达式是否是函数
+     * @param expr 如 name.contains("aa")
+     */
+    static isFunction(expr) {
+        const regExp = /\w+\.\w+\(.*\)/;
+        return regExp.test(expr);
+    }
+
+    /**
+     * 解析函数, 得到变量，函数名，参数
+     * 注意：只支持单参数函数
+     * @param expr
+     */
+    static parseStrFunction(expr) {
+        const regExp = /^(\w+)(\.\w+)\("(.*)"\)$/;
+        const match = expr.match(regExp);
+        if (!match) {
+            return null;
+        }
+        const [, left, op, right] = match;
+        return { left, op,right };
+    }
+
+    /**
+     * 解析普通表达式， 如 a==1,  b>5, c=="你好"
+     *
+     */
+    static parse(expr) {
+        // 支持的比较操作符， 注意顺序，先比较的操作符长的
+        const operators = ['==', '!=', '<=', '>=', '<', '>'];
+
+        const op = operators.find(op => StringUtils.contains(expr, op))
+        if (!op) {
+            return null
+        }
+
+        const index = expr.indexOf(op);
+        const left = expr.substring(0, index).trim();
+        let right = expr.substring(index + op.length).trim();
+        right = StringUtils.removePrefixAndSuffix(right, '"', '"')
+
+        return {left, op, right};
+    }
+
+
+}
+

package/src/pages/flowable/design/provider/properties/ConditionProps.jsx

@@ -1,4 +1,4 @@
-import {isTextFieldEntryEdited, TextFieldEntry} from '@bpmn-io/properties-panel';
+import {isTextFieldEntryEdited, TextAreaEntry, TextFieldEntry} from '@bpmn-io/properties-panel';
 import {useService} from 'bpmn-js-properties-panel';
 import {renderReact} from "./utils";
 import {ConditionDesignButton} from "./ConditionDesign";
@@ -61,10 +61,10 @@ function Component(props) {
     const moddle = useService('moddle');
 
 
-    return TextFieldEntry({
+    return TextAreaEntry({
         element,
         id: id,
-        label: '条件表达式',
+        label: '条件表达式(JUEL)',
         getValue,
         setValue: value=>setValue(value,element,modeling,moddle),
         debounce,

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

@@ -1,76 +1,76 @@
 import React from "react";
 import {HttpUtils, ProTable} from "../../../framework";
 
-export default class  extends React.Component {
+export default class extends React.Component {
 
     columns = [
-            {
-                title: 'ID',
-                dataIndex: 'id',
-            },
-            {
-                title: '分类',
-                dataIndex: 'category',
-            },
-            {
-                title: '名称',
-                dataIndex: 'name',
-            },
-            {
-                title: '键',
-                dataIndex: 'key',
-            },
-            {
-                title: '描述',
-                dataIndex: 'description',
-            },
-            {
-                title: '版本',
-                dataIndex: 'version',
-            },
-            {
-                title: '资源名称',
-                dataIndex: 'resourceName',
-            },
-            {
-                title: '部署ID',
-                dataIndex: 'deploymentId',
-            },
-            {
-                title: '图表资源名称',
-                dataIndex: 'diagramResourceName',
-            },
-            {
-                title: '是否有开始表单键',
-                dataIndex: 'hasStartFormKey',
-                render: (value) => value ? '是' : '否',
-            },
-            {
-                title: '是否有图形符号',
-                dataIndex: 'hasGraphicalNotation',
-                render: (value) => value ? '是' : '否',
-            },
-            {
-                title: '是否挂起',
-                dataIndex: 'suspended',
-                render: (value) => value ? '是' : '否',
-            },
-            {
-                title: '租户ID',
-                dataIndex: 'tenantId',
-            },
-            {
-                title: '派生自',
-                dataIndex: 'derivedFrom',
-            },
-            {
-                title: '根派生来源',
-                dataIndex: 'derivedFromRoot',
-            },
-            {
-                title: '派生版本',
-                dataIndex: 'derivedVersion',
-            },
+        {
+            title: 'ID',
+            dataIndex: 'id',
+        },
+        {
+            title: '分类',
+            dataIndex: 'category',
+        },
+        {
+            title: '名称',
+            dataIndex: 'name',
+        },
+        {
+            title: '键',
+            dataIndex: 'key',
+        },
+        {
+            title: '描述',
+            dataIndex: 'description',
+        },
+        {
+            title: '版本',
+            dataIndex: 'version',
+        },
+        {
+            title: '资源名称',
+            dataIndex: 'resourceName',
+        },
+        {
+            title: '部署ID',
+            dataIndex: 'deploymentId',
+        },
+        {
+            title: '图表资源名称',
+            dataIndex: 'diagramResourceName',
+        },
+        {
+            title: '是否有开始表单键',
+            dataIndex: 'hasStartFormKey',
+            render: (value) => value ? '是' : '否',
+        },
+        {
+            title: '是否有图形符号',
+            dataIndex: 'hasGraphicalNotation',
+            render: (value) => value ? '是' : '否',
+        },
+        {
+            title: '是否挂起',
+            dataIndex: 'suspended',
+            render: (value) => value ? '是' : '否',
+        },
+        {
+            title: '租户ID',
+            dataIndex: 'tenantId',
+        },
+        {
+            title: '派生自',
+            dataIndex: 'derivedFrom',
+        },
+        {
+            title: '根派生来源',
+            dataIndex: 'derivedFromRoot',
+        },
+        {
+            title: '派生版本',
+            dataIndex: 'derivedVersion',
+        },
 
 
     ]

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

@@ -100,7 +100,7 @@ export default class extends React.Component {
                             },
                             {
                                 key: '2',
-                                label: '流程',
+                                label: '流程图',
                                 icon: <ShareAltOutlined/>,
                                 children: this.renderProcess(img, commentList)
                             }

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

@@ -173,7 +173,7 @@ export default class extends React.Component {
 
 
     render() {
-        return <Page>
+        return <Page padding>
             <ProTable
                 actionRef={this.tableRef}
                 toolBarRender={() => {

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

@@ -1,136 +0,0 @@
-import {Button, Card, Form, Modal, Table} from 'antd'
-import React from 'react'
-
-import {ButtonList, HttpUtils, ValueType} from '../../../framework'
-
-
-export default class extends React.Component {
-
-    state = {
-        data: [],
-        formValues: {},
-        formOpen: false
-    }
-
-    formRef = React.createRef()
-    tableRef = React.createRef()
-
-    columns = [
-        {
-            title: '参数名称',
-            dataIndex: 'name',
-            width: 300,
-
-        },
-        {
-            title: '编码',
-            dataIndex: 'code',
-        },
-
-
-        {
-            title: '值',
-            dataIndex: 'value',
-            render(v, record) {
-                if (v != null) {
-                    return ValueType.renderView(record.valueType, {value: v})
-                }
-            }
-        },
-
-
-        {
-            title: '说明',
-            dataIndex: 'description',
-        },
-        {
-            title: '更新时间',
-            dataIndex: 'updateTime',
-        },
-
-        {
-            title: '操作',
-            dataIndex: 'option',
-            fixed: 'right',
-            render: (_, record) => (
-                <ButtonList>
-                    <Button size='small' perm='sysConfig:save' onClick={() => this.handleEdit(record)}> 修改 </Button>
-                </ButtonList>
-            ),
-        },
-    ]
-
-    componentDidMount() {
-        this.loadData();
-    }
-
-    loadData() {
-        HttpUtils.get('admin/sysConfig/page').then(rs => {
-            this.setState({data: rs})
-        })
-    }
-
-    handleEdit = record => {
-        this.setState({formOpen: true, formValues: record})
-    }
-
-
-    onFinish = values => {
-        HttpUtils.post('admin/sysConfig/save', values).then(rs => {
-            this.setState({formOpen: false})
-            this.loadData()
-        })
-    }
-
-
-    render() {
-        return <>
-            <Card loading={this.state.data.length === 0}>
-                <Table
-                    dataSource={this.state.data}
-                    actionRef={this.tableRef}
-                    pagination={false}
-                    expandable={
-                        {
-                            defaultExpandAllRows: true
-                        }
-                    }
-                    columns={this.columns}
-                    rowKey='id'
-                    bordered
-                    size='small'
-                />
-            </Card>
-
-
-            <Modal title={'编辑系统参数'}
-                   open={this.state.formOpen}
-                   onOk={() => this.formRef.current.submit()}
-                   onCancel={() => this.setState({formOpen: false})}
-                   destroyOnHidden
-                   maskClosable={false}
-                   width={400}
-            >
-
-                <Form ref={this.formRef}
-                      initialValues={this.state.formValues}
-                      onFinish={this.onFinish}
-                      layout='vertical'
-                >
-
-                    <Form.Item name='id' noStyle/>
-
-                    <Form.Item name='value' label={this.state.formValues.label}>
-                        {ValueType.renderField(this.state.formValues.valueType)}
-                    </Form.Item>
-
-                </Form>
-            </Modal>
-        </>
-
-
-    }
-}
-
-
-