ronds-metadata 1.0.10 → 1.0.12

package/es/api/index.d.ts

@@ -5,7 +5,7 @@ export default class Api implements IAPI {
      * @param keyWords
      * @returns
      */
-    GetMetadataList(keyWords?: string): Promise<any>;
+    GetMetadataList(keyWords?: string[]): Promise<any>;
     /**
      * 通过元数据Id获取元数据详情
      * @param metadataId

package/es/api/index.js

@@ -20,20 +20,31 @@ var Api = /*#__PURE__*/function () {
      */
     function () {
       var _GetMetadataList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(keyWords) {
-        var url, res;
+        var param, url, res;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                url = "/metadata?module=".concat(keyWords || '');
-                _context.next = 3;
-                return http.get(url);
+                param = {
+                  filter: {
+                    name: '',
+                    tags: keyWords
+                  },
+                  order: [],
+                  pagination: {
+                    page: 1,
+                    size: 30
+                  }
+                };
+                url = "/metadata/list";
+                _context.next = 4;
+                return http.post(url, param);
 
-              case 3:
+              case 4:
                 res = _context.sent;
                 return _context.abrupt("return", res.data);
 
-              case 5:
+              case 6:
               case "end":
                 return _context.stop();
             }
@@ -96,9 +107,10 @@ var Api = /*#__PURE__*/function () {
             switch (_context3.prev = _context3.next) {
               case 0:
                 param = {
-                  value: JSON.stringify([data]),
+                  schema: JSON.stringify([data]),
                   name: data.id,
-                  module: metadataTag
+                  tags: [metadataTag],
+                  permission: 'public'
                 };
                 url = "/metadata";
                 _context3.next = 4;

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

@@ -179,7 +179,8 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
         },
         onChange: function onChange(value) {
           var _refIds = refIds;
-          _refIds[index] = value;
+          _refIds[index] = value; // form.setFieldsValue({ id: value });
+
           setRefIds(_objectSpread({}, _refIds));
         },
         options: metaType || []

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

@@ -201,7 +201,8 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
                 borderRadius: '5px',
                 padding: '10px',
                 marginBottom: '10px',
-                display: 'flex'
+                display: 'flex',
+                alignItems: 'center'
               }
             }, /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
               label: "Array",
@@ -228,7 +229,36 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
                 width: '180px'
               },
               options: metaType || []
-            }))));
+            })), /*#__PURE__*/React.createElement("div", {
+              style: {
+                padding: '0 10px'
+              }
+            }, /*#__PURE__*/React.createElement(_Tooltip, {
+              title: "\u6DFB\u52A0\u5F15\u7528\u7C7B\u578B"
+            }, /*#__PURE__*/React.createElement(_Button, {
+              shape: "circle",
+              size: "small",
+              type: "primary",
+              onClick: function onClick() {
+                onNewRefClick && onNewRefClick();
+              },
+              icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
+            })), /*#__PURE__*/React.createElement(_Tooltip, {
+              title: "\u5237\u65B0"
+            }, /*#__PURE__*/React.createElement(_Button, {
+              shape: "circle",
+              size: "small",
+              style: {
+                marginLeft: '10px'
+              },
+              onClick: function onClick() {
+                setRefresh(false);
+                setTimeout(function () {
+                  setRefresh(true);
+                }, 100);
+              },
+              icon: /*#__PURE__*/React.createElement(ReloadOutlined, null)
+            })))));
 
           case 'enum':
             return /*#__PURE__*/React.createElement("div", {

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

@@ -12,16 +12,21 @@ export var useMetaType = function useMetaType(tag) {
   React.useEffect(function () {
     if (isFresh) {
       var service = new MetadataService();
-      service.GetMetadataList(tag).then(function (res) {
+
+      var _tag = tag ? [tag] : [];
+
+      service.GetMetadataList(_tag).then(function (res) {
         var _metaType = [];
 
-        for (var i = 0; i < res.length; i++) {
-          var obj = {
-            label: res[i].name,
-            value: res[i].id
-          };
+        if (res) {
+          for (var i = 0; i < res.length; i++) {
+            var obj = {
+              label: res[i].name,
+              value: res[i].id
+            };
 
-          _metaType.push(obj);
+            _metaType.push(obj);
+          }
         }
 
         setMetaType([].concat(_metaType));

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

@@ -1,5 +1,9 @@
 import './index.less';
 interface IMetadataEditProps {
+    /**
+     * 默认元数据最外层的名称无法编辑
+     */
+    isNameDisabled?: boolean;
     /**
      * 元数据的标签，根据这个标签在元数据库里检索元数据
      */

package/es/comps/MetadataEdit/index.js

@@ -20,6 +20,7 @@ import { OUTERMOST_TYPES_OPTIONS } from './constant';
 
 var MetadataEdit = function MetadataEdit(props) {
   var initialValues = props.initialValues,
+      isNameDisabled = props.isNameDisabled,
       metadataTag = props.metadataTag,
       onFinish = props.onFinish,
       onNewRefClick = props.onNewRefClick;
@@ -137,7 +138,9 @@ var MetadataEdit = function MetadataEdit(props) {
     rules: [{
       required: true
     }]
-  }, /*#__PURE__*/React.createElement(_Input, null)), /*#__PURE__*/React.createElement(_Form.Item, {
+  }, /*#__PURE__*/React.createElement(_Input, {
+    disabled: isNameDisabled
+  })), /*#__PURE__*/React.createElement(_Form.Item, {
     label: "\u7C7B\u578B",
     name: "type",
     style: {

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

@@ -12,7 +12,6 @@ import { getDataCell } from '../utils';
 
 function Index(props) {
   var id = props.id,
-      require = props.require,
       items = props.items,
       isRefForm = props.isRefForm,
       disabled = props.disabled;
@@ -38,7 +37,7 @@ function Index(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "ant-form-item-label mt-1"
   }, /*#__PURE__*/React.createElement("label", {
-    className: "".concat(require && 'ant-form-item-required')
+    className: "".concat((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require) && 'ant-form-item-required')
   }, extraInfo.label || id)), formContext.isShowTypeInfo && /*#__PURE__*/React.createElement("div", {
     style: {
       padding: '0 6px',

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

@@ -17,7 +17,6 @@ var TextArea = _Input.TextArea;
 
 function Index(props) {
   var id = props.id,
-      require = props.require,
       isRefForm = props.isRefForm,
       disabled = props.disabled,
       field = props.field,
@@ -96,7 +95,7 @@ function Index(props) {
       name: [field === null || field === void 0 ? void 0 : field.name].concat(_toConsumableArray(name)),
       fieldKey: [field === null || field === void 0 ? void 0 : field.fieldKey],
       rules: [{
-        required: require
+        required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
       }],
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -107,7 +106,7 @@ function Index(props) {
     label: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.label) || id,
     name: name,
     rules: [{
-      required: require
+      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -119,7 +118,7 @@ function Index(props) {
     name: [field === null || field === void 0 ? void 0 : field.name],
     fieldKey: [field === null || field === void 0 ? void 0 : field.fieldKey],
     rules: [{
-      required: require
+      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip

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

@@ -14,7 +14,6 @@ function Index(props) {
   var id = props.id,
       name = props.name,
       isRefForm = props.isRefForm,
-      require = props.require,
       disabled = props.disabled,
       field = props.field,
       isObj = props.isObj;
@@ -34,7 +33,7 @@ function Index(props) {
       label: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.label) || id,
       fieldKey: [field === null || field === void 0 ? void 0 : field.fieldKey],
       rules: [{
-        required: require
+        required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
       }],
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -48,7 +47,7 @@ function Index(props) {
     label: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.label) || id,
     name: name,
     rules: [{
-      required: require
+      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -63,7 +62,7 @@ function Index(props) {
     name: [field === null || field === void 0 ? void 0 : field.name],
     fieldKey: [field === null || field === void 0 ? void 0 : field.fieldKey],
     rules: [{
-      required: require
+      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip

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

@@ -22,7 +22,6 @@ function Index(props) {
 
   var id = props.id,
       idx = props.idx,
-      require = props.require,
       refId = props.refId,
       disabled = props.disabled,
       isRefForm = props.isRefForm,
@@ -101,14 +100,17 @@ function Index(props) {
       var server = new MetadataService();
       server.GetMetadataDetailById(refId).then(function (res) {
         var provider = new JsonMetadataProvider();
-        var mySchema = JSON.parse(res.value);
-        provider.add_types(mySchema);
-        var FormCls = provider.get_type(mySchema[0].id);
-        var formCls = new FormCls();
-        var _fields = formCls.__type__.__fields__;
-        refFieldsRef.current = _fields;
-        setRefFields(_objectSpread({}, _fields));
-        setSchema(_toConsumableArray(mySchema));
+
+        if (res === null || res === void 0 ? void 0 : res.schema) {
+          var mySchema = JSON.parse(res.schema);
+          provider.add_types(mySchema);
+          var FormCls = provider.get_type(mySchema[0].id);
+          var formCls = new FormCls();
+          var _fields = formCls.__type__.__fields__;
+          refFieldsRef.current = _fields;
+          setRefFields(_objectSpread({}, _fields));
+          setSchema(_toConsumableArray(mySchema));
+        }
       });
     }
   }, [refId]);
@@ -150,7 +152,7 @@ function Index(props) {
         textAlign: 'left'
       }
     }, /*#__PURE__*/React.createElement("label", {
-      className: "".concat(require && 'ant-form-item-required')
+      className: "".concat((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require) && 'ant-form-item-required')
     }, extraInfo.label || id)), /*#__PURE__*/React.createElement("div", {
       style: {
         padding: '10px',
@@ -184,7 +186,7 @@ function Index(props) {
     label: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.label) || id,
     name: id,
     rules: [{
-      required: require
+      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip) || help
@@ -212,7 +214,7 @@ function Index(props) {
     name: [field === null || field === void 0 ? void 0 : field.name],
     fieldKey: [field === null || field === void 0 ? void 0 : field.fieldKey],
     rules: [{
-      required: require
+      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip

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

@@ -14,7 +14,6 @@ function Index(props) {
   var id = props.id,
       name = props.name,
       isRefForm = props.isRefForm,
-      require = props.require,
       disabled = props.disabled,
       field = props.field,
       isObj = props.isObj;
@@ -50,7 +49,7 @@ function Index(props) {
       name: [field === null || field === void 0 ? void 0 : field.name].concat(_toConsumableArray(name)),
       fieldKey: [field === null || field === void 0 ? void 0 : field.fieldKey],
       rules: [{
-        required: require
+        required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
       }],
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -67,7 +66,7 @@ function Index(props) {
     label: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.label) || id,
     name: name,
     rules: [{
-      required: require
+      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -85,7 +84,7 @@ function Index(props) {
     name: [field === null || field === void 0 ? void 0 : field.name],
     fieldKey: [field === null || field === void 0 ? void 0 : field.fieldKey],
     rules: [{
-      required: require
+      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip

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

@@ -14,7 +14,6 @@ function Index(props) {
   var id = props.id,
       name = props.name,
       isRefForm = props.isRefForm,
-      require = props.require,
       disabled = props.disabled,
       field = props.field,
       isObj = props.isObj;
@@ -35,7 +34,7 @@ function Index(props) {
       valuePropName: "checked",
       fieldKey: [field === null || field === void 0 ? void 0 : field.fieldKey],
       rules: [{
-        required: require
+        required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
       }],
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -51,7 +50,7 @@ function Index(props) {
     name: name,
     valuePropName: "checked",
     rules: [{
-      required: require
+      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
@@ -68,7 +67,7 @@ function Index(props) {
     valuePropName: "checked",
     fieldKey: [field === null || field === void 0 ? void 0 : field.fieldKey],
     rules: [{
-      required: require
+      required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip

package/es/comps/MetadataForm/index.js

@@ -55,7 +55,7 @@ var MetadataForm = function MetadataForm(props) {
     if (refId) {
       var server = new MetadataService();
       server.GetMetadataDetailById(refId).then(function (res) {
-        var _schema = JSON.parse(res.value);
+        var _schema = JSON.parse(res.schema);
 
         setMySchema(_toConsumableArray(_schema));
       });

package/es/framework/http/index.d.ts

@@ -25,7 +25,7 @@ export declare class HttpHelper {
     private interceptorInit;
     private _http;
     constructor(client?: AxiosInstance);
-    get<T = any>(url: string, params?: any, options?: HttpOption): Promise<BaseResData<T>>;
+    get<T = any>(url: string, data?: any, params?: any, options?: HttpOption): Promise<BaseResData<T>>;
     post<T = any>(url: string, data?: any, params?: any, options?: HttpOption): Promise<BaseResData<T>>;
     put<T = any>(url: string, data?: any, params?: any, options?: HttpOption): Promise<BaseResData<T>>;
     delete<T = any>(url: string, params?: any, options?: HttpOption): Promise<BaseResData<T>>;

package/es/framework/http/index.js

@@ -223,10 +223,11 @@ export var HttpHelper = /*#__PURE__*/function () {
 
   _createClass(HttpHelper, [{
     key: "get",
-    value: function get(url, params, options) {
+    value: function get(url, data, params, options) {
       return this.fetch(url, _objectSpread({
         params: params,
-        method: 'get'
+        method: 'get',
+        data: data
       }, options));
     }
   }, {

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

@@ -4,7 +4,7 @@ export declare class MetadataService {
     api: IAPI;
     constructor(api?: IAPI);
     /** 获取元数据列表 */
-    GetMetadataList(keyWords?: string): Promise<{
+    GetMetadataList(keyWords?: string[]): Promise<{
         id: string;
         name: string;
         schema: string;

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

@@ -1,87 +1,87 @@
-export type IMetaType = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array' | string;
-
-export type IMetaData = {
-  /**
-   * 类名称/属性名称
-   */
-  id: string;
-  /**
-   * 类型
-   */
-  type: IMetaType;
-  /**
-   * 属性
-   */
-  properties?: IMetaProperties[];
-
-  /**
-   * 引用id
-   */
-  refId?: string;
-  /**
-   * 静态的变量
-   */
-  fields?: IMetaFileds[];
-};
-
-export type IMetaProperties = {
-  /**
-   * 类规则名称
-   */
-  id: string;
-
-  /**
-   * 类型
-   */
-  type: IMetaType;
-
-  /**
-   * 引用id
-   */
-  refId?: string;
-  /**
-   * 静态的变量
-   */
-  fields?: IMetaFileds[];
-  /**
-   * 枚举值
-   */
-  enum?: { value: string }[];
-  /**
-   * 数组类型
-   */
-  items?: { type: IMetaType; refId?: string };
-};
-
-export type IMetaFileds = {
-  /**
-   * 规则名称
-   */
-  id: string;
-
-  /**
-   * 类型
-   */
-  type: IMetaType;
-
-  /**
-   * 引用id
-   */
-  refId?: string;
-
-  /**
-   * 规则值
-   */
-  value: any;
-};
-
-export interface IAPI {
-  // 获取元数据列表
-  GetMetadataList(keyWords?: string): Promise<{ id: string; name: string; schema: string }[]>;
-  // 通过元数据Id获取元数据详情
-  GetMetadataDetailById(metadataId: string): Promise<any>;
-  // 新增元数据
-  SaveMetadata(data: any, metadataTag: string): Promise<any>;
-  // 获取元数据的值
-  GetMetadataObjList(metadataId): Promise<any[]>;
-}
+export type IMetaType = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array' | string;
+
+export type IMetaData = {
+  /**
+   * 类名称/属性名称
+   */
+  id: string;
+  /**
+   * 类型
+   */
+  type: IMetaType;
+  /**
+   * 属性
+   */
+  properties?: IMetaProperties[];
+
+  /**
+   * 引用id
+   */
+  refId?: string;
+  /**
+   * 静态的变量
+   */
+  fields?: IMetaFileds[];
+};
+
+export type IMetaProperties = {
+  /**
+   * 类规则名称
+   */
+  id: string;
+
+  /**
+   * 类型
+   */
+  type: IMetaType;
+
+  /**
+   * 引用id
+   */
+  refId?: string;
+  /**
+   * 静态的变量
+   */
+  fields?: IMetaFileds[];
+  /**
+   * 枚举值
+   */
+  enum?: { value: string }[];
+  /**
+   * 数组类型
+   */
+  items?: { type: IMetaType; refId?: string };
+};
+
+export type IMetaFileds = {
+  /**
+   * 规则名称
+   */
+  id: string;
+
+  /**
+   * 类型
+   */
+  type: IMetaType;
+
+  /**
+   * 引用id
+   */
+  refId?: string;
+
+  /**
+   * 规则值
+   */
+  value: any;
+};
+
+export interface IAPI {
+  // 获取元数据列表
+  GetMetadataList(keyWords?: string[]): Promise<{ id: string; name: string; schema: string }[]>;
+  // 通过元数据Id获取元数据详情
+  GetMetadataDetailById(metadataId: string): Promise<any>;
+  // 新增元数据
+  SaveMetadata(data: any, metadataTag: string): Promise<any>;
+  // 获取元数据的值
+  GetMetadataObjList(metadataId): Promise<any[]>;
+}

package/package.json

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