strategy-panel 1.0.1 → 1.0.2

package/es/{common/graph-common/node-element → packages/graph-canvas/graph-model/node/logical-node}/logical-element.js

@@ -1,6 +1,3 @@
-import "antd/es/config-provider/style";
-import _ConfigProvider from "antd/es/config-provider";
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -15,25 +12,33 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React from 'react';
 import classNames from 'classnames';
-import { ANT_PREFIX } from "../../constants/global";
-import { NodePopover } from "../node-popover";
 import { ReactSVG } from 'react-svg';
+import { useExperimentGraph } from "../../..";
+import { useObservableState } from "../../../../hooks/useObservableState";
+import { COMMONLY_USED } from "../../../node-types";
+import ORSvg from "./images/OR.svg";
+import ANDSvg from "./images/AND.svg";
+import XORSvg from "./images/XOR.svg";
+import lockingSvg from "./images/locking.svg";
+import unlockSvg from "./images/unlock.svg";
 import "./logical-element.less";
-import { useExperimentGraph } from "../../../pages/rx-models/experiment-graph";
-import { useObservableState } from "../../../hooks/useObservableState";
 var operatorUrl = {
-  '|': require("../../../assets/OR.svg"),
-  '&': require("../../../assets/AND.svg"),
-  '^': require("../../../assets/XOR.svg")
+  '|': ORSvg,
+  '&': ANDSvg,
+  '^': XORSvg,
+  LOCK: lockingSvg,
+  UNLOCK: unlockSvg
 };
 
-var ConditionElement = function ConditionElement(props) {
+var LogicalElement = function LogicalElement(props) {
+  var _data$id, _data$id$split;
+
   var node = props.node,
       experimentId = props.experimentId;
   var data = (node === null || node === void 0 ? void 0 : node.getData()) || {};
   var id = data.id,
-      imgUrl = data.imgUrl,
-      nodeData = data.nodeData;
+      imgUrl = data.imgUrl;
+  var nodeData = typeof (data === null || data === void 0 ? void 0 : data.nodeData) === 'string' ? JSON.parse(data.nodeData) : data.nodeData;
   var operator = nodeData === null || nodeData === void 0 ? void 0 : nodeData.operator;
   var expGraph = useExperimentGraph(experimentId);
 
@@ -44,16 +49,28 @@ var ConditionElement = function ConditionElement(props) {
       activeNodeInstance = _useObservableState2[0];
 
   var nodeId = activeNodeInstance && activeNodeInstance.id;
-  return /*#__PURE__*/React.createElement(_ConfigProvider, {
-    prefixCls: ANT_PREFIX
-  }, /*#__PURE__*/React.createElement(NodePopover, null, /*#__PURE__*/React.createElement("div", {
+  var nodeType = data === null || data === void 0 ? void 0 : (_data$id = data.id) === null || _data$id === void 0 ? void 0 : (_data$id$split = _data$id.split('-')) === null || _data$id$split === void 0 ? void 0 : _data$id$split[0];
+  console.log('operatorxxxxxx666', nodeType, operator, data);
+  return /*#__PURE__*/React.createElement("div", {
     className: classNames('logical-element', {
       selected: !!nodeId && nodeId === id
     })
   }, /*#__PURE__*/React.createElement(ReactSVG, {
     src: operator ? (operatorUrl === null || operatorUrl === void 0 ? void 0 : operatorUrl[operator]) || imgUrl : imgUrl,
-    className: "icon"
-  }))));
+    className: "icon",
+    style: {
+      marginLeft: operator === 'UNLOCK' ? 4 : 0
+    },
+    beforeInjection: function beforeInjection(svg) {
+      if (nodeType === COMMONLY_USED.LOCKED) {
+        svg.setAttribute('width', operator === 'UNLOCK' ? '35px' : '25px');
+        svg.setAttribute('height', operator === 'UNLOCK' ? '35px' : '30px');
+        svg.setAttribute('viewBox', operator === 'UNLOCK' ? '0 0 35 35' : '0 0 25 30');
+      } else {
+        svg.setAttribute('viewBox', '0 0 28 28');
+      }
+    }
+  }));
 };
 
-export default ConditionElement;
+export default LogicalElement;

package/es/{common/graph-common/node-element → packages/graph-canvas/graph-model/node/logical-node}/logical-element.less

@@ -1,9 +1,4 @@
-@import "./common-element.less";
-
-
-@node-element-primary-color: #00A6FF;
-@logical-bg-edg: 50px;
-@logical-edg: 30px;
+@import "../style.less";
 
 .logical-element {
   display: flex;
@@ -22,7 +17,7 @@
     background-color: @node-element-primary-color;
     .icon {
       svg path {
-        fill: #fff;
+        fill: #fff !important;
       }
     }
     .name {
@@ -32,11 +27,11 @@
   .icon {
     width: @logical-edg;
     height: @logical-edg;
-    svg {
+    div, svg {
       width: @logical-edg;
       height: @logical-edg;
       path {
-        fill: @node-element-primary-color;
+        fill: @node-element-primary-color !important;
       }
     }
   }

package/es/packages/graph-canvas/graph-model/node/style.less

@@ -0,0 +1,8 @@
+@node-element-primary-color: #00A6FF;
+@condition-element-width: 260px;
+@condition-element-height: 107px;
+@condition-element-name-max-width: 144px;
+@logical-bg-edg: 50px;
+@logical-edg: 30px;
+@borderColor: #d9d9d9;
+

package/es/{common → packages/graph-canvas}/graph-utils/graph.d.ts

@@ -1,83 +1,87 @@
-interface NodeParams {
-    id: string;
-    name: string;
-    imgUrl: string;
-    x: number;
-    y: number;
-}
-export declare const createNodePorts: (id: string, timestamp: string) => {
-    inPorts: {
-        id: string;
-        sequence: number;
-    }[];
-    outPorts: ({
-        id: string;
-        sequence: number;
-        group?: undefined;
-    } | {
-        id: string;
-        sequence: number;
-        group: string;
-    })[];
-};
-export declare const createNode: ({ id, name, imgUrl, x, y }: NodeParams) => {
-    inPorts: {
-        id: string;
-        sequence: number;
-    }[];
-    outPorts: ({
-        id: string;
-        sequence: number;
-        group?: undefined;
-    } | {
-        id: string;
-        sequence: number;
-        group: string;
-    })[];
-    id: string;
-    name: string;
-    imgUrl: string;
-    positionX: number;
-    positionY: number;
-};
-export declare const copyNode: ({ id, name, imgUrl, x, y }: NodeParams) => {
-    inPorts: {
-        id: string;
-        sequence: number;
-    }[];
-    outPorts: ({
-        id: string;
-        sequence: number;
-        group?: undefined;
-    } | {
-        id: string;
-        sequence: number;
-        group: string;
-    })[];
-    id: string;
-    name: string;
-    imgUrl: string;
-    positionX: number;
-    positionY: number;
-};
-export declare const addNode: (params: NodeParams) => {
-    inPorts: {
-        id: string;
-        sequence: number;
-    }[];
-    outPorts: ({
-        id: string;
-        sequence: number;
-        group?: undefined;
-    } | {
-        id: string;
-        sequence: number;
-        group: string;
-    })[];
-    id: string;
-    name: string;
-    imgUrl: string;
-    positionX: number;
-    positionY: number;
-};
-export {};
+interface NodeParams {
+    id: string;
+    name: string;
+    imgUrl: string;
+    x: number;
+    y: number;
+    applicationImgUrl?: string;
+}
+export declare const createNodePorts: (id: string, timestamp: string) => {
+    inPorts: {
+        id: string;
+        sequence: number;
+    }[];
+    outPorts: ({
+        id: string;
+        sequence: number;
+        group?: undefined;
+    } | {
+        id: string;
+        sequence: number;
+        group: string;
+    })[];
+};
+export declare const createNode: ({ id, name, imgUrl, applicationImgUrl, x, y }: NodeParams) => {
+    inPorts: {
+        id: string;
+        sequence: number;
+    }[];
+    outPorts: ({
+        id: string;
+        sequence: number;
+        group?: undefined;
+    } | {
+        id: string;
+        sequence: number;
+        group: string;
+    })[];
+    id: string;
+    name: string;
+    imgUrl: string;
+    applicationImgUrl: string | undefined;
+    positionX: number;
+    positionY: number;
+};
+export declare const copyNode: ({ id, name, imgUrl, applicationImgUrl, x, y }: NodeParams) => {
+    inPorts: {
+        id: string;
+        sequence: number;
+    }[];
+    outPorts: ({
+        id: string;
+        sequence: number;
+        group?: undefined;
+    } | {
+        id: string;
+        sequence: number;
+        group: string;
+    })[];
+    id: string;
+    name: string;
+    imgUrl: string;
+    applicationImgUrl: string | undefined;
+    positionX: number;
+    positionY: number;
+};
+export declare const addNode: (params: NodeParams) => {
+    inPorts: {
+        id: string;
+        sequence: number;
+    }[];
+    outPorts: ({
+        id: string;
+        sequence: number;
+        group?: undefined;
+    } | {
+        id: string;
+        sequence: number;
+        group: string;
+    })[];
+    id: string;
+    name: string;
+    imgUrl: string;
+    applicationImgUrl: string | undefined;
+    positionX: number;
+    positionY: number;
+};
+export {};

package/es/{common → packages/graph-canvas}/graph-utils/graph.js

@@ -5,7 +5,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import random from 'lodash/random';
-import { SIGN_OPERATION } from "../graph-common/node-types";
+import { SIGN_OPERATION } from "../node-types";
 export var createNodePorts = function createNodePorts(id, timestamp) {
   // 条件判断
   if (id === SIGN_OPERATION.CONDITION) {
@@ -15,14 +15,14 @@ export var createNodePorts = function createNodePorts(id, timestamp) {
         sequence: 1
       }],
       outPorts: [{
-        id: id ? "".concat(id, "-OUT-").concat(timestamp) : "out-".concat(timestamp),
+        id: id ? "".concat(id, "-IS-").concat(timestamp) : "out-".concat(timestamp),
         sequence: 1
       }, {
-        id: id ? "".concat(id, "-OUT-LEFT-").concat(timestamp) : "out-".concat(timestamp),
+        id: id ? "".concat(id, "-NOT-LEFT-").concat(timestamp) : "out-".concat(timestamp),
         sequence: 2,
         group: 'outLeft'
       }, {
-        id: id ? "".concat(id, "-OUT-RIGHT-").concat(timestamp) : "out-".concat(timestamp),
+        id: id ? "".concat(id, "-NOT-RIGHT-").concat(timestamp) : "out-".concat(timestamp),
         sequence: 3,
         group: 'outRight'
       }]
@@ -67,6 +67,7 @@ export var createNode = function createNode(_ref) {
   var id = _ref.id,
       name = _ref.name,
       imgUrl = _ref.imgUrl,
+      applicationImgUrl = _ref.applicationImgUrl,
       x = _ref.x,
       y = _ref.y;
   var timestamp = "".concat(Date.now());
@@ -75,6 +76,7 @@ export var createNode = function createNode(_ref) {
     id: id ? "".concat(id, "-").concat(timestamp) : "".concat(timestamp),
     name: name,
     imgUrl: imgUrl,
+    applicationImgUrl: applicationImgUrl,
     positionX: x,
     positionY: y
   }, portsParams);
@@ -83,12 +85,14 @@ export var copyNode = function copyNode(_ref2) {
   var id = _ref2.id,
       name = _ref2.name,
       imgUrl = _ref2.imgUrl,
+      applicationImgUrl = _ref2.applicationImgUrl,
       x = _ref2.x,
       y = _ref2.y;
   return createNode({
     id: id,
     name: name,
     imgUrl: imgUrl,
+    applicationImgUrl: applicationImgUrl,
     x: x + 200 + random(20, false),
     y: y + 15 + random(20, false)
   });

package/es/{pages/rx-models/experiment-graph.d.ts → packages/graph-canvas/index.d.ts}

@@ -1,82 +1,79 @@
-import type { Subscription } from 'rxjs';
-import { BehaviorSubject } from 'rxjs';
-import type { ConnectionRemovedArgs } from './graph-core';
-import { GraphCore } from './graph-core';
-import { CommonNode } from '@/common/graph-common/shape/node';
-import GroupNode from '@/common/graph-common/shape/nodes/GroupNode';
-import type BaseNode from '@/common/graph-common/shape/nodes/BaseNode';
-import type { BaseEdge } from '@/common/graph-common/shape/edge';
-import { GuideEdge } from '@/common/graph-common/shape/edge';
-import type { NExecutionStatus, NExperiment, NExperimentGraph } from './typing';
-import { formatGraphData } from './graph-util';
-export declare function parseStatus(data: NExecutionStatus.ExecutionStatus): NExecutionStatus.ExecutionStatus;
-declare type NodeMeta = ReturnType<typeof formatGraphData>['nodes'][number];
-declare type EdgeMeta = ReturnType<typeof formatGraphData>['edges'][number];
-declare class ExperimentGraph extends GraphCore<BaseNode, BaseEdge> {
-    nodeMetas?: NodeMeta[];
-    edgeMetas?: EdgeMeta[];
-    pendingNodes: BaseNode[];
-    experimentId: string;
-    loading$: BehaviorSubject<boolean>;
-    experiment$: BehaviorSubject<NExperiment.Experiment>;
-    experimentGraph$: BehaviorSubject<NExperimentGraph.ExperimentGraph>;
-    activeNodeInstance$: BehaviorSubject<NExecutionStatus.ActiveNode>;
-    activeModal$: BehaviorSubject<NExperimentGraph.ModalParams | undefined>;
-    selectedGroup$: BehaviorSubject<GroupNode | undefined>;
-    experimentGraphSub?: Subscription;
-    executionStatusQuerySub?: Subscription;
-    reRenderSub?: Subscription;
-    constructor(expId: string);
-    initialize(): Promise<void>;
-    initPreviewData(graphRes: any): Promise<void>;
-    loadExperimentGraph(graphRes: any): Promise<void>;
-    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;
-    createTypeNodeMeta: (nodeMeta: NodeMeta, nodeType: any, experimentId: string) => BaseNode | undefined;
-    renderNode(nodeMeta: NodeMeta): BaseNode | undefined;
-    afterLayout(): void;
-    renderEdge(edgeMeta: EdgeMeta): BaseEdge | undefined;
-    validateContextMenu: (info: NExperimentGraph.ContextMenuInfo) => boolean;
-    onSelectNodes(nodes: BaseNode[]): void;
-    onClearSelectNodes(): void;
-    handlerResize: (e: CustomEvent<string>) => void;
-    onConnectNode(args: any): Promise<{
-        success: boolean;
-    }>;
-    onConnectionRemoved(args: ConnectionRemovedArgs): void;
-    onMoveNodeStart(args: any): void;
-    onMoveNodes(movedNodes: any[]): Promise<void>;
-    onDeleteNodeOrEdge(args: {
-        nodes: BaseNode[];
-        edges: GuideEdge[];
-    }): void;
-    validateNodeCopyable(cell: BaseNode): boolean;
-    onCopyNode(node: CommonNode): void;
-    setActiveAlgoData: (data: any) => void;
-    requestAddNode: (param: {
-        nodeMeta: any;
-        clientX: number;
-        clientY: number;
-    }) => Promise<any>;
-    requestDeleteNodes: (ids: string[] | string) => Promise<{
-        success: boolean;
-    }>;
-    requestDeleteEdges: (edges: BaseEdge | BaseEdge[]) => Promise<{
-        success: boolean;
-    }>;
-    undoDeleteNode: () => Promise<void>;
-    updateNodeData: (nodeInstanceId: string, nodeData: any) => Promise<void>;
-    zoomGraph: (factor: number) => void;
-    zoomGraphToFit: () => void;
-    zoomGraphRealSize: () => void;
-    deleteEdgeFromContextMenu: (edge: BaseEdge) => Promise<void>;
-    unSelectNode: () => void;
-    setModal(params: NExperimentGraph.ModalParams | undefined): Promise<void>;
-    dispose(): void;
-}
-export declare const gModelMap: Map<string, ExperimentGraph>;
-export declare const useExperimentGraph: (experimentId: string) => ExperimentGraph;
-export declare const useUnmountExperimentGraph: (experimentId: string) => void;
-export {};
+import type { Subscription } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
+import type { ConnectionRemovedArgs } from "../graph-core";
+import { GraphCore } from "../graph-core";
+import { CommonNode } from './graph-model/node';
+import type BaseNode from "../graph-model/node";
+import type BaseEdge from "../graph-model/edge";
+import GuideEdge from "../graph-model/edge";
+import type { NExecutionStatus, NExperiment, NExperimentGraph } from "../graph-core/typing";
+import { formatGraphData } from "../graph-core/graph-util";
+declare type NodeMeta = ReturnType<typeof formatGraphData>['nodes'][number];
+declare type EdgeMeta = ReturnType<typeof formatGraphData>['edges'][number];
+declare class ExperimentGraph extends GraphCore<BaseNode, BaseEdge> {
+    nodeMetas?: NodeMeta[];
+    edgeMetas?: EdgeMeta[];
+    pendingNodes: BaseNode[];
+    experimentId: string;
+    loading$: BehaviorSubject<boolean>;
+    experiment$: BehaviorSubject<NExperiment.Experiment>;
+    experimentGraph$: BehaviorSubject<NExperimentGraph.ExperimentGraph>;
+    activeNodeInstance$: BehaviorSubject<NExecutionStatus.ActiveNode>;
+    experimentGraphSub?: Subscription;
+    executionStatusQuerySub?: Subscription;
+    reRenderSub?: Subscription;
+    constructor(expId: string);
+    initialize(): Promise<void>;
+    resetGraphData(): Promise<void>;
+    initPreviewData(graphRes: any): Promise<void>;
+    loadExperimentGraph(graphRes: any): Promise<void>;
+    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;
+    registerEdge: () => void;
+    createTypeNodeMeta: (nodeMeta: NodeMeta, nodeType: any, experimentId: string) => BaseNode | undefined;
+    renderNode(nodeMeta: NodeMeta): BaseNode | undefined;
+    afterLayout(): void;
+    renderEdge(edgeMeta: EdgeMeta): BaseEdge | undefined;
+    validateContextMenu: (info: NExperimentGraph.ContextMenuInfo) => boolean;
+    onSelectNodes(nodes: BaseNode[]): void;
+    onClearSelectNodes(): void;
+    handlerResize: (e: CustomEvent<string>) => void;
+    onConnectNode(args: any): Promise<{
+        success: boolean;
+    }>;
+    onConnectionRemoved(args: ConnectionRemovedArgs): void;
+    onMoveNodeStart(args: any): void;
+    onMoveNodes(movedNodes: any[]): Promise<void>;
+    onDeleteNodeOrEdge(args: {
+        nodes: BaseNode[];
+        edges: GuideEdge[];
+    }): void;
+    validateNodeCopyable(cell: BaseNode): boolean;
+    onCopyNode(node: CommonNode): void;
+    setActiveAlgoData: (data: any) => void;
+    requestAddNode: (param: {
+        nodeMeta: any;
+        clientX: number;
+        clientY: number;
+    }) => Promise<any>;
+    requestDeleteNodes: (ids: string[] | string) => Promise<{
+        success: boolean;
+    }>;
+    requestDeleteEdges: (edges: BaseEdge | BaseEdge[]) => Promise<{
+        success: boolean;
+    }>;
+    undoDeleteNode: () => Promise<void>;
+    updateNodeData: (nodeInstanceId: string, nodeData: any) => Promise<void>;
+    zoomGraph: (factor: number) => void;
+    zoomGraphToFit: () => void;
+    zoomGraphRealSize: () => void;
+    deleteEdgeFromContextMenu: (edge: BaseEdge) => Promise<void>;
+    unSelectNode: () => void;
+    dispose(): void;
+}
+export declare const gModelMap: Map<string, ExperimentGraph>;
+export declare const useExperimentGraph: (experimentId: string) => ExperimentGraph;
+export declare const useUnmountExperimentGraph: (experimentId: string) => void;
+export {};