ronds-metadata 1.0.26 → 1.0.30

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

@@ -69,7 +69,7 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
 
     for (var i = 0; i < _fields.length; i++) {
       if (_fields[i].type === 'ref') {
-        _fields[i].value = refValues[i];
+        _fields[i].value = refValues[i] || _fields[i].value;
       }
     }
 

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

@@ -16,6 +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';
 
 var MetaPropsEdit = function MetaPropsEdit(props) {
   var form = props.form,
@@ -52,7 +53,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
         remove = _ref.remove;
     return /*#__PURE__*/React.createElement(React.Fragment, null, fields.map(function (field, index) {
       return /*#__PURE__*/React.createElement("div", {
-        key: field.key
+        key: guid()
       }, /*#__PURE__*/React.createElement("div", {
         style: {
           display: 'flex',

package/es/comps/MetadataEdit/index.js

@@ -42,6 +42,12 @@ var MetadataEdit = function MetadataEdit(props) {
       metaSchema = _React$useState4[0],
       setMetaSchema = _React$useState4[1];
 
+  var metaSchemaRef = React.useRef({
+    id: '',
+    type: 'object'
+  });
+  var firstLoadRef = React.useRef(true);
+
   var _React$useState5 = React.useState(false),
       _React$useState6 = _slicedToArray(_React$useState5, 2),
       isFields = _React$useState6[0],
@@ -66,15 +72,17 @@ var MetadataEdit = function MetadataEdit(props) {
     });
   }, [form]);
   React.useEffect(function () {
-    if (initialValues) {
+    if (initialValues && firstLoadRef.current) {
       form.setFieldsValue(_objectSpread({}, initialValues));
       setMetaSchema(_objectSpread({}, initialValues));
+      metaSchemaRef.current = initialValues;
       processFileds(initialValues);
+      firstLoadRef.current = false;
     }
   }, [form, initialValues]);
 
   var onMyFinish = function onMyFinish(values) {
-    var _metaSchema = metaSchema;
+    var _metaSchema = metaSchemaRef.current;
     _metaSchema.id = values.id;
     _metaSchema.type = values.type;
 
@@ -93,10 +101,13 @@ var MetadataEdit = function MetadataEdit(props) {
     }
 
     setMetaSchema(_objectSpread({}, _metaSchema));
+    metaSchemaRef.current = _metaSchema;
     onFinish && onFinish(JSON.stringify(_metaSchema));
   };
 
   var onAddFields = function onAddFields(index) {
+    debugger;
+
     if (index === -1) {
       var _id = form.getFieldValue('id');
 
@@ -112,7 +123,7 @@ var MetadataEdit = function MetadataEdit(props) {
       return;
     }
 
-    var _properties = form.getFieldValue('properties');
+    var _properties = metaSchemaRef.current.properties || form.getFieldValue('properties');
 
     var _curFields = _properties[index];
 

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

@@ -33,11 +33,6 @@ function Index(props) {
       color = _React$useState2[0],
       setColor = _React$useState2[1];
 
-  var _React$useState3 = React.useState(null),
-      _React$useState4 = _slicedToArray(_React$useState3, 2),
-      date = _React$useState4[0],
-      setDate = _React$useState4[1];
-
   React.useEffect(function () {
     if ((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.type) === 'colorPicker') {
       setColor(formContext.form.getFieldValue(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/es/utils.d.ts

@@ -12,3 +12,4 @@ export declare function useDebounce(fn: Function, delay: number, dep?: Dependenc
  */
 export declare function useThrottle(fn: Function, delay: number, dep?: DependencyList): (...args: any[]) => void;
 export declare function deepClone<T = any>(target: T): T;
+export declare function guid(): string;

package/es/utils.js

@@ -1,3 +1,11 @@
+/*
+ * @Author: your name
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2021-12-22 14:10:34
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \ronds.metadata\src\utils.ts
+ */
 import { useCallback, useEffect, useRef } from 'react';
 /** 防抖 */
 
@@ -78,4 +86,23 @@ export function useThrottle(fn, delay) {
 }
 export function deepClone(target) {
   return JSON.parse(JSON.stringify(target));
+}
+export function guid() {
+  var id = '',
+      i,
+      random,
+      chars = 'abcdef';
+  id += chars[Math.floor(Math.random() * Math.floor(chars.length))];
+
+  for (i = 1; i < 32; i++) {
+    random = Math.random() * 16 | 0;
+
+    if (i == 8 || i == 12 || i == 16 || i == 20) {
+      id += '-';
+    }
+
+    id += (i == 12 ? 4 : i == 16 ? random & 3 | 8 : random).toString(16);
+  }
+
+  return id;
 }

package/package.json

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