ronds-metadata 1.1.94 → 1.1.96

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/Cell/Checkbox.d.ts

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

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/Cell/Checkbox.js

@@ -0,0 +1,17 @@
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import React from "react";
+import { withFieldCellWrapper } from '../HOC';
+
+var Index = function Index(props) {
+  var data = props.data,
+      fgStream = props.fgStream,
+      setting = props.setting;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Input, {
+    disabled: setting === null || setting === void 0 ? void 0 : setting.disabled,
+    placeholder: setting === null || setting === void 0 ? void 0 : setting.placeholder,
+    allowClear: true
+  }));
+};
+
+export default withFieldCellWrapper(Index);

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/Cell/Color.d.ts

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

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/Cell/Color.js

@@ -0,0 +1,17 @@
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import React from "react";
+import { withFieldCellWrapper } from '../HOC';
+
+var Index = function Index(props) {
+  var data = props.data,
+      fgStream = props.fgStream,
+      setting = props.setting;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Input, {
+    disabled: setting === null || setting === void 0 ? void 0 : setting.disabled,
+    placeholder: setting === null || setting === void 0 ? void 0 : setting.placeholder,
+    allowClear: true
+  }));
+};
+
+export default withFieldCellWrapper(Index);

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/Cell/Obj.js

@@ -1,22 +1,43 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+
 /*
  * @Author: uloveits 719310130@qq.com
  * @Date: 2023-02-06 15:05:42
  * @LastEditors: uloveits 719310130@qq.com
- * @LastEditTime: 2023-02-15 16:40:40
+ * @LastEditTime: 2023-02-17 14:54:47
  */
+import React from 'react';
 import CanvasCore from '../../index';
 import { withFieldCellWrapper } from '../HOC';
-import React from 'react';
+import { streamEventType } from '../../../../../settings/index';
 
 var Index = function Index(props) {
   var data = props.data,
       fgStream = props.fgStream,
       setting = props.setting;
+
+  var _React$useState = React.useState([]),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      nodes = _React$useState2[0],
+      setNodes = _React$useState2[1];
+
   var nodesRef = React.useRef([]);
+  React.useEffect(function () {}, [setting]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CanvasCore, {
+    key: data.id,
     refId: data.id,
     onChange: function onChange(nodes) {
+      setNodes(_toConsumableArray(nodes));
       nodesRef.current = nodes;
+      fgStream && fgStream.next({
+        type: streamEventType.onTypesChange,
+        payload: _defineProperty({}, data.id, {
+          id: (setting === null || setting === void 0 ? void 0 : setting.id) || data.id,
+          nodes: nodes
+        })
+      });
     }
   }));
 };

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/Cell/Password.d.ts

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

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/Cell/Password.js

@@ -0,0 +1,17 @@
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import React from "react";
+import { withFieldCellWrapper } from '../HOC';
+
+var Index = function Index(props) {
+  var data = props.data,
+      fgStream = props.fgStream,
+      setting = props.setting;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Input, {
+    disabled: setting === null || setting === void 0 ? void 0 : setting.disabled,
+    placeholder: setting === null || setting === void 0 ? void 0 : setting.placeholder,
+    allowClear: true
+  }));
+};
+
+export default withFieldCellWrapper(Index);

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/Cell/Radio.d.ts

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

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/Cell/Radio.js

@@ -0,0 +1,17 @@
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import React from "react";
+import { withFieldCellWrapper } from '../HOC';
+
+var Index = function Index(props) {
+  var data = props.data,
+      fgStream = props.fgStream,
+      setting = props.setting;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Input, {
+    disabled: setting === null || setting === void 0 ? void 0 : setting.disabled,
+    placeholder: setting === null || setting === void 0 ? void 0 : setting.placeholder,
+    allowClear: true
+  }));
+};
+
+export default withFieldCellWrapper(Index);

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/Cell/Upload.d.ts

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

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/Cell/Upload.js

@@ -0,0 +1,17 @@
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import React from "react";
+import { withFieldCellWrapper } from '../HOC';
+
+var Index = function Index(props) {
+  var data = props.data,
+      fgStream = props.fgStream,
+      setting = props.setting;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Input, {
+    disabled: setting === null || setting === void 0 ? void 0 : setting.disabled,
+    placeholder: setting === null || setting === void 0 ? void 0 : setting.placeholder,
+    allowClear: true
+  }));
+};
+
+export default withFieldCellWrapper(Index);

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/HOC/index.js

@@ -33,8 +33,10 @@ export function withFieldCellWrapper(WrappedComponent) {
     var processFgStreamData = React.useCallback(function (p) {
       switch (p === null || p === void 0 ? void 0 : p.type) {
         case streamEventType.onSettingValueChange:
-          if (p === null || p === void 0 ? void 0 : p.payload[data.id]) {
-            setCellSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : p.payload[data.id]));
+          if ((p === null || p === void 0 ? void 0 : p.payload.refId) === refId) {
+            if (p === null || p === void 0 ? void 0 : p.payload[data.id]) {
+              setCellSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : p.payload[data.id]));
+            }
           }
 
           break;

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: wangxian
  * @Date: 2023-02-06 11:35:45
- * @LastEditTime: 2023-02-15 16:19:46
+ * @LastEditTime: 2023-02-16 14:54:43
  */
 import React from 'react';
 import Input from './Cell/Input';
@@ -11,6 +11,11 @@ import Number from './Cell/Number';
 import Switch from './Cell/Switch';
 import Select from './Cell/Select';
 import MutiSelect from './Cell/MutiSelect';
+import Color from './Cell/Color';
+import Checkbox from './Cell/Checkbox';
+import Radio from './Cell/Radio';
+import Password from './Cell/Password';
+import Upload from './Cell/Upload';
 import Obj from './Cell/Obj';
 import List from './Cell/List';
 
@@ -45,6 +50,11 @@ var DataCellMap = {
   switch: Switch,
   select: Select,
   mutiSelect: MutiSelect,
+  color: Color,
+  checkbox: Checkbox,
+  radio: Radio,
+  password: Password,
+  upload: Upload,
   obj: Obj,
   list: List
 };

package/es/comps/FormGenerator/comps/Canvas/core/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { FG } from '../../../../../comps/FormGenerator/index.d';
 import './index.less';
 interface ICanvasCoreProps {
@@ -12,5 +13,5 @@ interface ICanvasCoreProps {
      */
     onChange?: (nodes: FG.Node[]) => void;
 }
-declare const CanvasCore: (props: ICanvasCoreProps) => JSX.Element;
-export default CanvasCore;
+declare const _default: React.MemoExoticComponent<(props: ICanvasCoreProps) => JSX.Element>;
+export default _default;

package/es/comps/FormGenerator/comps/Canvas/core/index.js

@@ -45,9 +45,6 @@ var CanvasCore = function CanvasCore(props) {
       allSetting = _React$useState8[0],
       setAllSetting = _React$useState8[1];
 
-  React.useEffect(function () {
-    onChange && onChange(list);
-  }, [list]);
   var addNewNode = React.useCallback(function (_node, dropId, position) {
     var _newNode;
 
@@ -86,27 +83,35 @@ var CanvasCore = function CanvasCore(props) {
     }
 
     if ((_newNode = newNode) === null || _newNode === void 0 ? void 0 : _newNode.id) {
-      setCurNodeId(newNode.id);
       fGCtx.fgStream && fGCtx.fgStream.next({
         type: streamEventType.onNodeSelect,
-        payload: newNode
+        payload: {
+          node: newNode,
+          refId: refId
+        }
       });
     }
 
     setList(_toConsumableArray(_list));
     listRef.current = _list;
+    onChange && onChange(_list);
   }, []);
   var processFgStreamData = React.useCallback(function (p) {
-    var _p$payload, _p$payload2, _p$payload4;
+    var _p$payload, _p$payload$node, _p$payload2, _p$payload3;
 
     switch (p === null || p === void 0 ? void 0 : p.type) {
+      case streamEventType.onNodeSelect:
+        setCurNodeId(p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : (_p$payload$node = _p$payload.node) === null || _p$payload$node === void 0 ? void 0 : _p$payload$node.id);
+        break;
+
       case streamEventType.onClearCanvas:
         setList([]);
         listRef.current = [];
+        onChange && onChange([]);
         break;
 
       case streamEventType.onDropOver:
-        if (refId === ((_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.refId)) {
+        if (refId === ((_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.refId)) {
           addNewNode(p.payload.dragItem, p.payload.dropId, p.payload.position);
         }
 
@@ -122,7 +127,8 @@ var CanvasCore = function CanvasCore(props) {
           return it.id !== p.payload.id;
         });
         setList(_toConsumableArray(_list));
-        listRef.current = _list; // 默认焦点放在第一个
+        listRef.current = _list;
+        onChange && onChange(_list); // 默认焦点放在第一个
 
         if (_list.length > 0) {
           onSelect(_list[0]);
@@ -135,13 +141,24 @@ var CanvasCore = function CanvasCore(props) {
         break;
 
       case streamEventType.onSettingValueChange:
-        if (p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.formSetting) {
-          var _p$payload3;
+        if (p === null || p === void 0 ? void 0 : (_p$payload3 = p.payload) === null || _p$payload3 === void 0 ? void 0 : _p$payload3.formSetting) {
+          var _p$payload4;
+
+          setFormSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload4 = p.payload) === null || _p$payload4 === void 0 ? void 0 : _p$payload4.formSetting));
+        }
+
+        if ((p === null || p === void 0 ? void 0 : p.payload.refId) === refId) {
+          if (refId) {
+            var _p$payload5;
 
-          setFormSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload3 = p.payload) === null || _p$payload3 === void 0 ? void 0 : _p$payload3.formSetting));
+            setAllSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload5 = p.payload) === null || _p$payload5 === void 0 ? void 0 : _p$payload5.allSetting[refId]));
+          } else {
+            var _p$payload6;
+
+            setAllSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload6 = p.payload) === null || _p$payload6 === void 0 ? void 0 : _p$payload6.allSetting));
+          }
         }
 
-        setAllSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload4 = p.payload) === null || _p$payload4 === void 0 ? void 0 : _p$payload4.allSetting));
         break;
     }
   }, []);
@@ -185,10 +202,12 @@ var CanvasCore = function CanvasCore(props) {
       dropRef = _useDrop2[1];
 
   var onSelect = function onSelect(it) {
-    setCurNodeId(it.id);
     fGCtx.fgStream && fGCtx.fgStream.next({
       type: streamEventType.onNodeSelect,
-      payload: it
+      payload: {
+        node: it,
+        refId: refId
+      }
     });
   };
 
@@ -241,7 +260,8 @@ var CanvasCore = function CanvasCore(props) {
     }, /*#__PURE__*/React.createElement("div", {
       key: it.id,
       className: "drag-item ".concat(curNodeId === it.id ? 'drag-item-selected' : ''),
-      onClick: function onClick() {
+      onClick: function onClick(e) {
+        e.stopPropagation();
         onSelect(it);
       }
     }, /*#__PURE__*/React.createElement(RenderField, {
@@ -260,4 +280,4 @@ var CanvasCore = function CanvasCore(props) {
   }, "\u62D6\u62FD\u5DE6\u4FA7\u680F\u7684\u7EC4\u4EF6\u8FDB\u884C\u6DFB\u52A0")))));
 };
 
-export default CanvasCore;
+export default /*#__PURE__*/React.memo(CanvasCore);

package/es/comps/FormGenerator/comps/Canvas/index.js

@@ -3,12 +3,13 @@ import _message from "antd/es/message";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
 import copy from 'copy-to-clipboard';
 import { FGCtx } from '../../Provider';
 import { streamEventType } from '../../settings';
-import { transFG2Schema } from '../../transformer';
+import { transFG2Schema, transSchema2FG } from '../../transformer';
 import CanvasCore from './core';
 import MetadataForm from '../../../../comps/MetadataForm';
 import useObservable from '../../../../framework/rxjs-hooks/useObservable';
@@ -16,6 +17,7 @@ import useObservable from '../../../../framework/rxjs-hooks/useObservable';
 var Canvas = function Canvas() {
   var nodesRef = React.useRef([]);
   var settingRef = React.useRef({});
+  var typesRef = React.useRef({});
 
   var _React$useState = React.useState([]),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -30,6 +32,13 @@ var Canvas = function Canvas() {
           settingRef.current = p.payload.allSetting;
         }
 
+        break;
+
+      case streamEventType.onTypesChange:
+        if (p === null || p === void 0 ? void 0 : p.payload) {
+          typesRef.current = _objectSpread(_objectSpread({}, typesRef.current), p === null || p === void 0 ? void 0 : p.payload);
+        }
+
         break;
     }
   }, []);
@@ -45,14 +54,67 @@ var Canvas = function Canvas() {
 
   var onPreview = function onPreview() {
     if (schema.length === 0) {
-      var _schema = transFG2Schema(nodesRef.current, settingRef.current);
+      var _schema = transFG2Schema(nodesRef.current, settingRef.current, typesRef.current);
 
-      setSchema(_toConsumableArray(_schema));
+      setSchema(_toConsumableArray(_schema || []));
     } else {
       setSchema([]);
     }
   };
 
+  var onImport = function onImport() {
+    var _schema = [{
+      id: 'FormGenerator',
+      type: 'object',
+      properties: [{
+        id: 'obj-e5f4',
+        type: 'ref',
+        fields: [{
+          id: 'com.ronds.schema.default.Rule.Form',
+          type: 'ref',
+          refId: 'com.ronds.schema.default.Rule.Form',
+          value: {
+            label: '对象',
+            ref: {}
+          }
+        }],
+        refId: 'obj-e5f4_ref'
+      }, {
+        id: 'input-d4d3',
+        type: 'text',
+        fields: [{
+          id: 'com.ronds.schema.default.Rule.Form',
+          type: 'ref',
+          refId: 'com.ronds.schema.default.Rule.Form',
+          value: {
+            label: '输入框',
+            text: {}
+          }
+        }]
+      }],
+      types: [{
+        id: 'obj-e5f4_ref',
+        type: 'object',
+        properties: [{
+          id: 'textarea-eb7d',
+          type: 'text',
+          fields: [{
+            id: 'com.ronds.schema.default.Rule.Form',
+            type: 'ref',
+            refId: 'com.ronds.schema.default.Rule.Form',
+            value: {
+              label: '文本框',
+              text: {
+                type: 'textarea'
+              }
+            }
+          }]
+        }]
+      }]
+    }];
+    var a = transSchema2FG(_schema);
+  };
+
   return /*#__PURE__*/React.createElement("div", {
     style: {
       height: '100%',
@@ -74,9 +136,14 @@ var Canvas = function Canvas() {
     },
     onClick: onClearCanvas
   }, "\u6E05\u7A7A"), /*#__PURE__*/React.createElement(_Button, {
+    style: {
+      marginRight: '8px'
+    },
+    onClick: onImport
+  }, "\u5BFC\u5165"), /*#__PURE__*/React.createElement(_Button, {
     type: "primary",
     onClick: function onClick() {
-      var _schema = transFG2Schema(nodesRef.current, settingRef.current);
+      var _schema = transFG2Schema(nodesRef.current, settingRef.current, typesRef.current);
 
       if (copy(JSON.stringify(_schema))) {
         _message.success("\u5DF2\u590D\u5236\u5230\u526A\u5207\u677F");

package/es/comps/FormGenerator/comps/Settings/index.js

@@ -26,23 +26,34 @@ var Settings = function Settings() {
       curTab = _React$useState4[0],
       setCurTab = _React$useState4[1];
 
+  var refIdRef = React.useRef();
   var settingValueRef = React.useRef({
     formSetting: formSetting.param.defaultValue
   });
   var processFgStreamData = React.useCallback(function (p) {
-    var _p$payload, _p$payload2;
-
     switch (p === null || p === void 0 ? void 0 : p.type) {
       case streamEventType.onNodeSelect:
-        setCurNode(_objectSpread({}, p === null || p === void 0 ? void 0 : p.payload));
-        setCurTab(p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.id); // 赋值
+        refIdRef.current = p === null || p === void 0 ? void 0 : p.payload.refId;
+
+        var _node = p === null || p === void 0 ? void 0 : p.payload.node;
 
-        if (settingValueRef.current[p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.id]) {
-          setTimeout(function () {
-            var _p$payload3;
+        setCurNode(_objectSpread({}, _node));
+        setCurTab(_node.id); // 赋值
 
-            compFormRef.current && compFormRef.current.setFieldsValue(_objectSpread({}, settingValueRef.current[p === null || p === void 0 ? void 0 : (_p$payload3 = p.payload) === null || _p$payload3 === void 0 ? void 0 : _p$payload3.id]));
-          }, 100);
+        if (refIdRef.current) {
+          var _key = "".concat(refIdRef.current, "_ref");
+
+          if (settingValueRef.current[_key] && settingValueRef.current[_key][_node.id]) {
+            setTimeout(function () {
+              compFormRef.current && compFormRef.current.setFieldsValue(_objectSpread({}, settingValueRef.current[_key][_node.id]));
+            }, 100);
+          }
+        } else {
+          if (settingValueRef.current[_node.id]) {
+            setTimeout(function () {
+              compFormRef.current && compFormRef.current.setFieldsValue(_objectSpread({}, settingValueRef.current[_node.id]));
+            }, 100);
+          }
         }
 
         break;
@@ -65,11 +76,20 @@ var Settings = function Settings() {
     var _payload;
 
     var _settingValue = settingValueRef.current;
-    _settingValue[id] = allVals;
+
+    if (refIdRef.current) {
+      var _key = "".concat(refIdRef.current, "_ref");
+
+      _settingValue = settingValueRef.current[_key] ? settingValueRef.current : _objectSpread(_objectSpread({}, settingValueRef.current), {}, _defineProperty({}, _key, {}));
+      _settingValue[_key][id] = allVals;
+    } else {
+      _settingValue[id] = allVals;
+    }
+
     settingValueRef.current = _settingValue;
     fGCtx.fgStream && fGCtx.fgStream.next({
       type: streamEventType.onSettingValueChange,
-      payload: (_payload = {}, _defineProperty(_payload, id, allVals), _defineProperty(_payload, "allSetting", settingValueRef.current), _payload)
+      payload: (_payload = {}, _defineProperty(_payload, id, allVals), _defineProperty(_payload, "allSetting", settingValueRef.current), _defineProperty(_payload, "refId", refIdRef.current), _payload)
     });
   };
 

package/es/comps/FormGenerator/settings/index.d.ts

@@ -1008,6 +1008,62 @@ export declare const mutiSelectParam: {
         isMutiple: boolean;
     };
 };
+export declare const colorParam: {
+    type: string;
+    schema: {
+        id: string;
+        type: string;
+        properties: ({
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    label: string;
+                };
+            }[];
+        } | {
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    common: {
+                        label: string;
+                    };
+                    'common-en-US': {};
+                };
+            }[];
+        })[];
+        types: {
+            id: string;
+            type: string;
+            properties: {
+                id: string;
+                type: string;
+                fields: {
+                    id: string;
+                    type: string;
+                    refId: string;
+                    value: {
+                        text: {};
+                        common: {
+                            label: string;
+                        };
+                        'common-en-US': {};
+                    };
+                }[];
+            }[];
+        }[];
+    }[];
+    rule: {
+        type: string;
+    };
+};
 export declare const basicComps: {
     id: string;
     name: string;
@@ -1054,6 +1110,117 @@ export declare const basicComps: {
         }[];
     };
 }[];
+export declare const complexComps: {
+    id: string;
+    name: string;
+    type: string;
+    param: {
+        type: string;
+        schema: {
+            id: string;
+            type: string;
+            properties: ({
+                id: string;
+                type: string;
+                fields: {
+                    id: string;
+                    type: string;
+                    refId: string;
+                    value: {
+                        label: string;
+                    };
+                }[];
+            } | {
+                id: string;
+                type: string;
+                fields: {
+                    id: string;
+                    type: string;
+                    refId: string;
+                    value: {
+                        common: {
+                            label: string;
+                        };
+                        'common-en-US': {};
+                    };
+                }[];
+            })[];
+            types: {
+                id: string;
+                type: string;
+                properties: {
+                    id: string;
+                    type: string;
+                    fields: {
+                        id: string;
+                        type: string;
+                        refId: string;
+                        value: {
+                            text: {};
+                            common: {
+                                label: string;
+                            };
+                            'common-en-US': {};
+                        };
+                    }[];
+                }[];
+            }[];
+        }[];
+    };
+}[];
+export declare const objParam: {
+    type: string;
+    schema: {
+        id: string;
+        type: string;
+        properties: ({
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    label: string;
+                };
+            }[];
+        } | {
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    common: {
+                        label: string;
+                    };
+                    'common-en-US': {};
+                };
+            }[];
+        })[];
+        types: {
+            id: string;
+            type: string;
+            properties: {
+                id: string;
+                type: string;
+                fields: {
+                    id: string;
+                    type: string;
+                    refId: string;
+                    value: {
+                        text: {};
+                        common: {
+                            label: string;
+                        };
+                        'common-en-US': {};
+                    };
+                }[];
+            }[];
+        }[];
+    }[];
+};
 export declare const layoutComps: {
     id: string;
     name: string;
@@ -1228,7 +1395,7 @@ export declare const formSettingSchema: {
                 };
                 common: {
                     label: string;
-                    tooltip: string;
+                    help: string;
                     depend: {};
                 };
             };
@@ -1307,7 +1474,7 @@ export declare const formSetting: {
                         };
                         common: {
                             label: string;
-                            tooltip: string;
+                            help: string;
                             depend: {};
                         };
                     };
@@ -1326,5 +1493,6 @@ export declare const streamEventType: {
     onNodeCopy: string;
     onClearCanvas: string;
     onSettingValueChange: string;
+    onTypesChange: string;
     onDropOver: string;
 };

package/es/comps/FormGenerator/settings/index.js

@@ -3,7 +3,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 /*
  * @Author: wangxian
  * @Date: 2023-02-06 08:24:17
- * @LastEditTime: 2023-02-14 14:30:30
+ * @LastEditTime: 2023-02-17 08:53:34
  */
 import { RefRule, Rule } from './ruleConfig';
 export var inputSchema = [{
@@ -93,6 +93,13 @@ export var mutiSelectParam = {
   rule: {
     isMutiple: true
   }
+};
+export var colorParam = {
+  type: 'text',
+  schema: settingSchema.textarea,
+  rule: {
+    type: 'colorPicker'
+  }
 }; // 基础组件列表渲染
 
 export var basicComps = [{
@@ -130,13 +137,44 @@ export var basicComps = [{
   name: '下拉多选',
   type: 'mutiSelect',
   param: mutiSelectParam
-}]; // 布局组件列表渲染
+}]; // 基础组件列表渲染
+
+export var complexComps = [{
+  id: 'color',
+  name: '颜色选择',
+  type: 'color',
+  param: colorParam
+}, {
+  id: 'password',
+  name: '密码框',
+  type: 'password',
+  param: inputParam
+}, {
+  id: 'upload',
+  name: '上传',
+  type: 'upload',
+  param: textareaParam
+}, {
+  id: 'checkbox',
+  name: '多选框',
+  type: 'checkbox',
+  param: dateParam
+}, {
+  id: 'radio',
+  name: '单选框',
+  type: 'radio',
+  param: numberParam
+}];
+export var objParam = {
+  type: 'ref',
+  schema: settingSchema.input
+}; // 布局组件列表渲染
 
 export var layoutComps = [{
   id: 'obj',
   name: '对象',
   type: 'obj',
-  param: inputParam
+  param: objParam
 }, {
   id: 'list',
   name: '常规列表',
@@ -147,6 +185,9 @@ export var layoutComps = [{
 export var sidebarCtx = [{
   name: '基础组件',
   children: basicComps
+}, {
+  name: '高级组件',
+  children: complexComps
 }, {
   name: '布局组件',
   children: layoutComps
@@ -230,7 +271,7 @@ export var formSettingSchema = [{
         },
         common: {
           label: '标签宽度',
-          tooltip: '不填自适应默认宽度',
+          help: '不填自适应默认宽度',
           depend: {}
         }
       }
@@ -256,5 +297,6 @@ export var streamEventType = {
   onNodeCopy: 'onNodeCopy',
   onClearCanvas: 'onClearCanvas',
   onSettingValueChange: 'onSettingValueChange',
+  onTypesChange: 'onTypesChange',
   onDropOver: 'onDropOver'
 };

package/es/comps/FormGenerator/settings/ruleConfig.js

@@ -3,7 +3,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 /*
  * @Author: wangxian
  * @Date: 2023-02-08 10:36:25
- * @LastEditTime: 2023-02-10 19:38:32
+ * @LastEditTime: 2023-02-16 14:43:53
  */
 import { DEFAULT_DATE_FORMAT } from '../../../comps/MetadataForm/DataCell/Input';
 export var Rule = {
@@ -201,8 +201,6 @@ export var Rule = {
         value: 'textarea'
       }, {
         value: 'upload'
-      }, {
-        value: 'buttonCell'
       }],
       type: 'enum',
       fields: [{

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

@@ -1,13 +1,7 @@
 import { FG } from '../../comps/FormGenerator/index.d';
-export declare const transFG2Schema: (nodes: FG.Node[], settings: any) => {
-    id: string;
-    type: string;
-    properties: any[];
-    fields: {
-        id: string;
-        type: string;
-        refId: string;
-        value: {};
-    }[];
+export declare const transFG2Schema: (nodes: FG.Node[], settings: any, _types?: any, schemaId?: string) => any;
+export declare const transSchema2FG: (schema: any) => {
+    nodes: any[];
+    setting: any[];
     types: any[];
-}[];
+};

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-02-10 18:18:23
+ * @LastEditTime: 2023-02-17 17:22:08
  */
 import { deepClone } from '../../utils';
 var EMPTY_OBJ = [{
@@ -16,8 +16,7 @@ var EMPTY_OBJ = [{
     type: 'ref',
     refId: 'com.ronds.schema.default.Rule.Form',
     value: {}
-  }],
-  types: []
+  }]
 }];
 var EMPTY_PROP = {
   id: '',
@@ -36,7 +35,12 @@ var renderProp = function renderProp(node, setting) {
   var _setting = setting && deepClone(setting) || {};
 
   _prop.id = (_setting === null || _setting === void 0 ? void 0 : _setting.id) || node.id;
-  _prop.type = node.param.type;
+  _prop.type = node.param.type; // ref类型加上refId
+
+  if (node.param.type === 'ref') {
+    _prop.refId = "".concat(_prop.id, "_ref");
+  }
+
   _prop.fields[0].value = _objectSpread(_objectSpread({}, _setting), {}, _defineProperty({
     label: (_setting === null || _setting === void 0 ? void 0 : _setting.label) || node.name
   }, node.param.type, _objectSpread({}, node.param.rule || _objectSpread({}, _setting[node.param.type]))));
@@ -44,23 +48,65 @@ var renderProp = function renderProp(node, setting) {
 }; // FG配置生成 metedata
 
 
-export var transFG2Schema = function transFG2Schema(nodes, settings) {
-  var schema = deepClone(EMPTY_OBJ);
-  var props = [];
+export var transFG2Schema = function transFG2Schema(nodes, settings, _types, schemaId) {
+  try {
+    var schema = deepClone(EMPTY_OBJ);
+
+    if (schemaId) {
+      schema[0].id = schemaId;
+    }
+
+    var props = [];
+    var types = [];
+
+    for (var i = 0; i < nodes.length; i++) {
+      var _prop = renderProp(nodes[i], settings && settings[nodes[i].id]);
+
+      props.push(_prop);
+    }
 
-  for (var i = 0; i < nodes.length; i++) {
-    var _prop = renderProp(nodes[i], settings[nodes[i].id]);
+    schema[0].properties = [].concat(props);
 
-    props.push(_prop);
+    if (settings && (settings === null || settings === void 0 ? void 0 : settings.formSetting)) {
+      schema[0].fields[0].value = deepClone(settings.formSetting);
+    } else {
+      delete schema[0].fields;
+    }
+
+    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"));
+
+        types.push(_type[0]);
+      }
+    }
+
+    if (types.length > 0) {
+      schema[0].types = [].concat(types);
+    }
+
+    return schema;
+  } catch (error) {
+    console.warn('transFG2Schema.err', error);
   }
+};
+
+var processProps = function processProps(prop) {}; // metadata 生成FG配置
+
 
-  schema[0].properties = [].concat(props);
+export var transSchema2FG = function transSchema2FG(schema) {
+  var res = {
+    nodes: [],
+    setting: [],
+    types: []
+  };
+  var _props = schema[0].properties; // { id: 'input', name: '输入框', type: 'input', param: inputParam },
 
-  if (settings.formSetting) {
-    schema[0].fields[0].value = deepClone(settings.formSetting);
-  } else {
-    delete schema[0].fields;
+  for (var i = 0; i < _props.length; i++) {
+    var obj = processProps(_props[i]);
   }
 
-  return schema;
+  return res;
 };

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

@@ -31,7 +31,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-16 10:52:57
+ * @LastEditTime: 2023-02-16 14:32:47
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';

package/es/comps/MetadataForm/DataCell/layout/TableArray.js

@@ -279,6 +279,14 @@ var TableArray = function TableArray(props) {
   }, [schema, processSchemaToColumns]);
 
   var onTableChange = function onTableChange(values) {
+    if (typeof name === 'string') {
+      form.setFieldsValue(_objectSpread({}, _defineProperty({}, "".concat(name), values)));
+    } else {
+      var val = {};
+      assign(name, _objectSpread({}, values), val);
+      form.setFieldsValue(_objectSpread({}, val));
+    }
+
     listRef.current = values;
   };
 

package/es/comps/MetadataForm/utils.js

@@ -9,7 +9,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-14 17:26:21
+ * @LastEditTime: 2023-02-20 16:04:04
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -78,10 +78,10 @@ export function renderForm(schemaRef, options) {
   var _form = [];
 
   for (var i = 0; i < _properties.length; i++) {
-    var _properties$i, _properties$i2, _properties$i2$fields, _properties$i2$fields2;
+    var _properties$i, _properties$i2, _properties$i2$fields, _properties$i2$fields2, _properties$i2$fields3, _properties$i3, _properties$i3$fields, _properties$i3$fields2;
 
     var _colSpan = colSpan;
-    var compColSpan = ((_properties$i = _properties[i]) === null || _properties$i === void 0 ? void 0 : _properties$i.fields) && ((_properties$i2 = _properties[i]) === null || _properties$i2 === void 0 ? void 0 : (_properties$i2$fields = _properties$i2.fields[0]) === null || _properties$i2$fields === void 0 ? void 0 : (_properties$i2$fields2 = _properties$i2$fields.value) === null || _properties$i2$fields2 === void 0 ? void 0 : _properties$i2$fields2.colSpan);
+    var compColSpan = ((_properties$i = _properties[i]) === null || _properties$i === void 0 ? void 0 : _properties$i.fields) && (((_properties$i2 = _properties[i]) === null || _properties$i2 === void 0 ? void 0 : (_properties$i2$fields = _properties$i2.fields[0]) === null || _properties$i2$fields === void 0 ? void 0 : (_properties$i2$fields2 = _properties$i2$fields.value) === null || _properties$i2$fields2 === void 0 ? void 0 : (_properties$i2$fields3 = _properties$i2$fields2.common) === null || _properties$i2$fields3 === void 0 ? void 0 : _properties$i2$fields3.colSpan) || ((_properties$i3 = _properties[i]) === null || _properties$i3 === void 0 ? void 0 : (_properties$i3$fields = _properties$i3.fields[0]) === null || _properties$i3$fields === void 0 ? void 0 : (_properties$i3$fields2 = _properties$i3$fields.value) === null || _properties$i3$fields2 === void 0 ? void 0 : _properties$i3$fields2.colSpan));
 
     if (compColSpan) {
       _colSpan = compColSpan * colSpan <= 24 ? compColSpan * colSpan : 24;

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.1.94",
+  "version": "1.1.96",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",