ronds-metadata 1.2.78 → 1.2.80

package/es/comps/DynamicPorts/comps/shape/edge.js

@@ -5,7 +5,7 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 /*
  * @Author: wangxian
  * @Date: 2022-05-24 09:18:34
- * @LastEditTime: 2022-05-24 10:43:18
+ * @LastEditTime: 2023-07-03 16:20:13
  */
 import { Shape, Edge } from '@antv/x6';
 import './edge.less';

package/es/comps/DynamicPorts/graph.js

@@ -13,7 +13,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 /*
  * @Author: wangxian
  * @Date: 2022-05-24 14:31:01
- * @LastEditTime: 2023-03-24 11:12:35
+ * @LastEditTime: 2023-07-03 16:49:09
  */
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import produce from 'immer';
@@ -156,7 +156,10 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
             title: port.name,
             placement: placement
           }, /*#__PURE__*/React.createElement("span", {
-            className: "dp-port ".concat(port.connected ? 'connected' : '')
+            className: "dp-port ".concat(port.connected ? 'connected' : ''),
+            style: port.color && {
+              borderColor: "".concat(port.connected ? "".concat(port.color, " transparent transparent") : port.color)
+            }
           })), container);
         }
       }
@@ -436,7 +439,7 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
     value: // 处理连线事件
     function () {
       var _onConnectNode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(args) {
-        var _args$edge, edge, isNew, source, target, node, portId, data;
+        var _args$edge, edge, isNew, source, target, _edge$getTargetCell, _edge$getTargetCell$p, _ports$find, node, portId, ports, color, data;
         return _regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -446,6 +449,10 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
                 // 处理边虚线样式更新的问题。
                 node = args.currentCell;
                 portId = edge.getTargetPortId();
+                ports = ((_edge$getTargetCell = edge.getTargetCell()) === null || _edge$getTargetCell === void 0 ? void 0 : (_edge$getTargetCell$p = _edge$getTargetCell.port) === null || _edge$getTargetCell$p === void 0 ? void 0 : _edge$getTargetCell$p.ports) || [];
+                color = (_ports$find = ports.find(function (v) {
+                  return v.id === portId;
+                })) === null || _ports$find === void 0 ? void 0 : _ports$find.color;
                 if (node && portId) {
                   // 触发 port 重新渲染
                   node.setPortProp(portId, 'connected', true);
@@ -454,7 +461,7 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
                     line: {
                       strokeDasharray: '',
                       targetMarker: '',
-                      stroke: '#808080'
+                      stroke: color || '#808080'
                     }
                   });
                   data = {
@@ -463,6 +470,9 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
                     outPortId: source.port,
                     inPortId: target.port
                   };
+                  if (color) {
+                    data.color = color;
+                  }
                   edge.setData(data);
                   this.updateDPGraph([], [data]);
                 }

package/es/comps/DynamicPorts/index.less

@@ -195,4 +195,22 @@
     z-index: 10;
     box-sizing: border-box;
   }
+
+  .error {
+    stroke-width: 2px;
+    path:nth-child(2) {
+      stroke: rgba(245, 34, 45, 0.45) !important;
+      stroke-width: 2px;
+    }
+  }
+  .edgeProcessing {
+    path:nth-child(2) {
+      stroke: rgba(57, 202, 116, 0.8);
+      stroke-width: 2px;
+      stroke-dasharray: 8px, 2px;
+      &:local {
+        animation: processing-line 30s infinite linear;
+      }
+    }
+  }
 }

package/es/comps/DynamicPorts/interface.d.ts

@@ -46,6 +46,7 @@ export declare namespace NDPGraph {
         target: string;
         outPortId: string;
         inPortId: string;
+        color?: string;
     }
     interface OutPort extends Port {
     }
@@ -54,6 +55,7 @@ export declare namespace NDPGraph {
     interface Port {
         id: string;
         name: string;
+        color?: string;
         seq: number;
         type: number | string;
     }

package/es/comps/DynamicPorts/interface.js

@@ -1,6 +1,6 @@
 /*
  * @Author: wangxian
  * @Date: 2022-05-24 16:10:46
- * @LastEditTime: 2023-03-20 14:04:22
+ * @LastEditTime: 2023-07-03 16:30:28
  */
 export {};

package/es/comps/DynamicPorts/utils.d.ts

@@ -80,6 +80,7 @@ export declare function formatGraphData(graphData: NDPGraph.GraphData): {
             target: string;
             outPortId: string;
             inPortId: string;
+            color?: string;
         };
         sourceAnchor: string;
         source: {
@@ -98,7 +99,15 @@ export declare function formatGraphData(graphData: NDPGraph.GraphData): {
         };
         label: string;
         zIndex: number;
+        attrs: {
+            line: {
+                strokeDasharray: string;
+                targetMarker: string;
+                stroke: string;
+            };
+        };
         outPortId: string;
         inPortId: string;
+        color?: string;
     }[];
 };

package/es/comps/DynamicPorts/utils.js

@@ -3,7 +3,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 /*
  * @Author: wangxian
  * @Date: 2022-05-24 16:40:49
- * @LastEditTime: 2022-05-27 16:02:48
+ * @LastEditTime: 2023-07-03 16:31:06
  */
 import { sortBy } from 'lodash-es';
 import { NODE_HEIGHT, NODE_WIDTH } from './constant';
@@ -40,16 +40,18 @@ export function formatNodeInfoToNodeMeta(nodeData) {
     outPorts = nodeData.outPorts;
   sortBy(inPorts, 'seq').forEach(function (inPort) {
     portItems.push(_objectSpread(_objectSpread({}, inPort), {}, {
+      color: inPort === null || inPort === void 0 ? void 0 : inPort.color,
       group: 'in',
       id: inPort.id.toString(),
-      connected: !!inputPortConnectedMap[inPort.id.toString()]
+      connected: !!inputPortConnectedMap["".concat(id.toString()).concat(inPort.id.toString())]
     }));
   });
   sortBy(outPorts, 'seq').forEach(function (outPort) {
     portItems.push(_objectSpread(_objectSpread({}, outPort), {}, {
+      color: outPort === null || outPort === void 0 ? void 0 : outPort.color,
       group: 'out',
       id: outPort.id.toString(),
-      connected: !!inputPortConnectedMap[outPort.id.toString()]
+      connected: !!inputPortConnectedMap["".concat(id.toString()).concat(outPort.id.toString())]
     }));
   });
   return _objectSpread(_objectSpread({}, nodeData), {}, {
@@ -81,13 +83,14 @@ export function formatGraphData(graphData) {
     _graphData$edges = graphData.edges,
     edges = _graphData$edges === void 0 ? [] : _graphData$edges;
   // 格式化边
-  var formattedEdges = edges.map(function (edges) {
-    var source = edges.source,
-      outPortId = edges.outPortId,
-      target = edges.target,
-      inPortId = edges.inPortId;
-    return _objectSpread(_objectSpread({}, edges), {}, {
-      data: _objectSpread({}, edges),
+  var formattedEdges = edges.map(function (edge) {
+    var source = edge.source,
+      outPortId = edge.outPortId,
+      target = edge.target,
+      inPortId = edge.inPortId,
+      color = edge.color;
+    return _objectSpread(_objectSpread({}, edge), {}, {
+      data: _objectSpread({}, edge),
       sourceAnchor: 'bottom',
       source: {
         cell: source.toString(),
@@ -104,12 +107,20 @@ export function formatGraphData(graphData) {
         }
       },
       label: '',
-      zIndex: 1
+      zIndex: 1,
+      attrs: {
+        line: {
+          strokeDasharray: '',
+          targetMarker: '',
+          stroke: color || '#808080'
+        }
+      }
     });
   });
   // 记录所有已连线的输入桩
   var inputPortConnectedMap = formattedEdges.reduce(function (acc, edge) {
-    acc[edge.inPortId] = true;
+    var _edge$target;
+    acc["".concat((_edge$target = edge.target) === null || _edge$target === void 0 ? void 0 : _edge$target.cell).concat(edge.inPortId)] = true;
     return acc;
   }, {});
   // 格式化算法组件节点

package/es/comps/FormGenerator/comps/Sidebar/JsonSchema.d.ts

@@ -0,0 +1,5 @@
+interface IJsonSchemaProps {
+    json: string;
+}
+declare const JsonSchema: (props: IJsonSchemaProps) => JSX.Element;
+export default JsonSchema;

package/es/comps/FormGenerator/comps/Sidebar/JsonSchema.js

@@ -0,0 +1,10 @@
+import React from "react";
+import JsonView from '../../../../comps/JsonView';
+var JsonSchema = function JsonSchema(props) {
+  var json = props.json;
+  var onChange = function onChange(txt) {};
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(JsonView, {
+    json: json
+  }));
+};
+export default JsonSchema;

package/es/comps/FormGenerator/comps/Sidebar/index.d.ts

@@ -1,2 +1,3 @@
+import './index.less';
 declare const Sidebar: () => JSX.Element;
 export default Sidebar;

package/es/comps/FormGenerator/comps/Sidebar/index.js

@@ -1,21 +1,33 @@
+import "antd/es/radio/style";
+import _Radio from "antd/es/radio";
 import "antd/es/row/style";
 import _Row from "antd/es/row";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: uloveits 719310130@qq.com
  * @Date: 2023-02-04 16:35:16
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-06-26 08:46:07
+ * @LastEditTime: 2023-06-30 10:15:25
  */
 import React from 'react';
 import { sidebarCtx } from '../../settings';
 import Elements from './Elements';
+import './index.less';
+import JsonSchema from './JsonSchema';
 var Sidebar = function Sidebar() {
+  var _React$useState = React.useState('comps'),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    active = _React$useState2[0],
+    setActive = _React$useState2[1];
   return /*#__PURE__*/React.createElement("div", {
+    className: "fg-sidebar"
+  }, /*#__PURE__*/React.createElement("div", {
     style: {
-      height: '100%',
-      width: '100%',
+      height: 'calc(100% - 40px)',
       padding: '4px',
-      overflowY: 'auto'
+      width: '100%',
+      overflowY: 'auto',
+      display: "".concat(active === 'comps' ? '' : 'none')
     }
   }, sidebarCtx.map(function (it) {
     return /*#__PURE__*/React.createElement("div", {
@@ -36,6 +48,33 @@ var Sidebar = function Sidebar() {
         data: v
       });
     })));
-  }));
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      height: 'calc(100% - 40px)',
+      padding: '4px',
+      width: '100%',
+      overflowY: 'auto',
+      display: "".concat(active === 'json' ? '' : 'none')
+    }
+  }, /*#__PURE__*/React.createElement(JsonSchema, {
+    json: ""
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "fg-sidebar-bottom-tool"
+  }, /*#__PURE__*/React.createElement(_Radio.Group, {
+    options: [{
+      label: '组件',
+      value: 'comps'
+    }, {
+      label: 'JSON',
+      value: 'json'
+    }],
+    onChange: function onChange(_ref) {
+      var value = _ref.target.value;
+      setActive(value);
+    },
+    value: active,
+    optionType: "button",
+    buttonStyle: "solid"
+  })));
 };
 export default Sidebar;

package/es/comps/FormGenerator/comps/Sidebar/index.less

@@ -0,0 +1,21 @@
+.fg-sidebar {
+  height: 100%;
+  position: relative;
+
+  &-bottom-tool {
+    position: absolute;
+    display: flex;
+    left: 0;
+    right: 0;
+    align-items: center;
+    bottom: 0;
+    cursor: pointer;
+    .ant-radio-group {
+      width: 100%;
+      .ant-radio-button-wrapper {
+        width: 50%;
+        text-align: center;
+      }
+    }
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.2.78",
+  "version": "1.2.80",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",