ronds-metadata 1.2.8 → 1.2.9

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

@@ -1,16 +1,49 @@
-import "antd/es/input/style";
-import _Input from "antd/es/input";
-import React from "react";
+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-24 17:00:24
+ */
+import React from 'react';
+import CanvasCore from '../../index';
 import { withFieldCellWrapper } from '../HOC';
+import { streamEventType } from '../../../../../settings/index';
 
 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
+      setting = props.setting,
+      types = props.types;
+
+  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 () {
+    if ((types === null || types === void 0 ? void 0 : types.nodes.length) > 0) {
+      setNodes(_toConsumableArray(types.nodes));
+      nodesRef.current = types.nodes;
+    }
+  }, [types]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CanvasCore, {
+    key: data.id,
+    refId: data.id,
+    nodes: nodes,
+    onChange: function onChange(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/index.js

@@ -9,7 +9,7 @@ import React from 'react';
 import copy from 'copy-to-clipboard';
 import { FGCtx } from '../../Provider';
 import { streamEventType } from '../../settings';
-import { transFG2Schema, transSchema2FG } from '../../transformer';
+import { transFG2Schema } from '../../transformer';
 import CanvasCore from './core';
 import MetadataForm from '../../../../comps/MetadataForm';
 import useObservable from '../../../../framework/rxjs-hooks/useObservable';
@@ -62,99 +62,6 @@ var Canvas = function Canvas() {
     }
   };
 
-  var onImport = function onImport() {
-    var _schema = [{
-      id: 'FormGenerator',
-      type: 'object',
-      properties: [{
-        id: 'name',
-        type: 'text',
-        fields: [{
-          id: 'com.ronds.schema.default.Rule.Form',
-          type: 'ref',
-          refId: 'com.ronds.schema.default.Rule.Form',
-          value: {
-            common: {
-              id: 'name',
-              label: '名称',
-              color: '#d13333',
-              colSpan: 1,
-              defaultValue: '1',
-              help: '2',
-              tooltip: '3',
-              placeholder: '4',
-              require: true,
-              disabled: true,
-              rules: []
-            },
-            text: {}
-          }
-        }]
-      }, {
-        id: 'config',
-        type: 'ref',
-        fields: [{
-          id: 'com.ronds.schema.default.Rule.Form',
-          type: 'ref',
-          refId: 'com.ronds.schema.default.Rule.Form',
-          value: {
-            common: {
-              id: 'config',
-              label: '配置中心',
-              color: '#5671c2',
-              depend: {}
-            },
-            ref: {}
-          }
-        }],
-        refId: 'Setting'
-      }],
-      fields: [{
-        id: 'com.ronds.schema.default.Rule.Form',
-        type: 'ref',
-        refId: 'com.ronds.schema.default.Rule.Form',
-        value: {
-          colSpan: 24,
-          layout: 'horizontal'
-        }
-      }],
-      types: [{
-        id: 'Setting',
-        type: 'object',
-        properties: [{
-          id: 'ege',
-          type: 'text',
-          fields: [{
-            id: 'com.ronds.schema.default.Rule.Form',
-            type: 'ref',
-            refId: 'com.ronds.schema.default.Rule.Form',
-            value: {
-              common: {
-                id: 'ege',
-                label: '年纪',
-                color: '#df8181',
-                defaultValue: '1',
-                help: '4',
-                tooltip: '333',
-                placeholder: '5',
-                rules: [null],
-                depend: {}
-              },
-              text: {
-                type: 'textarea'
-              }
-            }
-          }]
-        }]
-      }]
-    }];
-    var defaultValue = transSchema2FG(_schema);
-    fGCtx.fgStream && fGCtx.fgStream.next({
-      type: streamEventType.onDefaultValue,
-      payload: _objectSpread({}, defaultValue)
-    });
-  };
-
   return /*#__PURE__*/React.createElement("div", {
     style: {
       height: '100%',
@@ -176,11 +83,6 @@ 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, typesRef.current);

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

@@ -1,5 +1,9 @@
 import './index.less';
 interface IFormGeneratorProps {
+    /**
+     * 初始化默认渲染的schema（首次加载渲染）
+     */
+    defaultSchema?: any;
 }
 declare const FormGenerator: (props: IFormGeneratorProps) => JSX.Element;
 export default FormGenerator;

package/es/comps/FormGenerator/index.js

@@ -4,7 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2023-02-04 13:45:31
- * @LastEditTime: 2023-02-21 15:34:17
+ * @LastEditTime: 2023-02-24 16:33:24
  */
 import React from 'react';
 import { DndProvider } from 'react-dnd';
@@ -17,8 +17,10 @@ import { FGCtx } from './Provider';
 import useMemoSubject from '../../framework/rxjs-hooks/useMemoSubject';
 import useObservable from '../../framework/rxjs-hooks/useObservable';
 import { streamEventType } from './settings';
+import { transSchema2FG } from './transformer';
 
 var FormGenerator = function FormGenerator(props) {
+  var defaultSchema = props.defaultSchema;
   var FGStream = useMemoSubject();
 
   var _React$useState = React.useState({}),
@@ -27,6 +29,15 @@ var FormGenerator = function FormGenerator(props) {
       setTypes = _React$useState2[1];
 
   var typesRef = React.useRef({});
+  React.useEffect(function () {
+    if (defaultSchema) {
+      var defaultValue = transSchema2FG(defaultSchema);
+      FGStream.next({
+        type: streamEventType.onDefaultValue,
+        payload: _objectSpread({}, defaultValue)
+      });
+    }
+  }, [defaultSchema]);
   var processFgStreamData = React.useCallback(function (p) {
     switch (p === null || p === void 0 ? void 0 : p.type) {
       case streamEventType.onTypesChange:

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

@@ -1221,6 +1221,59 @@ export declare const objParam: {
         }[];
     }[];
 };
+export declare const listParam: {
+    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;

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-21 14:19:44
+ * @LastEditTime: 2023-02-24 17:01:30
  */
 import { RefRule, Rule } from './ruleConfig';
 export var inputSchema = [{
@@ -168,6 +168,10 @@ export var complexComps = [{
 export var objParam = {
   type: 'ref',
   schema: settingSchema.input
+};
+export var listParam = {
+  type: 'array',
+  schema: settingSchema.input
 }; // 布局组件列表渲染
 
 export var layoutComps = [{
@@ -179,7 +183,7 @@ export var layoutComps = [{
   id: 'list',
   name: '常规列表',
   type: 'list',
-  param: inputParam
+  param: listParam
 }]; // Sidebar 内容配置
 
 export var sidebarCtx = [{

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-21 14:51:10
+ * @LastEditTime: 2023-02-24 17:05:48
  */
 import { deepClone } from '../../utils';
 import { basicComps, layoutComps } from './settings';
@@ -40,6 +40,15 @@ var renderProp = function renderProp(node, setting) {
 
   if (node.param.type === 'ref') {
     _prop.refId = "".concat(_prop.id, "_ref");
+  } // array类型加上 items
+
+
+  if (node.param.type === 'array') {
+    var _items = {
+      type: 'ref',
+      refId: "".concat(_prop.id, "_ref")
+    };
+    _prop.items = _items;
   }
 
   var typeValue = _setting[node.param.type];

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

@@ -47,7 +47,11 @@ interface ISqlEditProps {
     /**
      * 是否只读
      */
-    readOnly?: boolean;
+    readOnly?: boolean | string;
+    /**
+     * 显示选中行的样式
+     */
+    styleActiveLine?: boolean;
     /**
      * 鼠标光标选中回调
      */

package/es/comps/JsonEdit/index.js

@@ -38,6 +38,8 @@ var SqlEdit = function SqlEdit(props) {
       isGutters = _props$isGutters === void 0 ? true : _props$isGutters,
       _props$readOnly = props.readOnly,
       readOnly = _props$readOnly === void 0 ? false : _props$readOnly,
+      _props$styleActiveLin = props.styleActiveLine,
+      styleActiveLine = _props$styleActiveLin === void 0 ? false : _props$styleActiveLin,
       value = props.value,
       onChange = props.onChange,
       onSelectChange = props.onSelectChange,
@@ -87,7 +89,7 @@ var SqlEdit = function SqlEdit(props) {
       tabSize: 4,
       mode: mode,
       theme: theme,
-      readOnly: readOnly ? 'nocursor' : readOnly,
+      readOnly: readOnly,
       lineNumbers: isLineNumbers,
       lineWrapping: true,
       foldGutter: true,
@@ -99,6 +101,8 @@ var SqlEdit = function SqlEdit(props) {
       },
       matchBrackets: true,
       autoCloseBrackets: true,
+      smartIndent: true,
+      styleActiveLine: styleActiveLine,
       extraKeys: extraKeys
     });
 

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

@@ -12,7 +12,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-23 15:42:40
+ * @LastEditTime: 2023-02-24 14:05:06
  */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
@@ -56,16 +56,6 @@ function Index(props) {
       help = _React$useState2[0],
       setHelp = _React$useState2[1];
 
-  // const myName = React.useMemo(() => {
-  //   let res = [];
-  //   if (name && name.length > 0) {
-  //     res = deepClone(name);
-  //     res.push(id);
-  //   } else {
-  //     return id;
-  //   }
-  //   return res;
-  // }, [name, id]);
   React.useEffect(function () {
     if (items && items.refId) {
       var arr = items.refId.split('.');
@@ -73,7 +63,7 @@ function Index(props) {
     }
   }, [items]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Row, null, /*#__PURE__*/React.createElement(_Col, {
-    span: labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? labelSpan : 24
+    flex: labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? "0 0 ".concat(labelSpan * 100 / 24, "%") : '0 0 1'
   }, !(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.titleHidden) && /*#__PURE__*/React.createElement("div", {
     style: {
       position: 'relative',
@@ -93,7 +83,7 @@ function Index(props) {
       background: '#fff'
     }
   }, help || (items === null || items === void 0 ? void 0 : items.type)))), /*#__PURE__*/React.createElement(_Col, {
-    span: labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? 24 - labelSpan : 24
+    flex: labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? "0 0 ".concat((24 - labelSpan) * 100 / 24, "%") : '0 0 1'
   }, extraInfo.layout === 'table' && items.type === 'ref' ? /*#__PURE__*/React.createElement(TableArray, {
     initValue: formContext.initialValues,
     initEnumValue: initEnumValue,

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

@@ -17,7 +17,7 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-23 19:32:47
+ * @LastEditTime: 2023-02-24 15:35:17
  */
 import React from 'react';
 import { UploadOutlined } from '@ant-design/icons';
@@ -39,6 +39,8 @@ function Index(props) {
   var formRefContext = React.useContext(MetadataRefContext);
   var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form, props.type);
 
+  if (id === 'p' || id === 'user') {}
+
   var _React$useState = React.useState([]),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       rules = _React$useState2[0],

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

@@ -200,8 +200,10 @@ function Index(props) {
   if (isRefForm && !field && schema.length > 0) {
     var _fieldRule$, _fieldRule$$value, _fieldRule$2, _fieldRule$2$value, _fieldRule$2$value$co;
 
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Row, null, !(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.titleHidden) && /*#__PURE__*/React.createElement(_Col, {
-      span: (formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan) && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan : 24
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Row, {
+      className: "ant-form-item"
+    }, !(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.titleHidden) && /*#__PURE__*/React.createElement(_Col, {
+      flex: labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? "0 0 ".concat(labelSpan * 100 / 24, "%") : '0 0 1'
     }, /*#__PURE__*/React.createElement("div", {
       style: {
         display: 'flex',
@@ -228,7 +230,7 @@ function Index(props) {
       },
       icon: isFold ? /*#__PURE__*/React.createElement(CaretDownOutlined, null) : /*#__PURE__*/React.createElement(CaretUpOutlined, null)
     })))), /*#__PURE__*/React.createElement(_Col, {
-      span: (formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan) && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? 24 - (formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan) : 24
+      flex: labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? "0 0 ".concat((24 - labelSpan) * 100 / 24, "%") : '0 0 1'
     }, /*#__PURE__*/React.createElement("div", {
       style: {
         padding: '10px',

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-23 19:34:06
+ * @LastEditTime: 2023-02-24 11:32:14
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -212,7 +212,8 @@ function Index(props) {
                 } 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']
+                    label: it[(http === null || http === void 0 ? void 0 : http.value) || 'name'],
+                    disabled: false
                   };
                 }
               }));

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

@@ -34,6 +34,8 @@ export function withAddOnAfter(WrappedComponent) {
         cellColSpan = _React$useState4[0],
         setCellColSpan = _React$useState4[1];
 
+    if (id === 'p' || id === 'user') {}
+
     var labelSpan = React.useMemo(function () {
       var _fields$0$value, _fields$0$value$commo;
 
@@ -77,6 +79,18 @@ export function withAddOnAfter(WrappedComponent) {
         return res;
       }
 
+      if (id && name.length > 0 && field) {
+        var _res = deepClone(name);
+
+        _res.push(id);
+
+        if (type !== 'ref') {
+          _res.shift();
+        }
+
+        return _res;
+      }
+
       return [id];
     }, [id, name]);
 

package/es/comps/MetadataForm/index.js

@@ -187,7 +187,7 @@ var MetadataForm = function MetadataForm(props) {
     return _labelSpan;
   }, [labelSpan, formFieldValue === null || formFieldValue === void 0 ? void 0 : formFieldValue.labelSpan]);
   var myLayout = React.useMemo(function () {
-    var _layout = undefined;
+    var _layout = 'vertical';
 
     if (layout || (formFieldValue === null || formFieldValue === void 0 ? void 0 : formFieldValue.layout)) {
       _layout = (formFieldValue === null || formFieldValue === void 0 ? void 0 : formFieldValue.layout) ? formFieldValue === null || formFieldValue === void 0 ? void 0 : formFieldValue.layout : layout;

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

@@ -1,5 +1,5 @@
 import { IFormOptions } from './interface';
-export declare function getDataCell(item: any, options: IFormOptions, colSpan: any): JSX.Element;
+export declare function getDataCell(item: any, options: IFormOptions, colSpan: number): JSX.Element;
 /**
  *  渲染表单
  * @param schemaRef 元数据的schema

package/es/comps/MetadataForm/utils.js

@@ -7,7 +7,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-21 19:35:40
+ * @LastEditTime: 2023-02-24 15:32:47
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -29,6 +29,10 @@ export function getDataCell(item, options, colSpan) {
   if (item.type && DataCellMap[item.type]) {
     var Comm = DataCellMap[item.type];
 
+    if (colSpan === 23) {}
+
+    if (item.type === 'ref') {}
+
     var isDisabled = function isDisabled(b) {
       if (typeof b === 'boolean') {
         return b;

package/package.json

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