ronds-metadata 1.2.78 → 1.2.79

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 10:35:43
  */
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import produce from 'immer';
@@ -201,6 +201,7 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
               _this.deleteNodes(oldGraph.nodes.map(function (it) {
                 return it.id;
               }));
+              _this.onDeleteEdges(oldGraph.edges);
               _formatGraphData2 = formatGraphData(graphData), nodes = _formatGraphData2.nodes, edges = _formatGraphData2.edges;
               nodes.forEach(function (nodeMeta) {
                 return _this.renderNode(nodeMeta);
@@ -209,7 +210,7 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
                 return _this.renderEdge(edgeMeta);
               });
               _this.loadDPGraph(graphData);
-            case 6:
+            case 7:
             case "end":
               return _context.stop();
           }

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 14:32:33
  */
 import { sortBy } from 'lodash-es';
 import { NODE_HEIGHT, NODE_WIDTH } from './constant';
@@ -42,14 +42,14 @@ export function formatNodeInfoToNodeMeta(nodeData) {
     portItems.push(_objectSpread(_objectSpread({}, inPort), {}, {
       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), {}, {
       group: 'out',
       id: outPort.id.toString(),
-      connected: !!inputPortConnectedMap[outPort.id.toString()]
+      connected: !!inputPortConnectedMap["".concat(id.toString()).concat(outPort.id.toString())]
     }));
   });
   return _objectSpread(_objectSpread({}, nodeData), {}, {
@@ -109,7 +109,8 @@ export function formatGraphData(graphData) {
   });
   // 记录所有已连线的输入桩
   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.79",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",