ronds-metadata 1.1.3 → 1.1.6

package/es/api/index.d.ts

@@ -15,4 +15,5 @@ export default class Api implements IAPI {
     /** 添加元数据 */
     SaveMetadata(data: any, metadataTag: string): Promise<any>;
     GetMetadataObjList(data: any): Promise<any>;
+    GetEnumDataByUrl(url: string): Promise<any>;
 }

package/es/api/index.js

@@ -6,7 +6,7 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-03-28 15:33:19
+ * @LastEditTime: 2022-05-21 08:37:14
  */
 import { HttpHelper } from '../framework/http';
 var http = new HttpHelper();
@@ -173,6 +173,37 @@ var Api = /*#__PURE__*/function () {
       }
 
       return GetMetadataObjList;
+    }() // 通过扩展规则获取枚举类型的值
+
+  }, {
+    key: "GetEnumDataByUrl",
+    value: function () {
+      var _GetEnumDataByUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(url) {
+        var res;
+        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+          while (1) {
+            switch (_context5.prev = _context5.next) {
+              case 0:
+                _context5.next = 2;
+                return http.get(encodeURI(url));
+
+              case 2:
+                res = _context5.sent;
+                return _context5.abrupt("return", res.successed ? res.data : []);
+
+              case 4:
+              case "end":
+                return _context5.stop();
+            }
+          }
+        }, _callee5);
+      }));
+
+      function GetEnumDataByUrl(_x6) {
+        return _GetEnumDataByUrl.apply(this, arguments);
+      }
+
+      return GetEnumDataByUrl;
     }()
   }]);
 

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

@@ -0,0 +1,2 @@
+declare const DynamicPorts: () => JSX.Element;
+export default DynamicPorts;

package/es/comps/DynamicPorts/index.js

@@ -0,0 +1,80 @@
+/*
+ * @Author: wangxian
+ * @Date: 2022-05-16 18:53:31
+ * @LastEditTime: 2022-05-23 17:05:14
+ */
+import { Markup } from "@antv/x6/es/view/markup";
+import React from 'react';
+
+var DynamicPorts = function DynamicPorts() {
+  var containerRef = React.useRef();
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    ref: containerRef
+  }));
+};
+
+export default DynamicPorts;
+var testNode = {
+  x: 40,
+  y: 35,
+  width: 160,
+  height: 30,
+  label: 'Hello',
+  attrs: {
+    body: {
+      strokeWidth: 1,
+      stroke: '#108ee9',
+      fill: '#fff',
+      rx: 5,
+      ry: 5
+    }
+  },
+  portMarkup: [Markup.getForeignObjectMarkup()],
+  ports: {
+    items: [{
+      group: 'in',
+      id: 'in1'
+    }, {
+      group: 'in',
+      id: 'in2'
+    }, {
+      group: 'out',
+      id: 'out1'
+    }, {
+      group: 'out',
+      id: 'out2'
+    }],
+    groups: {
+      in: {
+        position: {
+          name: 'top'
+        },
+        attrs: {
+          fo: {
+            width: 10,
+            height: 10,
+            x: -5,
+            y: -5,
+            magnet: 'true'
+          }
+        },
+        zIndex: 1
+      },
+      out: {
+        position: {
+          name: 'bottom'
+        },
+        attrs: {
+          fo: {
+            width: 10,
+            height: 10,
+            x: -5,
+            y: -5,
+            magnet: 'true'
+          }
+        },
+        zIndex: 1
+      }
+    }
+  }
+};

package/es/comps/MetadataForm/DataCell/Ref.js

@@ -117,37 +117,74 @@ function Index(props) {
       initEnumValue: initEnumValue
     };
   }, [field]);
+  var getSchemaByRefId = React.useCallback( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(server, __TYPE__) {
+      var _schema, res, provider, FormCls, formCls, _fields;
+
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              _schema = []; // 如果有内部类，优先在内部类里面找
+
+              if (__TYPE__.length > 0) {
+                _schema = __TYPE__.filter(function (it) {
+                  return it.id === refId;
+                });
+              } // 内部类找不到 从接口里面拿
+
+
+              if (!(_schema.length === 0)) {
+                _context2.next = 7;
+                break;
+              }
+
+              _context2.next = 5;
+              return server.GetMetadataDetailById(refId);
+
+            case 5:
+              res = _context2.sent;
+
+              if (res === null || res === void 0 ? void 0 : res.schema) {
+                _schema = JSON.parse(res === null || res === void 0 ? void 0 : res.schema);
+              }
+
+            case 7:
+              provider = new JsonMetadataProvider();
+
+              if (_schema.length > 0) {
+                provider.add_types(_schema);
+                FormCls = provider.get_type(_schema[0].id);
+                formCls = new FormCls();
+                _fields = formCls.__type__.__fields__;
+                refFieldsRef.current = _fields;
+                setRefFields(_objectSpread({}, _fields));
+                setSchema(_toConsumableArray(_schema));
+              }
+
+            case 9:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+
+    return function (_x, _x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), [refId]);
   React.useEffect(function () {
     if (refId) {
       var server = new MetadataService();
-      server.GetMetadataDetailById(refId).then(function (res) {
-        var provider = new JsonMetadataProvider();
-
-        if (res === null || res === void 0 ? void 0 : res.schema) {
-          var mySchema = JSON.parse(res.schema);
-          provider.add_types(mySchema);
-          var FormCls = provider.get_type(mySchema[0].id);
-          var formCls = new FormCls();
-          var _fields = formCls.__type__.__fields__;
-          refFieldsRef.current = _fields;
-          setRefFields(_objectSpread({}, _fields));
-          setSchema(_toConsumableArray(mySchema));
-          return function () {
-            provider = null;
-          };
-        }
-
-        return function () {
-          provider = null;
-        };
-      });
+      getSchemaByRefId(server, formContext.__TYPE__);
       return function () {
         server = null;
       };
     }
 
     return function () {};
-  }, [refId]);
+  }, [getSchemaByRefId, formContext.__TYPE__]);
   React.useEffect(function () {
     if (refId) {
       var arr = refId.split(':');
@@ -156,12 +193,17 @@ function Index(props) {
   }, [refId]);
 
   if (isRefForm && !field && schema.length > 0) {
-    var _fieldRule$, _fieldRule$$value, _fieldRule$2, _fieldRule$2$value;
+    var _fieldRule$, _fieldRule$$value, _fieldRule$2, _fieldRule$2$value, _fieldRule$2$value$co;
 
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       style: {
         display: 'flex',
         alignItems: 'center'
+      },
+      onClick: function onClick() {
+        if (formContext.isFoldForm) {
+          setIsFold(!isFold);
+        }
       }
     }, /*#__PURE__*/React.createElement("div", {
       className: "ant-form-item-label",
@@ -172,7 +214,7 @@ function Index(props) {
       }
     }, /*#__PURE__*/React.createElement("label", {
       className: "".concat((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require) && 'ant-form-item-required')
-    }, extraInfo.label || fieldRule && ((_fieldRule$ = fieldRule[0]) === null || _fieldRule$ === void 0 ? void 0 : (_fieldRule$$value = _fieldRule$.value) === null || _fieldRule$$value === void 0 ? void 0 : _fieldRule$$value.label) || fieldRule && ((_fieldRule$2 = fieldRule[0]) === null || _fieldRule$2 === void 0 ? void 0 : (_fieldRule$2$value = _fieldRule$2.value) === null || _fieldRule$2$value === void 0 ? void 0 : _fieldRule$2$value.common.label) || id)), formContext.isFoldForm && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
+    }, (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.label) || fieldRule && ((_fieldRule$ = fieldRule[0]) === null || _fieldRule$ === void 0 ? void 0 : (_fieldRule$$value = _fieldRule$.value) === null || _fieldRule$$value === void 0 ? void 0 : _fieldRule$$value.label) || fieldRule && ((_fieldRule$2 = fieldRule[0]) === null || _fieldRule$2 === void 0 ? void 0 : (_fieldRule$2$value = _fieldRule$2.value) === null || _fieldRule$2$value === void 0 ? void 0 : (_fieldRule$2$value$co = _fieldRule$2$value.common) === null || _fieldRule$2$value$co === void 0 ? void 0 : _fieldRule$2$value$co.label) || id)), formContext.isFoldForm && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
       type: "link",
       onClick: function onClick() {
         setIsFold(!isFold);

package/es/comps/MetadataForm/DataCell/Select.js

@@ -3,20 +3,28 @@ import _Form from "antd/es/form";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
+import "antd/es/cascader/style";
+import _Cascader from "antd/es/cascader";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-11 16:41:22
+ * @LastEditTime: 2022-05-23 16:51:06
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
+import { MetadataService } from '../../../framework/metadata/MetadataService';
+import { deepClone } from '../../../utils';
+import { useAsyncMemo } from '../../../framework/hooks/use-async-memo';
 
 function Index(props) {
-  var _extraInfo$disabled2, _extraInfo$disabled3;
+  var _extraInfo$http3, _extraInfo$http4;
 
   var id = props.id,
       name = props.name,
@@ -25,11 +33,18 @@ function Index(props) {
       initEnumValue = _props$initEnumValue === void 0 ? {} : _props$initEnumValue,
       disabled = props.disabled,
       field = props.field,
-      isObj = props.isObj;
+      isObj = props.isObj,
+      _props$enum = props.enum,
+      myEnum = _props$enum === void 0 ? [] : _props$enum;
   var formContext = React.useContext(MetadataFormContext) || {};
   var formRefContext = React.useContext(MetadataRefContext);
   var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form, props.type);
 
+  var _React$useState = React.useState([]),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      cascaderOption = _React$useState2[0],
+      setCascaderOption = _React$useState2[1];
+
   var onSelect = function onSelect(value) {
     formContext.stream$ && formContext.stream$.next({
       type: 'onSelectChange',
@@ -37,18 +52,72 @@ function Index(props) {
     });
   };
 
-  var options = React.useMemo(function () {
+  var getEnumDataByUrl = React.useCallback( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(http, pid) {
+      var server, _url, res;
+
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              server = new MetadataService();
+              _url = pid || pid === '' ? http.url.replace('{pid}', pid) : http.url;
+              _context.next = 4;
+              return server.GetEnumDataByUrl(_url);
+
+            case 4:
+              res = _context.sent;
+
+              if (!(res && res.length > 0)) {
+                _context.next = 9;
+                break;
+              }
+
+              return _context.abrupt("return", res.map(function (it) {
+                if (http === null || http === void 0 ? void 0 : http.isCascader) {
+                  return {
+                    value: it[(http === null || http === void 0 ? void 0 : http.key) || 'id'],
+                    label: it[(http === null || http === void 0 ? void 0 : http.value) || 'name'],
+                    isLeaf: it['isLeaf'] ? it['isLeaf'] : false
+                  };
+                } else {
+                  return {
+                    value: it[(http === null || http === void 0 ? void 0 : http.key) || 'id'],
+                    label: it[(http === null || http === void 0 ? void 0 : http.value) || 'name']
+                  };
+                }
+              }));
+
+            case 9:
+              console.warn("".concat(_url, " is not return success result"));
+              return _context.abrupt("return", []);
+
+            case 11:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }(), []);
+
+  var processSelectOptionsData = function processSelectOptionsData() {
     var _options = [];
 
-    var _enum = props.enum || [];
+    var _enum = deepClone(myEnum || []); // 扩展规则的value
+
 
     if (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.value) {
-      _enum = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.value;
+      _enum = deepClone(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.value);
     } // 目前是更具那么的id判断的，暂未考虑重名问题
 
 
     if (initEnumValue[id]) {
-      _enum = initEnumValue[id];
+      _enum = deepClone(initEnumValue[id]);
     }
 
     _enum.forEach(function (it) {
@@ -61,10 +130,107 @@ function Index(props) {
     });
 
     return _options;
-  }, [props.enum, initEnumValue, name]);
+  };
+
+  var options = React.useMemo(function () {
+    return processSelectOptionsData();
+  }, [initEnumValue, myEnum, id]);
+  var httpOptions = useAsyncMemo( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var _extraInfo$http, res;
+
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http) && (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http.url))) {
+              _context2.next = 6;
+              break;
+            }
+
+            _context2.next = 3;
+            return getEnumDataByUrl(deepClone(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http), '');
+
+          case 3:
+            res = _context2.sent;
+
+            if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http = extraInfo.http) === null || _extraInfo$http === void 0 ? void 0 : _extraInfo$http.isCascader) {
+              setCascaderOption(_toConsumableArray(res));
+            }
+
+            return _context2.abrupt("return", res);
+
+          case 6:
+            return _context2.abrupt("return", []);
+
+          case 7:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  })), [extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http]);
+
+  var loadData = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(selectedOptions) {
+      var targetOption, _children;
+
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              targetOption = selectedOptions[selectedOptions.length - 1];
+              targetOption.loading = true;
+              _context3.next = 4;
+              return getEnumDataByUrl(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http, targetOption.value);
+
+            case 4:
+              _children = _context3.sent;
+              setTimeout(function () {
+                targetOption.loading = false;
+                targetOption.children = _children;
+                setCascaderOption(_toConsumableArray(cascaderOption));
+              }, 500);
+
+            case 6:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    }));
+
+    return function loadData(_x3) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+
+  var processSelectType = function processSelectType(b) {
+    if (b) {
+      return /*#__PURE__*/React.createElement(_Cascader, {
+        multiple: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple,
+        options: cascaderOption,
+        loadData: loadData,
+        maxTagCount: 10
+      });
+    } else {
+      var _extraInfo$disabled;
+
+      return /*#__PURE__*/React.createElement(_Select, {
+        mode: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple) ? 'multiple' : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
+        onSelect: onSelect,
+        disabled: (_extraInfo$disabled = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled !== void 0 ? _extraInfo$disabled : disabled,
+        placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
+        options: httpOptions && httpOptions.length > 0 ? httpOptions : options,
+        getPopupContainer: function getPopupContainer(triggerNode) {
+          return triggerNode.parentNode;
+        },
+        allowClear: true
+      });
+    }
+  };
 
   if (isObj && isRefForm && field) {
-    var _extraInfo$disabled;
+    var _extraInfo$http2;
 
     return /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
       style: {
@@ -79,17 +245,7 @@ function Index(props) {
       }],
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
-    }), /*#__PURE__*/React.createElement(_Select, {
-      mode: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple) ? 'multiple' : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
-      onSelect: onSelect,
-      disabled: (_extraInfo$disabled = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled !== void 0 ? _extraInfo$disabled : disabled,
-      placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
-      options: options,
-      getPopupContainer: function getPopupContainer(triggerNode) {
-        return triggerNode.parentNode;
-      },
-      allowClear: true
-    }));
+    }), processSelectType((_extraInfo$http2 = extraInfo.http) === null || _extraInfo$http2 === void 0 ? void 0 : _extraInfo$http2.isCascader));
   }
 
   return !field ? /*#__PURE__*/React.createElement(_Form.Item, {
@@ -105,17 +261,7 @@ function Index(props) {
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
-  }, /*#__PURE__*/React.createElement(_Select, {
-    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple) ? 'multiple' : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
-    onSelect: onSelect,
-    disabled: (_extraInfo$disabled2 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled2 !== void 0 ? _extraInfo$disabled2 : disabled,
-    placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
-    options: options,
-    getPopupContainer: function getPopupContainer(triggerNode) {
-      return triggerNode.parentNode;
-    },
-    allowClear: true
-  })) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
+  }, processSelectType((_extraInfo$http3 = extraInfo.http) === null || _extraInfo$http3 === void 0 ? void 0 : _extraInfo$http3.isCascader)) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
     style: {
       flex: 1,
       paddingRight: '10px'
@@ -127,17 +273,7 @@ function Index(props) {
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
-  }), /*#__PURE__*/React.createElement(_Select, {
-    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple) ? 'multiple' : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
-    onSelect: onSelect,
-    disabled: (_extraInfo$disabled3 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled3 !== void 0 ? _extraInfo$disabled3 : disabled,
-    placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
-    options: options,
-    getPopupContainer: function getPopupContainer(triggerNode) {
-      return triggerNode.parentNode;
-    },
-    allowClear: true
-  }));
+  }), processSelectType((_extraInfo$http4 = extraInfo.http) === null || _extraInfo$http4 === void 0 ? void 0 : _extraInfo$http4.isCascader));
 }
 
 export default /*#__PURE__*/React.memo(Index);

package/es/comps/MetadataForm/hooks/index.js

@@ -5,7 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: your name
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-17 15:28:24
+ * @LastEditTime: 2022-05-21 08:51:08
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \ronds.metadata\src\comps\MetadataForm\hooks\index.tsx
@@ -28,10 +28,6 @@ export var useGetExtraInfo = function useGetExtraInfo(fields, id, form, type) {
     if (fields) {
       var extraInfo = fields.get(id);
 
-      if (id === 'kafkaSource') {
-        debugger;
-      }
-
       if (extraInfo) {
         // 将map转化为对象
         var _extraInfo = {};
@@ -54,11 +50,7 @@ export var useGetExtraInfo = function useGetExtraInfo(fields, id, form, type) {
         // 时间格式转化
         if (_extraInfo.type === 'datePicker' && form.getFieldValue(id)) {
           form.setFieldsValue(_defineProperty({}, id, moment(form.getFieldValue(id), 'YYYY-MM-DD HH:mm:ss')));
-        } // 暂时注释加载默认值
-        // if (_extraInfo?.defaultValue) {
-        //   form.setFieldsValue({ [id]: _extraInfo?.defaultValue });
-        // }
-
+        }
 
         setExtra(_objectSpread({}, _extraInfo));
       }

package/es/comps/MetadataForm/index.js

@@ -39,10 +39,15 @@ var MetadataForm = function MetadataForm(props) {
       mySchma = _React$useState2[0],
       setMySchema = _React$useState2[1];
 
-  var _React$useState3 = React.useState(),
+  var _React$useState3 = React.useState([]),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
-      fields = _React$useState4[0],
-      setFields = _React$useState4[1];
+      innerSchemas = _React$useState4[0],
+      setInnerSchemas = _React$useState4[1];
+
+  var _React$useState5 = React.useState(),
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      fields = _React$useState6[0],
+      setFields = _React$useState6[1];
 
   var firstLoadRef = React.useRef(true);
   var firstLoadForm = React.useRef(true);
@@ -99,12 +104,15 @@ var MetadataForm = function MetadataForm(props) {
   }, [refId]);
   React.useEffect(function () {
     if (mySchma && mySchma.length > 0) {
+      var _mySchma$;
+
       var provider = new JsonMetadataProvider();
       provider.add_types(mySchma);
       var FormCls = provider.get_type(mySchma[0].id);
       var formCls = new FormCls();
       var _fields = formCls.__type__.__fields__;
       setFields(_fields);
+      setInnerSchemas(((_mySchma$ = mySchma[0]) === null || _mySchma$ === void 0 ? void 0 : _mySchma$.types) || []);
       return function () {
         provider = null;
       };
@@ -127,7 +135,8 @@ var MetadataForm = function MetadataForm(props) {
       stream$: stream$,
       initialValues: initialValues,
       isShowTypeInfo: isShowTypeInfo,
-      isFoldForm: isFoldForm
+      isFoldForm: isFoldForm,
+      __TYPE__: innerSchemas
     }
   }, /*#__PURE__*/React.createElement(_Form, {
     className: "metadata-form",

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import { FormInstance } from 'antd/lib/form/hooks/useForm';
+import { IMetaData } from '../../framework/metadata/types';
 export interface IMetadataFormContextProps {
     fields: any;
     form: FormInstance;
@@ -7,6 +8,7 @@ export interface IMetadataFormContextProps {
     initialValues: any;
     isShowTypeInfo: boolean;
     isFoldForm: boolean;
+    __TYPE__: IMetaData[];
 }
 export declare const MetadataFormContext: React.Context<IMetadataFormContextProps>;
 export interface IMetadataRefContextProps {

package/es/comps/MetadataForm/interface.js

@@ -1,7 +1,7 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-11 11:55:02
+ * @LastEditTime: 2022-05-23 11:56:54
  */
 import React from 'react';
 export var MetadataFormContext = /*#__PURE__*/React.createContext(null);

package/es/framework/hooks/use-async-memo.d.ts

@@ -0,0 +1,3 @@
+import { DependencyList } from 'react';
+export declare function useAsyncMemo<T>(factory: () => Promise<T> | undefined | null, deps: DependencyList): T | undefined;
+export declare function useAsyncMemo<T>(factory: () => Promise<T> | undefined | null, deps: DependencyList, initial: T): T;

package/es/framework/hooks/use-async-memo.js

@@ -0,0 +1,32 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+
+/*
+ * @Author: wangxian
+ * @Date: 2022-05-21 11:04:53
+ * @LastEditTime: 2022-05-21 11:07:34
+ */
+import { useEffect, useState } from 'react';
+export function useAsyncMemo(factory, deps, initial) {
+  var _useState = useState(initial),
+      _useState2 = _slicedToArray(_useState, 2),
+      val = _useState2[0],
+      setVal = _useState2[1];
+
+  useEffect(function () {
+    var cancel = false;
+    var promise = factory();
+
+    if (promise) {
+      promise.then(function (val) {
+        if (!cancel) {
+          setVal(val);
+        }
+      });
+    }
+
+    return function () {
+      cancel = true;
+    };
+  }, deps);
+  return val;
+}

package/es/framework/metadata/MetadataService.d.ts

@@ -15,4 +15,6 @@ export declare class MetadataService {
     SaveMetadata(data: any, metadataTag: string): Promise<any>;
     /** 获取元数据的值 */
     GetMetadataObjList(data: any): Promise<any[]>;
+    /** 通过扩展规则获取枚举类型的值 */
+    GetEnumDataByUrl(url: string): Promise<any[]>;
 }

package/es/framework/metadata/MetadataService.js

@@ -6,7 +6,7 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-03-28 11:52:05
+ * @LastEditTime: 2022-05-21 08:35:21
  */
 import Api from '../../api';
 var globalAPI = new Api();
@@ -132,6 +132,32 @@ export var MetadataService = /*#__PURE__*/function () {
 
       return GetMetadataObjList;
     }()
+    /** 通过扩展规则获取枚举类型的值 */
+
+  }, {
+    key: "GetEnumDataByUrl",
+    value: function () {
+      var _GetEnumDataByUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(url) {
+        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+          while (1) {
+            switch (_context5.prev = _context5.next) {
+              case 0:
+                return _context5.abrupt("return", this.api.GetEnumDataByUrl(url));
+
+              case 1:
+              case "end":
+                return _context5.stop();
+            }
+          }
+        }, _callee5, this);
+      }));
+
+      function GetEnumDataByUrl(_x6) {
+        return _GetEnumDataByUrl.apply(this, arguments);
+      }
+
+      return GetEnumDataByUrl;
+    }()
   }]);
 
   return MetadataService;

package/es/framework/metadata/types.d.ts

@@ -1,3 +1,8 @@
+/*
+ * @Author: wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2022-05-23 12:00:58
+ */
 export type IMetaType = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array' | string;
 
 export type IMetaData = {
@@ -22,6 +27,10 @@ export type IMetaData = {
    * 静态的变量
    */
   fields?: IMetaFileds[];
+  /**
+   * 内部类
+   */
+  types?: IMetaData[];
 };
 
 export type IMetaProperties = {
@@ -84,4 +93,6 @@ export interface IAPI {
   SaveMetadata(data: any, metadataTag: string): Promise<any>;
   // 获取元数据的值
   GetMetadataObjList(data: any): Promise<any[]>;
+  /** 通过扩展规则获取枚举类型的值 */
+  GetEnumDataByUrl(url: string): Promise<any[]>;
 }

package/es/index.d.ts

@@ -7,6 +7,7 @@ export { default as JsonView } from './comps/JsonView';
 export { default as JsonEdit } from './comps/JsonEdit';
 export { default as MdEditor } from './comps/MdEdit';
 export { default as Editable } from './comps/Editable';
+export { default as DynamicPorts } from './comps/DynamicPorts';
 export * from './framework/metadata/index';
 export { default as http, addInterceptor } from './framework/http/index';
 export { default as useMemoSubject } from './framework/rxjs-hooks/useMemoSubject';

package/es/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-11 09:02:18
+ * @LastEditTime: 2022-05-23 16:32:32
  */
 import "./theme.css";
 export { default as MetadataEdit } from './comps/MetadataEdit';
@@ -12,6 +12,7 @@ export { default as JsonView } from './comps/JsonView';
 export { default as JsonEdit } from './comps/JsonEdit';
 export { default as MdEditor } from './comps/MdEdit';
 export { default as Editable } from './comps/Editable';
+export { default as DynamicPorts } from './comps/DynamicPorts';
 export * from './framework/metadata/index';
 export { default as http, addInterceptor } from './framework/http/index';
 export { default as useMemoSubject } from './framework/rxjs-hooks/useMemoSubject';

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.1.3",
+  "version": "1.1.6",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -31,6 +31,7 @@
     "/es"
   ],
   "dependencies": {
+    "@antv/x6": "^1.32.2",
     "@babel/helper-create-regexp-features-plugin": "^7.12.13",
     "@babel/runtime": "^7.11.2",
     "@popperjs/core": "^2.4.4",

package/es/comps/RzGraph/index.d.ts

@@ -1,2 +0,0 @@
-declare const RzGraph: () => JSX.Element;
-export default RzGraph;

package/es/comps/RzGraph/index.js

@@ -1,7 +0,0 @@
-import React from "react";
-
-var RzGraph = function RzGraph() {
-  return /*#__PURE__*/React.createElement(React.Fragment, null);
-};
-
-export default RzGraph;