ronds-metadata 1.0.35 → 1.0.38

package/README.md

@@ -1,25 +1,25 @@
-# ronds-metadata
-
-# 使用前准备
-
-在使用之前，推荐学习[容知的元数据规则](http://172.16.0.8:5000/oo/r/634418027609242111)
-
-# 安装及使用
-
-## 安装
-
-```
-yarn add ronds-metadata
-```
-
-## 使用
-
-### 引入所需组件
-
-在代码中 import 需要的组件并按照文档说明使用
-
-```
-import { MetadataFrom, MetadataEdit, JsonView, JsonEdit } from 'ronds-metadata';
-
-import { JsonMetadataProvider } from 'ronds-metadata/es/framework/metadata/index';
-```
+# ronds-metadata
+
+# 使用前准备
+
+在使用之前，推荐学习[容知的元数据规则](http://172.16.0.8:5000/oo/r/634418027609242111)
+
+# 安装及使用
+
+## 安装
+
+```
+yarn add ronds-metadata
+```
+
+## 使用
+
+### 引入所需组件
+
+在代码中 import 需要的组件并按照文档说明使用
+
+```
+import { MetadataFrom, MetadataEdit, JsonView, JsonEdit } from 'ronds-metadata';
+
+import { JsonMetadataProvider } from 'ronds-metadata/es/framework/metadata/index';
+```

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

@@ -15,9 +15,9 @@ import 'codemirror/addon/fold/foldcode';
 import 'codemirror/addon/fold/foldgutter';
 import 'codemirror/addon/fold/brace-fold';
 import 'codemirror/addon/fold/comment-fold';
-import 'codemirror/addon/selection/active-line';
-import 'codemirror/addon/edit/closeBrackets';
-import 'codemirror/addon/edit/matchBrackets';
+import 'codemirror/addon/selection/active-line.js';
+import 'codemirror/addon/edit/closebrackets.js';
+import 'codemirror/addon/edit/matchbrackets.js';
 import './index.less';
 interface ISqlEditProps {
     /**

package/es/comps/JsonEdit/index.js

@@ -19,9 +19,9 @@ import 'codemirror/addon/fold/foldcode';
 import 'codemirror/addon/fold/foldgutter';
 import 'codemirror/addon/fold/brace-fold';
 import 'codemirror/addon/fold/comment-fold';
-import 'codemirror/addon/selection/active-line';
-import 'codemirror/addon/edit/closeBrackets';
-import 'codemirror/addon/edit/matchBrackets';
+import 'codemirror/addon/selection/active-line.js';
+import 'codemirror/addon/edit/closebrackets.js';
+import 'codemirror/addon/edit/matchbrackets.js';
 import "./index.css";
 import { SQL_DICO } from './constant';
 
@@ -87,7 +87,7 @@ var SqlEdit = function SqlEdit(props) {
       tabSize: 4,
       mode: mode,
       theme: theme,
-      readOnly: readOnly,
+      readOnly: readOnly ? 'nocursor' : readOnly,
       lineNumbers: isLineNumbers,
       lineWrapping: true,
       foldGutter: true,
@@ -128,12 +128,13 @@ var SqlEdit = function SqlEdit(props) {
 
     if (value) {
       editorRef.current.setValue(value);
+      editorRef.current.focus();
+      editorRef.current.setCursor(editorRef.current.lineCount(), 0);
     }
   }, [value]);
   React.useEffect(function () {
     if (!editorRef.current) return;
-    debugger;
-    editorRef.current.setOption('readOnly', readOnly);
+    editorRef.current.setOption('readOnly', readOnly ? 'nocursor' : readOnly);
     editorRef.current.setOption('lineNumbers', isLineNumbers);
     editorRef.current.setOption('gutters', isGutters ? ['CodeMirror-linenumbers', 'CodeMirror-foldgutter', 'CodeMirror-lint-markers'] : []);
   }, [readOnly, isLineNumbers, isGutters]);

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

@@ -0,0 +1,6 @@
+interface IMetaFieldsEditProps {
+    defaultValues?: any;
+    onChange?: (values: any) => void;
+}
+declare const MetaFieldsEdit: (props: IMetaFieldsEditProps) => JSX.Element;
+export default MetaFieldsEdit;

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

@@ -0,0 +1,237 @@
+import "antd/es/button/style";
+import _Button from "antd/es/button";
+import "antd/es/switch/style";
+import _Switch from "antd/es/switch";
+import "antd/es/input-number/style";
+import _InputNumber from "antd/es/input-number";
+import "antd/es/select/style";
+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 _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 { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
+import React from 'react';
+import { RULE_TYPES_OPTIONS } from '../constant';
+import { useMetaType } from '../hooks';
+import MetadataForm from '../../MetadataForm';
+
+var MetaFieldsEdit = function MetaFieldsEdit(props) {
+  var defaultValues = props.defaultValues,
+      onChange = props.onChange;
+
+  var _Form$useForm = _Form.useForm(),
+      _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+      form = _Form$useForm2[0];
+
+  var _React$useState = React.useState({}),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      ruleTypes = _React$useState2[0],
+      setRuleTypes = _React$useState2[1];
+
+  var _React$useState3 = React.useState({}),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      refIds = _React$useState4[0],
+      setRefIds = _React$useState4[1];
+
+  var _React$useState5 = React.useState({}),
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      refValues = _React$useState6[0],
+      setRefValues = _React$useState6[1];
+
+  var metaType = useMetaType('扩展规则');
+  React.useEffect(function () {
+    if (defaultValues) {
+      //   console.log('defaultValues', defaultValues);
+      form.setFieldsValue({
+        fields: defaultValues
+      });
+      var _ruleTypes = ruleTypes;
+      var _refIds = refIds;
+
+      for (var i = 0; i < defaultValues.length; i++) {
+        _ruleTypes[i] = defaultValues[i].type;
+
+        if (defaultValues[i].type === 'ref') {
+          _refIds[i] = defaultValues[i].refId;
+        }
+      }
+
+      setRefIds(_objectSpread({}, _refIds));
+      setRuleTypes(_objectSpread({}, _ruleTypes));
+    }
+  }, [defaultValues, form]);
+
+  var onFinish = function onFinish(values) {
+    var _fields = values.fields;
+
+    for (var i = 0; i < _fields.length; i++) {
+      if (_fields[i].type === 'ref') {
+        _fields[i].value = refValues[i] || _fields[i].value;
+      }
+    } // console.log('_fields', _fields);
+
+
+    onChange && onChange(_fields);
+  };
+
+  var onRefRulesValuesChange = function onRefRulesValuesChange(values, idx) {
+    // console.log('onRefRulesValuesChange', values, refValues);
+    var _refValues = refValues;
+    _refValues[idx] = _refValues[idx] ? _objectSpread(_objectSpread({}, _refValues[idx]), values) : _objectSpread({}, values);
+    setRefValues(_objectSpread({}, _refValues));
+  };
+
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Form, {
+    className: "metadata-edit",
+    style: {
+      position: 'relative'
+    },
+    form: form,
+    name: "control-hooks",
+    onFinish: onFinish
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      padding: '10px'
+    }
+  }, /*#__PURE__*/React.createElement(_Form.List, {
+    name: "fields"
+  }, function (fields, _ref) {
+    var add = _ref.add,
+        remove = _ref.remove;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, fields.map(function (field, index) {
+      var _defaultValues$index;
+
+      //   console.log('fields=========', fields);
+      return /*#__PURE__*/React.createElement("div", {
+        key: field.key
+      }, /*#__PURE__*/React.createElement("div", {
+        style: {
+          display: 'flex',
+          alignItems: 'flex-start'
+        }
+      }, /*#__PURE__*/React.createElement(_Form.Item, _extends({
+        className: "pr-10"
+      }, field, {
+        label: "\u89C4\u5219\u540D\u79F0",
+        name: [field.name, 'id'],
+        fieldKey: [field.fieldKey, 'id'],
+        rules: [{
+          required: true
+        }]
+      }), /*#__PURE__*/React.createElement(_Input, {
+        style: {
+          width: '120px'
+        }
+      })), /*#__PURE__*/React.createElement(_Form.Item, _extends({
+        className: "pr-10"
+      }, field, {
+        label: "\u89C4\u5219\u7C7B\u578B",
+        name: [field.name, 'type'],
+        fieldKey: [field.fieldKey, 'type'],
+        rules: [{
+          required: true
+        }]
+      }), /*#__PURE__*/React.createElement(_Select, {
+        style: {
+          width: '120px'
+        },
+        onChange: function onChange(value) {
+          var _ruleTypes = ruleTypes;
+          _ruleTypes[index] = value;
+          setRuleTypes(_objectSpread({}, _ruleTypes));
+        },
+        options: RULE_TYPES_OPTIONS
+      })), ruleTypes[index] === 'text' && /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
+        label: "\u89C4\u5219\u503C",
+        name: [field.name, 'value'],
+        fieldKey: [field.fieldKey, 'value'],
+        rules: [{
+          required: true
+        }]
+      }), /*#__PURE__*/React.createElement(_Input, {
+        style: {
+          width: '120px'
+        }
+      })), ruleTypes[index] === 'number' && /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
+        label: "\u89C4\u5219\u503C",
+        name: [field.name, 'value'],
+        fieldKey: [field.fieldKey, 'value'],
+        rules: [{
+          required: true
+        }]
+      }), /*#__PURE__*/React.createElement(_InputNumber, {
+        style: {
+          width: '120px'
+        }
+      })), ruleTypes[index] === 'bool' && /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
+        label: "\u89C4\u5219\u503C",
+        name: [field.name, 'value'],
+        fieldKey: [field.fieldKey, 'value'],
+        rules: [{
+          required: true
+        }]
+      }), /*#__PURE__*/React.createElement(_Switch, null)), ruleTypes[index] === 'ref' && /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
+        label: "Ref",
+        name: [field.name, 'refId'],
+        fieldKey: [field.fieldKey, 'refId'],
+        rules: [{
+          required: true
+        }]
+      }), /*#__PURE__*/React.createElement(_Select, {
+        style: {
+          width: '120px'
+        },
+        onChange: function onChange(value) {
+          var _refIds = refIds;
+          _refIds[index] = value;
+          setRefIds(_objectSpread({}, _refIds));
+          var newData = form.getFieldValue('fields'); // console.log('newData', newData);
+
+          newData[index].id = value;
+          form.setFieldsValue({
+            fields: newData
+          });
+        },
+        options: metaType || []
+      })), /*#__PURE__*/React.createElement("div", {
+        style: {
+          lineHeight: '88px',
+          paddingLeft: '15px'
+        }
+      }, /*#__PURE__*/React.createElement(MinusCircleOutlined, {
+        onClick: function onClick() {
+          return remove(field.name);
+        }
+      }))), refIds[index] && /*#__PURE__*/React.createElement("div", {
+        style: {
+          border: '1px solid #d9d9d9',
+          padding: '10px',
+          marginBottom: '10px'
+        }
+      }, /*#__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],
+        onValuesChange: function onValuesChange(values, allValues) {
+          onRefRulesValuesChange(allValues, index);
+        }
+      })));
+    }), /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Button, {
+      type: "dashed",
+      onClick: function onClick() {
+        return add();
+      },
+      block: true,
+      icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
+    }, "\u6DFB\u52A0\u6269\u5C55\u89C4\u5219")));
+  }), /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Button, {
+    type: "primary",
+    block: true,
+    htmlType: "submit"
+  }, "\u786E\u5B9A")))));
+};
+
+export default MetaFieldsEdit;

package/es/comps/MetadataEditV2/components/MetaPropsEdit.d.ts

@@ -0,0 +1,12 @@
+import { FormInstance } from 'antd/lib/form';
+interface IMetaPropsEditProps {
+    form: FormInstance;
+    id?: string;
+    metadataTag?: string;
+    name: string;
+    isEdit?: boolean;
+    onAddFields?: (idx: number) => void;
+    onNewRefClick?: () => void;
+}
+declare const MetaPropsEdit: (props: IMetaPropsEditProps) => JSX.Element;
+export default MetaPropsEdit;