ronds-metadata 1.0.27 → 1.0.31

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

@@ -16,7 +16,7 @@ import React from 'react';
 import { MinusCircleOutlined, PlusOutlined, ReloadOutlined } from '@ant-design/icons';
 import { ARRAY_TYPES_OPTIONS, BASIC_TYPES_OPTIONS, NUMBER_FORMAT_OPTIONS } from '../constant';
 import { useMetaType } from '../hooks';
-import { guid } from '@/utils';
+import { guid } from '../../../utils';
 
 var MetaPropsEdit = function MetaPropsEdit(props) {
   var form = props.form,

package/es/comps/MetadataEdit/index.js

@@ -106,6 +106,8 @@ var MetadataEdit = function MetadataEdit(props) {
   };
 
   var onAddFields = function onAddFields(index) {
+    debugger;
+
     if (index === -1) {
       var _id = form.getFieldValue('id');
 
@@ -121,7 +123,12 @@ var MetadataEdit = function MetadataEdit(props) {
       return;
     }
 
-    var _properties = metaSchemaRef.current.properties;
+    var _properties_from = form.getFieldValue('properties') || [];
+
+    var _properties_ref = metaSchemaRef.current.properties || [];
+
+    var _properties = _properties_from.length <= _properties_ref.length ? _properties_ref : _properties_from;
+
     var _curFields = _properties[index];
 
     if (_curFields && _curFields.id) {

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

@@ -21,12 +21,12 @@ function Index(props) {
   var _extraInfo$disabled, _extraInfo$disabled2;
 
   var id = props.id,
-      idx = props.idx,
       refId = props.refId,
       disabled = props.disabled,
       isRefForm = props.isRefForm,
       initEnumValue = props.initEnumValue,
-      field = props.field;
+      field = props.field,
+      name = props.name;
   var formContext = React.useContext(MetadataFormContext) || {};
   var extraInfo = useGetExtraInfo(formContext.fields, id, formContext.form);
 
@@ -105,7 +105,7 @@ function Index(props) {
       disabled: disabled,
       isRefForm: true,
       isShowTypeInfo: formContext.isShowTypeInfo,
-      pName: [id],
+      pName: name || [id],
       field: field ? field : undefined,
       isObj: true,
       initEnumValue: initEnumValue
@@ -129,18 +129,7 @@ function Index(props) {
         }
       });
     }
-  }, [refId]); // React.useEffect(() => {
-  //   if (formContext.initialValues) {
-  //     const _myFormValues = formContext.initialValues;
-  //     console.log('idx===============', idx, id, _myFormValues);
-  //     let myValue: any = _myFormValues[id];
-  //     if (!myValue) return;
-  //     if ((idx || idx === 0) && myValue?.length > 0) {
-  //       myValue = myValue[idx];
-  //     }
-  //   }
-  // }, [formContext.initialValues, id, idx, onSearch]);
-
+  }, [refId]);
   React.useEffect(function () {
     if (refId) {
       var arr = refId.split(':');

package/package.json

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