ronds-metadata 1.1.29 → 1.1.30

package/es/comps/MetadataForm/DataCell/layout/TableArray.js

@@ -1,9 +1,9 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useRef } from 'react';
@@ -40,16 +40,33 @@ var TableArray = function TableArray(props) {
   var refFieldsRef = React.useRef(refFields);
   var firstLoadRef = useRef(true);
 
-  var _React$useState7 = React.useState([]),
+  var _React$useState7 = React.useState(),
       _React$useState8 = _slicedToArray(_React$useState7, 2),
-      list = _React$useState8[0],
-      setList = _React$useState8[1];
+      tblStream = _React$useState8[0],
+      setTblStream = _React$useState8[1];
+
+  var _React$useState9 = React.useState([]),
+      _React$useState10 = _slicedToArray(_React$useState9, 2),
+      list = _React$useState10[0],
+      setList = _React$useState10[1];
 
   useObservable(function (p) {
     if ((p === null || p === void 0 ? void 0 : p.type) === 'setFieldsValue') {
       setList(_toConsumableArray(p.payload[name]));
     }
   }, [formContext.stream$]);
+  useObservable(function (p) {
+    if ((p === null || p === void 0 ? void 0 : p.type) === 'onValuesChange') {
+      var _p$payload;
+
+      formContext.stream$.next({
+        type: 'onValuesChange',
+        payload: _defineProperty({}, "".concat(name), _objectSpread({
+          rowIdx: p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.rowIdx
+        }, p.payload.values))
+      });
+    }
+  }, [tblStream]);
   var getSchemaByRefId = React.useCallback( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(server, __TYPE__) {
       var _schema, res, provider, FormCls, formCls, _fields;
@@ -194,10 +211,6 @@ var TableArray = function TableArray(props) {
 
   var onTableChange = function onTableChange(values) {
     form.setFieldsValue(_objectSpread({}, _defineProperty({}, "".concat(name), values)));
-    formContext.stream$.next({
-      type: 'onValuesChange',
-      payload: _defineProperty({}, "".concat(name), values)
-    });
   };
 
   var onButtonCellClick = function onButtonCellClick(record) {
@@ -225,6 +238,9 @@ var TableArray = function TableArray(props) {
     dataSource: list,
     onMulChange: onTableChange,
     onButtonCellClick: onButtonCellClick,
+    getStreamInstance: function getStreamInstance(_tblStream) {
+      setTblStream(_tblStream);
+    },
     tableProps: {
       scroll: {
         x: '100%',

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

@@ -1,16 +1,18 @@
 /*
  * @Author: wangxian
  * @Date: 2022-03-30 10:12:11
- * @LastEditTime: 2022-03-30 10:52:51
+ * @LastEditTime: 2022-07-14 08:33:58
  */
 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) {
+    var _dep$, _dep$2;
+
+    var subscription = dep[0] && ((_dep$ = dep[0]) === null || _dep$ === void 0 ? void 0 : _dep$.subscribe) && ((_dep$2 = dep[0]) === null || _dep$2 === void 0 ? void 0 : _dep$2.subscribe(function (p) {
       fn(p);
-    });
+    }));
     return function () {
       return subscription && subscription.unsubscribe();
     };

package/package.json

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