ronds-metadata 1.0.77 → 1.0.78

package/es/comps/MetadataEdit/components/MetaFieldsEdit.js

@@ -61,16 +61,11 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              if (!(_refId.indexOf('Rule.Form') > -1)) {
-                _context.next = 12;
-                break;
-              }
-
               server = new MetadataService();
-              _context.next = 4;
+              _context.next = 3;
               return server.GetMetadataDetailById(_refId);
 
-            case 4:
+            case 3:
               res = _context.sent;
               _schema = JSON.parse(res.schema);
               _properties = _schema[0].properties;
@@ -82,7 +77,7 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
               _refSchema[idx] = _schema;
               setRefSchema(_objectSpread({}, _refSchema));
 
-            case 12:
+            case 11:
             case "end":
               return _context.stop();
           }
@@ -103,25 +98,32 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              if (!value) {
-                _context2.next = 3;
+              _refIds = refIds;
+
+              if (!(value && value.indexOf('Rule.Form') > -1)) {
+                _context2.next = 6;
                 break;
               }
 
-              _context2.next = 3;
+              _context2.next = 4;
               return processSpecialRuleData(value, index);
 
-            case 3:
-              _refIds = refIds;
+            case 4:
+              _context2.next = 8;
+              break;
+
+            case 6:
               _refIds[index] = value;
               setRefIds(_objectSpread({}, _refIds));
+
+            case 8:
               newData = form.getFieldValue('fields');
               newData[index].id = value;
               form.setFieldsValue({
                 fields: newData
               });
 
-            case 9:
+            case 11:
             case "end":
               return _context2.stop();
           }
@@ -148,47 +150,102 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
             }];
             _refIds = refIds;
             _ruleTypes = ruleTypes;
-            _context3.next = 5;
+
+            if (!(_defaultValues[0].refId.indexOf('Rule.Form') > -1)) {
+              _context3.next = 8;
+              break;
+            }
+
+            _context3.next = 6;
             return processSpecialRuleData(_defaultValues[0].refId, 0);
 
-          case 5:
+          case 6:
+            _context3.next = 10;
+            break;
+
+          case 8:
             _refIds[0] = _defaultValues[0].refId;
-            _ruleTypes[0] = 'ref';
             setRefIds(_objectSpread({}, _refIds));
+
+          case 10:
+            _ruleTypes[0] = 'ref';
             setRuleTypes(_objectSpread({}, _ruleTypes));
             form.setFieldsValue({
               fields: _defaultValues
             });
 
-          case 10:
+          case 13:
           case "end":
             return _context3.stop();
         }
       }
     }, _callee3);
-  })), []);
-  React.useEffect(function () {
-    if (defaultValues) {
-      form.setFieldsValue({
-        fields: defaultValues
-      });
-      var _ruleTypes = ruleTypes;
-      var _refIds = refIds;
+  })), [form]);
+  var processDefaultValues = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+    var _ruleTypes, _refIds, i;
 
-      for (var i = 0; i < defaultValues.length; i++) {
-        _ruleTypes[i] = defaultValues[i].type;
+    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            _ruleTypes = ruleTypes;
+            _refIds = refIds;
+            form.setFieldsValue({
+              fields: defaultValues
+            });
+            i = 0;
+
+          case 4:
+            if (!(i < defaultValues.length)) {
+              _context4.next = 16;
+              break;
+            }
+
+            _ruleTypes[i] = defaultValues[i].type;
+
+            if (!(defaultValues[i].type === 'ref')) {
+              _context4.next = 13;
+              break;
+            }
+
+            if (!(defaultValues[i].refId.indexOf('Rule.Form') > -1)) {
+              _context4.next = 12;
+              break;
+            }
+
+            _context4.next = 10;
+            return processSpecialRuleData(defaultValues[i].refId, i);
 
-        if (defaultValues[i].type === 'ref') {
-          _refIds[i] = defaultValues[i].refId;
+          case 10:
+            _context4.next = 13;
+            break;
+
+          case 12:
+            _refIds[i] = defaultValues[i].refId;
+
+          case 13:
+            i++;
+            _context4.next = 4;
+            break;
+
+          case 16:
+            setRefIds(_objectSpread({}, _refIds));
+            setRuleTypes(_objectSpread({}, _ruleTypes));
+
+          case 18:
+          case "end":
+            return _context4.stop();
         }
       }
-
-      setRefIds(_objectSpread({}, _refIds));
-      setRuleTypes(_objectSpread({}, _ruleTypes));
+    }, _callee4);
+  })), [form]);
+  React.useEffect(function () {
+    if (defaultValues) {
+      processDefaultValues();
     } else {
       processInitRule();
     }
-  }, [defaultValues, form, processInitRule]);
+  }, [defaultValues, processInitRule, processDefaultValues]);
 
   var onFinish = function onFinish(values) {
     var _fields = values.fields;
@@ -222,9 +279,9 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
     }
   }, /*#__PURE__*/React.createElement(_Form.List, {
     name: "fields"
-  }, function (fields, _ref4) {
-    var add = _ref4.add,
-        remove = _ref4.remove;
+  }, function (fields, _ref5) {
+    var add = _ref5.add,
+        remove = _ref5.remove;
     return /*#__PURE__*/React.createElement(React.Fragment, null, fields.map(function (field, index) {
       var _defaultValues$index;
 
@@ -327,7 +384,7 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
         onClick: function onClick() {
           return remove(field.name);
         }
-      }))), refIds[index] && /*#__PURE__*/React.createElement("div", {
+      }))), (refIds[index] || refSchema[index]) && /*#__PURE__*/React.createElement("div", {
         style: {
           border: '1px solid #d9d9d9',
           padding: '10px',

package/es/comps/MetadataEdit/index.js

@@ -128,7 +128,7 @@ var MetadataEdit = function MetadataEdit(props) {
 
     var _properties_ref = metaSchemaRef.current.properties || [];
 
-    var _properties = _properties_from.length <= _properties_ref.length ? _properties_ref : _properties_from;
+    var _properties = _properties_from.length >= _properties_ref.length ? _properties_from : _properties_ref;
 
     var _curFields = _properties[index];
 

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

@@ -8,13 +8,13 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-05 09:43:38
+ * @LastEditTime: 2022-05-06 10:49:34
  */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import { MetadataFormContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
-import { getDataCell } from '../utils';
+import { renderForm } from '../utils';
 import { deepClone } from '../../../utils';
 
 function Index(props) {
@@ -49,7 +49,7 @@ function Index(props) {
   }, [name, id]);
   React.useEffect(function () {
     if (items && items.refId) {
-      var arr = items.refId.split(':');
+      var arr = items.refId.split('.');
       setHelp(arr[arr.length - 1]);
     }
   }, [items]);
@@ -93,16 +93,18 @@ function Index(props) {
           width: '100%',
           marginBottom: '10px'
         }
-      }, /*#__PURE__*/React.createElement(React.Fragment, null, getDataCell(_objectSpread(_objectSpread({}, items), {}, {
-        idx: idx,
-        id: id
-      }), {
+      }, /*#__PURE__*/React.createElement(React.Fragment, null, renderForm([{
+        properties: [_objectSpread(_objectSpread({}, items), {}, {
+          idx: idx,
+          id: id
+        })]
+      }], {
         disabled: (_extraInfo$disabled = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled !== void 0 ? _extraInfo$disabled : disabled,
         initEnumValue: initEnumValue,
         isRefForm: isRefForm,
         isShowTypeInfo: formContext.isShowTypeInfo,
         field: field
-      }), /*#__PURE__*/React.createElement(MinusCircleOutlined, {
+      }, formContext.stream$), /*#__PURE__*/React.createElement(MinusCircleOutlined, {
         style: {
           marginLeft: '10px'
         },

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

@@ -169,7 +169,7 @@ function Index(props) {
       value: {
         fields: refFieldsRef.current
       }
-    }, renderForm(schema, formOptions))));
+    }, renderForm(schema, formOptions, formContext.stream$))));
   }
 
   if (isRefForm && field && schema.length > 0) {
@@ -184,7 +184,7 @@ function Index(props) {
       value: {
         fields: refFieldsRef.current
       }
-    }, renderForm(schema, formOptions))));
+    }, renderForm(schema, formOptions, formContext.stream$))));
   }
 
   return !field ? /*#__PURE__*/React.createElement(_Form.Item, {

package/es/comps/MetadataForm/index.js

@@ -1,4 +1,5 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
@@ -46,6 +47,14 @@ var MetadataForm = function MetadataForm(props) {
     if ((p === null || p === void 0 ? void 0 : p.type) === 'onSelectChange') {
       onSelectChange && onSelectChange(p.payload);
     }
+
+    if ((p === null || p === void 0 ? void 0 : p.type) === 'onRenderAfter') {
+      try {
+        form.setFieldsValue(_objectSpread({}, initialValues));
+      } catch (err) {
+        console.error("error\uFF1A".concat(err));
+      }
+    }
   }, [stream$]);
   var options = React.useMemo(function () {
     return {
@@ -73,7 +82,7 @@ var MetadataForm = function MetadataForm(props) {
     if (refId && !schema) {
       var server = new MetadataService();
       server.GetMetadataDetailById(refId).then(function (res) {
-        var _schema = JSON.parse(res.schema);
+        var _schema = JSON.parse(res.schema) || [];
 
         setMySchema(_toConsumableArray(_schema));
       });
@@ -110,11 +119,11 @@ var MetadataForm = function MetadataForm(props) {
     },
     layout: "horizontal",
     form: form,
-    name: "control-hooks",
-    initialValues: initialValues,
+    name: "control-hooks" // initialValues={initialValues}
+    ,
     onFinish: onFinish,
     onValuesChange: onValuesChange
-  }, renderForm(mySchma, options))));
+  }, renderForm(mySchma, options, stream$))));
 };
 
 export default MetadataForm;

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

@@ -11,4 +11,4 @@ export declare function getDataCell(item: any, options: IFormOptions): JSX.Eleme
  * @param isObj 是否是个对象
  * @returns
  */
-export declare function renderForm(schemaRef: any[], options: IFormOptions): JSX.Element;
+export declare function renderForm(schemaRef: any[], options: IFormOptions, stream$?: any): JSX.Element;

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-04-15 10:50:40
+ * @LastEditTime: 2022-05-06 11:18:09
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -53,7 +53,7 @@ export function getDataCell(item, options) {
  * @returns
  */
 
-export function renderForm(schemaRef, options) {
+export function renderForm(schemaRef, options, stream$) {
   if (schemaRef.length === 0) return /*#__PURE__*/React.createElement(_Spin, null);
   var _schema = schemaRef[0];
   var _properties = _schema.properties;
@@ -63,5 +63,47 @@ export function renderForm(schemaRef, options) {
     _form.push(getDataCell(_properties[i], options));
   }
 
+  hasRenderAfter(_form, stream$);
   return /*#__PURE__*/React.createElement(React.Fragment, null, _form);
+}
+var __ref__ = [];
+var __count__ = 0;
+
+function hasRenderAfter(_form, stream$) {
+  var _loop = function _loop(i) {
+    if (_form[i].props.type === 'ref') {
+      if (__ref__.findIndex(function (it) {
+        return it === _form[i].key;
+      }) === -1) {
+        __ref__.push(_form[i].key);
+      }
+    } // if (_form[i].props.type === 'array' && _form[i].props.items.type === 'ref') {
+    //   if (__ref__.findIndex((it) => it === _form[i].key) === -1) {
+    //     __ref__.push(_form[i].key);
+    //   }
+    // }
+
+  };
+
+  for (var i = 0; i < _form.length; i++) {
+    _loop(i);
+  }
+
+  var idx = _form.findIndex(function (it) {
+    return it.props.type === 'ref';
+  }); // 表单渲染结束
+
+
+  if (idx === -1) {
+    __count__ = __count__ + 1;
+
+    if (__count__ === __ref__.length) {
+      stream$ && stream$.next({
+        type: 'onRenderAfter',
+        payload: ''
+      });
+      __ref__ = [];
+      __count__ = 0;
+    }
+  }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.0.77",
+  "version": "1.0.78",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -64,7 +64,7 @@
     "@types/react-window": "^1.8.2",
     "@types/styled-components": "^5.1.2",
     "@umijs/test": "^3.0.5",
-    "antd": "^4.16.6",
+    "antd": "^4.18.1",
     "babel-loader": "^8.1.0",
     "css-loader": "^4.2.2",
     "dumi": "^1.0.16",