ronds-metadata 1.0.53 → 1.0.56

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

@@ -11,9 +11,12 @@ import { useGetExtraInfo } from '../hooks';
 import { getDataCell } from '../utils';
 
 function Index(props) {
+  var _fields$0$value;
+
   var id = props.id,
       items = props.items,
       isRefForm = props.isRefForm,
+      fields = props.fields,
       initEnumValue = props.initEnumValue,
       disabled = props.disabled;
   var formContext = React.useContext(MetadataFormContext) || {};
@@ -30,6 +33,7 @@ function Index(props) {
       setHelp(arr[arr.length - 1]);
     }
   }, [items]);
+  debugger;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: {
       position: 'relative',
@@ -39,7 +43,7 @@ function Index(props) {
     className: "ant-form-item-label mt-1"
   }, /*#__PURE__*/React.createElement("label", {
     className: "".concat((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require) && 'ant-form-item-required')
-  }, extraInfo.label || id)), formContext.isShowTypeInfo && /*#__PURE__*/React.createElement("div", {
+  }, extraInfo.label || ((_fields$0$value = fields[0].value) === null || _fields$0$value === void 0 ? void 0 : _fields$0$value.label) || id)), formContext.isShowTypeInfo && /*#__PURE__*/React.createElement("div", {
     style: {
       padding: '0 6px',
       position: 'absolute',
@@ -55,7 +59,8 @@ function Index(props) {
       borderRadius: '4px'
     }
   }, /*#__PURE__*/React.createElement(_Form.List, {
-    name: id
+    name: id,
+    key: id
   }, function (fields, _ref) {
     var add = _ref.add,
         remove = _ref.remove;

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

@@ -10,6 +10,12 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+
+/*
+ * @Author: wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2022-04-02 17:18:27
+ */
 import React from 'react';
 import { BgColorsOutlined } from '@ant-design/icons';
 import { SketchPicker } from 'react-color';

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

@@ -1,20 +1,19 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
+import "antd/es/select/style";
+import _Select from "antd/es/select";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import "antd/es/select/style";
-import _Select from "antd/es/select";
 import React from 'react';
 import { MetadataService } from '../../../framework/metadata/MetadataService';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
 import { renderForm } from '../utils';
 import { JsonMetadataProvider } from '../../../framework/metadata';
-var Option = _Select.Option;
 
 function Index(props) {
   var _extraInfo$disabled, _extraInfo$disabled2;
@@ -94,10 +93,10 @@ function Index(props) {
     }, _callee);
   })), []);
   React.useEffect(function () {
-    if (refId) {
+    if (refId && isRefForm) {
       onSearch();
     }
-  }, [refId, onSearch]);
+  }, [refId, isRefForm, onSearch]);
   var formOptions = React.useMemo(function () {
     return {
       disabled: disabled,
@@ -124,9 +123,21 @@ function Index(props) {
           refFieldsRef.current = _fields;
           setRefFields(_objectSpread({}, _fields));
           setSchema(_toConsumableArray(mySchema));
+          return function () {
+            provider = null;
+          };
         }
+
+        return function () {
+          provider = null;
+        };
       });
+      return function () {
+        server = null;
+      };
     }
+
+    return function () {};
   }, [refId]);
   React.useEffect(function () {
     if (refId) {

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

@@ -4,6 +4,13 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+
+/*
+ * @Author:wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2022-04-01 17:07:41
+ */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
@@ -22,6 +29,14 @@ function Index(props) {
   var formContext = React.useContext(MetadataFormContext) || {};
   var formRefContext = React.useContext(MetadataRefContext);
   var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form);
+
+  var onSelect = function onSelect(value) {
+    formContext.stream$ && formContext.stream$.next({
+      type: 'onSelectChange',
+      payload: _defineProperty({}, id, value)
+    });
+  };
+
   var options = React.useMemo(function () {
     var _options = [];
 
@@ -69,6 +84,7 @@ function Index(props) {
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
     }), /*#__PURE__*/React.createElement(_Select, {
       mode: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
+      onSelect: onSelect,
       disabled: (_extraInfo$disabled = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled !== void 0 ? _extraInfo$disabled : disabled,
       placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
       options: options,
@@ -86,6 +102,7 @@ function Index(props) {
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
   }, /*#__PURE__*/React.createElement(_Select, {
     mode: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
+    onSelect: onSelect,
     disabled: (_extraInfo$disabled2 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled2 !== void 0 ? _extraInfo$disabled2 : disabled,
     placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
     options: options,
@@ -104,6 +121,7 @@ function Index(props) {
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
   }), /*#__PURE__*/React.createElement(_Select, {
     mode: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
+    onSelect: onSelect,
     disabled: (_extraInfo$disabled3 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled3 !== void 0 ? _extraInfo$disabled3 : disabled,
     placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
     options: options,

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

@@ -1,5 +1,11 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+
+/*
+ * @Author: wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2022-04-01 16:48:49
+ */
 import React from 'react';
 import { deepClone } from '../../../utils';
 import "./index.css";
@@ -24,6 +30,8 @@ export function withAddOnAfter(WrappedComponent) {
         var arr = refId.split(':');
         setHelp(arr[arr.length - 1]);
       }
+
+      return function () {};
     }, [refId]);
 
     var _name = React.useMemo(function () {
@@ -37,6 +45,7 @@ export function withAddOnAfter(WrappedComponent) {
     }, [id, name]);
 
     return /*#__PURE__*/React.createElement("div", {
+      key: "".concat(_name.toString(), "_div"),
       className: "with-add-on-after"
     }, /*#__PURE__*/React.createElement(WrappedComponent, _extends({
       key: _name.toString(),

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

@@ -5,7 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: your name
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2021-12-03 16:00:13
+ * @LastEditTime: 2022-04-02 16:44:45
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \ronds.metadata\src\comps\MetadataForm\hooks\index.tsx

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

@@ -42,6 +42,10 @@ interface IMetadataFormProps {
      * 表单值的改变回调
      */
     onValuesChange?: (changedValues: any, allValues: any) => void;
+    /**
+     * select选择的回调
+     */
+    onSelectChange?: (changedValues: any) => void;
 }
 declare const MetadataForm: (props: IMetadataFormProps) => JSX.Element;
 export default MetadataForm;

package/es/comps/MetadataForm/index.js

@@ -8,6 +8,8 @@ import "./index.css";
 import { MetadataFormContext } from './interface';
 import { JsonMetadataProvider } from '../../framework/metadata';
 import { MetadataService } from '../../framework/metadata/MetadataService';
+import useMemoSubject from '../../framework/rxjs-hooks/useMemoSubject';
+import useObservable from '../../framework/rxjs-hooks/useObservable';
 
 var MetadataForm = function MetadataForm(props) {
   var _Form$useForm = _Form.useForm(),
@@ -26,7 +28,8 @@ var MetadataForm = function MetadataForm(props) {
       initEnumValue = props.initEnumValue,
       onFinish = props.onFinish,
       getFormInstance = props.getFormInstance,
-      onValuesChange = props.onValuesChange;
+      onValuesChange = props.onValuesChange,
+      onSelectChange = props.onSelectChange;
 
   var _React$useState = React.useState([]),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -38,6 +41,12 @@ var MetadataForm = function MetadataForm(props) {
       fields = _React$useState4[0],
       setFields = _React$useState4[1];
 
+  var stream$ = useMemoSubject();
+  useObservable(function (p) {
+    if ((p === null || p === void 0 ? void 0 : p.type) === 'onSelectChange') {
+      onSelectChange && onSelectChange(p.payload);
+    }
+  }, [stream$]);
   var options = React.useMemo(function () {
     return {
       disabled: disabled,
@@ -78,12 +87,18 @@ var MetadataForm = function MetadataForm(props) {
       var formCls = new FormCls();
       var _fields = formCls.__type__.__fields__;
       setFields(_fields);
+      return function () {
+        provider = null;
+      };
     }
+
+    return function () {};
   }, [mySchma]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MetadataFormContext.Provider, {
     value: {
       fields: fields,
       form: form,
+      stream$: stream$,
       initialValues: initialValues,
       isShowTypeInfo: isShowTypeInfo
     }

package/es/comps/MetadataForm/interface.d.ts

@@ -3,6 +3,7 @@ import { FormInstance } from 'antd/lib/form/hooks/useForm';
 export interface IMetadataFormContextProps {
     fields: any;
     form: FormInstance;
+    stream$: any;
     initialValues: any;
     isShowTypeInfo: boolean;
 }
@@ -29,6 +30,7 @@ export interface IMetaFormProps {
     isRefForm?: boolean;
     initEnumValue?: any;
     field?: any;
+    fields?: any[];
     name?: string[];
     isObj?: boolean;
     refId?: string;

package/es/comps/MetadataForm/interface.js

@@ -1,3 +1,8 @@
+/*
+ * @Author:wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2022-04-02 17:06:28
+ */
 import React from 'react';
 export var MetadataFormContext = /*#__PURE__*/React.createContext(null);
 export var MetadataRefContext = /*#__PURE__*/React.createContext(null);

package/es/comps/MetadataForm/utils.js

@@ -1,6 +1,12 @@
 import "antd/es/spin/style";
 import _Spin from "antd/es/spin";
 import _extends from "@babel/runtime/helpers/esm/extends";
+
+/*
+ * @Author: wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2022-04-02 17:19:55
+ */
 import React from 'react';
 import Input from './DataCell/Input';
 import Number from './DataCell/Number';
@@ -20,7 +26,9 @@ var DataCellMap = {
 export function getDataCell(item, options) {
   if (item.type && DataCellMap[item.type]) {
     var Comm = DataCellMap[item.type];
-    return /*#__PURE__*/React.createElement(Comm, _extends({}, item, {
+    return /*#__PURE__*/React.createElement(Comm, _extends({
+      key: item.id
+    }, item, {
       disabled: options.disabled,
       isRefForm: options.isRefForm,
       isShowTypeInfo: options.isShowTypeInfo,

package/es/framework/rxjs-hooks/useMemoSubject.js

@@ -1,20 +1,16 @@
 /*
  * @Author: wangxian
  * @Date: 2022-03-30 10:12:11
- * @LastEditTime: 2022-03-31 19:23:32
+ * @LastEditTime: 2022-04-01 08:15:21
  */
 import React from 'react';
 import { BehaviorSubject } from 'rxjs';
 
 var useMemoSubject = function useMemoSubject() {
-  var subjectRef$ = React.useRef();
-  React.useEffect(function () {
-    subjectRef$.current = new BehaviorSubject(undefined);
-    return function () {
-      subjectRef$.current.complete();
-    };
+  var subject$ = React.useMemo(function () {
+    return new BehaviorSubject(undefined);
   }, []);
-  return subjectRef$.current;
+  return subject$;
 };
 
 export default useMemoSubject;

package/package.json

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