ronds-metadata 1.0.36 → 1.0.39

package/es/comps/MetadataEditV2/index.js

@@ -0,0 +1,303 @@
+import "antd/es/drawer/style";
+import _Drawer from "antd/es/drawer";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
+import "antd/es/select/style";
+import _Select from "antd/es/select";
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import "antd/es/message/style";
+import _message from "antd/es/message";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React from 'react';
+import "./index.css";
+import MetaFieldsEdit from './components/MetaFieldsEdit';
+import MetaPropsEdit from './components/MetaPropsEdit';
+import { OUTERMOST_TYPES_OPTIONS } from './constant';
+
+var MetadataEditV2 = function MetadataEditV2(props) {
+  var initialValues = props.initialValues,
+      isNameDisabled = props.isNameDisabled,
+      metadataTag = props.metadataTag,
+      onFinish = props.onFinish,
+      onNewRefClick = props.onNewRefClick;
+
+  var _Form$useForm = _Form.useForm(),
+      _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+      form = _Form$useForm2[0];
+
+  var _React$useState = React.useState('object'),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      outerType = _React$useState2[0],
+      setOutType = _React$useState2[1];
+
+  var _React$useState3 = React.useState({
+    id: '',
+    type: 'object'
+  }),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      metaSchema = _React$useState4[0],
+      setMetaSchema = _React$useState4[1];
+
+  var metaSchemaRef = React.useRef({
+    id: '',
+    type: 'object'
+  });
+  var firstLoadRef = React.useRef(true);
+
+  var _React$useState5 = React.useState(false),
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      isFields = _React$useState6[0],
+      setIsFields = _React$useState6[1];
+
+  var _React$useState7 = React.useState({}),
+      _React$useState8 = _slicedToArray(_React$useState7, 2),
+      fields = _React$useState8[0],
+      setFields = _React$useState8[1];
+
+  var _React$useState9 = React.useState({}),
+      _React$useState10 = _slicedToArray(_React$useState9, 2),
+      curFields = _React$useState10[0],
+      setCurFields = _React$useState10[1];
+
+  React.useEffect(function () {
+    form.setFieldsValue({
+      id: 'Test'
+    });
+    form.setFieldsValue({
+      type: 'object'
+    });
+  }, [form]);
+  React.useEffect(function () {
+    if (initialValues && firstLoadRef.current) {
+      form.setFieldsValue(_objectSpread({}, initialValues));
+      setMetaSchema(_objectSpread({}, initialValues));
+      metaSchemaRef.current = initialValues;
+      processFileds(initialValues);
+      firstLoadRef.current = false;
+    }
+  }, [form, initialValues]);
+
+  var onMyFinish = function onMyFinish(values) {
+    debugger; // console.log('values:', values, JSON.stringify(values));
+    // console.log('values:', values);
+
+    var _metaSchema = metaSchemaRef.current;
+    _metaSchema.id = values.id;
+    _metaSchema.type = values.type;
+
+    if (values === null || values === void 0 ? void 0 : values.properties) {
+      _metaSchema.properties = values.properties;
+
+      var _loop = function _loop(i) {
+        var ele = _metaSchema.properties[i];
+        var curFields = fields[_metaSchema.properties[i].id];
+
+        if (curFields) {
+          _metaSchema.properties[i].fields = curFields;
+        }
+
+        var propKeys = Object.keys(ele);
+        var needOptKeys = ['name', 'code', 'desc'];
+
+        if (ele.fields) {
+          propKeys.forEach(function (propKey) {
+            if (needOptKeys.indexOf(propKey) > -1) {
+              ele.fields.forEach(function (field, index) {
+                if (index === 0) {
+                  if (propKey === 'name') {
+                    field.value[propKey] = ele[propKey];
+                    field.value.label = ele[propKey];
+                  } else {
+                    field.value[propKey] = ele[propKey];
+                  }
+                }
+              });
+              delete ele[propKey];
+            }
+          });
+        } else {
+          ele.fields = [{
+            type: 'ref',
+            refId: 'Rule.Form',
+            id: 'Rule.Form',
+            value: {
+              label: '',
+              name: '',
+              code: '',
+              desc: ''
+            }
+          }];
+          propKeys.forEach(function (propKey) {
+            if (needOptKeys.indexOf(propKey) > -1) {
+              ele.fields.forEach(function (field, index) {
+                if (index === 0) {
+                  if (propKey === 'name') {
+                    field.value[propKey] = ele[propKey];
+                    field.value.label = ele[propKey];
+                  } else {
+                    field.value[propKey] = ele[propKey];
+                  }
+                }
+              });
+              delete ele[propKey];
+            }
+          });
+        }
+      };
+
+      for (var i = 0; i < _metaSchema.properties.length; i++) {
+        _loop(i);
+      }
+    }
+
+    if (fields[values.id]) {
+      _metaSchema.fields = fields[values.id];
+    }
+
+    setMetaSchema(_objectSpread({}, _metaSchema));
+    metaSchemaRef.current = _metaSchema;
+    onFinish && onFinish(JSON.stringify(_metaSchema));
+  };
+
+  var onAddFields = function onAddFields(index) {
+    // debugger;
+    if (index === -1) {
+      var _id = form.getFieldValue('id');
+
+      if (_id) {
+        setIsFields(true);
+        setCurFields({
+          id: _id
+        });
+      } else {
+        _message.warn('请填写元数据名称');
+      }
+
+      return;
+    } // console.log('========1========', form.getFieldValue('properties'));
+
+
+    var _properties_from = form.getFieldValue('properties') || [];
+
+    var _properties_ref = metaSchemaRef.current.properties || [];
+
+    var _properties = _properties_from.length <= _properties_ref.length ? _properties_ref : _properties_from; // console.log('properties', _properties);
+
+
+    var _curFields = _properties[index];
+
+    if (_curFields && _curFields.id) {
+      setIsFields(true);
+      var idx = ((metaSchema === null || metaSchema === void 0 ? void 0 : metaSchema.fields) || []).findIndex(function (v) {
+        return v.id === _curFields.id;
+      });
+
+      if ((metaSchema === null || metaSchema === void 0 ? void 0 : metaSchema.fields) && idx >= 0) {
+        setCurFields(_objectSpread({}, metaSchema === null || metaSchema === void 0 ? void 0 : metaSchema.fields[idx]));
+      } else {
+        // console.log('_curFields', _curFields);
+        setCurFields(_objectSpread({}, _curFields));
+      }
+    } else {
+      _message.warn('请填写属性名称');
+    }
+  };
+
+  var onFieldsChange = function onFieldsChange(values) {
+    // debugger;
+    // console.log('onFieldsChange', values, curFields);
+    var _fields = fields;
+    _fields[curFields.id] = values;
+    setFields(_objectSpread({}, _fields));
+    setIsFields(false);
+  };
+
+  var onOuterTypeChange = function onOuterTypeChange(value) {
+    setOutType(value);
+  };
+
+  var processFileds = function processFileds(schema) {
+    debugger;
+    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;
+        }
+      }
+    }
+
+    if (schema.fields) {
+      _fields[schema.id] = schema.fields;
+    }
+
+    setFields(_objectSpread({}, _fields));
+  };
+
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Form, {
+    className: "metadata-edit",
+    initialValues: initialValues,
+    form: form,
+    name: "control-hooks",
+    onFinish: onMyFinish
+  }, /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u540D\u79F0",
+    name: "id",
+    style: {
+      marginBottom: '15px'
+    },
+    rules: [{
+      required: true
+    }]
+  }, /*#__PURE__*/React.createElement(_Input, {
+    disabled: isNameDisabled
+  })), /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u7C7B\u578B",
+    name: "type",
+    style: {
+      marginBottom: '15px'
+    },
+    rules: [{
+      required: true
+    }]
+  }, /*#__PURE__*/React.createElement(_Select, {
+    options: OUTERMOST_TYPES_OPTIONS,
+    onChange: onOuterTypeChange
+  })), outerType === 'object' && /*#__PURE__*/React.createElement(MetaPropsEdit, {
+    form: form,
+    metadataTag: metadataTag,
+    name: "properties",
+    onAddFields: onAddFields,
+    onNewRefClick: onNewRefClick
+  }), /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Button, {
+    type: "primary",
+    block: true,
+    htmlType: "submit"
+  }, "\u786E\u5B9A"))), /*#__PURE__*/React.createElement(_Drawer, {
+    title: (curFields === null || curFields === void 0 ? void 0 : curFields.id) || 'fields',
+    width: 450,
+    bodyStyle: {
+      padding: 0
+    },
+    placement: "right",
+    onClose: function onClose() {
+      setIsFields(false);
+    },
+    mask: false,
+    push: false,
+    visible: isFields,
+    destroyOnClose: true
+  }, /*#__PURE__*/React.createElement(MetaFieldsEdit, {
+    key: curFields === null || curFields === void 0 ? void 0 : curFields.id,
+    defaultValues: fields[curFields.id],
+    onChange: onFieldsChange
+  })));
+};
+
+export default MetadataEditV2;

package/es/comps/MetadataEditV2/type.d.ts

@@ -0,0 +1,20 @@
+export interface IMetaFileds {
+  id: string;
+  type: 'object';
+  properties: any[];
+  value: any;
+}
+
+export type ITypeStatus = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array';
+
+export type IMetaProperty = {
+  /**
+   * 属性的名称
+   */
+  id: string;
+  /**
+   * 类型
+   */
+  type: string;
+  enum?: any[];
+};

package/es/framework/http/cache.js

@@ -1,4 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import { cloneDeep } from 'lodash';
 /**
@@ -7,7 +8,7 @@ import { cloneDeep } from 'lodash';
  * @class httpCache
  */
 
-var HttpCache = function HttpCache() {
+var HttpCache = /*#__PURE__*/_createClass(function HttpCache() {
   var _this = this;
 
   _classCallCheck(this, HttpCache);
@@ -131,7 +132,7 @@ var HttpCache = function HttpCache() {
       });
     }
   };
-};
+});
 
 window.rondsGraphCache = window.rondsGraphCache ? window.rondsGraphCache : new HttpCache();
 export default window.rondsGraphCache;

package/es/framework/http/index.js

@@ -64,7 +64,7 @@ httpClient.defaults.timeout = defaultOptions.timeout;
  * @template T
  */
 
-export var BaseResData = function BaseResData(data, successed) {
+export var BaseResData = /*#__PURE__*/_createClass(function BaseResData(data, successed) {
   var msg = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
   var status = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 200;
   var errData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
@@ -94,7 +94,7 @@ export var BaseResData = function BaseResData(data, successed) {
   if (this.successed === false) {
     this.data = undefined;
   }
-}; //数据转换拦截器
+}); //数据转换拦截器
 
 httpClient.interceptors.response.use(function (response) {
   //正常数据

package/es/framework/metadata/index.js

@@ -47,12 +47,12 @@ export var Enum = /*#__PURE__*/function () {
 
   return Enum;
 }();
-export var Array = function Array(items) {
+export var Array = /*#__PURE__*/_createClass(function Array(items) {
   _classCallCheck(this, Array);
 
   this.items = void 0;
   this.items = items;
-};
+});
 export var MetaObject = /*#__PURE__*/function () {
   function MetaObject() {
     _classCallCheck(this, MetaObject);

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(data: any): 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(data: any): Promise<any[]>;
+}

package/es/index.d.ts

@@ -1,4 +1,5 @@
 export { default as MetadataEdit } from './comps/MetadataEdit';
+export { default as MetadataEditV2 } from './comps/MetadataEditV2';
 export { default as MetadataForm } from './comps/MetadataForm';
 export { default as JsonView } from './comps/JsonView';
 export { default as JsonEdit } from './comps/JsonEdit';

package/es/index.js

@@ -1,11 +1,12 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2021-12-14 09:08:16
- * @LastEditors: wangxain
+ * @LastEditTime: 2022-03-03 17:12:29
+ * @LastEditors: Please set LastEditors
  * @FilePath: \ronds.metadata\src\index.ts
  */
 export { default as MetadataEdit } from './comps/MetadataEdit';
+export { default as MetadataEditV2 } from './comps/MetadataEditV2';
 export { default as MetadataForm } from './comps/MetadataForm';
 export { default as JsonView } from './comps/JsonView';
 export { default as JsonEdit } from './comps/JsonEdit';