ronds-metadata 1.0.14 → 1.0.18

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

@@ -14,7 +14,7 @@ import _Input from "antd/es/input";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined, ReloadOutlined } from '@ant-design/icons';
-import { BASIC_TYPES_OPTIONS, NUMBER_FORMAT_OPTIONS } from '../constant';
+import { ARRAY_TYPES_OPTIONS, BASIC_TYPES_OPTIONS, NUMBER_FORMAT_OPTIONS } from '../constant';
 import { useMetaType } from '../hooks';
 
 var MetaPropsEdit = function MetaPropsEdit(props) {
@@ -114,7 +114,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           return (prevValues === null || prevValues === void 0 ? void 0 : (_prevValues$name$inde = prevValues[name][index]) === null || _prevValues$name$inde === void 0 ? void 0 : _prevValues$name$inde.type) !== (currentValues === null || currentValues === void 0 ? void 0 : (_currentValues$name$i = currentValues[name][index]) === null || _currentValues$name$i === void 0 ? void 0 : _currentValues$name$i.type) || (prevValues === null || prevValues === void 0 ? void 0 : (_prevValues$name$inde2 = prevValues[name][index]) === null || _prevValues$name$inde2 === void 0 ? void 0 : _prevValues$name$inde2.items) !== (currentValues === null || currentValues === void 0 ? void 0 : (_currentValues$name$i2 = currentValues[name][index]) === null || _currentValues$name$i2 === void 0 ? void 0 : _currentValues$name$i2.items);
         }
       }, function (_ref2) {
-        var _properties$index, _properties$index2, _properties$index2$it;
+        var _properties$index, _properties$index2, _properties$index2$it, _properties$index3, _properties$index3$it;
 
         var getFieldValue = _ref2.getFieldValue;
 
@@ -216,7 +216,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
               style: {
                 width: '180px'
               },
-              options: BASIC_TYPES_OPTIONS
+              options: ARRAY_TYPES_OPTIONS
             })), _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'],
@@ -258,7 +258,19 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
                 }, 100);
               },
               icon: /*#__PURE__*/React.createElement(ReloadOutlined, null)
-            })))));
+            })))), _properties && ((_properties$index3 = _properties[index]) === null || _properties$index3 === void 0 ? void 0 : (_properties$index3$it = _properties$index3.items) === null || _properties$index3$it === void 0 ? void 0 : _properties$index3$it.type) === 'number' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
+              label: "format",
+              name: [field.name, 'items', 'format'],
+              fieldKey: [field.fieldKey, 'items', 'format'],
+              rules: [{
+                required: true
+              }]
+            }), /*#__PURE__*/React.createElement(_Select, {
+              style: {
+                width: '180px'
+              },
+              options: NUMBER_FORMAT_OPTIONS
+            }))));
 
           case 'enum':
             return /*#__PURE__*/React.createElement("div", {

package/es/comps/MetadataEdit/constant/index.d.ts

@@ -2,6 +2,10 @@ export declare const BASIC_TYPES_OPTIONS: {
     label: string;
     value: string;
 }[];
+export declare const ARRAY_TYPES_OPTIONS: {
+    label: string;
+    value: string;
+}[];
 export declare const OUTERMOST_TYPES_OPTIONS: {
     label: string;
     value: string;

package/es/comps/MetadataEdit/constant/index.js

@@ -17,6 +17,19 @@ export var BASIC_TYPES_OPTIONS = [{
   label: '引用类型',
   value: 'ref'
 }];
+export var ARRAY_TYPES_OPTIONS = [{
+  label: '数字',
+  value: 'number'
+}, {
+  label: '文本',
+  value: 'text'
+}, {
+  label: '布尔类型',
+  value: 'bool'
+}, {
+  label: '引用类型',
+  value: 'ref'
+}];
 export var OUTERMOST_TYPES_OPTIONS = [{
   label: '对象',
   value: 'object'

package/es/comps/MetadataEdit/index.js

@@ -69,6 +69,7 @@ var MetadataEdit = function MetadataEdit(props) {
     if (initialValues) {
       form.setFieldsValue(_objectSpread({}, initialValues));
       setMetaSchema(_objectSpread({}, initialValues));
+      processFileds(initialValues);
     }
   }, [form, initialValues]);
 
@@ -111,8 +112,7 @@ var MetadataEdit = function MetadataEdit(props) {
       return;
     }
 
-    var _properties = form.getFieldValue('properties');
-
+    var _properties = metaSchema.properties;
     var _curFields = _properties[index];
 
     if (_curFields && _curFields.id) {
@@ -142,6 +142,21 @@ var MetadataEdit = function MetadataEdit(props) {
     setOutType(value);
   };
 
+  var processFileds = function processFileds(schema) {
+    var _properties = schema.properties;
+    var _fields = fields;
+
+    if (_properties) {
+      for (var i = 0; i < _properties.length; i++) {
+        if (_properties[i].fields) {
+          _fields[_properties[i].id] = _properties[i].fields;
+        }
+      }
+
+      setFields(_objectSpread({}, _fields));
+    }
+  };
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Form, {
     className: "metadata-edit",
     initialValues: initialValues,

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

@@ -1,5 +1,4 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
 export var useGetExtraInfo = function useGetExtraInfo(fields, id, form) {
@@ -18,11 +17,11 @@ export var useGetExtraInfo = function useGetExtraInfo(fields, id, form) {
 
         for (var k in extraInfo) {
           _extraInfo[k] = extraInfo[k];
-        }
+        } // 暂时注释加载默认值
+        // if (_extraInfo?.defaultValue) {
+        //   form.setFieldsValue({ [id]: _extraInfo?.defaultValue });
+        // }
 
-        if (_extraInfo === null || _extraInfo === void 0 ? void 0 : _extraInfo.defaultValue) {
-          form.setFieldsValue(_defineProperty({}, id, _extraInfo === null || _extraInfo === void 0 ? void 0 : _extraInfo.defaultValue));
-        }
 
         setExtra(_objectSpread({}, _extraInfo));
       }

package/package.json

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