From f0a4332b89992e173985b51d422f856176f375c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=B4=AB=E5=8D=87?= <luozhu2021@gmail.com>
Date: Wed, 4 Dec 2024 10:08:23 +0800
Subject: [PATCH 01/10] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=20zoomIn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/x-flow/src/operator/ZoomInOut/index.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/x-flow/src/operator/ZoomInOut/index.tsx b/packages/x-flow/src/operator/ZoomInOut/index.tsx
index 4c56c2d54..4c1ed8e89 100644
--- a/packages/x-flow/src/operator/ZoomInOut/index.tsx
+++ b/packages/x-flow/src/operator/ZoomInOut/index.tsx
@@ -99,7 +99,7 @@ const ZoomInOut: FC = () => {
   } = useReactFlow();
 
   const { zoom } = useViewport();
-  
+
   const handleZoom = (type: string) => {
     if (type === ZoomType.zoomToFit)
       fitView()
@@ -123,23 +123,23 @@ const ZoomInOut: FC = () => {
   return (
     <div className='fai-reactflow-zoominout'>
       <Tooltip title='放大'>
-        <Button 
-          type='text' 
-          icon={<IconView type='icon-zoomout' style={{ fontSize: 18, color: '#667085' }} />} 
+        <Button
+          type='text'
+          icon={<IconView type='icon-zoomout' style={{ fontSize: 18, color: '#667085' }} />}
           onClick={(e) => {
             e.stopPropagation();
             zoomOut();
           }}
         />
       </Tooltip>
-      <div style={{ fontSize: '13px', fontWeight: 500, padding: '0 2px' }}>
+      <div style={{ fontSize: '13px', fontWeight: 500, padding: '0 2px', textAlign: 'center', width: '32px' }}>
         <Popover content={<ZoomSelect handleZoom={handleZoom} />} zIndex={1000} trigger='click'>
           {parseFloat(`${zoom * 100}`).toFixed(0)}%
         </Popover>
       </div>
       <Tooltip title='缩小'>
-        <Button 
-          type='text' 
+        <Button
+          type='text'
           icon={<IconView type='icon-zoomin' style={{ fontSize: 18, color: '#667085' }} />}
           onClick={(e) => {
             e.stopPropagation();

From f3506c9349c2bef08c3bdbbc2362663ca3f03d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=B4=AB=E5=8D=87?= <luozhu2021@gmail.com>
Date: Wed, 4 Dec 2024 10:30:11 +0800
Subject: [PATCH 02/10] =?UTF-8?q?chore:=20=E4=BD=BF=E7=94=A8=20addNodes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CustomNode/index.tsx       | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/packages/x-flow/src/components/CustomNode/index.tsx b/packages/x-flow/src/components/CustomNode/index.tsx
index bbff9b7fb..a72e9b020 100644
--- a/packages/x-flow/src/components/CustomNode/index.tsx
+++ b/packages/x-flow/src/components/CustomNode/index.tsx
@@ -35,13 +35,13 @@ export default memo((props: any) => {
     widgets[`${capitalize(type)}Node`] || widgets['CommonNode'];
   const [isHovered, setIsHovered] = useState(false);
   const reactflow = useReactFlow();
-  const { edges, nodes, setNodes, setEdges, mousePosition } = useStore(
+  const { edges, nodes, addNodes, addEdges, mousePosition } = useStore(
     (state: any) => ({
       nodes: state.nodes,
       edges: state.edges,
       mousePosition: state.mousePosition,
-      setNodes: state.setNodes,
-      setEdges: state.setEdges,
+      addNodes: state.addNodes,
+      addEdges: state.addEdges,
       onEdgesChange: state.onEdgesChange,
     }),
     shallow
@@ -67,23 +67,19 @@ export default memo((props: any) => {
     });
     const targetId = uuid();
 
-    const newNodes = produce(nodes, (draft: any) => {
-      draft.push({
-        id: targetId,
-        type: 'custom',
-        data,
-        position: { x, y },
-      });
-    });
-    const newEdges = produce(edges, (draft: any) => {
-      draft.push({
-        id: uuid(),
-        source: id,
-        target: targetId,
-      });
-    });
-    setNodes(newNodes);
-    setEdges(newEdges);
+    const newNodes = {
+      id: targetId,
+      type: 'custom',
+      data,
+      position: { x, y },
+    };
+    const newEdges = {
+      id: uuid(),
+      source: id,
+      target: targetId,
+    };
+    addNodes(newNodes);
+    addEdges(newEdges);
   };
 
   let targetPosition = Position.Left;

From 6dd7cc5438f458f1d14054f47d665cabb80c51d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=B4=AB=E5=8D=87?= <luozhu2021@gmail.com>
Date: Wed, 4 Dec 2024 10:32:35 +0800
Subject: [PATCH 03/10] =?UTF-8?q?chore:=20=E4=B8=8D=E4=BD=BF=E7=94=A8=20im?=
 =?UTF-8?q?mer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/x-flow/src/components/CustomNode/index.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/x-flow/src/components/CustomNode/index.tsx b/packages/x-flow/src/components/CustomNode/index.tsx
index a72e9b020..f587c09d5 100644
--- a/packages/x-flow/src/components/CustomNode/index.tsx
+++ b/packages/x-flow/src/components/CustomNode/index.tsx
@@ -1,6 +1,5 @@
 import { Handle, Position, useReactFlow } from '@xyflow/react';
 import classNames from 'classnames';
-import produce from 'immer';
 import React, { memo, useContext, useState } from 'react';
 import { shallow } from 'zustand/shallow';
 import { useStore } from '../../hooks/useStore';
@@ -35,7 +34,7 @@ export default memo((props: any) => {
     widgets[`${capitalize(type)}Node`] || widgets['CommonNode'];
   const [isHovered, setIsHovered] = useState(false);
   const reactflow = useReactFlow();
-  const { edges, nodes, addNodes, addEdges, mousePosition } = useStore(
+  const { addNodes, addEdges, mousePosition } = useStore(
     (state: any) => ({
       nodes: state.nodes,
       edges: state.edges,

From 49935bbbd3c71ae283107861284208051dc3d231 Mon Sep 17 00:00:00 2001
From: "zhanbo.lh" <zhanbo.lh@alibaba-inc.com>
Date: Wed, 4 Dec 2024 10:34:37 +0800
Subject: [PATCH 04/10] =?UTF-8?q?feat:=20xflow=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CustomHtml/index.tsx       | 65 -------------------
 .../src/components/NodeContainer/index.tsx    | 32 ++++++---
 .../x-flow/src/components/NodesMenu/index.tsx | 32 ++++++---
 .../src/components/PanelContainer/index.tsx   | 39 +++++------
 .../x-flow/src/nodes/node-common/index.tsx    |  5 +-
 packages/x-flow/src/nodes/node-end/index.tsx  |  3 +-
 .../x-flow/src/nodes/node-start/index.tsx     |  3 +-
 .../x-flow/src/nodes/node-switch/index.tsx    |  5 +-
 packages/x-flow/src/types.ts                  |  1 +
 packages/x-flow/src/utils/createIconFont.ts   |  2 +-
 packages/x-flow/src/withProvider.tsx          |  2 +
 11 files changed, 76 insertions(+), 113 deletions(-)
 delete mode 100644 packages/x-flow/src/components/CustomHtml/index.tsx

diff --git a/packages/x-flow/src/components/CustomHtml/index.tsx b/packages/x-flow/src/components/CustomHtml/index.tsx
deleted file mode 100644
index 64eda1582..000000000
--- a/packages/x-flow/src/components/CustomHtml/index.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import React from 'react';
-import { Tooltip, Typography } from 'antd';
-import _ from 'lodash';
-import IconView from '../IconView';
-
-const { Text } = Typography;
-
-export default (props: any) => {
-  const { value, config, showEllipsis, width } = props;
-  const item = config?.[value];
-
-  if (showEllipsis && width) {
-    return (
-      <Text
-        style={showEllipsis ? { width } : undefined}
-        ellipsis={showEllipsis ? { tooltip: value } : false}
-      >
-        {value}
-      </Text>
-    );
-  }
-
-  if (config?.requiredByValue && props.addons.schemaPath.includes('[]')) {
-    // 根据当前行的数据判断是否必填
-    const values = props.addons.getValues();
-    const dataPath = props.addons.dataPath;
-    const record = _.get(values, dataPath.slice(0, dataPath.lastIndexOf('.')));
-    const pathName = dataPath.slice(dataPath.lastIndexOf('.') + 1);
-    // console.log('🚀 ~ record:', record, pathName);
-    // 获取当前行的数据
-
-    return (
-      <span style={{ display: 'flex', alignItems: 'center' }}>
-        {record?.required && config?.[pathName] === 'required' ? (
-          <span style={{ color: '#ff4d4f', marginTop: '6px' }}>*</span>
-        ) : (
-          ''
-        )}
-        <span style={{ margin: '0 3px' }}>{value}</span>
-      </span>
-    );
-  }
-
-  if (!item) {
-    return value;
-  }
-  const { required, tooltip } = item;
-
-  return (
-    <span style={{ display: 'flex', alignItems: 'center' }}>
-      {required && (
-        <span style={{ color: '#ff4d4f', marginTop: '6px' }}>*</span>
-      )}
-      <span style={{ margin: '0 3px' }}>{item?.label || value}</span>
-      {!!tooltip && (
-        <Tooltip title={tooltip}>
-          <IconView
-            type="icon-help"
-            style={{ fontSize: 16, color: 'rgba(0, 0, 0, 45%)' }}
-          />
-        </Tooltip>
-      )}
-    </span>
-  );
-};
diff --git a/packages/x-flow/src/components/NodeContainer/index.tsx b/packages/x-flow/src/components/NodeContainer/index.tsx
index 5340bc2c1..b71785c29 100644
--- a/packages/x-flow/src/components/NodeContainer/index.tsx
+++ b/packages/x-flow/src/components/NodeContainer/index.tsx
@@ -1,13 +1,27 @@
 import { Typography } from 'antd';
 import classNames from 'classnames';
-import React, { memo } from 'react';
-import IconView from '../IconView';
+import React, { memo, useMemo } from 'react';
+import createIconFont from '../../utils/createIconFont';
 import './index.less';
 
 const { Text, Paragraph } = Typography;
 
 export default memo((props: any) => {
-  const { className, onClick, children, icon, title, desc, hideDesc, NodeWidget, nodeMinHeight } = props;
+  const { 
+    className, 
+    onClick, 
+    children, 
+    icon, 
+    title, 
+    desc, 
+    hideDesc, 
+    NodeWidget, 
+    nodeMinHeight,
+    iconFontUrl
+  } = props;
+
+  const IconBox = useMemo(() => createIconFont(iconFontUrl), [iconFontUrl]);
+
 
   return (
     <div
@@ -17,9 +31,9 @@ export default memo((props: any) => {
       onClick={onClick}
       style={nodeMinHeight ? { minHeight: nodeMinHeight } : {}}
     >
-      <div className="node-title">
-        <span className="icon-box" style={{ background: icon?.bgColor }}>
-          <IconView {...icon} />
+      <div className='node-title'>
+        <span className='icon-box' style={{ background: icon?.bgColor }}>
+          <IconBox {...icon} />
         </span>
         {/* <span style={{ marginLeft: '8px' }}>{title}</span> */}
         <Text
@@ -29,8 +43,8 @@ export default memo((props: any) => {
           {title}
         </Text>
       </div>
-      <div className="node-body">{children}</div>
-      {/* {!hideDesc && !!desc && <div className="node-desc">{desc}</div>} */}
+      <div className='node-body'>{children}</div>
+      {/* {!hideDesc && !!desc && <div className='node-desc'>{desc}</div>} */}
       {
         NodeWidget && <div className='node-widget'>
           {NodeWidget}
@@ -42,7 +56,7 @@ export default memo((props: any) => {
             rows: 2,
             tooltip: { title: desc, placement: 'topRight' },
           }}
-          className="node-desc"
+          className='node-desc'
         >
           {desc}
         </Paragraph>
diff --git a/packages/x-flow/src/components/NodesMenu/index.tsx b/packages/x-flow/src/components/NodesMenu/index.tsx
index d0281eff8..f090506a9 100644
--- a/packages/x-flow/src/components/NodesMenu/index.tsx
+++ b/packages/x-flow/src/components/NodesMenu/index.tsx
@@ -1,9 +1,9 @@
-
-import React, { forwardRef, Ref } from 'react';
+import React, { forwardRef, Ref, useContext, useMemo } from 'react';
 import { Popover, Input } from 'antd';
 import { SearchOutlined } from '@ant-design/icons';
+import { ConfigContext } from '../../models/context';
 import { useSet } from '../../utils/hooks';
-import IconView from '../IconView';
+import createIconFont from '../../utils/createIconFont';
 import { TNodeMenu } from '../../types';
 import './index.less';
 
@@ -36,11 +36,13 @@ const searchNodeList = (query: string, list: any[]) => {
 };
 
 // 悬浮菜单项详细描述
-const MenuTooltip = ({ icon, title, description }: any) => {
+const MenuTooltip = ({ icon, title, description, iconFontUrl }: any) => {
+  const IconBox = useMemo(() => createIconFont(iconFontUrl), [iconFontUrl]);
+
   return (
     <div className='xflow-node-menu-tooltip'>
       <div className='icon-box-max' style={{ background: icon?.bgColor, marginRight: '8px' }}>
-        <IconView type={icon?.type} style={{ color: '#fff', fontSize: 13, ...icon?.style }} />
+        <IconBox type={icon?.type} style={{ color: '#fff', fontSize: 13, ...icon?.style }} />
       </div>
       <div className='title'>
         {title}
@@ -54,7 +56,9 @@ const MenuTooltip = ({ icon, title, description }: any) => {
 
 // 节点菜单项
 const MenuItem = (props: any) => {
-  const { title, type, icon, onClick } = props;
+  const { title, type, icon, onClick, iconFontUrl } = props;
+  const IconBox = useMemo(() => createIconFont(iconFontUrl), [iconFontUrl]);
+
   return (
     <Popover
       key={type}
@@ -67,7 +71,7 @@ const MenuItem = (props: any) => {
         onClick={onClick(type)}
       >
         <span className='icon-box' style={{ background: icon?.bgColor, marginRight: '8px' }}>
-          <IconView
+          <IconBox
             type={icon?.type}
             style={{ color: '#fff', fontSize: 13 }}
           />
@@ -90,6 +94,7 @@ const filterHiddenMenu = (list: any) => {
  */
 const NodesMenu = (props: TNodeMenu, ref: Ref<HTMLDivElement>) => {
   const { items, showSearch, onClick } = props;
+  const { iconFontUrl } = useContext(ConfigContext);
 
   const [state, setState] = useSet({
     menuList: [...items]
@@ -122,12 +127,21 @@ const NodesMenu = (props: TNodeMenu, ref: Ref<HTMLDivElement>) => {
           <div key={`${item.type}-${index}`}>
             <div className='menu-group-title'>{item.title}</div>
             {filterHiddenMenu(item.items).map((data: any, index: number) => (
-               <MenuItem {...data} onClick={handleItemClick} key={index} />
+              <MenuItem
+                iconFontUrl={iconFontUrl}
+                {...data} 
+                onClick={handleItemClick} 
+                key={index}
+              />
             ))}
           </div>
         ) : (
           <div key={`${item.type}-${index}`}>
-            <MenuItem {...item} onClick={handleItemClick} />
+            <MenuItem
+              iconFontUrl={iconFontUrl}
+              {...item}
+              onClick={handleItemClick}
+            />
           </div>
         ))}
       </div>
diff --git a/packages/x-flow/src/components/PanelContainer/index.tsx b/packages/x-flow/src/components/PanelContainer/index.tsx
index bc9778c59..6c39484ce 100644
--- a/packages/x-flow/src/components/PanelContainer/index.tsx
+++ b/packages/x-flow/src/components/PanelContainer/index.tsx
@@ -1,10 +1,11 @@
 import { Divider, Drawer, Input, Space } from 'antd';
 import produce from 'immer';
 import { debounce } from 'lodash';
-import React, { FC, useContext, useEffect, useState } from 'react';
+import React, { FC, useContext, useEffect, useState, useMemo } from 'react';
 import { shallow } from 'zustand/shallow';
 import { useStore } from '../../hooks/useStore';
 import { ConfigContext } from '../../models/context';
+import createIconFont from '../../utils/createIconFont';
 import IconView from '../IconView';
 import './index.less';
 
@@ -19,22 +20,12 @@ interface IPanelProps {
   data: any; // data值
 }
 
-const getDescription = (nodeType: string, description: string) => {
-  if (nodeType === 'Input') {
-    return '工作流的起始节点，用于设定启动工作流入参信息';
-  }
-  if (nodeType === 'Output') {
-    return '工作流的最终节点，用于返回工作流运行后的出参信息';
-  }
-  return description || '';
-};
-
-const Panel: FC<IPanelProps> = (props: any) => {
+const Panel: FC<IPanelProps> = (props: IPanelProps) => {
   // disabled属性取的地方可能不对------to do
   const { onClose, children, nodeType, disabled, node, description, id, data } =
     props;
   // 1.获取节点配置信息
-  const { settingMap } = useContext(ConfigContext);
+  const { settingMap, iconFontUrl } = useContext(ConfigContext);
   const nodeSetting = settingMap[nodeType] || {};
   const { nodes, setNodes } = useStore(
     (state: any) => ({
@@ -73,22 +64,24 @@ const Panel: FC<IPanelProps> = (props: any) => {
     setTitleVal(data?.title || nodeSetting?.title);
   }, [JSON.stringify(data), id]);
 
+  const Icon = useMemo(() => createIconFont(iconFontUrl), [iconFontUrl]);
+
   return (
     <Drawer
-      rootClassName="custom-node-panel"
+      rootClassName='custom-node-panel'
       open={true}
       // width={400}  // 默认378
       mask={false}
       onClose={onClose}
       title={
         <>
-          <div className="title-box">
+          <div className='title-box'>
             <div style={{ display: 'flex', alignItems: 'center', flex: 1 }}>
               <span
-                className="icon-box"
+                className='icon-box'
                 style={{ background: nodeSetting?.icon?.bgColor }}
               >
-                <IconView
+                <Icon
                   style={{ fontSize: 14, color: '#fff' }}
                   type={nodeSetting?.icon?.type}
                 />
@@ -107,29 +100,29 @@ const Panel: FC<IPanelProps> = (props: any) => {
                 />
               )}
             </div>
-            <div className="title-actions">
+            <div className='title-actions'>
               <Space size={[4, 4]}>
                 {!isDisabled && (
                   <>
-                    <IconView type="icon-bofang" style={{ fontSize: 18 }} />
-                    <Divider type="vertical" />
+                    <IconView type='icon-bofang' style={{ fontSize: 18 }} />
+                    <Divider type='vertical' />
                   </>
                 )}
                 {/* <IconView type='icon-help'/> */}
                 <IconView
-                  type="icon-remove"
+                  type='icon-remove'
                   style={{ fontSize: 16 }}
                   onClick={onClose}
                 />
               </Space>
             </div>
           </div>
-          <div className="desc-box">
+          <div className='desc-box'>
             {isDisabled ? (
               description
             ) : (
               <Input.TextArea
-                placeholder="添加描述..."
+                placeholder='添加描述...'
                 autoSize={{ minRows: 1 }}
                 value={descVal}
                 // value={data?.desc}
diff --git a/packages/x-flow/src/nodes/node-common/index.tsx b/packages/x-flow/src/nodes/node-common/index.tsx
index fa863ae3d..917e0cdcb 100644
--- a/packages/x-flow/src/nodes/node-common/index.tsx
+++ b/packages/x-flow/src/nodes/node-common/index.tsx
@@ -4,13 +4,13 @@ import { ConfigContext } from '../../models/context';
 
 export default memo((props: any) => {
   const { type, onClick, data } = props;
-  const { settingMap, widgets } = useContext(ConfigContext);
+  const { settingMap, widgets, iconFontUrl } = useContext(ConfigContext);
   const nodeSetting = settingMap[type] || {};
   const NodeWidget = widgets[nodeSetting?.nodeWidget] || undefined;
 
   return (
     <NodeContainer
-      className="custom-node-code"
+      className='custom-node-code'
       title={data?.title || nodeSetting.title}
       icon={{
         type: nodeSetting?.icon?.type,
@@ -21,6 +21,7 @@ export default memo((props: any) => {
       hideDesc={nodeSetting?.hideDesc || !data?.desc}
       desc={data?.desc}
       NodeWidget={NodeWidget ? <NodeWidget data={data} /> : undefined}
+      iconFontUrl={iconFontUrl}
     />
   );
 });
diff --git a/packages/x-flow/src/nodes/node-end/index.tsx b/packages/x-flow/src/nodes/node-end/index.tsx
index 890357a49..a22708088 100644
--- a/packages/x-flow/src/nodes/node-end/index.tsx
+++ b/packages/x-flow/src/nodes/node-end/index.tsx
@@ -4,7 +4,7 @@ import { ConfigContext } from '../../models/context';
 
 export default memo((props: any) => {
   const { onClick, type, data } = props;
-  const { settingMap,widgets } = useContext(ConfigContext);
+  const { settingMap,widgets, iconFontUrl } = useContext(ConfigContext);
   const nodeSetting = settingMap[type] || {};
   const NodeWidget = widgets[nodeSetting?.nodeWidget] || undefined;
 
@@ -21,6 +21,7 @@ export default memo((props: any) => {
       hideDesc={nodeSetting?.hideDesc || !data?.desc}
       desc={data?.desc}
       NodeWidget={NodeWidget ? <NodeWidget data={data} /> : undefined}
+      iconFontUrl={iconFontUrl}
     />
   );
 });
diff --git a/packages/x-flow/src/nodes/node-start/index.tsx b/packages/x-flow/src/nodes/node-start/index.tsx
index 923cadfd9..180808eca 100644
--- a/packages/x-flow/src/nodes/node-start/index.tsx
+++ b/packages/x-flow/src/nodes/node-start/index.tsx
@@ -4,7 +4,7 @@ import { ConfigContext } from '../../models/context';
 
 export default memo((props: any) => {
   const { onClick, type, data } = props;
-  const { settingMap, widgets } = useContext(ConfigContext);
+  const { settingMap, widgets, iconFontUrl } = useContext(ConfigContext);
   const nodeSetting = settingMap[type] || {};
   const NodeWidget = widgets[nodeSetting?.nodeWidget] || undefined;
 
@@ -21,6 +21,7 @@ export default memo((props: any) => {
       hideDesc={nodeSetting?.hideDesc || !data?.desc}
       desc={data?.desc}
       NodeWidget={NodeWidget ? <NodeWidget data={data} /> : undefined}
+      iconFontUrl={iconFontUrl}
     />
   );
 });
diff --git a/packages/x-flow/src/nodes/node-switch/index.tsx b/packages/x-flow/src/nodes/node-switch/index.tsx
index 53824f8de..1d495fd19 100644
--- a/packages/x-flow/src/nodes/node-switch/index.tsx
+++ b/packages/x-flow/src/nodes/node-switch/index.tsx
@@ -10,13 +10,13 @@ export default memo((props: any) => {
     data,
     nodeMinHeight
   } = props;
-  const { settingMap, widgets } = useContext(ConfigContext);
+  const { settingMap, widgets, iconFontUrl } = useContext(ConfigContext);
   const nodeSetting = settingMap[type] || {};
   const NodeWidget = widgets[nodeSetting?.nodeWidget] || undefined;
 
   return (
     <NodeContainer
-      className="custom-node-code"
+      className='custom-node-code'
       title={data?.title || nodeSetting?.title || 'Switch'}
       icon={{
         type: nodeSetting?.icon?.type || 'icon-switch',
@@ -28,6 +28,7 @@ export default memo((props: any) => {
       desc={data?.desc}
       NodeWidget={NodeWidget ? <NodeWidget data={data} /> : <SwitchBuildInNodeWidget data={data} />}
       nodeMinHeight={nodeMinHeight}
+      iconFontUrl={iconFontUrl}
     />
   );
 });
diff --git a/packages/x-flow/src/types.ts b/packages/x-flow/src/types.ts
index c23c315bc..493ad9216 100644
--- a/packages/x-flow/src/types.ts
+++ b/packages/x-flow/src/types.ts
@@ -41,6 +41,7 @@ export interface FlowProps {
   widgets: any; // 自定义组件
   settings: (TNodeGroup | TNodeItem)[]; // 节点配置
   nodeSelector: TNodeSelector;
+  iconFontUrl: string;
 }
 
 export default FlowProps;
diff --git a/packages/x-flow/src/utils/createIconFont.ts b/packages/x-flow/src/utils/createIconFont.ts
index f11184a35..d87d653de 100644
--- a/packages/x-flow/src/utils/createIconFont.ts
+++ b/packages/x-flow/src/utils/createIconFont.ts
@@ -2,6 +2,6 @@ import { createFromIconfontCN } from '@ant-design/icons';
 
 export default (url?: string) => {
   return createFromIconfontCN({
-    scriptUrl: url || '//at.alicdn.com/t/a/font_2750617_sax751jyfjl.js',
+    scriptUrl: url || '//at.alicdn.com/t/a/font_4201076_frx3c9x07if.js',
   });
 };
\ No newline at end of file
diff --git a/packages/x-flow/src/withProvider.tsx b/packages/x-flow/src/withProvider.tsx
index 2f5b4a9c2..32baa4002 100644
--- a/packages/x-flow/src/withProvider.tsx
+++ b/packages/x-flow/src/withProvider.tsx
@@ -25,6 +25,7 @@ export default function withProvider<T>(
       nodeSelector,
       settings,
       initialValues,
+      iconFontUrl,
       ...restProps
     } = props;
 
@@ -47,6 +48,7 @@ export default function withProvider<T>(
       nodeSelector,
       settings,
       settingMap,
+      iconFontUrl,
       widgets: {
         ...defaultWidgets,
         ...widgets,

From c1d339265f327bb5bf8ffca4f019c1480d66029f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=94=E6=A2=A6?= <hemengying.hmy@alibaba-inc.com>
Date: Wed, 4 Dec 2024 14:35:44 +0800
Subject: [PATCH 05/10] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=A4=9A=E4=B8=AA=E6=9D=A1=E4=BB=B6=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=EF=BC=8Cdata=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/xflow/demo/switchNode/setting.tsx        | 20 +++++++++++++++++++
 .../src/nodes/node-switch/setting/index.tsx   | 18 +++++++++--------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/docs/xflow/demo/switchNode/setting.tsx b/docs/xflow/demo/switchNode/setting.tsx
index 1c790f4ef..4dc9eadcb 100644
--- a/docs/xflow/demo/switchNode/setting.tsx
+++ b/docs/xflow/demo/switchNode/setting.tsx
@@ -16,6 +16,16 @@ export default [
       type: 'icon-prompt',
       bgColor: '#17B26A',
     },
+    settingSchema: {
+      type: "object",
+      properties: {
+        input: {
+          title: '提示词',
+          type: 'string',
+          widget: 'textArea',
+        },
+      }
+    },
   },
   {
     title: '知识库',
@@ -25,5 +35,15 @@ export default [
       type: 'icon-knowledge',
       bgColor: '#6172F3',
     },
+    settingSchema: {
+      type: "object",
+      properties: {
+        input: {
+          title: '知识库',
+          type: 'string',
+          widget: 'textArea',
+        },
+      }
+    },
   },
 ];
diff --git a/packages/x-flow/src/nodes/node-switch/setting/index.tsx b/packages/x-flow/src/nodes/node-switch/setting/index.tsx
index c4e3f9e01..46ee2b7a6 100644
--- a/packages/x-flow/src/nodes/node-switch/setting/index.tsx
+++ b/packages/x-flow/src/nodes/node-switch/setting/index.tsx
@@ -1,6 +1,6 @@
 import FormRender, { Schema, useForm } from 'form-render';
-import React, { memo } from 'react';
-import '../index.less'
+import React, { memo, useEffect } from 'react';
+import '../index.less';
 
 interface INodeSwitchSettingPorps {
   onChange: (val: any) => void;
@@ -10,12 +10,12 @@ interface INodeSwitchSettingPorps {
 const schema: Schema = {
   type: 'object',
   span: 24,
-  displayType: "row",
+  displayType: 'row',
   properties: {
     switchData: {
       type: 'array',
       widget: 'simpleList',
-      display:"block",
+      display: 'block',
       props: {
         hideCopy: true,
         hideMove: true,
@@ -44,16 +44,18 @@ export default memo((props: INodeSwitchSettingPorps) => {
     },
   };
 
+  useEffect(() => {
+    form.resetFields();
+    form.setValues(value || {});
+  }, [JSON.stringify(value)]);
+
   return (
     <FormRender
       schema={schema}
       form={form}
       watch={watch}
       size={'small'}
-      onMount={() => {
-        form.setValues(value || {});
-      }}
-      className='custom-node-switch-setting'
+      className="custom-node-switch-setting"
     />
   );
 });

From 476f160d792f7507d141416b04a44359e308fc1b Mon Sep 17 00:00:00 2001
From: "zhanbo.lh" <zhanbo.lh@alibaba-inc.com>
Date: Wed, 4 Dec 2024 16:37:52 +0800
Subject: [PATCH 06/10] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/x-flow/.fatherrc.js | 9 ---------
 packages/x-flow/package.json | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/x-flow/.fatherrc.js b/packages/x-flow/.fatherrc.js
index 4d442af1f..54e4c410c 100644
--- a/packages/x-flow/.fatherrc.js
+++ b/packages/x-flow/.fatherrc.js
@@ -22,14 +22,5 @@ export default {
       },
       'antd',
     ],
-    [
-      'import',
-      {
-        libraryName: '@ant-design/icons',
-        libraryDirectory: 'lib/icons',
-        camel2DashComponentName: false,
-      },
-      '@ant-design/icons',
-    ],
   ],
 };
diff --git a/packages/x-flow/package.json b/packages/x-flow/package.json
index 77aaf6a0d..f4f0c9266 100644
--- a/packages/x-flow/package.json
+++ b/packages/x-flow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@xrenders/xflow",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "一款功能强大、易用灵活的流程编辑器框架，帮助你轻松构建复杂的工作流和流程产品",
   "keywords": [
     "xflow"

From eacab1fe169368de93f3d988b5ba723144bc405e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=94=E6=A2=A6?= <hemengying.hmy@alibaba-inc.com>
Date: Wed, 4 Dec 2024 17:15:14 +0800
Subject: [PATCH 07/10] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=B1=95=E7=A4=BA=E5=B9=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../switchNode/customSwitchNode/index.tsx     |  33 ++++
 .../switchNode/customSwitchNode/setting.tsx   | 151 ++++++++++++++++++
 docs/xflow/demo/switchNode/index.tsx          |  61 ++++++-
 docs/xflow/demo/switchNode/setting.tsx        | 101 ++++++++++++
 docs/xflow/nodeBuildIn.md                     |  11 +-
 .../src/components/CustomNode/index.tsx       |  68 ++------
 .../components/CustomNode/sourceHandle.tsx    |   6 +-
 .../src/components/NodeContainer/index.tsx    |   5 +-
 .../node-switch/SwitchBuildInNodeWidget.tsx   |  65 +++++++-
 .../x-flow/src/nodes/node-switch/index.less   |  38 ++++-
 .../x-flow/src/nodes/node-switch/index.tsx    |  19 ++-
 11 files changed, 481 insertions(+), 77 deletions(-)
 create mode 100644 docs/xflow/demo/switchNode/customSwitchNode/index.tsx
 create mode 100644 docs/xflow/demo/switchNode/customSwitchNode/setting.tsx

diff --git a/docs/xflow/demo/switchNode/customSwitchNode/index.tsx b/docs/xflow/demo/switchNode/customSwitchNode/index.tsx
new file mode 100644
index 000000000..04a700cd1
--- /dev/null
+++ b/docs/xflow/demo/switchNode/customSwitchNode/index.tsx
@@ -0,0 +1,33 @@
+import XFlow from '@xrenders/xflow';
+import settings from './setting';
+import React from 'react';
+
+const customWidget = ({ data, key, item }) => {
+  return <p style={{ wordWrap: 'break-word' }}>{item?.value}</p>;
+};
+
+export default () => {
+  const nodes = [
+    {
+      type: 'Switch',
+      id: '2',
+      position: { x: 171.25, y: 218.75 },
+      data: { switchData:[{value:"条件1"}]}
+    },
+  ];
+
+  const edges = [];
+
+  return (
+    <div style={{ height: '600px' }}>
+      <XFlow
+        initialValues={{ nodes, edges }}
+        settings={settings}
+        nodeSelector={{
+          showSearch: true,
+        }}
+        widgets={{ customWidget }}
+      />
+    </div>
+  );
+};
diff --git a/docs/xflow/demo/switchNode/customSwitchNode/setting.tsx b/docs/xflow/demo/switchNode/customSwitchNode/setting.tsx
new file mode 100644
index 000000000..891c3b6b5
--- /dev/null
+++ b/docs/xflow/demo/switchNode/customSwitchNode/setting.tsx
@@ -0,0 +1,151 @@
+export default [
+  {
+    title: 'Switch',
+    type: 'Switch',
+    description: '允许你根据 if/else 条件将 workflow 拆分成两个分支',
+    icon: {
+      type: 'icon-switch',
+      bgColor: '#06AED4',
+    },
+   nodeWidget: "customWidget"   // 自定义节点面板渲染
+  },
+  {
+    title: '开始',
+    type: 'Start',
+    hidden: true,
+    targetHandleHidden: true,
+    icon: {
+      type: 'icon-start',
+      bgColor: '#17B26A',
+    },
+    settingSchema: {
+      type: 'object',
+      properties: {
+        input: {
+          title: '变量一',
+          type: 'string',
+          widget: 'input',
+        },
+        select: {
+          title: '变量二',
+          type: 'string',
+          widget: 'select',
+          props: {
+            options: [
+              { label: 'a', value: 'a' },
+              { label: 'b', value: 'b' },
+              { label: 'c', value: 'c' },
+            ],
+          },
+        },
+        radio1: {
+          title: '点击单选',
+          type: 'string',
+          widget: 'radio',
+          props: {
+            options: [
+              { label: '早', value: 'a' },
+              { label: '中', value: 'b' },
+              { label: '晚', value: 'c' }
+            ]
+          }
+        },
+        textarea1: {
+          title: '长文本',
+          type: 'string',
+          widget: 'textArea'
+        },
+        date1: {
+          title: '日期选择',
+          type: 'string',
+          widget: 'datePicker'
+        },
+        dateRange1: {
+          title: '日期范围',
+          type: 'range',
+          widget: 'dateRange'
+        },
+        time1: {
+          title: '时间选择',
+          type: 'string',
+          widget: 'timePicker'
+        },
+        timeRange1: {
+          title: '时间范围',
+          type: 'range',
+          widget: 'timeRange'
+        },
+      },
+    },
+  },
+  {
+    title: '结束',
+    type: 'End',
+    hidden: true,
+    sourceHandleHidden: true,
+    icon: {
+      type: 'icon-end',
+      bgColor: '#F79009',
+    },
+    settingSchema: {
+      type: "object",
+      properties: {
+        input: {
+          title: '变量一',
+          type: 'string',
+          widget: 'input',
+        },
+        select: {
+          title: '变量二',
+          type: 'string',
+          widget: 'select',
+          props: {
+            options: [
+              { label: 'a', value: 'a' },
+              { label: 'b', value: 'b' },
+              { label: 'c', value: 'c' },
+            ],
+          },
+        },
+      }
+    }
+  },
+  {
+    title: 'Prompt',
+    type: 'Prompt',
+    description: '通过精心设计提示词，提升大语言模型回答效果',
+    icon: {
+      type: 'icon-prompt',
+      bgColor: '#17B26A',
+    },
+    settingSchema: {
+      type: "object",
+      properties: {
+        input: {
+          title: '提示词',
+          type: 'string',
+          widget: 'textArea',
+        },
+      }
+    },
+  },
+  {
+    title: '知识库',
+    type: 'knowledge',
+    description: '允许你从知识库中查询与用户问题相关的文本内容',
+    icon: {
+      type: 'icon-knowledge',
+      bgColor: '#6172F3',
+    },
+    settingSchema: {
+      type: "object",
+      properties: {
+        input: {
+          title: '知识库',
+          type: 'string',
+          widget: 'textArea',
+        },
+      }
+    },
+  },
+];
diff --git a/docs/xflow/demo/switchNode/index.tsx b/docs/xflow/demo/switchNode/index.tsx
index 5a9c47fdd..0ade042e5 100644
--- a/docs/xflow/demo/switchNode/index.tsx
+++ b/docs/xflow/demo/switchNode/index.tsx
@@ -1,13 +1,66 @@
-import React from 'react';
 import XFlow from '@xrenders/xflow';
 import settings from './setting';
 
 export default () => {
   const nodes = [
-    { id: '1', type: 'Switch', data: { input: '开始节点', select: "b" }, position: { x: 40, y: 240 } },
+    {
+      type: 'Start',
+      id: '1',
+      position: { x: -130, y: 290 },
+    },
+    {
+      type: 'Switch',
+      id: '2',
+      position: { x: 171.25, y: 218.75 },
+      data: { switchData: [{ value: '条件1' }] },
+    },
+    {
+      type: 'End',
+      id: '3',
+      position: { x: 915, y: 287.5 },
+    },
+    {
+      id: 'g29rz9ol4ugqz8m8',
+      type: 'Prompt',
+      position: { x: 525, y: 210 },
+    },
+    {
+      id: 'swqutt73ihfa9lkb',
+      type: 'knowledge',
+      position: { x: 522.5, y: 472.5 },
+    },
   ];
 
-  const edges = []
+  const edges = [
+    {
+      source: '1',
+      target: '2',
+      id: 'xy-edge__1-2',
+    },
+    {
+      source: '2',
+      sourceHandle: 'id_0',
+      target: 'g29rz9ol4ugqz8m8',
+      id: 'xy-edge__2id_0-g29rz9ol4ugqz8m8',
+    },
+    { id: 'w6vmrun9sos4t6ds', target: 'swqutt73ihfa9lkb' },
+    {
+      source: '2',
+      sourceHandle: 'id_else',
+      target: 'swqutt73ihfa9lkb',
+      id: 'xy-edge__2id_else-swqutt73ihfa9lkb',
+    },
+    {
+      source: 'g29rz9ol4ugqz8m8',
+      target: '3',
+      id: 'xy-edge__g29rz9ol4ugqz8m8-3',
+    },
+    {
+      source: 'swqutt73ihfa9lkb',
+      target: '3',
+      id: 'xy-edge__swqutt73ihfa9lkb-3',
+    },
+  ];
 
   return (
     <div style={{ height: '600px' }}>
@@ -20,4 +73,4 @@ export default () => {
       />
     </div>
   );
-}
+};
diff --git a/docs/xflow/demo/switchNode/setting.tsx b/docs/xflow/demo/switchNode/setting.tsx
index 4dc9eadcb..c39eec316 100644
--- a/docs/xflow/demo/switchNode/setting.tsx
+++ b/docs/xflow/demo/switchNode/setting.tsx
@@ -8,6 +8,107 @@ export default [
       bgColor: '#06AED4',
     },
   },
+  {
+    title: '开始',
+    type: 'Start',
+    hidden: true,
+    targetHandleHidden: true,
+    icon: {
+      type: 'icon-start',
+      bgColor: '#17B26A',
+    },
+    settingSchema: {
+      type: 'object',
+      properties: {
+        input: {
+          title: '变量一',
+          type: 'string',
+          widget: 'input',
+        },
+        select: {
+          title: '变量二',
+          type: 'string',
+          widget: 'select',
+          props: {
+            options: [
+              { label: 'a', value: 'a' },
+              { label: 'b', value: 'b' },
+              { label: 'c', value: 'c' },
+            ],
+          },
+        },
+        radio1: {
+          title: '点击单选',
+          type: 'string',
+          widget: 'radio',
+          props: {
+            options: [
+              { label: '早', value: 'a' },
+              { label: '中', value: 'b' },
+              { label: '晚', value: 'c' }
+            ]
+          }
+        },
+        textarea1: {
+          title: '长文本',
+          type: 'string',
+          widget: 'textArea'
+        },
+        date1: {
+          title: '日期选择',
+          type: 'string',
+          widget: 'datePicker'
+        },
+        dateRange1: {
+          title: '日期范围',
+          type: 'range',
+          widget: 'dateRange'
+        },
+        time1: {
+          title: '时间选择',
+          type: 'string',
+          widget: 'timePicker'
+        },
+        timeRange1: {
+          title: '时间范围',
+          type: 'range',
+          widget: 'timeRange'
+        },
+      },
+    },
+  },
+  {
+    title: '结束',
+    type: 'End',
+    hidden: true,
+    sourceHandleHidden: true,
+    icon: {
+      type: 'icon-end',
+      bgColor: '#F79009',
+    },
+    settingSchema: {
+      type: "object",
+      properties: {
+        input: {
+          title: '变量一',
+          type: 'string',
+          widget: 'input',
+        },
+        select: {
+          title: '变量二',
+          type: 'string',
+          widget: 'select',
+          props: {
+            options: [
+              { label: 'a', value: 'a' },
+              { label: 'b', value: 'b' },
+              { label: 'c', value: 'c' },
+            ],
+          },
+        },
+      }
+    }
+  },
   {
     title: 'Prompt',
     type: 'Prompt',
diff --git a/docs/xflow/nodeBuildIn.md b/docs/xflow/nodeBuildIn.md
index 0df7c0a19..127d9109b 100644
--- a/docs/xflow/nodeBuildIn.md
+++ b/docs/xflow/nodeBuildIn.md
@@ -4,10 +4,17 @@ title: '内置节点'
 mobile: false
 group: 
   title: 最佳展示
-  order: 2
+  order: 
 ---
 # 内置节点
 
 ## 条件内置节点
-SwitchNode
+内置条件节点，可以直接设置type为`Switch`使用，条件节点的数据格式为` switchData:[{value:"条件1"}]`
+
 <code src="./demo/switchNode/index.tsx"></code>
+
+
+## 自定义条件节点
+ 可以通过`nodeWidget`自定义节点面板的渲染，也可以通过`settingSchema`和`settingWidget`自定义在弹窗中展示的业务配置组件。
+
+<code src="./demo/switchNode/customSwitchNode/index.tsx"></code>
diff --git a/packages/x-flow/src/components/CustomNode/index.tsx b/packages/x-flow/src/components/CustomNode/index.tsx
index f587c09d5..a712fc9c9 100644
--- a/packages/x-flow/src/components/CustomNode/index.tsx
+++ b/packages/x-flow/src/components/CustomNode/index.tsx
@@ -8,25 +8,6 @@ import { capitalize, uuid } from '../../utils';
 import './index.less';
 import SourceHandle from './sourceHandle';
 
-const generateRandomArray = (x: number, type?: string) => {
-  const randomArray = [];
-  for (let i = 0; i < x; i++) {
-    const id = `id_${i}`;
-    if (type === 'Switch') {
-      if (i === 0) {
-        randomArray.push({ id, switchTitle: 'IF' });
-      } else if (i === x - 1) {
-        randomArray.push({ id, switchTitle: 'ELSE' });
-      } else {
-        randomArray.push({ id, switchTitle: 'ELIF' });
-      }
-    } else {
-      randomArray.push({ id });
-    }
-  }
-  return randomArray;
-};
-
 export default memo((props: any) => {
   const { id, type, data, layout, isConnectable, selected, onClick } = props;
   const { widgets, settingMap } = useContext(ConfigContext);
@@ -34,7 +15,7 @@ export default memo((props: any) => {
     widgets[`${capitalize(type)}Node`] || widgets['CommonNode'];
   const [isHovered, setIsHovered] = useState(false);
   const reactflow = useReactFlow();
-  const { addNodes, addEdges, mousePosition } = useStore(
+  const { addNodes, addEdges, mousePosition,nodes,edges } = useStore(
     (state: any) => ({
       nodes: state.nodes,
       edges: state.edges,
@@ -45,17 +26,7 @@ export default memo((props: any) => {
     }),
     shallow
   );
-  // data中的switchData的长度，即：if和if else 的数量,条件数量
-  const switchDataLength =
-    data?.switchData?.length >= 1 ? Number(data?.switchData?.length + 1) : 2;
-  const nodeHeight = 45; // 每次增长的节点高度
-  // 1.switch节点 if,else数量
-  const sourceHandleNum =
-    type === 'Switch'
-      ? generateRandomArray(switchDataLength, 'Switch')
-      : generateRandomArray(1);
-  const nodeMinHeight =
-    type === 'Switch' ? Number(switchDataLength * nodeHeight) : undefined;
+  const isSwitchNode = type === 'Switch';
 
   // 增加节点并进行联系
   const handleAddNode = (data: any) => {
@@ -87,7 +58,7 @@ export default memo((props: any) => {
     targetPosition = Position.Top;
     sourcePosition = Position.Bottom;
   }
-
+ console.log("1", JSON.stringify(nodes), '=====',JSON.stringify(edges))
   return (
     <div
       className={classNames('xflow-node-container', {
@@ -109,28 +80,21 @@ export default memo((props: any) => {
         type={type}
         data={data}
         onClick={() => onClick(data)}
-        nodeMinHeight={nodeMinHeight}
+        position={sourcePosition}
+        isConnectable={isConnectable}
+        selected={selected}
+        isHovered={isHovered}
+        handleAddNode={handleAddNode}
       />
-      {!settingMap?.[type]?.sourceHandleHidden && (
+      {!settingMap?.[type]?.sourceHandleHidden && !isSwitchNode && (
         <>
-          {(sourceHandleNum || [])?.map((item, key) => (
-            <SourceHandle
-              position={sourcePosition}
-              isConnectable={isConnectable}
-              selected={selected}
-              isHovered={isHovered}
-              handleAddNode={handleAddNode}
-              id={item?.id}
-              style={
-                item?.switchTitle
-                  ? key === 0
-                    ? { top: 40 }
-                    : { top: 40 * key + 40 }
-                  : {}
-              }
-              switchTitle={item?.switchTitle}
-            />
-          ))}
+          <SourceHandle
+            position={sourcePosition}
+            isConnectable={isConnectable}
+            selected={selected}
+            isHovered={isHovered}
+            handleAddNode={handleAddNode}
+          />
         </>
       )}
     </div>
diff --git a/packages/x-flow/src/components/CustomNode/sourceHandle.tsx b/packages/x-flow/src/components/CustomNode/sourceHandle.tsx
index 9202b000b..8dd53a1ea 100644
--- a/packages/x-flow/src/components/CustomNode/sourceHandle.tsx
+++ b/packages/x-flow/src/components/CustomNode/sourceHandle.tsx
@@ -11,7 +11,6 @@ export default memo((props: any) => {
     selected,
     isHovered,
     handleAddNode,
-    id,
     switchTitle,
     ...rest
   } = props;
@@ -32,12 +31,13 @@ export default memo((props: any) => {
         setIsShowTooltip(false);
         setOpenNodeSelectPopover(true);
       }}
-      id={id}
       {...rest}
     >
       {(selected || isHovered || openNodeSelectPopover) && (
         <>
-          {switchTitle && <div className="xflow-node-switch-title">{switchTitle}</div>}
+          {switchTitle && (
+            <div className="xflow-node-switch-title">{switchTitle}</div>
+          )}
           <div className="xflow-node-add-box">
             <NodeSelectPopover
               placement="right"
diff --git a/packages/x-flow/src/components/NodeContainer/index.tsx b/packages/x-flow/src/components/NodeContainer/index.tsx
index 5340bc2c1..746c3334c 100644
--- a/packages/x-flow/src/components/NodeContainer/index.tsx
+++ b/packages/x-flow/src/components/NodeContainer/index.tsx
@@ -7,7 +7,7 @@ import './index.less';
 const { Text, Paragraph } = Typography;
 
 export default memo((props: any) => {
-  const { className, onClick, children, icon, title, desc, hideDesc, NodeWidget, nodeMinHeight } = props;
+  const { className, onClick, children, icon, title, desc, hideDesc, NodeWidget } = props;
 
   return (
     <div
@@ -15,13 +15,11 @@ export default memo((props: any) => {
         [className]: !!className,
       })}
       onClick={onClick}
-      style={nodeMinHeight ? { minHeight: nodeMinHeight } : {}}
     >
       <div className="node-title">
         <span className="icon-box" style={{ background: icon?.bgColor }}>
           <IconView {...icon} />
         </span>
-        {/* <span style={{ marginLeft: '8px' }}>{title}</span> */}
         <Text
           style={{ width: 188, marginLeft: '8px' }}
           ellipsis={{ tooltip: title }}
@@ -30,7 +28,6 @@ export default memo((props: any) => {
         </Text>
       </div>
       <div className="node-body">{children}</div>
-      {/* {!hideDesc && !!desc && <div className="node-desc">{desc}</div>} */}
       {
         NodeWidget && <div className='node-widget'>
           {NodeWidget}
diff --git a/packages/x-flow/src/nodes/node-switch/SwitchBuildInNodeWidget.tsx b/packages/x-flow/src/nodes/node-switch/SwitchBuildInNodeWidget.tsx
index e6efb73fa..339934868 100644
--- a/packages/x-flow/src/nodes/node-switch/SwitchBuildInNodeWidget.tsx
+++ b/packages/x-flow/src/nodes/node-switch/SwitchBuildInNodeWidget.tsx
@@ -1,11 +1,62 @@
-import { Space,Typography } from 'antd';
+import { Flex } from 'antd';
 import React, { memo } from 'react';
+import SourceHandle from '../../components/CustomNode/sourceHandle';
+import './index.less';
 
 export default memo((props: any) => {
-  const { data } = props;
-  return <Space direction='vertical' size={19} style={{width:"100%"}}>
-    {(data?.switchData || [])?.map(item => <Typography.Text style={{ width: '100%', backgroundColor:'#f2f4f7'}} ellipsis={{tooltip:item?.value}}>
-      {item?.value}
-    </Typography.Text>)}
-  </Space>
+  const {
+    data,
+    position,
+    isConnectable,
+    selected,
+    isHovered,
+    handleAddNode,
+    CustomNodeWidget,
+  } = props;
+
+  return (
+    <Flex vertical className="node-switch-widget" gap={5}>
+      {(data?.switchData || [{}])?.map((item, index) => (
+        <div className="node-switch-widget-item" key={index}>
+          <div className="item-header">
+            <div className="item-title">{index === 0 ? 'IF' : 'ELIF'}</div>
+            <SourceHandle
+              position={position}
+              isConnectable={isConnectable}
+              selected={selected}
+              isHovered={isHovered}
+              handleAddNode={handleAddNode}
+              id={`id_${index}`}
+              className="item-handle"
+            />
+          </div>
+          <div className="item-content">
+            {CustomNodeWidget ? (
+              <CustomNodeWidget data={data} key={index} item={item} />
+            ) : (
+              <>
+                {item?.value && (
+                  <div className="item-content-in">{item?.value}</div>
+                )}
+              </>
+            )}
+          </div>
+        </div>
+      ))}
+      <div className="node-switch-widget-item">
+        <div className="item-header">
+          <div className="item-title">ELSE</div>
+          <SourceHandle
+            position={position}
+            isConnectable={isConnectable}
+            selected={selected}
+            isHovered={isHovered}
+            handleAddNode={handleAddNode}
+            className="item-handle"
+            id={'id_else'}
+          />
+        </div>
+      </div>
+    </Flex>
+  );
 });
diff --git a/packages/x-flow/src/nodes/node-switch/index.less b/packages/x-flow/src/nodes/node-switch/index.less
index 5a2c37ce3..4bc4064ad 100644
--- a/packages/x-flow/src/nodes/node-switch/index.less
+++ b/packages/x-flow/src/nodes/node-switch/index.less
@@ -8,6 +8,7 @@
     display: flex;
     height: 50px;
     align-items: center;
+
     span {
       font-weight: bold;
       margin-left: 8px;
@@ -15,8 +16,41 @@
   }
 }
 
-.custom-node-switch-setting{
-  .fr-list-simple,.ant-form-item,.fr-panel,.fr-inline-container{
+.custom-node-switch-setting {
+
+  .fr-list-simple,
+  .ant-form-item,
+  .fr-panel,
+  .fr-inline-container {
     width: 100%;
   }
 }
+
+.node-switch-widget {
+
+  .item-header {
+    position: relative;
+
+    .item-title {
+      text-align: right;
+      font-weight: 600;
+    }
+
+    .item-handle {
+      right: -16px;
+    }
+  }
+
+  .item-content {
+    margin: 5px 0;
+
+    .item-content-in {
+      background-color: #f2f4f7;
+      border-radius: 0.375rem;
+      padding: 0.25rem;
+      word-wrap: break-word;
+      text-align: justify;
+    }
+
+  }
+}
diff --git a/packages/x-flow/src/nodes/node-switch/index.tsx b/packages/x-flow/src/nodes/node-switch/index.tsx
index 53824f8de..502e0672d 100644
--- a/packages/x-flow/src/nodes/node-switch/index.tsx
+++ b/packages/x-flow/src/nodes/node-switch/index.tsx
@@ -8,7 +8,11 @@ export default memo((props: any) => {
     onClick,
     type,
     data,
-    nodeMinHeight
+    position,
+    isConnectable,
+    selected,
+    isHovered,
+    handleAddNode,
   } = props;
   const { settingMap, widgets } = useContext(ConfigContext);
   const nodeSetting = settingMap[type] || {};
@@ -26,8 +30,17 @@ export default memo((props: any) => {
       onClick={onClick}
       hideDesc={nodeSetting?.hideDesc || !data?.desc}
       desc={data?.desc}
-      NodeWidget={NodeWidget ? <NodeWidget data={data} /> : <SwitchBuildInNodeWidget data={data} />}
-      nodeMinHeight={nodeMinHeight}
+      NodeWidget={
+        <SwitchBuildInNodeWidget
+          data={data}
+          position={position}
+          isConnectable={isConnectable}
+          selected={selected}
+          isHovered={isHovered}
+          handleAddNode={handleAddNode}
+          CustomNodeWidget={NodeWidget}
+        />
+      }
     />
   );
 });

From f789416d7716c631693e002c8b8f076be16999aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=94=E6=A2=A6?= <hemengying.hmy@alibaba-inc.com>
Date: Wed, 4 Dec 2024 19:51:46 +0800
Subject: [PATCH 08/10] =?UTF-8?q?fix:=E5=8E=BB=E6=8E=89@remixicon/react?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=9B=BF=E6=8D=A2=E6=8E=89=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/x-flow/package.json                  |   1 -
 .../x-flow/src/components/IconView/index.tsx  |   2 +-
 .../x-flow/src/operator/Control/index.less    |   5 -
 .../x-flow/src/operator/Control/index.tsx     |  85 ++++++------
 .../x-flow/src/operator/UndoRedo/index.tsx    |   4 +-
 .../x-flow/src/operator/ZoomInOut/index.tsx   | 130 +++++++++---------
 packages/x-flow/src/operator/index.less       |   8 ++
 7 files changed, 118 insertions(+), 117 deletions(-)

diff --git a/packages/x-flow/package.json b/packages/x-flow/package.json
index f4f0c9266..0a14a812b 100644
--- a/packages/x-flow/package.json
+++ b/packages/x-flow/package.json
@@ -52,7 +52,6 @@
     "ahooks": "^3.7.5",
     "zustand": "^4.5.4",
     "@xyflow/react": "^12.3.2",
-    "@remixicon/react": "^4.2.0",
     "@dagrejs/dagre": "^1.1.3",
     "zundo": "^2.1.0",
     "use-context-selector": "^1.4.1",
diff --git a/packages/x-flow/src/components/IconView/index.tsx b/packages/x-flow/src/components/IconView/index.tsx
index eb681076f..4e27af627 100644
--- a/packages/x-flow/src/components/IconView/index.tsx
+++ b/packages/x-flow/src/components/IconView/index.tsx
@@ -7,7 +7,7 @@ import { createFromIconfontCN } from '@ant-design/icons';
  */
 
 const Icon = createFromIconfontCN({
-  scriptUrl: '//at.alicdn.com/t/a/font_4201076_frx3c9x07if.js',
+  scriptUrl: '//at.alicdn.com/t/a/font_4069358_20o5s0dsx86.js',
 });
 
 export default Icon;
diff --git a/packages/x-flow/src/operator/Control/index.less b/packages/x-flow/src/operator/Control/index.less
index bf99b50e9..48986c4ea 100644
--- a/packages/x-flow/src/operator/Control/index.less
+++ b/packages/x-flow/src/operator/Control/index.less
@@ -35,11 +35,6 @@
   }
 }
 
-.icon {
-  width: 1rem;
-  height: 1rem;
-}
-
 .separator {
   margin: 0 0.75rem;
   width: 1px;
diff --git a/packages/x-flow/src/operator/Control/index.tsx b/packages/x-flow/src/operator/Control/index.tsx
index cb8d9da65..bd39552aa 100644
--- a/packages/x-flow/src/operator/Control/index.tsx
+++ b/packages/x-flow/src/operator/Control/index.tsx
@@ -1,16 +1,10 @@
+import { Button, Tooltip } from 'antd';
 import type { MouseEvent } from 'react';
 import React, { memo } from 'react';
-import {
-  RiCursorLine,
-  RiFunctionAddLine,
-  RiHand,
-  RiStickyNoteAddLine,
-} from '@remixicon/react';
-import { Tooltip, Button } from 'antd';
 import IconView from '../../components/IconView';
-import { useEventEmitterContextContext } from '../../models/event-emitter';
 import NodeSelectPopover from '../../components/NodesPopover';
-import { useStoreApi, useStore } from '../../hooks/useStore';
+import { useStore, useStoreApi } from '../../hooks/useStore';
+import { useEventEmitterContextContext } from '../../models/event-emitter';
 
 import './index.less';
 
@@ -23,57 +17,68 @@ const Control = (props: any) => {
   const storeApi = useStoreApi();
   const panOnDrag = useStore(s => s.panOnDrag);
 
-  const { eventEmitter } = useEventEmitterContextContext()
+  const { eventEmitter } = useEventEmitterContextContext();
 
-  const handleInteractionModeChange = (panOnDrag) => {
-    storeApi.setState({ panOnDrag })
-  }
+  const handleInteractionModeChange = panOnDrag => {
+    storeApi.setState({ panOnDrag });
+  };
 
   return (
-    <div className='fai-reactflow-control'>
+    <div className="fai-reactflow-control">
       <NodeSelectPopover addNode={addNode}>
-        <Tooltip title='添加节点'>
+        <Tooltip title="添加节点">
           <Button
-            type='text'
-            icon={<IconView type='icon-add-circle' style={{ fontSize: 20 }} />}
+            type="text"
+            icon={<IconView type="icon-add-circle" className="icon" />}
           />
         </Tooltip>
       </NodeSelectPopover>
-      <Tooltip title='添加注释'>
-        <div
-          className='control-item'
-          onClick={addNote}
-        >
-          <RiStickyNoteAddLine className='icon' />
+      <Tooltip title="添加注释">
+        <div className="control-item" onClick={addNote}>
+          <IconView type="icon-sticky-note-add-line" className="icon" />
         </div>
       </Tooltip>
-      <div className='separator'></div>
-      <Tooltip title='指针模式'>
-        <div className='control-item' onClick={() => panOnDrag &&handleInteractionModeChange(false)}>
-          <RiCursorLine className='icon' style={{
-            color: !panOnDrag ? 'rgba(0, 0, 0, 0.25)' : 'rgba(0, 0, 0, 0.88)'
-          }}/>
+      <div className="separator"></div>
+      <Tooltip title="指针模式">
+        <div
+          className="control-item"
+          onClick={() => panOnDrag && handleInteractionModeChange(false)}
+        >
+          <IconView
+            type="icon-indicator"
+            className="icon"
+            style={{
+              color: !panOnDrag ? 'rgba(0, 0, 0, 0.25)' : '#666F83',
+            }}
+          />
         </div>
       </Tooltip>
-      <Tooltip title='手模式'>
-        <div className='control-item' onClick={() => !panOnDrag && handleInteractionModeChange(true)}>
-          <RiHand className='icon' style={{
-            color: panOnDrag ? 'rgba(0, 0, 0, 0.25)' : 'rgba(0, 0, 0, 0.88)'
-          }}/>
+      <Tooltip title="手模式">
+        <div
+          className="control-item"
+          onClick={() => !panOnDrag && handleInteractionModeChange(true)}
+        >
+          <IconView
+            type="icon-xianxingshouzhangtubiao"
+            className="icon"
+            style={{
+              color: panOnDrag ? 'rgba(0, 0, 0, 0.25)' : '#666F83',
+            }}
+          />
         </div>
       </Tooltip>
-      <div className='separator'></div>
-      <Tooltip title='整理节点'>
+      <div className="separator"></div>
+      <Tooltip title="整理节点">
         <Button
-          type='text'
-          icon={<RiFunctionAddLine className='icon' />}
+          type="text"
+          icon={<IconView type="icon-function-add-line1" className="icon" />}
           onClick={() => {
-            eventEmitter?.emit({ type: 'auto-layout-nodes' } as any)
+            eventEmitter?.emit({ type: 'auto-layout-nodes' } as any);
           }}
         />
       </Tooltip>
     </div>
-  )
+  );
 };
 
 export default memo(Control);
diff --git a/packages/x-flow/src/operator/UndoRedo/index.tsx b/packages/x-flow/src/operator/UndoRedo/index.tsx
index 2404b01b4..392cf27ac 100644
--- a/packages/x-flow/src/operator/UndoRedo/index.tsx
+++ b/packages/x-flow/src/operator/UndoRedo/index.tsx
@@ -16,7 +16,7 @@ export default memo(({ handleUndo, handleRedo, pastStates, futureStates }: UndoR
       <Tooltip title='撤销'>
         <Button
           type='text'
-          icon={<IconView type='icon-undo' style={{ fontSize: 18 }} />}
+          icon={<IconView type='icon-undo'  className="icon" />}
           onClick={handleUndo}
           disabled={!pastStates?.length}
         />
@@ -24,7 +24,7 @@ export default memo(({ handleUndo, handleRedo, pastStates, futureStates }: UndoR
       <Tooltip title='重做'>
         <Button
           type='text'
-          icon={<IconView type='icon-redo' style={{ fontSize: 18 }} />}
+          icon={<IconView type='icon-redo' className="icon" />}
           onClick={handleRedo}
           disabled={!futureStates?.length}
         />
diff --git a/packages/x-flow/src/operator/ZoomInOut/index.tsx b/packages/x-flow/src/operator/ZoomInOut/index.tsx
index 4c1ed8e89..b951a20d6 100644
--- a/packages/x-flow/src/operator/ZoomInOut/index.tsx
+++ b/packages/x-flow/src/operator/ZoomInOut/index.tsx
@@ -1,11 +1,11 @@
+import { useReactFlow, useViewport } from '@xyflow/react';
+import { Button, Popover, Tooltip } from 'antd';
 import type { FC } from 'react';
 import React, { Fragment, memo } from 'react';
-import { Button, Popover, Tooltip } from 'antd';
-import { useReactFlow, useViewport } from '@xyflow/react';
-import { getKeyboardKeyNameBySystem } from '../../utils';
-import ShortcutsName from './shortcuts-name';
 import IconView from '../../components/IconView';
+import { getKeyboardKeyNameBySystem } from '../../utils';
 import './index.less';
+import ShortcutsName from './shortcuts-name';
 
 enum ZoomType {
   zoomIn = 'zoomIn',
@@ -15,8 +15,8 @@ enum ZoomType {
   zoomTo50 = 'zoomTo50',
   zoomTo75 = 'zoomTo75',
   zoomTo100 = 'zoomTo100',
-  zoomTo200 = 'zoomTo200'
-};
+  zoomTo200 = 'zoomTo200',
+}
 
 const ZOOM_IN_OUT_OPTIONS = [
   [
@@ -46,109 +46,103 @@ const ZOOM_IN_OUT_OPTIONS = [
       key: ZoomType.zoomToFit,
       text: '自适应视图',
     },
-  ]
+  ],
 ];
 
 const ZoomSelect = ({ handleZoom }: any) => {
   return (
-    <div className='fai-reactflow-zoom-select'>
+    <div className="fai-reactflow-zoom-select">
       {ZOOM_IN_OUT_OPTIONS.map((options, i) => (
         <Fragment key={i}>
-          {i !== 0 && <div className='parting-line' />}
-          <div className='p-1'>
-            {
-              options.map(option => (
-                <div
-                  className='zoom-item'
-                  key={option.key}
-                  onClick={() => handleZoom(option.key)}
-                >
-                  {option.text}
-                  {
-                    option.key === ZoomType.zoomToFit && (
-                      <ShortcutsName keys={[`${getKeyboardKeyNameBySystem('ctrl')}`, '1']} />
-                    )
-                  }
-                  {
-                    option.key === ZoomType.zoomTo50 && (
-                      <ShortcutsName keys={['shift', '5']} />
-                    )
-                  }
-                  {
-                    option.key === ZoomType.zoomTo100 && (
-                      <ShortcutsName keys={['shift', '1']} />
-                    )
-                  }
-                </div>
-              ))
-            }
+          {i !== 0 && <div className="parting-line" />}
+          <div className="p-1">
+            {options.map(option => (
+              <div
+                className="zoom-item"
+                key={option.key}
+                onClick={() => handleZoom(option.key)}
+              >
+                {option.text}
+                {option.key === ZoomType.zoomToFit && (
+                  <ShortcutsName
+                    keys={[`${getKeyboardKeyNameBySystem('ctrl')}`, '1']}
+                  />
+                )}
+                {option.key === ZoomType.zoomTo50 && (
+                  <ShortcutsName keys={['shift', '5']} />
+                )}
+                {option.key === ZoomType.zoomTo100 && (
+                  <ShortcutsName keys={['shift', '1']} />
+                )}
+              </div>
+            ))}
           </div>
         </Fragment>
       ))}
     </div>
-  )
+  );
 };
 
-
 const ZoomInOut: FC = () => {
-  const {
-    zoomIn,
-    zoomOut,
-    zoomTo,
-    fitView,
-  } = useReactFlow();
+  const { zoomIn, zoomOut, zoomTo, fitView } = useReactFlow();
 
   const { zoom } = useViewport();
 
   const handleZoom = (type: string) => {
-    if (type === ZoomType.zoomToFit)
-      fitView()
+    if (type === ZoomType.zoomToFit) fitView();
 
-    if (type === ZoomType.zoomTo25)
-      zoomTo(0.25)
+    if (type === ZoomType.zoomTo25) zoomTo(0.25);
 
-    if (type === ZoomType.zoomTo50)
-      zoomTo(0.5)
+    if (type === ZoomType.zoomTo50) zoomTo(0.5);
 
-    if (type === ZoomType.zoomTo75)
-      zoomTo(0.75)
+    if (type === ZoomType.zoomTo75) zoomTo(0.75);
 
-    if (type === ZoomType.zoomTo100)
-      zoomTo(1)
+    if (type === ZoomType.zoomTo100) zoomTo(1);
 
-    if (type === ZoomType.zoomTo200)
-      zoomTo(2)
+    if (type === ZoomType.zoomTo200) zoomTo(2);
   };
 
   return (
-    <div className='fai-reactflow-zoominout'>
-      <Tooltip title='放大'>
+    <div className="fai-reactflow-zoominout">
+      <Tooltip title="放大">
         <Button
-          type='text'
-          icon={<IconView type='icon-zoomout' style={{ fontSize: 18, color: '#667085' }} />}
-          onClick={(e) => {
+          type="text"
+          icon={<IconView type="icon-zoomout" className="icon" />}
+          onClick={e => {
             e.stopPropagation();
             zoomOut();
           }}
         />
       </Tooltip>
-      <div style={{ fontSize: '13px', fontWeight: 500, padding: '0 2px', textAlign: 'center', width: '32px' }}>
-        <Popover content={<ZoomSelect handleZoom={handleZoom} />} zIndex={1000} trigger='click'>
+      <div
+        style={{
+          fontSize: '13px',
+          fontWeight: 500,
+          padding: '0 2px',
+          textAlign: 'center',
+          width: '32px',
+        }}
+      >
+        <Popover
+          content={<ZoomSelect handleZoom={handleZoom} />}
+          zIndex={1000}
+          trigger="click"
+        >
           {parseFloat(`${zoom * 100}`).toFixed(0)}%
         </Popover>
       </div>
-      <Tooltip title='缩小'>
+      <Tooltip title="缩小">
         <Button
-          type='text'
-          icon={<IconView type='icon-zoomin' style={{ fontSize: 18, color: '#667085' }} />}
-          onClick={(e) => {
+          type="text"
+          icon={<IconView type="icon-zoomin" className="icon" />}
+          onClick={e => {
             e.stopPropagation();
             zoomIn();
           }}
         />
       </Tooltip>
     </div>
-  )
+  );
 };
 
 export default memo(ZoomInOut);
diff --git a/packages/x-flow/src/operator/index.less b/packages/x-flow/src/operator/index.less
index d2cc387c0..74a471c34 100644
--- a/packages/x-flow/src/operator/index.less
+++ b/packages/x-flow/src/operator/index.less
@@ -24,3 +24,11 @@
     z-index: 9;
   }
 }
+
+
+.icon {
+  width: 1rem;
+  height: 1rem;
+  color: #666F83;
+  font-size: 20;
+}

From 82439ac2dbc788bbe359cfcade8e57efffe40cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=94=E6=A2=A6?= <hemengying.hmy@alibaba-inc.com>
Date: Wed, 4 Dec 2024 20:40:44 +0800
Subject: [PATCH 09/10] =?UTF-8?q?fix:=E6=9B=BF=E6=8D=A2=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/xflow/demo/basic/setting.tsx                       | 2 +-
 docs/xflow/demo/custom-flow/setting.tsx                 | 2 +-
 docs/xflow/demo/flow-provider/setting.tsx               | 2 +-
 docs/xflow/demo/layout/LR/setting.tsx                   | 2 +-
 docs/xflow/demo/layout/TB/setting.tsx                   | 2 +-
 docs/xflow/demo/nodeSetting/setting.tsx                 | 2 +-
 docs/xflow/demo/switchNode/customSwitchNode/setting.tsx | 2 +-
 docs/xflow/demo/switchNode/setting.tsx                  | 2 +-
 docs/xflow/schema/custom-settings.ts                    | 2 +-
 docs/xflow/schema/settings.ts                           | 2 +-
 packages/x-flow/src/components/IconView/index.tsx       | 2 +-
 packages/x-flow/src/utils/createIconFont.ts             | 5 +++--
 12 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/docs/xflow/demo/basic/setting.tsx b/docs/xflow/demo/basic/setting.tsx
index 937413778..49484fbc6 100644
--- a/docs/xflow/demo/basic/setting.tsx
+++ b/docs/xflow/demo/basic/setting.tsx
@@ -162,7 +162,7 @@ export default [
     type: 'Switch',
     description: '允许你根据 if/else 条件将 workflow 拆分成两个分支',
     icon: {
-      type: 'icon-switch',
+      type: 'icon-fenzhi',
       bgColor: '#06AED4',
     },
     settingSchema: {
diff --git a/docs/xflow/demo/custom-flow/setting.tsx b/docs/xflow/demo/custom-flow/setting.tsx
index 282e3dbc7..83276d3ee 100644
--- a/docs/xflow/demo/custom-flow/setting.tsx
+++ b/docs/xflow/demo/custom-flow/setting.tsx
@@ -74,7 +74,7 @@ export default [
     type: 'Switch',
     description: '允许你根据 if/else 条件将 workflow 拆分成两个分支',
     icon: {
-      type: 'icon-switch',
+      type: 'icon-fenzhi',
       bgColor: '#06AED4',
     },
   },
diff --git a/docs/xflow/demo/flow-provider/setting.tsx b/docs/xflow/demo/flow-provider/setting.tsx
index 72f080f69..97e5a27ac 100644
--- a/docs/xflow/demo/flow-provider/setting.tsx
+++ b/docs/xflow/demo/flow-provider/setting.tsx
@@ -132,7 +132,7 @@ export default [
     type: 'Switch',
     description: '允许你根据 if/else 条件将 workflow 拆分成两个分支',
     icon: {
-      type: 'icon-switch',
+      type: 'icon-fenzhi',
       bgColor: '#06AED4',
     },
   },
diff --git a/docs/xflow/demo/layout/LR/setting.tsx b/docs/xflow/demo/layout/LR/setting.tsx
index 72f080f69..97e5a27ac 100644
--- a/docs/xflow/demo/layout/LR/setting.tsx
+++ b/docs/xflow/demo/layout/LR/setting.tsx
@@ -132,7 +132,7 @@ export default [
     type: 'Switch',
     description: '允许你根据 if/else 条件将 workflow 拆分成两个分支',
     icon: {
-      type: 'icon-switch',
+      type: 'icon-fenzhi',
       bgColor: '#06AED4',
     },
   },
diff --git a/docs/xflow/demo/layout/TB/setting.tsx b/docs/xflow/demo/layout/TB/setting.tsx
index 72f080f69..97e5a27ac 100644
--- a/docs/xflow/demo/layout/TB/setting.tsx
+++ b/docs/xflow/demo/layout/TB/setting.tsx
@@ -132,7 +132,7 @@ export default [
     type: 'Switch',
     description: '允许你根据 if/else 条件将 workflow 拆分成两个分支',
     icon: {
-      type: 'icon-switch',
+      type: 'icon-fenzhi',
       bgColor: '#06AED4',
     },
   },
diff --git a/docs/xflow/demo/nodeSetting/setting.tsx b/docs/xflow/demo/nodeSetting/setting.tsx
index 72f080f69..97e5a27ac 100644
--- a/docs/xflow/demo/nodeSetting/setting.tsx
+++ b/docs/xflow/demo/nodeSetting/setting.tsx
@@ -132,7 +132,7 @@ export default [
     type: 'Switch',
     description: '允许你根据 if/else 条件将 workflow 拆分成两个分支',
     icon: {
-      type: 'icon-switch',
+      type: 'icon-fenzhi',
       bgColor: '#06AED4',
     },
   },
diff --git a/docs/xflow/demo/switchNode/customSwitchNode/setting.tsx b/docs/xflow/demo/switchNode/customSwitchNode/setting.tsx
index 891c3b6b5..cd49f7d86 100644
--- a/docs/xflow/demo/switchNode/customSwitchNode/setting.tsx
+++ b/docs/xflow/demo/switchNode/customSwitchNode/setting.tsx
@@ -4,7 +4,7 @@ export default [
     type: 'Switch',
     description: '允许你根据 if/else 条件将 workflow 拆分成两个分支',
     icon: {
-      type: 'icon-switch',
+      type: 'icon-fenzhi',
       bgColor: '#06AED4',
     },
    nodeWidget: "customWidget"   // 自定义节点面板渲染
diff --git a/docs/xflow/demo/switchNode/setting.tsx b/docs/xflow/demo/switchNode/setting.tsx
index c39eec316..4dd929e62 100644
--- a/docs/xflow/demo/switchNode/setting.tsx
+++ b/docs/xflow/demo/switchNode/setting.tsx
@@ -4,7 +4,7 @@ export default [
     type: 'Switch',
     description: '允许你根据 if/else 条件将 workflow 拆分成两个分支',
     icon: {
-      type: 'icon-switch',
+      type: 'icon-fenzhi',
       bgColor: '#06AED4',
     },
   },
diff --git a/docs/xflow/schema/custom-settings.ts b/docs/xflow/schema/custom-settings.ts
index 58e00b49c..e6461213f 100644
--- a/docs/xflow/schema/custom-settings.ts
+++ b/docs/xflow/schema/custom-settings.ts
@@ -83,7 +83,7 @@ export default [
     type: 'Switch',
     description: '允许你根据 if/else 条件将 workflow 拆分成两个分支',
     icon: {
-      type: 'icon-switch',
+      type: 'icon-fenzhi',
       bgColor: '#06AED4',
     },
   },
diff --git a/docs/xflow/schema/settings.ts b/docs/xflow/schema/settings.ts
index 72f080f69..97e5a27ac 100644
--- a/docs/xflow/schema/settings.ts
+++ b/docs/xflow/schema/settings.ts
@@ -132,7 +132,7 @@ export default [
     type: 'Switch',
     description: '允许你根据 if/else 条件将 workflow 拆分成两个分支',
     icon: {
-      type: 'icon-switch',
+      type: 'icon-fenzhi',
       bgColor: '#06AED4',
     },
   },
diff --git a/packages/x-flow/src/components/IconView/index.tsx b/packages/x-flow/src/components/IconView/index.tsx
index 4e27af627..2ef5d36df 100644
--- a/packages/x-flow/src/components/IconView/index.tsx
+++ b/packages/x-flow/src/components/IconView/index.tsx
@@ -7,7 +7,7 @@ import { createFromIconfontCN } from '@ant-design/icons';
  */
 
 const Icon = createFromIconfontCN({
-  scriptUrl: '//at.alicdn.com/t/a/font_4069358_20o5s0dsx86.js',
+  scriptUrl: '//at.alicdn.com/t/a/font_4069358_ihlwbi6uipk.js',
 });
 
 export default Icon;
diff --git a/packages/x-flow/src/utils/createIconFont.ts b/packages/x-flow/src/utils/createIconFont.ts
index d87d653de..24ae1bcdc 100644
--- a/packages/x-flow/src/utils/createIconFont.ts
+++ b/packages/x-flow/src/utils/createIconFont.ts
@@ -2,6 +2,7 @@ import { createFromIconfontCN } from '@ant-design/icons';
 
 export default (url?: string) => {
   return createFromIconfontCN({
-    scriptUrl: url || '//at.alicdn.com/t/a/font_4201076_frx3c9x07if.js',
+    // scriptUrl: url || '//at.alicdn.com/t/a/font_4201076_frx3c9x07if.js',
+    scriptUrl: url || '//at.alicdn.com/t/a/font_4069358_ihlwbi6uipk.js',
   });
-};
\ No newline at end of file
+};

From b0804b8686535103bd7074cc672ca1f455ed8079 Mon Sep 17 00:00:00 2001
From: "zhanbo.lh" <zhanbo.lh@alibaba-inc.com>
Date: Thu, 5 Dec 2024 10:48:19 +0800
Subject: [PATCH 10/10] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=20iconFonturl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                   | 1 +
 docs/xflow/api.md            | 4 +++-
 packages/x-flow/package.json | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 220033434..705f67bc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 .yarn
 .turbo/cookies
 .turbo/daemon
+.turbo
 
 # turbo
 */*/.turbo
diff --git a/docs/xflow/api.md b/docs/xflow/api.md
index d13cbdc56..50c3f5fe6 100644
--- a/docs/xflow/api.md
+++ b/docs/xflow/api.md
@@ -13,7 +13,9 @@ title: API
 | layout        | 节点布局的方向                       | `LR \| TB`                                                  | LR     | - |
 | widgets       | 自定义组件                           | `Record<string, ReactNode>`                                 | -      | - |
 | settings      | 节点配置，定义页面中可拖动的节点配置 | ( [TNodeGroup](#tnodegroup) \| [TNodeItem](#tnodeitem) )[ ] |        |
-| nodeSelector  | 节点选择器配置，可控制节点的可搜索性 | `TNodeSelector`                                             |        |
+| nodeSelector  | 节点选择器配置，可控制节点的可搜索性 | `TNodeSelector`      
+| iconFontUrl   | iconfont url，用于配置图标渲染 | `String`                                             |        |
+                                       |        |
 
 ### TNodeGroup
 
diff --git a/packages/x-flow/package.json b/packages/x-flow/package.json
index 0a14a812b..2c44e7349 100644
--- a/packages/x-flow/package.json
+++ b/packages/x-flow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@xrenders/xflow",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "description": "一款功能强大、易用灵活的流程编辑器框架，帮助你轻松构建复杂的工作流和流程产品",
   "keywords": [
     "xflow"