Merge branch 'ModelEngine-Group:3.5.x' into 3.5.x

Author: FUNK6666

.github/workflows/framework-java-compile.yml

@@ -0,0 +1,35 @@
+name: Framework Java Compile
+
+on:
+  push:
+    branches:
+      - 'main'
+      - '[0-9]+.[0-9]+.x'  # 匹配 x.x.x 格式且最后一位为 x（如 1.2.x、22.1.x）
+    paths:
+    - 'framework/**'
+    - '!framework/python/**'
+    - '!framework/elsa/**'
+    - 'examples/**'
+  pull_request:
+    branches:
+      - 'main'
+      - '[0-9]+.[0-9]+.x'
+    paths:
+      - 'framework/**'
+      - '!framework/python/**'
+      - '!framework/elsa/**'
+      - 'examples/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Maven
+        run: mvn clean install

framework/elsa/fit-elsa-react/package.json

@@ -25,7 +25,7 @@
     "@fit-elsa/elsa-core": "file:../fit-elsa",
     "@tinymce/tinymce-react": "4.3.0",
     "antd": "4.24.13",
-    "axios": "1.7.4",
+    "axios": "1.8.2",
     "monaco-editor": "^0.34.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

framework/elsa/fit-elsa-react/src/components/DefaultRoot.jsx

@@ -4,9 +4,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import React, {createContext, forwardRef, useContext, useEffect, useImperativeHandle, useReducer, useRef} from 'react';
+import React, {createContext, forwardRef, useContext, useEffect, useImperativeHandle, useReducer, useRef, useState} from 'react';
+import {createPortal} from 'react-dom';
 import './contentStyle.css';
-import {ConfigProvider, Form} from 'antd';
+import {Form} from 'antd';
+import {CloseOutlined} from '@ant-design/icons';
 import {useUpdateEffect} from '@/components/common/UseUpdateEffect.jsx';
 import {EVENT_TYPE} from '@fit-elsa/elsa-core';
 import PropTypes from 'prop-types';
@@ -26,117 +28,180 @@ const FormContext = createContext(null);
  * @return {JSX.Element}
  * @constructor
  */
-export const DefaultRoot = forwardRef(function ({shape, component, shapeStatus, borderPadding}, ref) {
-    const [data, dispatch] = useReducer(component.reducers, component.getJadeConfig());
-    const id = "react-root-" + shape.id;
-    const [form] = Form.useForm();
-    const domRef = useRef();
+export const DefaultRoot = forwardRef(function (
+  {shape, component, shapeStatus, borderPadding},
+  ref,
+) {
+  const [data, dispatch] = useReducer(
+    component.reducers,
+    component.getJadeConfig(),
+  );
+  const id = 'react-root-' + shape.id;
+  const [form] = Form.useForm();
+  const domRef = useRef();
+  const [open, setOpen] = useState(false);
 
-    // 对外暴露方法.
-    useImperativeHandle(ref, () => {
-        return {
-            getData: () => {
-                return data;
-            },
-            dispatch: (action) => {
-                dispatch(action);
-            }
-        }
-    });
-
-    /**
-     * 校验当前节点的form输入是否合法.
-     *
-     * @return Promise 校验结果
-     */
-    shape.validateForm = () => {
-        return form.validateFields();
+  // 对外暴露方法.
+  useImperativeHandle(ref, () => {
+    return {
+      getData: () => {
+        return data;
+      },
+      dispatch: (action) => {
+        dispatch(action);
+      },
     };
+  });
 
-    // 相当于 componentDidMount
-    useEffect(() => {
-        shape.observe();
-        shape.page.addEventListener(EVENT_TYPE.FOCUSED_SHAPES_CHANGE, onFocusedShapeChange);
-        shape.page.triggerEvent({type: "shape_rendered", value: {id: shape.id}});
-        return () => {
-            shape.page.removeEventListener(EVENT_TYPE.FOCUSED_SHAPES_CHANGE, onFocusedShapeChange);
-        };
-    }, []);
+  /**
+   * 校验当前节点的form输入是否合法.
+   *
+   * @return Promise 校验结果
+   */
+  shape.validateForm = () => {
+    return form.validateFields();
+  };
 
-    const onFocusedShapeChange = () => {
-        if (!domRef.current) {
-            return;
-        }
-        const focusedShapes = shape.page.getFocusedShapes();
-        if (focusedShapes.includes(shape)) {
-            domRef.current.style.pointerEvents = focusedShapes.length > 1 ? "none" : "auto";
-        } else {
-            domRef.current.style.pointerEvents = "auto";
-        }
+  // 相当于 componentDidMount
+  useEffect(() => {
+    shape.observe();
+    shape.page.addEventListener(
+      EVENT_TYPE.FOCUSED_SHAPES_CHANGE,
+      onFocusedShapeChange,
+    );
+    shape.page.triggerEvent({
+      type: 'shape_rendered',
+      value: {id: shape.id},
+    });
+    return () => {
+      shape.page.removeEventListener(
+        EVENT_TYPE.FOCUSED_SHAPES_CHANGE,
+        onFocusedShapeChange,
+      );
     };
+  }, []);
 
-    // 第一次进来不会触发，第一次发生变化时才触发.
-    useUpdateEffect(() => {
-        if (data.jadeNodeConfigChangeIgnored) {
-            return;
-        }
-        if (shape.hasError) {
-            shape.validateForm().then(shape.offError);
-        }
-        shape.graph.dirtied(null, {action: SYSTEM_ACTION.JADE_NODE_CONFIG_CHANGE, shape: shape.id});
-    }, [data]);
+  const onFocusedShapeChange = () => {
+    if (!domRef.current) {
+      return;
+    }
+    const focusedShapes = shape.page.getFocusedShapes();
+    if (focusedShapes.includes(shape)) {
+      domRef.current.style.pointerEvents = focusedShapes.length > 1 ? 'none' : 'auto';
+    } else {
+      domRef.current.style.pointerEvents = 'auto';
+    }
+    setOpen(shape.page.onConfigShape === shape.id);
+  };
 
-    // 当前是评估页面，并且runnable为false时，才出现遮盖层
-    return (<>
-        {shape.enableMask && <div className='jade-cover-level' style={{
+  // 第一次进来不会触发，第一次发生变化时才触发.
+  useUpdateEffect(() => {
+    if (data.jadeNodeConfigChangeIgnored) {
+      return;
+    }
+    if (shape.hasError) {
+      shape.validateForm().then(shape.offError);
+    }
+    shape.graph.dirtied(null, {
+      action: SYSTEM_ACTION.JADE_NODE_CONFIG_CHANGE,
+      shape: shape.id,
+    });
+  }, [data]);
+
+  // 当前是评估页面，并且runnable为false时，才出现遮盖层
+  return (
+    <>
+      {shape.enableMask && (
+        <div
+          className="jade-cover-level"
+          style={{
             margin: -borderPadding,
             width: `calc(100% + ${2 * borderPadding}px)`,
             height: `calc(100% + ${2 * borderPadding}px)`,
-        }}/>}
-        <div id={id} style={{display: 'block'}} ref={domRef}>
-            <Form form={form}
-                  name={`form-${shape.id}`}
-                  layout='vertical' // 设置全局的垂直布局
-                  className={'jade-form'}
-            >
-                <DispatchContext.Provider value={dispatch}>
-                    {shape.drawer.getHeaderComponent(data, shapeStatus)}
-                    <FormContext.Provider value={form}>
-                        <ShapeContext.Provider value={shape}>
-                            <DataContext.Provider value={data}>
-                                <div
-                                  className='react-node-content'
-                                  style={{borderRadius: `${shape.borderRadius}px`}}>
-                                    {component.getReactComponents(shapeStatus, data)}
-                                </div>
-                            </DataContext.Provider>
-                        </ShapeContext.Provider>
-                    </FormContext.Provider>
-                    {shape.drawer.getFooterComponent()}
-                </DispatchContext.Provider>
-            </Form>
-        </div>
-    </>);
+          }}
+        />
+      )}
+      <div id={id} style={{display: 'block'}} ref={domRef}>
+        <Form
+          form={form}
+          name={`form-${shape.id}`}
+          layout="vertical" // 设置全局的垂直布局
+          className={'jade-form'}
+        >
+          <DispatchContext.Provider value={dispatch}>
+            {shape.drawer.getHeaderComponent(data, shapeStatus)}
+            <FormContext.Provider value={form}>
+              <ShapeContext.Provider value={shape}>
+                <DataContext.Provider value={data}>
+                  <div
+                    className="react-node-content"
+                    style={{borderRadius: `${shape.borderRadius}px`}}
+                  >
+                    {component.getReactComponents(shapeStatus, data, false)}
+                  </div>
+                </DataContext.Provider>
+              </ShapeContext.Provider>
+            </FormContext.Provider>
+            {shape.drawer.getFooterComponent()}
+          </DispatchContext.Provider>
+        </Form>
+      </div>
+      {createPortal(
+        <div className={`jade-form-drawer ${open ? '' : 'hidden'}`}>
+          <Form
+            form={form}
+            name={`outside-form-${shape.id}`}
+            layout="vertical" // 设置全局的垂直布局
+            className={'jade-form'}
+          >
+            <DispatchContext.Provider value={dispatch}>
+              <div className="sticky-header">
+                {shape.drawer.getHeaderComponent(data, shapeStatus)}
+                <div className="jade-form-drawer-close" onClick={() => {
+                  shape.page.onConfigShape = undefined;
+                  setOpen(false);
+                }}>
+                  <CloseOutlined style={{fontSize: '12px'}}/>
+                </div>
+              </div>
+              <div className="jade-form-drawer-content">
+                <FormContext.Provider value={form}>
+                  <ShapeContext.Provider value={shape}>
+                    <DataContext.Provider value={data}>
+                      <div className="react-node-content">
+                        {component.getReactComponents(shapeStatus, data, true)}
+                      </div>
+                    </DataContext.Provider>
+                  </ShapeContext.Provider>
+                </FormContext.Provider>
+              </div>
+            </DispatchContext.Provider>
+          </Form>
+        </div>,
+        document.getElementById('elsa-graph'),
+      )}
+    </>
+  );
 });
 
 DefaultRoot.propTypes = {
-    shape: PropTypes.object,
-    component: PropTypes.object,
-    shapeStatus: PropTypes.object
+  shape: PropTypes.object,
+  component: PropTypes.object,
+  shapeStatus: PropTypes.object,
 };
 
 export function useDataContext() {
-    return useContext(DataContext);
+  return useContext(DataContext);
 }
 
 export function useShapeContext() {
-    return useContext(ShapeContext);
+  return useContext(ShapeContext);
 }
 
 export function useDispatch() {
-    return useContext(DispatchContext);
+  return useContext(DispatchContext);
 }
 
 export function useFormContext() {
-    return useContext(FormContext);
-}
+  return useContext(FormContext);
+}

framework/elsa/fit-elsa-react/src/components/base/jadeNode.jsx

@@ -76,6 +76,7 @@ export const jadeNode = (id, x, y, width, height, parent, drawer) => {
   self.referenceDisabled = false;
   self.statusManager = statusManager(self);
   self.isActiveInFlow = false;
+  self.allowConfig = true;
 
   overrideMethods(self);
   referenceDecorate(self);
@@ -437,14 +438,16 @@ export const jadeNode = (id, x, y, width, height, parent, drawer) => {
       return false;
     }
 
-    return nextNodes.map(n => {
-      chain.add(n);
-      if (!traverse(n, target, chain)) {
-        chain.delete(n);
-        return false;
+    // 这里只保留一条链路上的节点，若有多条链路，其他链路上的节点不计入其中。
+    for (let i = 0; i < nextNodes.length; i++) {
+      chain.add(nextNodes[i]);
+      if (traverse(nextNodes[i], target, chain)) {
+        return true;
+      } else {
+        chain.delete(nextNodes[i]);
       }
-      return true;
-    }).reduce((acc, v) => acc || v, false);
+    }
+    return false;
   };
 
   /**
@@ -486,5 +489,17 @@ export const jadeNode = (id, x, y, width, height, parent, drawer) => {
     self.invalidateAlone();
   };
 
+  /**
+   * @override
+   */
+  const select = self.select;
+  self.select = (xVal, yVal) => {
+    select.apply(self, [xVal, yVal]);
+    const focusedShapes = self.page.getFocusedShapes();
+    if (focusedShapes.length === 1 && focusedShapes.includes(self)) {
+      self.page.onConfigShape = self.allowConfig ? self.id : undefined;
+    }
+  };
+
   return self;
 };

framework/elsa/fit-elsa-react/src/components/common/JadeInputTree.jsx

@@ -173,13 +173,13 @@ export const JadeInputTree = (
           initialValue={openRadioId}
         >
           <Radio.Group value={openRadioId ?? undefined} onChange={handleRadioChange}>
-            <Tree defaultExpandAll={defaultExpandAll} blockNode className='jade-ant-tree' showLine>
+            <Tree selectable={false} defaultExpandAll={defaultExpandAll} blockNode className='jade-ant-tree' showLine>
               {renderTreeNodes(treeData)}
             </Tree>
           </Radio.Group>
         </Form.Item>
       ) : (
-        <Tree defaultExpandAll={defaultExpandAll} blockNode className='jade-ant-tree' showLine>
+        <Tree selectable={false} defaultExpandAll={defaultExpandAll} blockNode className='jade-ant-tree' showLine>
           {renderTreeNodes(treeData)}
         </Tree>
       )}