fix groovy json bug

Author: xlorne

admin-ui/package.json

@@ -6,6 +6,8 @@
     "@ant-design/icons": "^5.4.0",
     "@ant-design/pro-components": "^2.7.19",
     "@babel/standalone": "^7.25.6",
+    "@dnd-kit/core": "^6.2.0",
+    "@dnd-kit/sortable": "^9.0.0",
     "@logicflow/core": "^2.0.5",
     "@logicflow/extension": "^2.0.9",
     "@reduxjs/toolkit": "^2.2.7",

admin-ui/src/config/menus.tsx

@@ -15,6 +15,12 @@ export const menus = [
         icon: "SmileOutlined",
         page: 'welcome',
     },
+    {
+        path: '/portal',
+        name: '门户',
+        icon: "SmileOutlined",
+        page: 'portal',
+    },
     {
         path: '/user',
         name: '用户列表',

admin-ui/src/pages/portal/Draggable.tsx

@@ -0,0 +1,20 @@
+import React from 'react';
+import {useDraggable} from '@dnd-kit/core';
+
+const Draggable = (props: any) => {
+    const {attributes, listeners, setNodeRef, transform} = useDraggable({
+        id: 'draggable',
+    });
+    const style = transform ? {
+        transform: `translate3d(${transform.x}px, ${transform.y}px, 0)`,
+    } : undefined;
+
+
+    return (
+        <div ref={setNodeRef} style={style} {...listeners} {...attributes}>
+            {props.children}
+        </div>
+    );
+}
+
+export default Draggable;

admin-ui/src/pages/portal/Droppable.tsx

@@ -0,0 +1,20 @@
+import React from 'react';
+import {useDroppable} from '@dnd-kit/core';
+
+const Droppable=(props:any)=> {
+    const {isOver, setNodeRef} = useDroppable({
+        id: 'droppable',
+    });
+    const style = {
+        color: isOver ? 'green' : undefined,
+    };
+
+
+    return (
+        <div ref={setNodeRef} style={style}>
+            {props.children}
+        </div>
+    );
+}
+
+export default Droppable;

admin-ui/src/pages/portal/index.tsx

@@ -0,0 +1,11 @@
+import React from "react";
+
+const Portal = ()=>{
+    return (
+        <>
+
+        </>
+    )
+}
+
+export default Portal;

admin-ui/src/portal/index.tsx

@@ -0,0 +1,10 @@
+import React from "react";
+
+const Portal = ()=>{
+    return (
+        <>
+
+        </>
+    )
+}
+export default Portal;

example/example-application/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.25</version>
+        <version>3.3.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-domain/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.25</version>
+        <version>3.3.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-infra-flow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.25</version>
+        <version>3.3.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-infra-jpa/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.25</version>
+        <version>3.3.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.25</version>
+        <version>3.3.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/pom.xml

@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.25</version>
+    <version>3.3.26</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.25</version>
+    <version>3.3.26</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.25</version>
+        <version>3.3.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.25</version>
+        <version>3.3.26</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowButton.java

@@ -44,7 +44,7 @@ public class FlowButton {
      */
     private int order;
 
-    public boolean isGroovy() {
+    public boolean hasGroovy() {
         return groovy != null;
     }
 

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowCustomEventService.java

@@ -68,7 +68,7 @@ public MessageResult customFlowEvent(long recordId, IFlowOperator currentOperato
         if (flowButton == null) {
             throw new IllegalArgumentException("flow button not found");
         }
-        if (!flowButton.isGroovy()) {
+        if (!flowButton.hasGroovy()) {
             throw new IllegalArgumentException("flow button not groovy");
         }
         return flowButton.run(flowRecord, flowNode, flowWork, createOperator, currentOperator, bindData, opinion, historyRecords);

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.25</version>
+        <version>3.3.26</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.25</version>
+        <version>3.3.26</version>
     </parent>
     <artifactId>springboot-starter</artifactId>