Merge pull request #5 from MoeOtaLab/feature/operator-v2

Feature/operator v2
MoeOtaLab · Jan 13, 2024 · 70944b2 · 70944b2
2 parents 9ada3ba + e0d1391
commit 70944b2
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 29 deletions.
diff --git a/packages/flow/src/Diagrams/Nodes/Node/components/NodePorts/NodePorts.module.less b/packages/flow/src/Diagrams/Nodes/Node/components/NodePorts/NodePorts.module.less
@@ -1,6 +1,6 @@
 .port-type-container {
   border-radius: 6px;
-  padding: 4px 8px 4px 0px;
+  padding: 4px 0px 4px 0px;
 
   background-color: var(--color-bg);
 }

diff --git a/packages/flow/src/Diagrams/Nodes/Node/components/NodePorts/index.tsx b/packages/flow/src/Diagrams/Nodes/Node/components/NodePorts/index.tsx
@@ -69,7 +69,7 @@ export function NodePorts(props: { node: Partial<Node<IMetaOperatorData>> }) {
                     });
                   }}
                 >
-                  add port
+                  add
                 </span>
               )}
             </div>

diff --git a/packages/flow/src/Diagrams/Operators/InputOperator/index.tsx b/packages/flow/src/Diagrams/Operators/InputOperator/index.tsx
@@ -38,10 +38,10 @@ export class InputOperator
               hint: 'state',
             },
             children: [
-              new EndPoint({
-                type: 'source',
-                hint: 'state',
-              }),
+              // new EndPoint({
+              //   type: 'source',
+              //   hint: 'state',
+              // }),
             ],
           }),
           new EndPoint({
@@ -54,10 +54,10 @@ export class InputOperator
               hint: 'event',
             },
             children: [
-              new EndPoint({
-                type: 'source',
-                hint: 'event',
-              }),
+              // new EndPoint({
+              //   type: 'source',
+              //   hint: 'event',
+              // }),
             ],
           }),
           new EndPoint({

diff --git a/packages/flow/src/Diagrams/Operators/OutputOperator/index.tsx b/packages/flow/src/Diagrams/Operators/OutputOperator/index.tsx
@@ -19,10 +19,7 @@ export class OutputOperator
     });
   }
 
-  create(
-    data?: Partial<IOutputOperatorData> | undefined,
-    defaultProps?: Partial<Node<IOutputOperatorData>> | undefined,
-  ): Node<IOutputOperatorData> {
+  create(): Node<IOutputOperatorData> {
     return super.create({
       endPointOptions: {
         endPointList: [
@@ -36,10 +33,10 @@ export class OutputOperator
               hint: 'state',
             },
             children: [
-              new EndPoint({
-                type: 'target',
-                hint: 'state',
-              }),
+              // new EndPoint({
+              //   type: 'target',
+              //   hint: 'state',
+              // }),
             ],
           }),
 
@@ -53,10 +50,10 @@ export class OutputOperator
               hint: 'event',
             },
             children: [
-              new EndPoint({
-                type: 'target',
-                hint: 'event',
-              }),
+              // new EndPoint({
+              //   type: 'target',
+              //   hint: 'event',
+              // }),
             ],
           }),
         ],

diff --git a/packages/flow/src/Diagrams/Panels/ConsolePanel/Demo.tsx b/packages/flow/src/Diagrams/Panels/ConsolePanel/Demo.tsx
@@ -159,7 +159,7 @@ export const Demo: React.FC = () => {
             {outputValueIds?.map(({ port }) => {
               return (
                 <div key={port.id}>
-                  <Form.Item label={port.label}>
+                  <Form.Item label={port.label || port.variableName}>
                     {JSON.stringify(
                       instance?.output?.[port.variableName || '']?.current,
                     )}

diff --git a/packages/flow/src/Diagrams/Panels/LayerPanel/index.tsx b/packages/flow/src/Diagrams/Panels/LayerPanel/index.tsx
@@ -2,7 +2,7 @@ import classnames from 'classnames';
 import { useDiagramsContext } from '../../State/DiagramsProvider';
 import { Button, Input, Modal } from 'antd';
 import { type Layer } from '../../State/Layer';
-import { CustomOperator } from '../../Operators/CustomOperator';
+import { getOperatorFromOperatorType } from '../../Operators';
 import css from './LayerPanel.module.less';
 
 export function LayerPanel() {
@@ -63,12 +63,16 @@ export function LayerPanel() {
             ),
             onOk() {
               if (name) {
-                const newNode = new CustomOperator({
-                  data: { operatorName: name },
-                });
+                const customOperator =
+                  getOperatorFromOperatorType('CustomOperator');
+                if (!customOperator) {
+                  return;
+                }
+
+                const newNode = customOperator?.create();
 
                 // add nodes
-                CustomOperator.onAfterCreate({
+                customOperator.onAfterCreate({
                   node: newNode,
                   currentState: {
                     layer,

diff --git a/packages/flow/tsconfig.json b/packages/flow/tsconfig.json
@@ -8,7 +8,7 @@
       "ESNext"
     ],
     "allowJs": false,
-    "skipLibCheck": false,
+    "skipLibCheck": true,
     "esModuleInterop": false,
     "allowSyntheticDefaultImports": true,
     "strict": true,