ronds-metadata 1.1.26 → 1.1.29

package/es/comps/Editable/DataCell/ButtonCell.js

@@ -6,7 +6,7 @@ import _Button from "antd/es/button";
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:53:50
- * @LastEditTime: 2022-07-07 08:46:45
+ * @LastEditTime: 2022-07-08 08:57:41
  */
 import React from 'react';
 import { SettingOutlined } from '@ant-design/icons';
@@ -21,7 +21,8 @@ function Index(props) {
       editableStream = _ref.editableStream,
       editConfig = _ref.editConfig;
 
-  var onClick = function onClick() {
+  var onClick = function onClick(e) {
+    e.stopPropagation();
     editableStream && editableStream.next({
       type: 'onButtonCellClick',
       payload: record

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

@@ -194,6 +194,17 @@ 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) {
+    formContext.stream$.next({
+      type: 'onButtonCellClick',
+      payload: record
+    });
   };
 
   return /*#__PURE__*/React.createElement("div", {
@@ -213,6 +224,7 @@ var TableArray = function TableArray(props) {
     columns: columns,
     dataSource: list,
     onMulChange: onTableChange,
+    onButtonCellClick: onButtonCellClick,
     tableProps: {
       scroll: {
         x: '100%',

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

@@ -50,6 +50,10 @@ interface IMetadataFormProps {
      * select选择的回调
      */
     onSelectChange?: (changedValues: any) => void;
+    /**
+     * select选择的回调
+     */
+    onCellButtonClick?: (changedValues: any) => void;
 }
 declare const MetadataForm: (props: IMetadataFormProps) => JSX.Element;
 export default MetadataForm;

package/es/comps/MetadataForm/index.js

@@ -32,7 +32,8 @@ var MetadataForm = function MetadataForm(props) {
       onFinish = props.onFinish,
       getFormInstance = props.getFormInstance,
       onValuesChange = props.onValuesChange,
-      onSelectChange = props.onSelectChange;
+      onSelectChange = props.onSelectChange,
+      onCellButtonClick = props.onCellButtonClick;
 
   var _React$useState = React.useState([]),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -55,6 +56,10 @@ var MetadataForm = function MetadataForm(props) {
   useObservable(function (p) {
     if ((p === null || p === void 0 ? void 0 : p.type) === 'onSelectChange') {
       onSelectChange && onSelectChange(p.payload);
+    } else if ((p === null || p === void 0 ? void 0 : p.type) === 'onButtonCellClick') {
+      onCellButtonClick && onCellButtonClick(p.payload);
+    } else if ((p === null || p === void 0 ? void 0 : p.type) === 'onValuesChange') {
+      onValuesChange && onValuesChange(p === null || p === void 0 ? void 0 : p.payload, form.getFieldsValue());
     }
   }, [stream$]);
   var options = React.useMemo(function () {
@@ -122,10 +127,16 @@ var MetadataForm = function MetadataForm(props) {
   }, [mySchma]);
   React.useEffect(function () {
     if (initialValues && firstLoadRef.current) {
-      setTimeout(function () {
+      try {
         form.setFieldsValue(_objectSpread({}, initialValues));
         firstLoadRef.current = false;
-      }, 500);
+      } catch (ex) {
+        console.warn('init not sucess');
+        setTimeout(function () {
+          form.setFieldsValue(_objectSpread({}, initialValues));
+          firstLoadRef.current = false;
+        }, 500);
+      }
     }
   }, [initialValues]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MetadataFormContext.Provider, {

package/package.json

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