Merge branch 'xflow' of https://github.com/alibaba/x-render into xflow

alibaba · Jan 6, 2025 · ca574b5 · ca574b5
2 parents a29111c + 54994b7
commit ca574b5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/packages/x-flow/src/components/NodesPopover/index.tsx b/packages/x-flow/src/components/NodesPopover/index.tsx
@@ -1,5 +1,6 @@
 import { useClickAway } from 'ahooks';
 import { Popover } from 'antd';
+import { isFunction } from 'lodash';
 import React, {
   forwardRef,
   useCallback,
@@ -24,7 +25,7 @@ export default forwardRef((props: any, popoverRef) => {
   const closeRef: any = useRef<HTMLButtonElement>(null);
   const [open, setOpen] = useState(false);
 
-  const { settings, nodeSelector, antdVersion ,readOnly }: any = useContext(ConfigContext);
+  const { settings, nodeSelector, antdVersion ,readOnly ,clickAddNode }: any = useContext(ConfigContext);
   const { showSearch, popoverProps = { placement: 'top' } } =
     nodeSelector || {};
 
@@ -41,13 +42,20 @@ export default forwardRef((props: any, popoverRef) => {
   }, ref);
 
   const handCreateNode = useCallback<any>(({ type }) => {
-    if (type === 'Switch') {
-      addNode({ _nodeType: type, list: [{ '_id':`${uuid()}`}] });
-    } else if (type === 'Parallel') {
-      addNode({ _nodeType: type, list: [{ _id: `id_${uuid()}` }, { _id: `id_${uuid()}` }] });
-    } else {
-      addNode({ _nodeType: type });
+    if (isFunction(clickAddNode)) {
+      clickAddNode(type, ( data = {} )=>{
+        addNode({ _nodeType: type, ...data })
+      });
+    }else{
+      if (type === 'Switch') {
+        addNode({ _nodeType: type, list: [{ '_id':`${uuid()}`}] });
+      } else if (type === 'Parallel') {
+        addNode({ _nodeType: type, list: [{ _id: `id_${uuid()}` }, { _id: `id_${uuid()}` }] });
+      } else {
+        addNode({ _nodeType: type });
+      }
     }
+
     setOpen(false);
     onNodeSelectPopoverChange && onNodeSelectPopoverChange(false);
   }, []);
@@ -56,7 +64,7 @@ export default forwardRef((props: any, popoverRef) => {
     setTimeout(() => {
       setIsAddingNode(true);
       closeRef.current = true;
-      if(!readOnly){
+      if (!readOnly) {
         setOpen(true);
       }
     }, 50);

diff --git a/packages/x-flow/src/types.ts b/packages/x-flow/src/types.ts
@@ -130,6 +130,7 @@ export interface FlowProps {
   panel?:TPanel //表单配置面板
   onNodeClick?: NodeMouseHandler;
   onMenuItemClick: (itemInfo: ItemInfo, defaultAction: () => void) => void;
+  clickAddNode:(type:string,addNode:(initData?:Record<string,any>)=>void)=>void
   // 单点调试方法
 }
 interface ItemInfo {

diff --git a/packages/x-flow/src/withProvider.tsx b/packages/x-flow/src/withProvider.tsx
@@ -32,6 +32,7 @@ export default function withProvider<T>(
       onMenuItemClick,
       antdVersion ='V4',
       readOnly,
+      clickAddNode,
       ...restProps
     } = props;
     const settingMap = useMemo(() => {
@@ -59,6 +60,7 @@ export default function withProvider<T>(
       antdVersion,
       onMenuItemClick,
       readOnly,
+      clickAddNode,
       widgets: {
         ...defaultWidgets,
         ...widgets,