ronds-metadata 1.0.78 → 1.0.79

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

@@ -69,9 +69,13 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
               res = _context.sent;
               _schema = JSON.parse(res.schema);
               _properties = _schema[0].properties;
-              _properties = _properties.filter(function (it) {
-                return it.id === 'common' || it.id === type;
-              });
+
+              if (_refId === 'com.ronds.schema.default.Rule.Form') {
+                _properties = _properties.filter(function (it) {
+                  return it.id === 'common' || it.id === type;
+                });
+              }
+
               _schema[0].properties = _properties;
               _refSchema = refSchema;
               _refSchema[idx] = _schema;
@@ -92,7 +96,7 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
 
   var onRefSelectChange = React.useCallback( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(value, index) {
-      var _refIds, newData;
+      var _refIds, _refSchema, newData;
 
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
@@ -109,21 +113,24 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
               return processSpecialRuleData(value, index);
 
             case 4:
-              _context2.next = 8;
+              _context2.next = 9;
               break;
 
             case 6:
+              _refSchema = refSchema;
+              _refSchema[index] = undefined;
+              setRefSchema(_objectSpread({}, _refSchema));
+
+            case 9:
               _refIds[index] = value;
               setRefIds(_objectSpread({}, _refIds));
-
-            case 8:
               newData = form.getFieldValue('fields');
               newData[index].id = value;
               form.setFieldsValue({
                 fields: newData
               });
 
-            case 11:
+            case 14:
             case "end":
               return _context2.stop();
           }
@@ -152,7 +159,7 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
             _ruleTypes = ruleTypes;
 
             if (!(_defaultValues[0].refId.indexOf('Rule.Form') > -1)) {
-              _context3.next = 8;
+              _context3.next = 6;
               break;
             }
 
@@ -160,21 +167,15 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
             return processSpecialRuleData(_defaultValues[0].refId, 0);
 
           case 6:
-            _context3.next = 10;
-            break;
-
-          case 8:
             _refIds[0] = _defaultValues[0].refId;
             setRefIds(_objectSpread({}, _refIds));
-
-          case 10:
             _ruleTypes[0] = 'ref';
             setRuleTypes(_objectSpread({}, _ruleTypes));
             form.setFieldsValue({
               fields: _defaultValues
             });
 
-          case 13:
+          case 11:
           case "end":
             return _context3.stop();
         }
@@ -197,19 +198,19 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
 
           case 4:
             if (!(i < defaultValues.length)) {
-              _context4.next = 16;
+              _context4.next = 14;
               break;
             }
 
             _ruleTypes[i] = defaultValues[i].type;
 
             if (!(defaultValues[i].type === 'ref')) {
-              _context4.next = 13;
+              _context4.next = 11;
               break;
             }
 
             if (!(defaultValues[i].refId.indexOf('Rule.Form') > -1)) {
-              _context4.next = 12;
+              _context4.next = 10;
               break;
             }
 
@@ -217,22 +218,18 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
             return processSpecialRuleData(defaultValues[i].refId, i);
 
           case 10:
-            _context4.next = 13;
-            break;
-
-          case 12:
             _refIds[i] = defaultValues[i].refId;
 
-          case 13:
+          case 11:
             i++;
             _context4.next = 4;
             break;
 
-          case 16:
+          case 14:
             setRefIds(_objectSpread({}, _refIds));
             setRuleTypes(_objectSpread({}, _ruleTypes));
 
-          case 18:
+          case 16:
           case "end":
             return _context4.stop();
         }

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-06 10:49:34
+ * @LastEditTime: 2022-05-06 12:08:47
  */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import { MetadataFormContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
-import { renderForm } from '../utils';
+import { getDataCell } from '../utils';
 import { deepClone } from '../../../utils';
 
 function Index(props) {
@@ -93,18 +93,16 @@ function Index(props) {
           width: '100%',
           marginBottom: '10px'
         }
-      }, /*#__PURE__*/React.createElement(React.Fragment, null, renderForm([{
-        properties: [_objectSpread(_objectSpread({}, items), {}, {
-          idx: idx,
-          id: id
-        })]
-      }], {
+      }, /*#__PURE__*/React.createElement(React.Fragment, null, getDataCell(_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
-      }, formContext.stream$), /*#__PURE__*/React.createElement(MinusCircleOutlined, {
+      }), /*#__PURE__*/React.createElement(MinusCircleOutlined, {
         style: {
           marginLeft: '10px'
         },

package/es/comps/MetadataForm/index.js

@@ -1,5 +1,5 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
@@ -48,13 +48,7 @@ var MetadataForm = function MetadataForm(props) {
       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));
-      }
-    }
+    if ((p === null || p === void 0 ? void 0 : p.type) === 'onRenderAfter') {}
   }, [stream$]);
   var options = React.useMemo(function () {
     return {
@@ -103,6 +97,13 @@ var MetadataForm = function MetadataForm(props) {
 
     return function () {};
   }, [mySchma]);
+  React.useEffect(function () {
+    if (initialValues) {
+      setTimeout(function () {
+        form.setFieldsValue(_objectSpread({}, initialValues));
+      }, 500);
+    }
+  }, [initialValues]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MetadataFormContext.Provider, {
     value: {
       fields: fields,

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 11:18:09
+ * @LastEditTime: 2022-05-06 11:24:37
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -97,7 +97,7 @@ function hasRenderAfter(_form, stream$) {
   if (idx === -1) {
     __count__ = __count__ + 1;
 
-    if (__count__ === __ref__.length) {
+    if (__count__ === __ref__.length && __ref__.length !== 0) {
       stream$ && stream$.next({
         type: 'onRenderAfter',
         payload: ''

package/package.json

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