ronds-metadata 1.1.5 → 1.1.8

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/comps/MetadataForm/DataCell/layout/TableArray.js

@@ -1,7 +1,9 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useRef } from 'react';
@@ -10,6 +12,7 @@ import { JsonMetadataProvider } from '../../../../framework/metadata';
 import Editable from '../../../../comps/Editable';
 import useObservable from '../../../../framework/rxjs-hooks/useObservable';
 import { MetadataFormContext } from '../../interface';
+import { getLabelByProps } from '../../utils';
 
 var TableArray = function TableArray(props) {
   var initValue = props.initValue,
@@ -46,31 +49,68 @@ var TableArray = function TableArray(props) {
       setList(_toConsumableArray(p.payload[name]));
     }
   }, [formContext.stream$]);
+  var getSchemaByRefId = React.useCallback( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(server, __TYPE__) {
+      var _schema, res, provider, FormCls, formCls, _fields;
+
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _schema = []; // 如果有内部类，优先在内部类里面找
+
+              if (__TYPE__.length > 0) {
+                _schema = __TYPE__.filter(function (it) {
+                  return it.id === refId;
+                });
+              } // 内部类找不到 从接口里面拿
+
+
+              if (!(_schema.length === 0)) {
+                _context.next = 7;
+                break;
+              }
+
+              _context.next = 5;
+              return server.GetMetadataDetailById(refId);
+
+            case 5:
+              res = _context.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));
+                setDefaultValue(_objectSpread({}, JSON.parse(JSON.stringify(formCls))));
+              }
+
+            case 9:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function (_x, _x2) {
+      return _ref.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));
-          setDefaultValue(_objectSpread({}, JSON.parse(JSON.stringify(formCls))));
-          return function () {
-            provider = null;
-          };
-        }
-
-        return function () {
-          provider = null;
-        };
-      });
+      getSchemaByRefId(server, formContext.__TYPE__);
       return function () {
         server = null;
       };
@@ -88,11 +128,9 @@ var TableArray = function TableArray(props) {
     var _columns = [];
 
     for (var i = 0; i < _properties.length; i++) {
-      var _it$fields$0$value, _it$fields$0$value$co, _it$fields$0$value2;
-
       var it = _properties[i];
       var obj = {
-        title: (it === null || it === void 0 ? void 0 : (_it$fields$0$value = it.fields[0].value) === null || _it$fields$0$value === void 0 ? void 0 : (_it$fields$0$value$co = _it$fields$0$value.common) === null || _it$fields$0$value$co === void 0 ? void 0 : _it$fields$0$value$co.label) || (it === null || it === void 0 ? void 0 : (_it$fields$0$value2 = it.fields[0].value) === null || _it$fields$0$value2 === void 0 ? void 0 : _it$fields$0$value2.label) || it.id,
+        title: getLabelByProps(it),
         key: it.id,
         dataIndex: it.id,
         width: 100,

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

@@ -12,3 +12,4 @@ export declare function getDataCell(item: any, options: IFormOptions): JSX.Eleme
  * @returns
  */
 export declare function renderForm(schemaRef: any[], options: IFormOptions, stream$?: any): JSX.Element;
+export declare function getLabelByProps(data: any): any;

package/es/comps/MetadataForm/utils.js

@@ -5,7 +5,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-06 13:43:47
+ * @LastEditTime: 2022-05-28 09:35:48
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -64,4 +64,13 @@ export function renderForm(schemaRef, options, stream$) {
   }
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, _form);
+}
+export function getLabelByProps(data) {
+  if (data.fields && data.fields.length > 0) {
+    var _data$fields$0$value, _data$fields$0$value$, _data$fields$, _data$fields$$value;
+
+    return ((_data$fields$0$value = data.fields[0].value) === null || _data$fields$0$value === void 0 ? void 0 : (_data$fields$0$value$ = _data$fields$0$value.common) === null || _data$fields$0$value$ === void 0 ? void 0 : _data$fields$0$value$.label) || ((_data$fields$ = data.fields[0]) === null || _data$fields$ === void 0 ? void 0 : (_data$fields$$value = _data$fields$.value) === null || _data$fields$$value === void 0 ? void 0 : _data$fields$$value.label) || data.id;
+  }
+
+  return data.id;
 }

package/es/framework/graph/index.css

@@ -0,0 +1,12 @@
+.ant-spin-container {
+  width: 100%;
+  height: 100%;
+}
+.x6-widget-selection-inner {
+  border: none !important;
+  box-shadow: none !important;
+}
+.x6-widget-selection-box {
+  border: none !important;
+  box-shadow: none !important;
+}

package/es/framework/graph/index.d.ts

@@ -0,0 +1,60 @@
+import { Graph, Node, Edge, Collection } from '@antv/x6';
+import './index.less';
+declare type DPGraphOptions = ConstructorParameters<typeof Graph>[0];
+export declare type ConnectionRemovedArgs = Collection.EdgeEventArgs['edge:removed'];
+interface RenderParams {
+    wrapper?: HTMLElement;
+    container?: HTMLElement;
+    nodes?: Node.Metadata[];
+    edges?: Node.Metadata[];
+}
+interface Options extends DPGraphOptions {
+    wrapper?: HTMLElement;
+    container?: HTMLElement;
+    nodes?: any[];
+    edges?: any[];
+}
+export interface ContextMenuInfo {
+    type: 'edge' | 'graph' | 'node';
+    data: any;
+}
+export declare class GraphCore<N extends Node<Node.Properties> = Node<Node.Properties>, E extends Edge<Edge.Properties> = Edge<Edge.Properties>> {
+    wrapper?: HTMLElement;
+    container?: HTMLElement;
+    nodeMetas?: any[];
+    edgeMetas?: any[];
+    options: Exclude<Options, 'wrapper' | 'nodes' | 'edges'>;
+    graph?: Graph;
+    private factorySub?;
+    constructor(options: Options);
+    setMeta(params: Pick<Options, 'wrapper' | 'container' | 'nodes' | 'edges'>): void;
+    get isMetaValid(): boolean;
+    setWrapper(wrapper: HTMLElement): void;
+    setContainer(container: HTMLElement): void;
+    setNodes(nodes: any[]): void;
+    setEdges(edges: any[]): void;
+    initFactorySub(): void;
+    render(params: RenderParams): void;
+    renderNode(nodeMeta: any): N | undefined;
+    renderEdge(edgeMeta: any): E | undefined;
+    afterLayout(): void;
+    onConnectNode(args: any): void;
+    onSelectNodes(nodes: N[]): void;
+    resizeGraph: () => void;
+    onConnectionRemoved(args: ConnectionRemovedArgs): void;
+    onDeleteNodeOrEdge(args: {
+        nodes: N[];
+        edges: E[];
+    }): void;
+    validateContextMenu(data: ContextMenuInfo): boolean;
+    onContextMenu(data: ContextMenuInfo): any;
+    zoom: (factor: number | 'fit' | 'real') => void;
+    addNode: (nodeMeta: any) => N;
+    addEdge: (edgeMeta: any) => E;
+    deleteNodes: (nodes: (Node | string)[] | Node | string) => void;
+    deleteEdges: (edges: (Edge | string)[] | Edge | string) => void;
+    getNodeById: (nodeId: string) => N | undefined;
+    throwRenderError: () => void;
+    dispose(): void;
+}
+export {};