strategy-panel 1.0.4 → 1.0.6-beta.1

package/es/components/canvas/component-tree-panel/category-tree/category-type.js

@@ -25,10 +25,10 @@ export var componentsData = [{
   isDir: true,
   tooltip: '触发组件是规则运行的触发条件，作为策略树中的第一个节点，目前支持设备触发、时间触发和手动触发',
   children: [{
+    nodeType: 'counter',
     id: SCENE_DISPLAY.EQUIPMENT,
     name: '设备触发',
-    imgUrl: device,
-    number: 1
+    imgUrl: device
   }, {
     id: SCENE_DISPLAY.MANUAL,
     name: '手动按钮',
@@ -57,7 +57,8 @@ export var componentsData = [{
   }, {
     id: SCENE_DISPLAY.TIME,
     name: '时间触发',
-    imgUrl: time
+    imgUrl: time,
+    description: "说明：在指定区间单位的时间内，发生报警才会生效，时间区间范围外则不会生效；"
   }]
 }, {
   id: COMPONENTS_TYPE.MOTION_OPERATION,
@@ -71,15 +72,18 @@ export var componentsData = [{
   }, {
     id: MOTION_OPERATION.ALARM,
     name: '报警',
-    imgUrl: alarm
+    imgUrl: alarm,
+    description: "执行报警通知"
   }, {
     id: MOTION_OPERATION.NOTICE,
     name: '通知',
-    imgUrl: notice
+    imgUrl: notice,
+    description: "执行通知规则"
   }, {
     id: MOTION_OPERATION.ORDER,
     name: '派发工单',
-    imgUrl: order
+    imgUrl: order,
+    description: "达到条件生成工单任务"
   }, {
     id: MOTION_OPERATION.CONTROL,
     name: '远程控制',

package/es/components/canvas/config-panel/config-common.d.ts

@@ -11,16 +11,6 @@ export declare const getComponentConfig: (experimentId: string) => {
             label: string;
             value: string;
         }[];
-    }[] | {
-        name: string;
-        type: string;
-        component: React.JSX.Element;
-    }[] | {
-        name: string;
-        label: string;
-        required: boolean;
-        type: string;
-        component: React.JSX.Element;
     }[] | ({
         name: string;
         label: string;
@@ -36,4 +26,4 @@ export declare const getComponentConfig: (experimentId: string) => {
         }[];
     })[];
 };
-export declare const getFormatComponent: (data: any, mode: ModeType) => React.JSX.Element | undefined;
+export declare const getFormatComponent: (data: any, viewMode: ModeType) => React.JSX.Element | undefined;

package/es/components/canvas/config-panel/config-common.js

@@ -3,20 +3,18 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React from 'react';
-import { Form, Input, Select } from 'antd';
+import { Form, Input, InputNumber, Select } from 'antd';
 import { withMode } from "../../../packages/hooks/withMode";
-import { MOTION_OPERATION,
+import { MOTION_OPERATION
 // COMPONENTS_TYPE,
 // COMMONLY_USED,
-SCENE_DISPLAY, SIGN_OPERATION
+, SIGN_OPERATION
 // MOTION_OPERATION,
 } from "../../../packages/graph-canvas/node-types";
-import TimeTrigger from "./components/time-trigger";
-import ConditionConfiguration from "./components/condition-configuration";
 import "./style.less";
 var Option = Select.Option;
 export var getComponentConfig = function getComponentConfig(experimentId) {
-  return _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, SIGN_OPERATION.LOGICAL, [{
+  return _defineProperty(_defineProperty({}, SIGN_OPERATION.LOGICAL, [{
     name: 'operator',
     label: '逻辑符号',
     type: 'select',
@@ -31,18 +29,6 @@ export var getComponentConfig = function getComponentConfig(experimentId) {
       label: '异',
       value: '^'
     }]
-  }]), SCENE_DISPLAY.TIME, [{
-    name: 'timeControl',
-    type: 'auto',
-    component: /*#__PURE__*/React.createElement(TimeTrigger, null)
-  }]), SIGN_OPERATION.CONDITION, [{
-    name: 'condition',
-    label: '条件配置',
-    required: true,
-    type: 'auto',
-    component: /*#__PURE__*/React.createElement(ConditionConfiguration, {
-      experimentId: experimentId
-    })
   }]), MOTION_OPERATION.CONTROL, [{
     name: 'name',
     label: '控制名称',
@@ -66,14 +52,15 @@ export var getComponentConfig = function getComponentConfig(experimentId) {
     }]
   }]);
 };
-export var getFormatComponent = function getFormatComponent(data, mode) {
+export var getFormatComponent = function getFormatComponent(data, viewMode) {
   var type = data.type,
     name = data.name,
     label = data.label,
     disabled = data.disabled,
     selectData = data.selectData,
     component = data.component,
-    required = data.required;
+    required = data.required,
+    mode = data.mode;
   var formComponent = undefined;
   var rules = [{
     required: required,
@@ -81,11 +68,10 @@ export var getFormatComponent = function getFormatComponent(data, mode) {
   }];
 
   //
-  var withModeComponent = withMode(component, mode);
+  var withModeComponent = withMode(component, viewMode);
 
   // console.log('withMode(component, mode)', withModeComponent.type)
-  // console.log('component', component.type)
-
+  console.log('getFormatComponent', data);
   switch (type) {
     case 'input':
       formComponent = /*#__PURE__*/React.createElement("div", {
@@ -97,7 +83,20 @@ export var getFormatComponent = function getFormatComponent(data, mode) {
         rules: rules,
         className: "no-margin-bottom"
       }, /*#__PURE__*/React.createElement(Input, {
-        disabled: mode === 'view' ? true : disabled
+        disabled: viewMode === 'view' ? true : disabled
+      })));
+      break;
+    case 'inputNumber':
+      formComponent = /*#__PURE__*/React.createElement("div", {
+        className: "border-bottom",
+        key: name
+      }, /*#__PURE__*/React.createElement(Form.Item, {
+        label: label,
+        name: name,
+        rules: rules,
+        className: "no-margin-bottom"
+      }, /*#__PURE__*/React.createElement(InputNumber, {
+        disabled: viewMode === 'view' ? true : disabled
       })));
       break;
     case 'select':
@@ -110,7 +109,9 @@ export var getFormatComponent = function getFormatComponent(data, mode) {
         rules: rules,
         className: "no-margin-bottom"
       }, /*#__PURE__*/React.createElement(Select, {
-        disabled: mode === 'view' ? true : disabled
+        mode: mode,
+        maxTagCount: "responsive",
+        disabled: viewMode === 'view' ? true : disabled
       }, selectData === null || selectData === void 0 ? void 0 : selectData.map(function (item) {
         return /*#__PURE__*/React.createElement(Option, {
           key: item.value,

package/es/components/canvas/config-panel/node-form.d.ts

@@ -8,6 +8,7 @@ export declare type configDataItem = Record<string, {
     required?: boolean;
     component?: React.ReactNode;
     disabled?: boolean;
+    mode?: 'multiple';
     selectData?: {
         label: string;
         value: any;

package/es/components/canvas/config-panel/node-form.js

@@ -44,6 +44,8 @@ var NodeForm = function NodeForm(_ref) {
     }
   }, [node === null || node === void 0 ? void 0 : node.nodeData]);
   var idsSplit = node === null || node === void 0 || (_node$id = node.id) === null || _node$id === void 0 ? void 0 : _node$id.split('-');
+  console.log("nodexxxxx ======", node, configData);
+  console.log("allConfigDataxxxx", allConfigData, extraConfigData);
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
     className: "config-panel-form",
@@ -66,6 +68,8 @@ var NodeForm = function NodeForm(_ref) {
     className: "no-margin-bottom"
   }, /*#__PURE__*/React.createElement(Input, null))), configData === null || configData === void 0 ? void 0 : configData.map(function (item) {
     return getFormatComponent(item, mode);
-  }));
+  }), (node === null || node === void 0 ? void 0 : node.description) && /*#__PURE__*/React.createElement("div", {
+    className: "config-description"
+  }, "\u8BF4\u660E: ", node === null || node === void 0 ? void 0 : node.description));
 };
 export default NodeForm;

package/es/components/canvas/config-panel/style.less

@@ -88,3 +88,7 @@
 .section-detail-select{
   display: flex;
 }
+
+.config-description{
+  padding: 0 10px 12px;
+}

package/es/components/canvas/dag-canvas/canvas-content.d.ts

@@ -6,6 +6,7 @@ interface Props {
     className?: string;
     viewData?: any;
     dragEnable: boolean;
+    methodMap?: Record<string, any[]>;
 }
 export declare const CanvasContent: React.FC<Props>;
 export {};

package/es/components/canvas/dag-canvas/canvas-content.js

@@ -16,7 +16,9 @@ export var CanvasContent = function CanvasContent(props) {
   var experimentId = props.experimentId,
     className = props.className,
     viewData = props.viewData,
-    dragEnable = props.dragEnable;
+    dragEnable = props.dragEnable,
+    _props$methodMap = props.methodMap,
+    methodMap = _props$methodMap === void 0 ? {} : _props$methodMap;
   var viewDataJSON = JSON.stringify(viewData);
   console.log('dragEnable', dragEnable);
   var containerRef = useRef(null);
@@ -26,7 +28,8 @@ export var CanvasContent = function CanvasContent(props) {
   // 渲染画布
   useEffect(function () {
     window.requestIdleCallback(function () {
-      expGraph.renderGraph(containerRef.current, canvasRef.current);
+      console.log('renderGraphxxx', methodMap);
+      expGraph.renderGraph(containerRef.current, canvasRef.current, {}, methodMap);
       if (viewData) {
         var _expGraph$graph, _expGraph$graph2, _expGraph$graph2$zoom;
         // console.log('=====================>>>>>>>>>>>>>>>>', viewData)
@@ -37,7 +40,7 @@ export var CanvasContent = function CanvasContent(props) {
         });
       }
     });
-  }, [expGraph, viewDataJSON]);
+  }, [expGraph, viewDataJSON, methodMap]);
   var checkNodeNumber = function checkNodeNumber(_ref) {
     var _expGraph$graph3;
     var id = _ref.id,
@@ -70,7 +73,7 @@ export var CanvasContent = function CanvasContent(props) {
               clientX: x,
               clientY: y,
               nodeMeta: item.component
-            });
+            }, methodMap);
           } else {
             message.error("".concat(item.component.name, "\u7EC4\u4EF6\u53EA\u80FD\u5B58\u5728\u4E00\u4E2A"));
           }

package/es/components/canvas/dag-canvas/index.d.ts

@@ -18,6 +18,11 @@ interface Props {
      * @description.zh-CN 拖拽可创建
      */
     dragEnable?: boolean;
+    /**
+     * @description       methodMap
+     * @description.zh-CN 方法映射
+     */
+    methodMap?: any;
 }
 declare const DAGCanvas: React.FC<Props>;
 export default DAGCanvas;

package/es/components/canvas/dag-canvas/index.js

@@ -8,7 +8,9 @@ var DAGCanvas = function DAGCanvas(props) {
     className = props.className,
     viewData = props.viewData,
     _props$dragEnable = props.dragEnable,
-    dragEnable = _props$dragEnable === void 0 ? true : _props$dragEnable;
+    dragEnable = _props$dragEnable === void 0 ? true : _props$dragEnable,
+    _props$methodMap = props.methodMap,
+    methodMap = _props$methodMap === void 0 ? {} : _props$methodMap;
   var expGraph = useExperimentGraph(experimentId);
 
   // 处理画布卸载
@@ -26,6 +28,7 @@ var DAGCanvas = function DAGCanvas(props) {
   }, /*#__PURE__*/React.createElement(CanvasContent, {
     dragEnable: dragEnable,
     viewData: viewData,
+    methodMap: methodMap,
     experimentId: experimentId,
     className: "canvas-content"
   }));

package/es/components/canvas/dag-canvas/preview.d.ts

@@ -5,6 +5,7 @@ interface Props {
     experimentId: string;
     className?: string;
     viewData?: any;
+    methodMap?: any;
 }
 declare const CanvasContent: React.FC<Props>;
 export default CanvasContent;

package/es/components/canvas/dag-canvas/preview.js

@@ -6,7 +6,9 @@ import "./canvas-content.less";
 var CanvasContent = function CanvasContent(props) {
   var experimentId = props.experimentId,
     className = props.className,
-    viewData = props.viewData;
+    viewData = props.viewData,
+    _props$methodMap = props.methodMap,
+    methodMap = _props$methodMap === void 0 ? {} : _props$methodMap;
   var viewDataJSON = JSON.stringify(viewData);
 
   // 处理画布卸载
@@ -22,7 +24,7 @@ var CanvasContent = function CanvasContent(props) {
       var _expGraph$graph, _expGraph$graph2, _expGraph$graph3;
       expGraph.renderGraph(containerRef.current, canvasRef.current, {
         interacting: false
-      });
+      }, methodMap);
       expGraph === null || expGraph === void 0 || (_expGraph$graph = expGraph.graph) === null || _expGraph$graph === void 0 || _expGraph$graph.hideGrid();
       expGraph === null || expGraph === void 0 || (_expGraph$graph2 = expGraph.graph) === null || _expGraph$graph2 === void 0 || _expGraph$graph2.disableKeyboard();
       expGraph.onClearSelectNodes();

package/es/components/canvas/index.d.ts

@@ -43,6 +43,11 @@ interface Props extends Omit<HeaderProps, 'experimentId'> {
      * @description.zh-CN 拖拽可创建
      */
     dragEnable?: boolean;
+    /**
+     * @description       methodMap
+     * @description.zh-CN 方法映射
+     */
+    methodMap?: any;
 }
 declare const StrategyCanvas: React.FC<Props>;
 export default StrategyCanvas;

package/es/components/canvas/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["experimentId", "headerVisible", "panelData", "configData", "mode", "viewData", "dragEnable"];
+var _excluded = ["experimentId", "headerVisible", "panelData", "configData", "mode", "viewData", "dragEnable", "methodMap"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -26,6 +26,8 @@ var StrategyCanvas = function StrategyCanvas(props) {
     viewData = _props$viewData === void 0 ? {} : _props$viewData,
     _props$dragEnable = props.dragEnable,
     dragEnable = _props$dragEnable === void 0 ? true : _props$dragEnable,
+    _props$methodMap = props.methodMap,
+    methodMap = _props$methodMap === void 0 ? {} : _props$methodMap,
     rest = _objectWithoutProperties(props, _excluded);
   console.log('userAgent', (_window = window) === null || _window === void 0 ? void 0 : _window.openDatebase);
   if ((_window2 = window) !== null && _window2 !== void 0 && _window2.openDatebase) {
@@ -42,6 +44,7 @@ var StrategyCanvas = function StrategyCanvas(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "experiment-edit-panel"
   }, /*#__PURE__*/React.createElement(CanvasPreview, {
+    methodMap: methodMap,
     viewData: viewData,
     experimentId: "".concat(experimentId),
     className: "panel-dag-canvas"
@@ -66,6 +69,7 @@ var StrategyCanvas = function StrategyCanvas(props) {
     className: "experiment-edit-panel"
   }, /*#__PURE__*/React.createElement(DAGCanvas, {
     viewData: viewData,
+    methodMap: methodMap,
     experimentId: "".concat(experimentId),
     className: "panel-dag-canvas",
     dragEnable: dragEnable

package/es/packages/graph-canvas/graph-utils/graph.d.ts

@@ -6,6 +6,7 @@ interface NodeParams {
     y: number;
     applicationImgUrl?: string;
     nodeData?: string;
+    description?: string;
 }
 export declare const createNodePorts: (id: string, timestamp: string) => {
     inPorts: {
@@ -22,7 +23,7 @@ export declare const createNodePorts: (id: string, timestamp: string) => {
         group: string;
     })[];
 };
-export declare const createNode: ({ id, name, imgUrl, applicationImgUrl, x, y, nodeData }: NodeParams) => {
+export declare const createNode: ({ id, name, imgUrl, applicationImgUrl, x, y, nodeData, description, ...restParams }: NodeParams) => {
     inPorts: {
         id: string;
         sequence: number;
@@ -40,11 +41,12 @@ export declare const createNode: ({ id, name, imgUrl, applicationImgUrl, x, y, n
     name: string;
     imgUrl: string;
     applicationImgUrl: string | undefined;
+    description: string | undefined;
     positionX: number;
     positionY: number;
     nodeData: string | undefined;
 };
-export declare const copyNode: ({ id, name, imgUrl, applicationImgUrl, x, y, nodeData }: NodeParams) => {
+export declare const copyNode: ({ id, name, imgUrl, applicationImgUrl, x, y, nodeData, description, ...restParams }: NodeParams) => {
     inPorts: {
         id: string;
         sequence: number;
@@ -62,6 +64,7 @@ export declare const copyNode: ({ id, name, imgUrl, applicationImgUrl, x, y, nod
     name: string;
     imgUrl: string;
     applicationImgUrl: string | undefined;
+    description: string | undefined;
     positionX: number;
     positionY: number;
     nodeData: string | undefined;
@@ -84,6 +87,7 @@ export declare const addNode: (params: NodeParams) => {
     name: string;
     imgUrl: string;
     applicationImgUrl: string | undefined;
+    description: string | undefined;
     positionX: number;
     positionY: number;
     nodeData: string | undefined;

package/es/packages/graph-canvas/graph-utils/graph.js

@@ -1,9 +1,13 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["id", "name", "imgUrl", "applicationImgUrl", "x", "y", "nodeData", "description"],
+  _excluded2 = ["id", "name", "imgUrl", "applicationImgUrl", "x", "y", "nodeData", "description"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import random from 'lodash/random';
 import { SIGN_OPERATION } from "../node-types";
 export var createNodePorts = function createNodePorts(id, timestamp) {
@@ -68,18 +72,21 @@ export var createNode = function createNode(_ref) {
     applicationImgUrl = _ref.applicationImgUrl,
     x = _ref.x,
     y = _ref.y,
-    nodeData = _ref.nodeData;
+    nodeData = _ref.nodeData,
+    description = _ref.description,
+    restParams = _objectWithoutProperties(_ref, _excluded);
   var timestamp = "".concat(Date.now());
   var portsParams = createNodePorts(id, timestamp);
-  return _objectSpread({
+  return _objectSpread(_objectSpread({
     id: id ? "".concat(id, "-").concat(timestamp) : "".concat(timestamp),
     name: name,
     imgUrl: imgUrl,
     applicationImgUrl: applicationImgUrl,
+    description: description,
     positionX: x,
     positionY: y,
     nodeData: nodeData
-  }, portsParams);
+  }, restParams), portsParams);
 };
 export var copyNode = function copyNode(_ref2) {
   var _id$split;
@@ -89,17 +96,21 @@ export var copyNode = function copyNode(_ref2) {
     applicationImgUrl = _ref2.applicationImgUrl,
     x = _ref2.x,
     y = _ref2.y,
-    nodeData = _ref2.nodeData;
+    nodeData = _ref2.nodeData,
+    description = _ref2.description,
+    restParams = _objectWithoutProperties(_ref2, _excluded2);
   var nodeId = id === null || id === void 0 || (_id$split = id.split('-')) === null || _id$split === void 0 ? void 0 : _id$split[0];
-  return createNode({
+  return createNode(_objectSpread(_objectSpread({
     id: nodeId,
     name: name,
     imgUrl: imgUrl,
     applicationImgUrl: applicationImgUrl,
     nodeData: nodeData,
+    description: description
+  }, restParams), {}, {
     x: x + 200 + random(20, false),
     y: y + 15 + random(20, false)
-  });
+  }));
 };
 export var addNode = function addNode(params) {
   return createNode(params);

package/es/packages/graph-canvas/index.d.ts

@@ -30,7 +30,7 @@ declare class ExperimentGraph extends GraphCore<BaseNode, BaseEdge> {
     updateExperimentGraph(nodes?: NExperimentGraph.Node[], links?: NExperimentGraph.Link[]): Promise<void>;
     delExperimentGraphElement(nodes?: string[], links?: NExperimentGraph.Link[]): Promise<void>;
     isGraphReady(): boolean;
-    renderGraph: (wrapper: HTMLElement, container: HTMLElement, options?: any) => void;
+    renderGraph: (wrapper: HTMLElement, container: HTMLElement, options?: any, nodeConfig?: Record<string, any>) => void;
     registerEdge: () => void;
     createTypeNodeMeta: (nodeMeta: NodeMeta, nodeType: any, experimentId: string) => BaseNode | undefined;
     renderNode(nodeMeta: NodeMeta): BaseNode | undefined;

package/es/packages/graph-canvas/index.js

@@ -104,7 +104,7 @@ var ExperimentGraph = /*#__PURE__*/function (_GraphCore) {
         // 当 snap 设置为 true 时连线的过程中距离节点或者连接桩 50px 时会触发自动吸附，可以通过配置 radius 属性自定义触发吸附的距离。当 snap 设置为 false 时不会触发自动吸附。默认值为 false。
         allowBlank: false,
         // 是否允许连接到画布空白位置的点
-        allowMulti: false,
+        allowMulti: "withPort",
         highlight: true,
         // 拖动边时，是否高亮显示所有可用的连接桩或节点
         router: 'manhattan',
@@ -142,7 +142,10 @@ var ExperimentGraph = /*#__PURE__*/function (_GraphCore) {
         // 是否触发交互事件  点击 magnet 时 根据 validateMagnet 返回值来判断是否新增边，触发时机是 magnet 被按下，如果返回 false，则没有任何反应，如果返回 true，会在当前 magnet 创建一条新的边。
         validateMagnet: function validateMagnet(_ref) {
           var magnet = _ref.magnet;
-          return magnet.getAttribute('port-group') !== 'in';
+          var portGroup = magnet.getAttribute('port-group');
+          // console.log('validateMagnet', portGroup, portGroup !== 'in')
+          // 允许从除了'in'和'method'之外的端口发起连接
+          return !['in', 'method'].includes(portGroup);
         },
         // 显示可用的链接桩  在移动边的时候判断连接是否有效，如果返回 false，当鼠标放开的时候，不会连接到当前元素，否则会连接到当前元素。
         validateConnection: function validateConnection(_ref2) {
@@ -150,6 +153,7 @@ var ExperimentGraph = /*#__PURE__*/function (_GraphCore) {
             targetView = _ref2.targetView,
             sourceMagnet = _ref2.sourceMagnet,
             targetMagnet = _ref2.targetMagnet;
+          // console.log("validateConnection", sourceView, targetView, sourceMagnet, targetMagnet)
           // 不允许连接到自己
           if (sourceView === targetView) {
             return false;
@@ -160,8 +164,9 @@ var ExperimentGraph = /*#__PURE__*/function (_GraphCore) {
             return false;
           }
 
-          // 只能连接到输入链接桩
-          if (!targetMagnet || targetMagnet.getAttribute('port-group') !== 'in') {
+          // 只能连接到输入链接桩或方法端口
+          var targetPortGroup = targetMagnet === null || targetMagnet === void 0 ? void 0 : targetMagnet.getAttribute('port-group');
+          if (!targetMagnet || !['in', 'method'].includes(targetPortGroup)) {
             return false;
           }
 
@@ -257,7 +262,9 @@ var ExperimentGraph = /*#__PURE__*/function (_GraphCore) {
     // 渲染画布
     _defineProperty(_assertThisInitialized(_this), "renderGraph", function (wrapper, container) {
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-      console.log('renderGraph');
+      var nodeConfig = arguments.length > 3 ? arguments[3] : undefined;
+      _this.nodeConfig = nodeConfig;
+      console.log('renderGraphxxx =====>1', nodeConfig, _this.nodeConfig);
       _this.experimentGraphSub = _this.experimentGraph$.pipe(filter(function (x) {
         return !!x;
       }),
@@ -273,7 +280,8 @@ var ExperimentGraph = /*#__PURE__*/function (_GraphCore) {
             container: container,
             nodes: nodes,
             edges: edges,
-            options: options
+            options: options,
+            nodeConfig: nodeConfig
           });
         }
       });
@@ -289,7 +297,9 @@ var ExperimentGraph = /*#__PURE__*/function (_GraphCore) {
       Graph.registerEdge('group-edge', GroupEdge);
     });
     _defineProperty(_assertThisInitialized(_this), "createTypeNodeMeta", function (nodeMeta, nodeType, experimentId) {
-      console.log('===================== createTypeNodeMeta', nodeMeta);
+      var _assertThisInitialize = _assertThisInitialized(_this),
+        nodeConfig = _assertThisInitialize.nodeConfig;
+      console.log('===================== createTypeNodeMeta', nodeType, _this.nodeConfig);
       var data = nodeMeta.data;
       var _ref3 = data,
         type = _ref3.type;
@@ -298,6 +308,7 @@ var ExperimentGraph = /*#__PURE__*/function (_GraphCore) {
         /* 条件判断 */
         if (nodeType === SIGN_OPERATION.CONDITION) {
           return _this.graph.addNode(new ConditionJudgment(_objectSpread(_objectSpread({}, nodeMeta), {}, {
+            nodeConfig: nodeConfig,
             shape: 'condition-judgement-element',
             component: /*#__PURE__*/React.createElement(ConditionElement, {
               experimentId: experimentId
@@ -307,6 +318,7 @@ var ExperimentGraph = /*#__PURE__*/function (_GraphCore) {
         /* 逻辑运算 */
         if (nodeType === SIGN_OPERATION.LOGICAL || nodeType === COMMONLY_USED.LOCKED) {
           return _this.graph.addNode(new LogicalNode(_objectSpread(_objectSpread({}, nodeMeta), {}, {
+            nodeConfig: nodeConfig,
             shape: 'logical-node',
             component: /*#__PURE__*/React.createElement(LogicalElement, {
               experimentId: experimentId
@@ -315,6 +327,7 @@ var ExperimentGraph = /*#__PURE__*/function (_GraphCore) {
         }
         if ((nodeType === null || nodeType === void 0 ? void 0 : nodeType.indexOf(COMPONENTS_TYPE.APPLICATION)) === 0) {
           return _this.graph.addNode(new ApplicationNode(_objectSpread(_objectSpread({}, nodeMeta), {}, {
+            nodeConfig: nodeConfig,
             shape: 'application-node',
             component: /*#__PURE__*/React.createElement(ApplicationElement, {
               experimentId: experimentId
@@ -322,7 +335,8 @@ var ExperimentGraph = /*#__PURE__*/function (_GraphCore) {
           })));
         }
         return _this.graph.addNode(new CommonNode(_objectSpread(_objectSpread({}, nodeMeta), {}, {
-          shape: 'application-node',
+          shape: 'base-rect-node',
+          nodeConfig: nodeConfig,
           component: /*#__PURE__*/React.createElement(NodeElement, {
             experimentId: experimentId
           })
@@ -351,12 +365,12 @@ var ExperimentGraph = /*#__PURE__*/function (_GraphCore) {
     // 发起请求增加节点
     _defineProperty(_assertThisInitialized(_this), "requestAddNode", /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(param) {
-        var _assertThisInitialize, graph, nodeMeta, clientX, clientY, pos, nodeRes, newNode;
+        var _assertThisInitialize2, graph, nodeMeta, clientX, clientY, pos, nodeRes, newNode;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               console.log('requestAddNode');
-              _assertThisInitialize = _assertThisInitialized(_this), graph = _assertThisInitialize.graph;
+              _assertThisInitialize2 = _assertThisInitialized(_this), graph = _assertThisInitialize2.graph;
               if (!graph) {
                 _context.next = 14;
                 break;
@@ -528,8 +542,8 @@ var ExperimentGraph = /*#__PURE__*/function (_GraphCore) {
     }());
     // 清除选中节点
     _defineProperty(_assertThisInitialized(_this), "unSelectNode", function () {
-      var _assertThisInitialize2 = _assertThisInitialized(_this),
-        graph = _assertThisInitialize2.graph;
+      var _assertThisInitialize3 = _assertThisInitialized(_this),
+        graph = _assertThisInitialize3.graph;
       if (graph) {
         graph.cleanSelection();
       }
@@ -600,7 +614,7 @@ var ExperimentGraph = /*#__PURE__*/function (_GraphCore) {
         return _resetGraphData.apply(this, arguments);
       }
       return resetGraphData;
-    }()
+    }() // 初始化预览数据
   }, {
     key: "initPreviewData",
     value: function () {

package/es/packages/graph-model/node/index.d.ts

@@ -2,6 +2,8 @@ import { ReactShape } from '@antv/x6-react-shape';
 import type { Node } from '@antv/x6/src/model/node';
 import './node-basic.less';
 export default class BaseNode extends ReactShape {
+    methodList: any;
     constructor(metadata?: Node.Metadata);
+    addMethodPorts(methods: any[]): void;
     isGroup(): boolean;
 }