ronds-metadata 1.0.12 → 1.0.16

package/es/api/index.d.ts

@@ -14,5 +14,5 @@ export default class Api implements IAPI {
     GetMetadataDetailById(metadataId: string): Promise<any>;
     /** 添加元数据 */
     SaveMetadata(data: any, metadataTag: string): Promise<any>;
-    GetMetadataObjList(metadataId: string): Promise<any[]>;
+    GetMetadataObjList(data: any): Promise<any[]>;
 }

package/es/api/index.js

@@ -138,7 +138,7 @@ var Api = /*#__PURE__*/function () {
   }, {
     key: "GetMetadataObjList",
     value: function () {
-      var _GetMetadataObjList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(metadataId) {
+      var _GetMetadataObjList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(data) {
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {

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

@@ -179,9 +179,13 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
         },
         onChange: function onChange(value) {
           var _refIds = refIds;
-          _refIds[index] = value; // form.setFieldsValue({ id: value });
-
+          _refIds[index] = value;
           setRefIds(_objectSpread({}, _refIds));
+          var newData = form.getFieldValue('fields');
+          newData[index].id = value;
+          form.setFieldsValue({
+            fields: newData
+          });
         },
         options: metaType || []
       })), /*#__PURE__*/React.createElement("div", {

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", {
@@ -307,7 +319,14 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
       },
       block: true,
       icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
-    }, "\u6DFB\u52A0".concat(name, "\u540D\u79F0"))));
+    }, "\u6DFB\u52A0".concat(name, "\u540D\u79F0"))), /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Button, {
+      type: "dashed",
+      onClick: function onClick() {
+        onAddFields(-1);
+      },
+      block: true,
+      icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
+    }, "\u6DFB\u52A0\u6269\u5C55\u89C4\u5219")));
   }));
 };
 

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

@@ -87,11 +87,30 @@ var MetadataEdit = function MetadataEdit(props) {
       }
     }
 
+    if (fields[values.id]) {
+      _metaSchema.fields = fields[values.id];
+    }
+
     setMetaSchema(_objectSpread({}, _metaSchema));
     onFinish && onFinish(JSON.stringify(_metaSchema));
   };
 
   var onAddFields = function onAddFields(index) {
+    if (index === -1) {
+      var _id = form.getFieldValue('id');
+
+      if (_id) {
+        setIsFields(true);
+        setCurFields({
+          id: _id
+        });
+      } else {
+        _message.warn('请填写元数据名称');
+      }
+
+      return;
+    }
+
     var _properties = form.getFieldValue('properties');
 
     var _curFields = _properties[index];

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

@@ -53,7 +53,7 @@ function Index(props) {
 
   var onSearch = useDebounce( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value) {
-      var param, res, _options, i, obj;
+      var param, server, res, _options, i, obj;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -65,16 +65,20 @@ function Index(props) {
                   keywords: value
                 },
                 order: []
-              }; // const res = await DatasetApi.getEntityList(param);
+              };
+              server = new MetadataService();
+              _context.next = 4;
+              return server.GetMetadataObjList(param);
 
-              res = {};
+            case 4:
+              res = _context.sent;
               _options = [];
 
-              if (res.successed) {
-                for (i = 0; i < res.data.list.length; i++) {
+              if (res.length > 0) {
+                for (i = 0; i < res.length; i++) {
                   obj = {
-                    label: res.data.list[i].name,
-                    value: res.data.list[i].namespace
+                    label: res[i].name,
+                    value: res[i].namespace
                   };
 
                   _options.push(obj);
@@ -83,7 +87,7 @@ function Index(props) {
 
               setOptions(!value ? [] : _options);
 
-            case 5:
+            case 8:
             case "end":
               return _context.stop();
           }

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/es/framework/metadata/MetadataService.d.ts

@@ -13,4 +13,6 @@ export declare class MetadataService {
     GetMetadataDetailById(metadataId: string): Promise<any>;
     /** 添加元数据 */
     SaveMetadata(data: any, metadataTag: string): Promise<any>;
+    /** 获取元数据的值 */
+    GetMetadataObjList(data: any): Promise<any[]>;
 }

package/es/framework/metadata/MetadataService.js

@@ -100,6 +100,32 @@ export var MetadataService = /*#__PURE__*/function () {
 
       return SaveMetadata;
     }()
+    /** 获取元数据的值 */
+
+  }, {
+    key: "GetMetadataObjList",
+    value: function () {
+      var _GetMetadataObjList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(data) {
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                return _context4.abrupt("return", this.api.GetMetadataObjList(data));
+
+              case 1:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4, this);
+      }));
+
+      function GetMetadataObjList(_x5) {
+        return _GetMetadataObjList.apply(this, arguments);
+      }
+
+      return GetMetadataObjList;
+    }()
   }]);
 
   return MetadataService;

package/es/framework/metadata/types.d.ts

@@ -83,5 +83,5 @@ export interface IAPI {
   // 新增元数据
   SaveMetadata(data: any, metadataTag: string): Promise<any>;
   // 获取元数据的值
-  GetMetadataObjList(metadataId): Promise<any[]>;
+  GetMetadataObjList(data: any): Promise<any[]>;
 }

package/package.json

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