ronds-metadata 1.1.99 → 1.2.0

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

@@ -12,14 +12,13 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-21 19:21:07
+ * @LastEditTime: 2023-02-22 13:54:18
  */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
 import { getDataCell } from '../utils';
-import { deepClone } from '../../../utils';
 import { tr } from '../../../framework/locale';
 import TableArray from './layout/TableArray';
 
@@ -56,18 +55,16 @@ function Index(props) {
       help = _React$useState2[0],
       setHelp = _React$useState2[1];
 
-  var myName = React.useMemo(function () {
-    var res = [];
-
-    if (name && name.length > 0) {
-      res = deepClone(name);
-      res.push(id);
-    } else {
-      return id;
-    }
-
-    return res;
-  }, [name, id]);
+  // 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('.');
@@ -104,7 +101,7 @@ function Index(props) {
     rowNumber: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.rowNumber) || 10,
     refId: items.refId,
     form: formContext.form,
-    name: myName
+    name: name
   }) : /*#__PURE__*/React.createElement("div", {
     style: {
       padding: '10px',
@@ -114,7 +111,7 @@ function Index(props) {
       margin: '0 0 8px'
     }
   }, /*#__PURE__*/React.createElement(_Form.List, {
-    name: myName,
+    name: name,
     key: id
   }, function (fields, _ref) {
     var add = _ref.add,

package/es/comps/MetadataForm/DataCell/layout/TableArray.js

@@ -283,7 +283,7 @@ var TableArray = function TableArray(props) {
       form.setFieldsValue(_objectSpread({}, _defineProperty({}, "".concat(name), values)));
     } else {
       var val = {};
-      assign(name, _objectSpread({}, values), val);
+      assign(name, _toConsumableArray(values), val);
       form.setFieldsValue(_objectSpread({}, val));
     }
 

package/es/comps/MetadataForm/index.js

@@ -111,13 +111,6 @@ var MetadataForm = function MetadataForm(props) {
           type: 'setFieldsValue',
           payload: vals
         });
-        stream$.next({
-          type: 'onValuesChange',
-          payload: {
-            val: vals,
-            allVals: vals
-          }
-        });
       };
 
       form.setFieldsValue = setFieldsValue;
@@ -184,6 +177,24 @@ var MetadataForm = function MetadataForm(props) {
       }
     }
   }, [initialValues, fields]);
+  var myLabelSpan = React.useMemo(function () {
+    var _labelSpan = undefined;
+
+    if (labelSpan || (formFieldValue === null || formFieldValue === void 0 ? void 0 : formFieldValue.labelSpan)) {
+      _labelSpan = (formFieldValue === null || formFieldValue === void 0 ? void 0 : formFieldValue.labelSpan) ? formFieldValue === null || formFieldValue === void 0 ? void 0 : formFieldValue.labelSpan : labelSpan;
+    }
+
+    return _labelSpan;
+  }, [labelSpan, formFieldValue === null || formFieldValue === void 0 ? void 0 : formFieldValue.labelSpan]);
+  var myLayout = React.useMemo(function () {
+    var _layout = undefined;
+
+    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;
+    }
+
+    return _layout;
+  }, [layout, formFieldValue === null || formFieldValue === void 0 ? void 0 : formFieldValue.layout]);
 
   var onMyValuesChange = function onMyValuesChange(value, allValues) {
     var _extra$text;
@@ -226,8 +237,8 @@ var MetadataForm = function MetadataForm(props) {
     value: {
       fields: fields,
       colSpan: colSpan,
-      labelSpan: labelSpan,
-      layout: (formFieldValue === null || formFieldValue === void 0 ? void 0 : formFieldValue.layout) || layout,
+      labelSpan: myLabelSpan,
+      layout: myLayout,
       form: form,
       stream$: stream$,
       initialValues: initialValues,
@@ -237,16 +248,16 @@ var MetadataForm = function MetadataForm(props) {
     }
   }, /*#__PURE__*/React.createElement(_Form, {
     className: "metadata-form",
-    wrapperCol: labelSpan && layout === 'horizontal' ? {
-      span: 24 - labelSpan,
+    wrapperCol: myLabelSpan && myLayout === 'horizontal' ? {
+      span: 24 - myLabelSpan,
       offset: 0
     } : undefined,
-    labelCol: labelSpan && layout === 'horizontal' ? {
-      span: labelSpan,
+    labelCol: myLabelSpan && myLayout === 'horizontal' ? {
+      span: myLabelSpan,
       offset: 0
     } : undefined,
     labelWrap: labelWrap,
-    layout: (formFieldValue === null || formFieldValue === void 0 ? void 0 : formFieldValue.layout) || layout,
+    layout: myLayout,
     form: form,
     name: "control-hooks",
     onFinish: onMyFinish,

package/package.json

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