ronds-metadata 1.1.5 → 1.1.6

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

@@ -118,11 +118,51 @@ function Index(props) {
     };
   }, [field]);
   var getSchemaByRefId = React.useCallback( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(server) {
+    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();
           }
@@ -130,41 +170,21 @@ function Index(props) {
       }, _callee2);
     }));
 
-    return function (_x) {
+    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(':');

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

@@ -14,7 +14,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-23 14:31:37
+ * @LastEditTime: 2022-05-23 16:51:06
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -40,15 +40,7 @@ function Index(props) {
   var formRefContext = React.useContext(MetadataRefContext);
   var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form, props.type);
 
-  var _React$useState = React.useState([{
-    value: 'zhejiang',
-    label: 'Zhejiang',
-    isLeaf: false
-  }, {
-    value: 'jiangsu',
-    label: 'Jiangsu',
-    isLeaf: false
-  }]),
+  var _React$useState = React.useState([]),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       cascaderOption = _React$useState2[0],
       setCascaderOption = _React$useState2[1];
@@ -69,7 +61,7 @@ function Index(props) {
           switch (_context.prev = _context.next) {
             case 0:
               server = new MetadataService();
-              _url = pid ? http.url.replace('{pid}', pid) : http.url;
+              _url = pid || pid === '' ? http.url.replace('{pid}', pid) : http.url;
               _context.next = 4;
               return server.GetEnumDataByUrl(_url);
 
@@ -83,14 +75,6 @@ function Index(props) {
 
               return _context.abrupt("return", res.map(function (it) {
                 if (http === null || http === void 0 ? void 0 : http.isCascader) {
-                  if (pid === 'child_1') {
-                    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'] : true
-                    };
-                  }
-
                   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'],
@@ -164,7 +148,7 @@ function Index(props) {
             }
 
             _context2.next = 3;
-            return getEnumDataByUrl(deepClone(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http));
+            return getEnumDataByUrl(deepClone(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http), '');
 
           case 3:
             res = _context2.sent;
@@ -225,7 +209,8 @@ function Index(props) {
       return /*#__PURE__*/React.createElement(_Cascader, {
         multiple: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple,
         options: cascaderOption,
-        loadData: loadData
+        loadData: loadData,
+        maxTagCount: 10
       });
     } else {
       var _extraInfo$disabled;
@@ -235,7 +220,7 @@ function Index(props) {
         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 || options,
+        options: httpOptions && httpOptions.length > 0 ? httpOptions : options,
         getPopupContainer: function getPopupContainer(triggerNode) {
           return triggerNode.parentNode;
         },

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.5",
+  "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;