ronds-metadata 1.0.72 → 1.0.75

package/es/comps/Editable/comps/Texty.d.ts

@@ -70,7 +70,7 @@ declare class Texty extends React.PureComponent<ITextyProps, any> {
     componentDidUpdate(): void;
     componentWillUnmount(): void;
     render(): JSX.Element;
-    renderTooltip: ({ ref, style, placement, arrowProps, }: any) => React.ReactPortal;
+    renderTooltip: ({ ref, style, placement, arrowProps }: any) => React.ReactPortal;
     setTargetRef: (ref: any) => void;
     handleMouseEvent: (e: any) => void;
     handleScroll: (e: any) => void;

package/es/comps/Editable/index.js

@@ -209,8 +209,7 @@ var Editable = function Editable(props) {
     if (_columns.findIndex(function (v) {
       return v.key === data.key;
     }) > -1) {
-      _message.warning('表格的key不可以重复');
-
+      // message.warning('表格的key不可以重复');
       return;
     }
 
@@ -236,8 +235,7 @@ var Editable = function Editable(props) {
     if (whiteColumn.findIndex(function (v) {
       return v === data.dataIndex;
     }) > -1) {
-      _message.warning("".concat(data.dataIndex, "\u65E0\u6CD5\u5220\u9664"));
-
+      // message.warning(`${data.dataIndex}无法删除`);
       return;
     }
 

package/es/comps/MetadataEdit/components/MetaFieldsEdit.d.ts

@@ -1,4 +1,5 @@
 interface IMetaFieldsEditProps {
+    type?: string;
     defaultValues?: any;
     onChange?: (values: any) => void;
 }

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

@@ -9,7 +9,9 @@ import _Select from "antd/es/select";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
@@ -18,9 +20,11 @@ import React from 'react';
 import { RULE_TYPES_OPTIONS } from '../constant';
 import { useMetaType } from '../hooks';
 import MetadataForm from '../../MetadataForm';
+import { MetadataService } from '../../../framework/metadata/MetadataService';
 
 var MetaFieldsEdit = function MetaFieldsEdit(props) {
-  var defaultValues = props.defaultValues,
+  var type = props.type,
+      defaultValues = props.defaultValues,
       onChange = props.onChange;
 
   var _Form$useForm = _Form.useForm(),
@@ -39,10 +43,96 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
 
   var _React$useState5 = React.useState({}),
       _React$useState6 = _slicedToArray(_React$useState5, 2),
-      refValues = _React$useState6[0],
-      setRefValues = _React$useState6[1];
+      refSchema = _React$useState6[0],
+      setRefSchema = _React$useState6[1];
+
+  var _React$useState7 = React.useState({}),
+      _React$useState8 = _slicedToArray(_React$useState7, 2),
+      refValues = _React$useState8[0],
+      setRefValues = _React$useState8[1];
 
   var metaType = useMetaType('扩展规则');
+
+  var processSpecialRuleData = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_refId, idx) {
+      var server, res, _schema, _properties, _refSchema;
+
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        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;
+              return server.GetMetadataDetailById(_refId);
+
+            case 4:
+              res = _context.sent;
+              _schema = JSON.parse(res.schema);
+              _properties = _schema[0].properties;
+              _properties = _properties.filter(function (it) {
+                return it.id === 'common' || it.id === type;
+              });
+              _schema[0].properties = _properties;
+              _refSchema = refSchema;
+              _refSchema[idx] = _schema;
+              setRefSchema(_objectSpread({}, _refSchema));
+
+            case 12:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function processSpecialRuleData(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  var onRefSelectChange = React.useCallback( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(value, index) {
+      var _refIds, newData;
+
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              if (!value) {
+                _context2.next = 3;
+                break;
+              }
+
+              _context2.next = 3;
+              return processSpecialRuleData(value, index);
+
+            case 3:
+              _refIds = refIds;
+              _refIds[index] = value;
+              setRefIds(_objectSpread({}, _refIds));
+              newData = form.getFieldValue('fields');
+              newData[index].id = value;
+              form.setFieldsValue({
+                fields: newData
+              });
+
+            case 9:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+
+    return function (_x3, _x4) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), [form]);
   React.useEffect(function () {
     if (defaultValues) {
       form.setFieldsValue({
@@ -96,9 +186,9 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
     }
   }, /*#__PURE__*/React.createElement(_Form.List, {
     name: "fields"
-  }, function (fields, _ref) {
-    var add = _ref.add,
-        remove = _ref.remove;
+  }, function (fields, _ref3) {
+    var add = _ref3.add,
+        remove = _ref3.remove;
     return /*#__PURE__*/React.createElement(React.Fragment, null, fields.map(function (field, index) {
       var _defaultValues$index;
 
@@ -136,7 +226,10 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
           _ruleTypes[index] = value;
           setRuleTypes(_objectSpread({}, _ruleTypes));
         },
-        options: RULE_TYPES_OPTIONS
+        options: RULE_TYPES_OPTIONS,
+        getPopupContainer: function getPopupContainer(triggerNode) {
+          return triggerNode.parentNode;
+        }
       })), ruleTypes[index] === 'text' && /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
         label: "\u89C4\u5219\u503C",
         name: [field.name, 'value'],
@@ -179,19 +272,15 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
           width: '120px'
         },
         onChange: function onChange(value) {
-          var _refIds = refIds;
-          _refIds[index] = value;
-          setRefIds(_objectSpread({}, _refIds));
-          var newData = form.getFieldValue('fields');
-          newData[index].id = value;
-          form.setFieldsValue({
-            fields: newData
-          });
+          onRefSelectChange(value, index);
         },
         options: metaType || [],
         filterOption: function filterOption(input, option) {
           return (option === null || option === void 0 ? void 0 : option.label.indexOf(input)) >= 0;
         },
+        getPopupContainer: function getPopupContainer(triggerNode) {
+          return triggerNode.parentNode;
+        },
         allowClear: true
       })), /*#__PURE__*/React.createElement("div", {
         style: {
@@ -211,6 +300,7 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
       }, /*#__PURE__*/React.createElement(MetadataForm, {
         initialValues: defaultValues && defaultValues.length > 0 && ((_defaultValues$index = defaultValues[index]) === null || _defaultValues$index === void 0 ? void 0 : _defaultValues$index.value),
         refId: refIds[index],
+        schema: refSchema[index],
         onValuesChange: function onValuesChange(values, allValues) {
           onRefRulesValuesChange(allValues, index);
         }

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

@@ -84,6 +84,9 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
         options: BASIC_TYPES_OPTIONS,
         onChange: function onChange() {
           onTypeChange(index);
+        },
+        getPopupContainer: function getPopupContainer(triggerNode) {
+          return triggerNode.parentNode;
         }
       })), /*#__PURE__*/React.createElement("div", {
         style: {
@@ -142,7 +145,10 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
               style: {
                 width: '180px'
               },
-              options: NUMBER_FORMAT_OPTIONS
+              options: NUMBER_FORMAT_OPTIONS,
+              getPopupContainer: function getPopupContainer(triggerNode) {
+                return triggerNode.parentNode;
+              }
             })));
 
           case 'ref':
@@ -170,6 +176,9 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
               filterOption: function filterOption(input, option) {
                 return (option === null || option === void 0 ? void 0 : option.label.indexOf(input)) >= 0;
               },
+              getPopupContainer: function getPopupContainer(triggerNode) {
+                return triggerNode.parentNode;
+              },
               allowClear: true
             })), /*#__PURE__*/React.createElement("div", {
               style: {
@@ -224,7 +233,10 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
               style: {
                 width: '180px'
               },
-              options: ARRAY_TYPES_OPTIONS
+              options: ARRAY_TYPES_OPTIONS,
+              getPopupContainer: function getPopupContainer(triggerNode) {
+                return triggerNode.parentNode;
+              }
             })), _properties && ((_properties$index2 = _properties[index]) === null || _properties$index2 === void 0 ? void 0 : (_properties$index2$it = _properties$index2.items) === null || _properties$index2$it === void 0 ? void 0 : _properties$index2$it.type) === 'ref' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
               label: "Ref",
               name: [field.name, 'items', 'refId'],
@@ -236,7 +248,10 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
               style: {
                 width: '180px'
               },
-              options: metaType || []
+              options: metaType || [],
+              getPopupContainer: function getPopupContainer(triggerNode) {
+                return triggerNode.parentNode;
+              }
             })), /*#__PURE__*/React.createElement("div", {
               style: {
                 padding: '0 10px'
@@ -277,7 +292,10 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
               style: {
                 width: '180px'
               },
-              options: NUMBER_FORMAT_OPTIONS
+              options: NUMBER_FORMAT_OPTIONS,
+              getPopupContainer: function getPopupContainer(triggerNode) {
+                return triggerNode.parentNode;
+              }
             }))));
 
           case 'enum':

package/es/comps/MetadataEdit/index.js

@@ -109,10 +109,13 @@ var MetadataEdit = function MetadataEdit(props) {
     if (index === -1) {
       var _id = form.getFieldValue('id');
 
+      var _type = form.getFieldValue('type');
+
       if (_id) {
         setIsFields(true);
         setCurFields({
-          id: _id
+          id: _id,
+          type: _type
         });
       } else {
         _message.warn('请填写元数据名称');
@@ -203,7 +206,10 @@ var MetadataEdit = function MetadataEdit(props) {
     }]
   }, /*#__PURE__*/React.createElement(_Select, {
     options: OUTERMOST_TYPES_OPTIONS,
-    onChange: onOuterTypeChange
+    onChange: onOuterTypeChange,
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentNode;
+    }
   })), outerType === 'object' && /*#__PURE__*/React.createElement(MetaPropsEdit, {
     form: form,
     metadataTag: metadataTag,
@@ -230,6 +236,7 @@ var MetadataEdit = function MetadataEdit(props) {
     destroyOnClose: true
   }, /*#__PURE__*/React.createElement(MetaFieldsEdit, {
     key: curFields === null || curFields === void 0 ? void 0 : curFields.id,
+    type: curFields === null || curFields === void 0 ? void 0 : curFields.type,
     defaultValues: fields[curFields.id],
     onChange: onFieldsChange
   })));

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

@@ -8,13 +8,14 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-04-11 10:20:33
+ * @LastEditTime: 2022-05-05 08:54:59
  */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import { MetadataFormContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
 import { getDataCell } from '../utils';
+import { deepClone } from '@/utils';
 
 function Index(props) {
   var _fieldRule$, _fieldRule$$value;
@@ -24,15 +25,28 @@ function Index(props) {
       isRefForm = props.isRefForm,
       fieldRule = props.fields,
       initEnumValue = props.initEnumValue,
+      name = props.name,
       disabled = props.disabled;
   var formContext = React.useContext(MetadataFormContext) || {};
-  var extraInfo = useGetExtraInfo(formContext.fields, id, formContext.form);
+  var extraInfo = useGetExtraInfo(formContext.fields, id, formContext.form, props.type);
 
   var _React$useState = React.useState(),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       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]);
   React.useEffect(function () {
     if (items && items.refId) {
       var arr = items.refId.split(':');
@@ -64,7 +78,7 @@ function Index(props) {
       borderRadius: '4px'
     }
   }, /*#__PURE__*/React.createElement(_Form.List, {
-    name: id,
+    name: myName,
     key: id
   }, function (fields, _ref) {
     var add = _ref.add,

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

@@ -2,6 +2,10 @@ import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import "antd/es/upload/style";
+import _Upload from "antd/es/upload";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
 import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
 import "antd/es/popover/style";
@@ -14,11 +18,12 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-04-02 17:18:27
+ * @LastEditTime: 2022-05-05 09:34:40
  */
 import React from 'react';
 import { BgColorsOutlined } from '@ant-design/icons';
 import { SketchPicker } from 'react-color';
+import { UploadOutlined } from '@ant-design/icons';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
 var TextArea = _Input.TextArea;
@@ -32,7 +37,7 @@ function Index(props) {
       isObj = props.isObj;
   var formContext = React.useContext(MetadataFormContext) || {};
   var formRefContext = React.useContext(MetadataRefContext);
-  var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form);
+  var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form, props.type);
 
   var _React$useState = React.useState(''),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -97,6 +102,13 @@ function Index(props) {
           placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder
         });
 
+      case 'upload':
+        return /*#__PURE__*/React.createElement(_Upload, {
+          name: "logo"
+        }, /*#__PURE__*/React.createElement(_Button, {
+          icon: /*#__PURE__*/React.createElement(UploadOutlined, null)
+        }, "\u4E0A\u4F20"));
+
       default:
         return /*#__PURE__*/React.createElement(_Input, {
           disabled: (_extraInfo$disabled5 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled5 !== void 0 ? _extraInfo$disabled5 : disabled,

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

@@ -19,7 +19,7 @@ function Index(props) {
       isObj = props.isObj;
   var formContext = React.useContext(MetadataFormContext) || {};
   var formRefContext = React.useContext(MetadataRefContext);
-  var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form);
+  var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form, props.type);
 
   if (isObj && isRefForm && field) {
     var _extraInfo$disabled;

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

@@ -26,7 +26,7 @@ function Index(props) {
       field = props.field,
       name = props.name;
   var formContext = React.useContext(MetadataFormContext) || {};
-  var extraInfo = useGetExtraInfo(formContext.fields, id, formContext.form);
+  var extraInfo = useGetExtraInfo(formContext.fields, id, formContext.form, props.type);
 
   var _React$useState = React.useState([]),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -48,7 +48,10 @@ function Index(props) {
   var _React$useState7 = React.useState(''),
       _React$useState8 = _slicedToArray(_React$useState7, 2),
       help = _React$useState8[0],
-      setHelp = _React$useState8[1];
+      setHelp = _React$useState8[1]; // if (id === 'enum') {
+  //   debugger;
+  // }
+
 
   var onSearch = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     var param, server, res, _options, i, obj;
@@ -146,7 +149,7 @@ function Index(props) {
     }
   }, [refId]);
 
-  if (isRefForm && !field && schema) {
+  if (isRefForm && !field && schema.length > 0) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: "ant-form-item-label",
       style: {
@@ -169,7 +172,7 @@ function Index(props) {
     }, renderForm(schema, formOptions))));
   }
 
-  if (isRefForm && field && schema) {
+  if (isRefForm && field && schema.length > 0) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       style: {
         padding: '10px',

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

@@ -9,7 +9,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-04-01 17:07:41
+ * @LastEditTime: 2022-05-05 09:26:37
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -28,7 +28,7 @@ function Index(props) {
       isObj = props.isObj;
   var formContext = React.useContext(MetadataFormContext) || {};
   var formRefContext = React.useContext(MetadataRefContext);
-  var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form);
+  var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form, props.type);
 
   var onSelect = function onSelect(value) {
     formContext.stream$ && formContext.stream$.next({
@@ -38,31 +38,32 @@ function Index(props) {
   };
 
   var options = React.useMemo(function () {
+    var _extraInfo$enum;
+
     var _options = [];
 
-    if (!initEnumValue[id] && props.enum && props.enum.length > 0) {
-      props.enum.forEach(function (_enum) {
-        var obj = {
-          label: _enum.value,
-          value: _enum.value
-        };
+    var _enum = props.enum || [];
+
+    if ((extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$enum = extraInfo.enum) === null || _extraInfo$enum === void 0 ? void 0 : _extraInfo$enum.value) || (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.value)) {
+      var _extraInfo$enum2;
 
-        _options.push(obj);
-      });
+      _enum = (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$enum2 = extraInfo.enum) === null || _extraInfo$enum2 === void 0 ? void 0 : _extraInfo$enum2.value) || (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.value);
     } // 目前是更具那么的id判断的，暂未考虑重名问题
 
 
     if (initEnumValue[id]) {
-      initEnumValue[id].forEach(function (_enum) {
-        var obj = {
-          label: _enum.value,
-          value: _enum.key
-        };
-
-        _options.push(obj);
-      });
+      _enum = initEnumValue[id];
     }
 
+    _enum.forEach(function (it) {
+      var obj = {
+        label: it.value,
+        value: (it === null || it === void 0 ? void 0 : it.key) || (it === null || it === void 0 ? void 0 : it.value)
+      };
+
+      _options.push(obj);
+    });
+
     return _options;
   }, [props.enum, initEnumValue, name]);
 
@@ -88,6 +89,9 @@ function Index(props) {
       disabled: (_extraInfo$disabled = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled !== void 0 ? _extraInfo$disabled : disabled,
       placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
       options: options,
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      },
       allowClear: true
     }));
   }
@@ -106,6 +110,9 @@ function Index(props) {
     disabled: (_extraInfo$disabled2 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled2 !== void 0 ? _extraInfo$disabled2 : disabled,
     placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
     options: options,
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentNode;
+    },
     allowClear: true
   })) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
     style: {
@@ -125,6 +132,9 @@ function Index(props) {
     disabled: (_extraInfo$disabled3 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled3 !== void 0 ? _extraInfo$disabled3 : disabled,
     placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
     options: options,
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentNode;
+    },
     allowClear: true
   }));
 }

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

@@ -4,6 +4,12 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/switch/style";
 import _Switch from "antd/es/switch";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+
+/*
+ * @Author: wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2022-05-05 09:37:53
+ */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
@@ -19,7 +25,7 @@ function Index(props) {
       isObj = props.isObj;
   var formContext = React.useContext(MetadataFormContext) || {};
   var formRefContext = React.useContext(MetadataRefContext);
-  var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form);
+  var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form, props.type);
 
   if (isObj && isRefForm && field) {
     var _extraInfo$disabled;

package/es/comps/MetadataForm/hooks/index.d.ts

@@ -1 +1 @@
-export declare const useGetExtraInfo: (fields: any, id: string, form: any) => any;
+export declare const useGetExtraInfo: (fields: any, id: string, form: any, type: string) => any;

package/es/comps/MetadataForm/hooks/index.js

@@ -1,18 +1,18 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 
 /*
  * @Author: your name
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-04-02 16:44:45
+ * @LastEditTime: 2022-05-05 09:37:02
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \ronds.metadata\src\comps\MetadataForm\hooks\index.tsx
  */
 import moment from 'moment';
 import React from 'react';
-export var useGetExtraInfo = function useGetExtraInfo(fields, id, form) {
+export var useGetExtraInfo = function useGetExtraInfo(fields, id, form, type) {
   var _React$useState = React.useState({}),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       extra = _React$useState2[0],
@@ -28,7 +28,12 @@ export var useGetExtraInfo = function useGetExtraInfo(fields, id, form) {
 
         for (var k in extraInfo) {
           _extraInfo[k] = extraInfo[k];
-        }
+        } // 兼容 common公共的属性
+
+
+        _extraInfo = _objectSpread(_objectSpread(_objectSpread({}, _extraInfo), _extraInfo['common']), _extraInfo[type]);
+        delete _extraInfo.common;
+        delete _extraInfo[type];
 
         // 时间格式转化
         if (_extraInfo.type === 'datePicker' && form.getFieldValue(id)) {

package/es/comps/MetadataForm/index.js

@@ -70,7 +70,7 @@ var MetadataForm = function MetadataForm(props) {
     }
   }, [schema]);
   React.useEffect(function () {
-    if (refId) {
+    if (refId && !schema) {
       var server = new MetadataService();
       server.GetMetadataDetailById(refId).then(function (res) {
         var _schema = JSON.parse(res.schema);

package/package.json

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