add buttons

xlorne · xlorne · commit 1494325bfcfe · 2024-11-25T19:58:28.000+08:00
diff --git a/admin-ui/src/components/Flow/panel/ButtonPanel.tsx b/admin-ui/src/components/Flow/panel/ButtonPanel.tsx
@@ -10,8 +10,10 @@ import {
     ProFormText,
     ProTable
 } from "@ant-design/pro-components";
-import {Button, Popconfirm} from "antd";
+import {Button, ColorPicker, Popconfirm, Space} from "antd";
 import FlowUtils from "@/components/Flow/utils";
+import ScriptModal from "@/components/Flow/panel/ScriptModal";
+import {EyeOutlined} from "@ant-design/icons";
 
 interface ButtonPanelProps {
     id: string;
@@ -20,12 +22,36 @@ interface ButtonPanelProps {
 const buttonEventOptions = [
     {
         label: "保存",
-        value: "save"
+        value: "SAVE"
     },
     {
         label: "提交",
-        value: "submit"
-    }
+        value: "SUBMIT"
+    },
+    {
+        label: "指定人员提交",
+        value: "SPECIFY_SUBMIT"
+    },
+    {
+        label: "驳回",
+        value: "REJECT"
+    },
+    {
+        label: "转办",
+        value: "TRANSFER"
+    },
+    {
+        label: "撤销",
+        value: "RECALL"
+    },
+    {
+        label: "延期",
+        value: "POSTPONED"
+    },
+    {
+        label: "自定义",
+        value: "CUSTOM"
+    },
 ]
 
 
@@ -35,8 +61,14 @@ const ButtonPanel: React.FC<ButtonPanelProps> = (props) => {
 
     const [form] = ProForm.useForm();
 
+    const [groovyForm] = ProForm.useForm();
+
     const [visible, setVisible] = React.useState(false);
 
+    const [scriptVisible, setScriptVisible] = React.useState(false);
+
+    const [type, setType] = React.useState<string>();
+
     const columns = [
         {
             title: 'id',
@@ -51,17 +83,19 @@ const ButtonPanel: React.FC<ButtonPanelProps> = (props) => {
         },
         {
             title: '事件类型',
-            dataIndex: 'event',
-            key: 'event',
+            dataIndex: 'type',
+            key: 'type',
             render: (value: string) => {
                 return buttonEventOptions.find((item: any) => item.value == value)?.label;
             }
         },
         {
             title: '按钮颜色',
-            dataIndex: 'color',
-            valueType: 'color',
-            key: 'color',
+            dataIndex: 'style',
+            key: 'style',
+            render: (_: any, record: any) => {
+                return <ColorPicker value={record.style.color} disabled={true}/>;
+            }
         },
         {
             title: '排序',
@@ -78,6 +112,7 @@ const ButtonPanel: React.FC<ButtonPanelProps> = (props) => {
                         onClick={() => {
                             form.resetFields();
                             form.setFieldsValue(record);
+                            setType(record.type);
                             setVisible(true);
                         }}
                     >
@@ -141,15 +176,16 @@ const ButtonPanel: React.FC<ButtonPanelProps> = (props) => {
                 }}
                 onFinish={async (values) => {
                     FlowUtils.updateButton(props.id, values);
-                    actionRef.current?.reload();
                     setVisible(false);
+                    actionRef.current?.reload();
                 }}
             >
                 <ProFormText
                     name={"id"}
                     hidden={true}
                 />
 
+
                 <ProFormText
                     name={"name"}
                     label={"按钮名称"}
@@ -162,40 +198,86 @@ const ButtonPanel: React.FC<ButtonPanelProps> = (props) => {
                     ]}
                 />
 
-                <ProFormSelect
-                    name={"event"}
-                    label={"按钮类型"}
-                    placeholder={"请输入按钮类型"}
+                <ProFormColorPicker
+                    name={"style"}
+                    label={"按钮颜色"}
+                    normalize={(value) => {
+                        return {
+                            color: value.toHexString()
+                        };
+                    }}
+                    getValueProps={(value) => {
+                        const color = value?.color;
+                        if (color) {
+                            return {
+                                value: color
+                            }
+                        }
+                        return value;
+                    }}
+                    placeholder={"请选择按钮颜色"}
                     rules={[
                         {
                             required: true,
-                            message: '请输入按钮类型'
+                            message: '请选择按钮颜色'
                         }
                     ]}
-                    options={buttonEventOptions}
                 />
 
-                <ProFormColorPicker
-                    name={"color"}
-                    label={"按钮颜色"}
-                    normalize={(value) => {
-                        return value.toHexString();
-                    }}
-                    placeholder={"请选择按钮颜色"}
+                <ProFormSelect
+                    name={"type"}
+                    label={(
+                        <Space>
+                            按钮类型
+
+                            {type === 'CUSTOM' && (
+                                <EyeOutlined
+                                    onClick={() => {
+                                        groovyForm.resetFields();
+                                        const script = form.getFieldValue('groovy') || 'def run(content){\n    // 你的代码\n  \n}';
+                                        groovyForm.setFieldsValue({
+                                            'script': script
+                                        });
+                                        setScriptVisible(!scriptVisible);
+                                    }}/>
+                            )}
+
+                        </Space>
+                    )}
+                    placeholder={"请输入按钮类型"}
                     rules={[
                         {
                             required: true,
-                            message: '请选择按钮颜色'
+                            message: '请输入按钮类型'
                         }
                     ]}
+                    options={buttonEventOptions}
+                    onChange={(value:string)=>{
+                        setType(value);
+                    }}
                 />
 
+                <ProFormText
+                    name={"groovy"}
+                    hidden={true}
+                />
+
+                <ScriptModal
+                    onFinish={(values) => {
+                        form.setFieldsValue({
+                            'groovy': values.script
+                        });
+                    }}
+                    form={groovyForm}
+                    setVisible={setScriptVisible}
+                    visible={scriptVisible}/>
+
                 <ProFormDigit
                     name={"order"}
                     label={"排序"}
                     min={0}
                     fieldProps={{
-                        step:1
+                        step: 1
                     }}
                     placeholder={"请输入排序"}
                     rules={[
diff --git a/admin-ui/src/components/Flow/utils/index.ts b/admin-ui/src/components/Flow/utils/index.ts
@@ -54,9 +54,10 @@ const FlowUtils = {
         for(const item of buttons){
             if(item.id == button.id){
                 item.name = button.name;
-                item.color = button.color;
-                item.event = button.event;
+                item.style = button.style;
+                item.type = button.type;
                 item.order = button.order;
+                item.groovy = button.groovy;
 
                 update = true;
             }
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.15</version>
+        <version>3.3.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.15</version>
+        <version>3.3.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.15</version>
+        <version>3.3.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.15</version>
+        <version>3.3.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.15</version>
+        <version>3.3.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.15</version>
+    <version>3.3.16</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.15</version>
+    <version>3.3.16</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.15</version>
+        <version>3.3.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.15</version>
+        <version>3.3.16</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/serializable/FlowWorkSerializable.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/serializable/FlowWorkSerializable.java
@@ -1,8 +1,10 @@
 package com.codingapi.springboot.flow.serializable;
 
+import com.codingapi.springboot.flow.domain.FlowButton;
 import com.codingapi.springboot.flow.domain.FlowNode;
 import com.codingapi.springboot.flow.domain.FlowWork;
 import com.codingapi.springboot.flow.em.ApprovalType;
+import com.codingapi.springboot.flow.em.FlowButtonType;
 import com.codingapi.springboot.flow.em.NodeType;
 import com.codingapi.springboot.flow.repository.FlowOperatorRepository;
 import com.esotericsoftware.kryo.Kryo;
@@ -96,6 +98,8 @@ public byte[] toSerializable() {
         kryo.register(FlowWorkSerializable.class);
         kryo.register(ApprovalType.class);
         kryo.register(NodeType.class);
+        kryo.register(FlowButton.class);
+        kryo.register(FlowButtonType.class);
 
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         Output output = new Output(outputStream);
@@ -113,6 +117,8 @@ public static FlowWorkSerializable fromSerializable(byte[] bytes) {
         kryo.register(FlowWorkSerializable.class);
         kryo.register(ApprovalType.class);
         kryo.register(NodeType.class);
+        kryo.register(FlowButton.class);
+        kryo.register(FlowButtonType.class);
         return kryo.readObject(new Input(bytes), FlowWorkSerializable.class);
     }
 
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.15</version>
+        <version>3.3.16</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.15</version>
+        <version>3.3.16</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 
