ronds-metadata 1.0.51 → 1.0.54

package/es/comps/Editable/index.js

@@ -3,13 +3,12 @@ import _Button from "antd/es/button";
 import "antd/es/table/style";
 import _Table from "antd/es/table";
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/message/style";
 import _message from "antd/es/message";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
-import { BehaviorSubject } from 'rxjs';
 import { pick, isArray } from 'lodash';
 import EditableCell from './comps/EditableCell';
 import EditableRow from './comps/EditableRow';
@@ -17,6 +16,8 @@ import { EditableContext } from './interface';
 import EditableAction from './comps/EditableAction';
 import { isFreeEditRow, removeCurKeyFromEditRow } from './utils';
 import EditableHeardCell from './comps/EditableHeardCell';
+import useMemoSubject from '../../framework/rxjs-hooks/useMemoSubject';
+import useObservable from '../../framework/rxjs-hooks/useObservable';
 
 var Editable = function Editable(props) {
   var _props$type = props.type,
@@ -78,38 +79,7 @@ var Editable = function Editable(props) {
   var lastDataSourceRef = React.useRef();
   var firstLoadRef = React.useRef(true); // 定义处理编辑表格的数据流
 
-  var editableStream = React.useMemo(function () {
-    return new BehaviorSubject(undefined);
-  }, []);
-
-  var processAddColumnsData = function processAddColumnsData(data) {
-    var _columns = addColumnsRef.current.length > 0 ? addColumnsRef.current : columns; // 判断key是否重复
-
-
-    if (_columns.findIndex(function (v) {
-      return v.key === data.key;
-    }) > -1) {
-      _message.warning('表格的key不可以重复');
-
-      return;
-    }
-
-    var idx = _columns.findIndex(function (v) {
-      return v.dataIndex === data.dataIndex;
-    });
-
-    var obj = {
-      title: data.title,
-      key: data.key,
-      dataIndex: data.key
-    };
-
-    _columns.splice(idx + 1, 0, _objectSpread(_objectSpread({}, _columns[0]), obj));
-
-    setAddColumns(_toConsumableArray(_columns));
-    addColumnsRef.current = _columns; // editableStream.next({ type: 'editHeardCellKey', payload: undefined });
-  };
-
+  var editableStream = useMemoSubject();
   var processStreamFactory = React.useCallback(function (data) {
     switch (data === null || data === void 0 ? void 0 : data.type) {
       case 'onValuesChange':
@@ -216,7 +186,38 @@ var Editable = function Editable(props) {
 
         break;
     }
-  }, [type]); // 返回stream的实例
+  }, [type]); // 集中处理数据流
+
+  useObservable(processStreamFactory, [editableStream]);
+
+  var processAddColumnsData = function processAddColumnsData(data) {
+    var _columns = addColumnsRef.current.length > 0 ? addColumnsRef.current : columns; // 判断key是否重复
+
+
+    if (_columns.findIndex(function (v) {
+      return v.key === data.key;
+    }) > -1) {
+      _message.warning('表格的key不可以重复');
+
+      return;
+    }
+
+    var idx = _columns.findIndex(function (v) {
+      return v.dataIndex === data.dataIndex;
+    });
+
+    var obj = {
+      title: data.title,
+      key: data.key,
+      dataIndex: data.key
+    };
+
+    _columns.splice(idx + 1, 0, _objectSpread(_objectSpread({}, _columns[0]), obj));
+
+    setAddColumns(_toConsumableArray(_columns));
+    addColumnsRef.current = _columns; // editableStream.next({ type: 'editHeardCellKey', payload: undefined });
+  }; // 返回stream的实例
+
 
   React.useEffect(function () {
     if (firstLoadRef && editableStream) {
@@ -230,16 +231,7 @@ var Editable = function Editable(props) {
       setRecords(_toConsumableArray(dataSource));
       recordsRef.current = dataSource;
     }
-  }, [dataSource]); // 集中处理数据流
-
-  React.useEffect(function () {
-    var subscription = editableStream.subscribe(function (p) {
-      processStreamFactory(p);
-    });
-    return function () {
-      return subscription.unsubscribe();
-    };
-  }, [editableStream, processStreamFactory]);
+  }, [dataSource]);
   var getEditColumn = React.useCallback(function (column) {
     var _column = _objectSpread(_objectSpread({}, column), {}, {
       children: isArray(column === null || column === void 0 ? void 0 : column.children) ? column.children.map(getEditColumn) : undefined

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

@@ -124,9 +124,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/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;
 }

package/es/comps/MetadataForm/interface.js

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

package/es/comps/MetadataForm/utils.js

@@ -9,6 +9,7 @@ import Switch from './DataCell/Switch';
 import Array from './DataCell/Array';
 import Ref from './DataCell/Ref';
 import { withAddOnAfter } from './HOC';
+import { guid } from '@/utils';
 var DataCellMap = {
   text: withAddOnAfter(Input),
   number: withAddOnAfter(Number),
@@ -20,7 +21,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: guid()
+    }, item, {
       disabled: options.disabled,
       isRefForm: options.isRefForm,
       isShowTypeInfo: options.isShowTypeInfo,

package/es/framework/rxjs-hooks/useMemoSubject.d.ts

@@ -0,0 +1,3 @@
+import { BehaviorSubject } from 'rxjs';
+declare const useMemoSubject: <T>() => BehaviorSubject<T>;
+export default useMemoSubject;

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

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

package/es/framework/rxjs-hooks/useObservable.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const useObservable: <T>(fn: Function, dep?: React.DependencyList) => void;
+export default useObservable;

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

@@ -0,0 +1,20 @@
+/*
+ * @Author: wangxian
+ * @Date: 2022-03-30 10:12:11
+ * @LastEditTime: 2022-03-30 10:52:51
+ */
+import React from 'react';
+
+var useObservable = function useObservable(fn) {
+  var dep = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  React.useEffect(function () {
+    var subscription = dep[0] && dep[0].subscribe(function (p) {
+      fn(p);
+    });
+    return function () {
+      return subscription && subscription.unsubscribe();
+    };
+  }, dep);
+};
+
+export default useObservable;

package/es/index.d.ts

@@ -8,4 +8,6 @@ export { default as MdEditor } from './comps/MdEdit';
 export { default as Editable } from './comps/Editable';
 export * from './framework/metadata/index';
 export { default as http, addInterceptor } from './framework/http/index';
+export { default as useMemoSubject } from './framework/rxjs-hooks/useMemoSubject';
+export { default as useObservable } from './framework/rxjs-hooks/useObservable';
 export { registerMetadataAPI } from './framework/metadata/MetadataService';

package/es/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-03-16 16:51:12
+ * @LastEditTime: 2022-03-30 10:55:03
  */
 export { default as MetadataEdit } from './comps/MetadataEdit';
 export { default as MetaPropsEdit } from './comps/MetadataEdit/components/MetaPropsEdit';
@@ -13,4 +13,6 @@ export { default as MdEditor } from './comps/MdEdit';
 export { default as Editable } from './comps/Editable';
 export * from './framework/metadata/index';
 export { default as http, addInterceptor } from './framework/http/index';
+export { default as useMemoSubject } from './framework/rxjs-hooks/useMemoSubject';
+export { default as useObservable } from './framework/rxjs-hooks/useObservable';
 export { registerMetadataAPI } from './framework/metadata/MetadataService';

package/package.json

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