ronds-metadata 1.2.24 → 1.2.26

package/es/comps/DynamicPorts/graph.js

@@ -107,13 +107,25 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
 
           if (!targetMagnet || targetMagnet.getAttribute('port-group') !== 'in') {
             return false;
+          } // 找到当前输出port
+
+
+          var sourcePortId = sourceMagnet.getAttribute('port');
+          var sourceNode = sourceView.cell;
+          var sourcePort = sourceNode.getPort(sourcePortId);
+          // 找到输入port
+          var targetPortId = targetMagnet.getAttribute('port');
+          var targetNode = targetView.cell;
+          var targetPort = targetNode.getPort(targetPortId);
+
+          // 如果设置输出port类型，则需要校验类型是否相等
+          // 只有类型相等才可以联线
+          if ((sourcePort === null || sourcePort === void 0 ? void 0 : sourcePort.type) && (targetPort === null || targetPort === void 0 ? void 0 : targetPort.type) && sourcePort.type !== targetPort.type) {
+            return false;
           } // 判断目标链接桩是否可连接
 
 
-          var portId = targetMagnet.getAttribute('port');
-          var node = targetView.cell;
-          var port = node.getPort(portId);
-          return !(port && port.connected);
+          return !(targetPort && targetPort.connected);
         }
       },
       scroller: {

package/es/comps/DynamicPorts/index.js

@@ -4,11 +4,12 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2022-05-16 18:53:31
- * @LastEditTime: 2022-06-28 14:58:00
+ * @LastEditTime: 2023-03-16 08:46:09
  */
 import React from 'react';
 import { filter } from 'rxjs';
 import { useDrop } from 'react-dnd';
+import ResizeSensor from 'css-element-queries/src/ResizeSensor';
 import './index.less';
 import './comps/shape/connector';
 import { useDPGraph, useUnmountDPGraph } from './graph';
@@ -33,7 +34,25 @@ var DynamicPorts = function DynamicPorts(props) {
   var dpGraphRef = React.useRef();
   var firstLoadRef = React.useRef(true); // 处理画布卸载
 
-  useUnmountDPGraph(); // 渲染画布
+  useUnmountDPGraph();
+  var resizeSensorRef = React.useRef(null);
+
+  var onResizeStrategy = function onResizeStrategy() {
+    var _dpGraphRef$current, _dpGraphRef$current2;
+
+    (_dpGraphRef$current = dpGraphRef.current) === null || _dpGraphRef$current === void 0 ? void 0 : _dpGraphRef$current.resizeGraph();
+    (_dpGraphRef$current2 = dpGraphRef.current) === null || _dpGraphRef$current2 === void 0 ? void 0 : _dpGraphRef$current2.zoomGraphRealSize();
+  };
+
+  React.useEffect(function () {
+    if (dpGraphRef.current) {
+      try {
+        resizeSensorRef.current = new ResizeSensor(divRef.current, onResizeStrategy);
+      } catch (ex) {
+        console.error(ex);
+      }
+    }
+  }, []); // 渲染画布
 
   React.useEffect(function () {
     if (firstLoadRef.current) {

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

@@ -55,6 +55,7 @@ export declare namespace NDPGraph {
         id: string;
         name: string;
         seq: number;
+        type: number | string;
     }
     interface Param {
         [key: string]: any;

package/es/comps/DynamicPorts/interface.js

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

package/es/comps/FormGenerator/index.js

@@ -4,7 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2023-02-04 13:45:31
- * @LastEditTime: 2023-02-25 10:53:17
+ * @LastEditTime: 2023-03-23 13:53:13
  */
 import React from 'react';
 import { DndProvider } from 'react-dnd';
@@ -18,6 +18,7 @@ import useMemoSubject from '../../framework/rxjs-hooks/useMemoSubject';
 import useObservable from '../../framework/rxjs-hooks/useObservable';
 import { streamEventType } from './settings';
 import { transSchema2FG } from './transformer';
+import { FormRobot } from '../../framework/fg/index';
 
 var FormGenerator = function FormGenerator(props) {
   var defaultSchema = props.defaultSchema;
@@ -29,6 +30,20 @@ var FormGenerator = function FormGenerator(props) {
       setTypes = _React$useState2[1];
 
   var typesRef = React.useRef({});
+  React.useEffect(function () {
+    var robot = new FormRobot();
+
+    var name = robot.input('name').label('名称').require().placeholder('请输入名称').valueOf();
+
+    var age = robot.input('age').label('年龄').defaultValue(1).valueOf();
+    var address = robot.textarea('address').label('地址').help('详细地址').valueOf();
+    var sex = robot.select('sex').label('性别').valueOf();
+
+    var birthday = robot.date('birthday').label('出身年月').require().valueOf();
+
+    var detail = robot.object([name, age], 'detail').valueOf();
+    var arr = robot.create([name, age, address, sex, birthday, detail]);
+  }, []);
   React.useEffect(function () {
     if (defaultSchema) {
       var defaultValue = transSchema2FG(defaultSchema);

package/es/comps/FormGenerator/transformer.d.ts

@@ -1,5 +1,5 @@
 import { FG } from '../../comps/FormGenerator/index.d';
-export declare const transFG2Schema: (nodes: FG.Node[], settings: any, _types?: any, schemaId?: string) => any;
+export declare const transFG2Schema: (nodes: FG.Node[], settings?: any, _types?: any, schemaId?: string) => any;
 export declare const transSchema2FG: (schema: any) => {
     nodes: any[];
     settings: {};

package/es/comps/FormGenerator/transformer.js

@@ -4,7 +4,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 /*
  * @Author: wangxian
  * @Date: 2023-02-08 14:45:46
- * @LastEditTime: 2023-03-01 15:53:54
+ * @LastEditTime: 2023-03-22 11:28:46
  */
 import { deepClone } from '../../utils';
 import { basicComps, complexComps, layoutComps } from './settings';
@@ -70,11 +70,22 @@ export var transFG2Schema = function transFG2Schema(nodes, settings, _types, sch
       schema[0].id = schemaId;
     }
 
+    var __types__ = _types || {};
+
     var props = [];
     var types = [];
 
     for (var i = 0; i < nodes.length; i++) {
-      var _prop = renderProp(nodes[i], settings && settings[nodes[i].id]);
+      var _nodes$i, _nodes$i$param;
+
+      if ((_nodes$i = nodes[i]) === null || _nodes$i === void 0 ? void 0 : (_nodes$i$param = _nodes$i.param) === null || _nodes$i$param === void 0 ? void 0 : _nodes$i$param.types) {
+        __types__[nodes[i].id] = {
+          id: nodes[i].id,
+          nodes: nodes[i].param.types
+        };
+      }
+
+      var _prop = renderProp(nodes[i], settings ? settings[nodes[i].id] : nodes[i].param.setting);
 
       props.push(_prop);
     }
@@ -87,11 +98,12 @@ export var transFG2Schema = function transFG2Schema(nodes, settings, _types, sch
       delete schema[0].fields;
     }
 
-    if (_types) {
-      var typeKeys = Object.keys(_types);
+    if (__types__) {
+      var typeKeys = Object.keys(__types__);
 
       for (var _i = 0; _i < typeKeys.length; _i++) {
-        var _type = transFG2Schema(_types[typeKeys[_i]].nodes, settings["".concat(typeKeys[_i], "_ref")], undefined, "".concat(_types[typeKeys[_i]].id, "_ref"));
+        var _type = transFG2Schema(__types__[typeKeys[_i]].nodes, // 没有传入内部类的情况 不需要传
+        _types && settings["".concat(typeKeys[_i], "_ref")], undefined, "".concat(__types__[typeKeys[_i]].id, "_ref"));
 
         types.push(_type[0]);
       }