ronds-metadata 1.0.51 → 1.0.52

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/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-03-30 10:39:05
+ */
+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.52",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",