ronds-metadata 1.0.94 → 1.0.97

package/es/comps/Editable/comps/EditableHeardCell.js

@@ -31,12 +31,10 @@ var EditableHeardCell = function EditableHeardCell(props) {
       editConfig = _ref.editConfig;
 
   var addColumnRef = React.useRef({
-    key: '',
     title: ''
   });
 
   var _React$useState = React.useState({
-    key: '',
     title: ''
   }),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -66,11 +64,9 @@ var EditableHeardCell = function EditableHeardCell(props) {
       }, addColumnRef.current)
     });
     setAddColumn({
-      key: '',
       title: ''
     });
     addColumnRef.current = {
-      key: '',
       title: ''
     };
   };
@@ -94,19 +90,6 @@ var EditableHeardCell = function EditableHeardCell(props) {
       marginBottom: '10px'
     }
   }, /*#__PURE__*/React.createElement(_Input, {
-    value: addColumn.key,
-    style: {
-      width: '100%',
-      marginBottom: '5px'
-    },
-    onChange: function onChange(e) {
-      var _ = addColumnRef.current;
-      _.key = e.target.value;
-      setAddColumn(_objectSpread({}, _));
-      addColumnRef.current = _;
-    },
-    placeholder: tr('请输入key')
-  }), /*#__PURE__*/React.createElement(_Input, {
     value: addColumn.title,
     style: {
       width: '100%'

package/es/comps/Editable/index.js

@@ -137,16 +137,15 @@ var Editable = function Editable(props) {
         break;
 
       case 'onSingleSave':
+        onRowConfirm && onRowConfirm({
+          rowIdx: lastValueRef.current.rowIdx,
+          values: lastValueRef.current.values,
+          allValues: _objectSpread(_objectSpread({}, recordsRef.current[lastValueRef.current.rowIdx]), lastValueRef.current.allValues)
+        });
+
         if (lastValueRef.current && lastValueRef.current.rowIdx === data.payload._rowKey_) {
-          onRowConfirm && onRowConfirm({
-            rowIdx: lastValueRef.current.rowIdx,
-            values: lastValueRef.current.values,
-            allValues: _objectSpread(_objectSpread({}, recordsRef.current[lastValueRef.current.rowIdx]), lastValueRef.current.allValues)
-          });
           editRowKeyRef.current = undefined;
           setEditRowkey(undefined);
-        } else {
-          _message.warn('当前值无修改');
         }
 
         break;

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

@@ -8,7 +8,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-16 17:20:54
+ * @LastEditTime: 2022-05-17 15:42:38
  */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
@@ -20,7 +20,7 @@ import { tr } from '../../../framework/locale';
 import TableArray from './layout/TableArray';
 
 function Index(props) {
-  var _fieldRule$, _fieldRule$$value;
+  var _fieldRule$, _fieldRule$$value, _fieldRule$2, _fieldRule$2$value;
 
   var id = props.id,
       items = props.items,
@@ -64,7 +64,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 || fieldRule && ((_fieldRule$ = fieldRule[0]) === null || _fieldRule$ === void 0 ? void 0 : (_fieldRule$$value = _fieldRule$.value) === null || _fieldRule$$value === void 0 ? void 0 : _fieldRule$$value.label) || id)), formContext.isShowTypeInfo && /*#__PURE__*/React.createElement("div", {
+  }, extraInfo.label || fieldRule && ((_fieldRule$ = fieldRule[0]) === null || _fieldRule$ === void 0 ? void 0 : (_fieldRule$$value = _fieldRule$.value) === null || _fieldRule$$value === void 0 ? void 0 : _fieldRule$$value.label) || fieldRule && ((_fieldRule$2 = fieldRule[0]) === null || _fieldRule$2 === void 0 ? void 0 : (_fieldRule$2$value = _fieldRule$2.value) === null || _fieldRule$2$value === void 0 ? void 0 : _fieldRule$2$value.common.label) || id)), formContext.isShowTypeInfo && /*#__PURE__*/React.createElement("div", {
     style: {
       padding: '0 6px',
       position: 'absolute',

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

@@ -25,6 +25,7 @@ function Index(props) {
       refId = props.refId,
       disabled = props.disabled,
       isRefForm = props.isRefForm,
+      fieldRule = props.fields,
       initEnumValue = props.initEnumValue,
       field = props.field,
       name = props.name;
@@ -155,6 +156,8 @@ function Index(props) {
   }, [refId]);
 
   if (isRefForm && !field && schema.length > 0) {
+    var _fieldRule$, _fieldRule$$value, _fieldRule$2, _fieldRule$2$value;
+
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       style: {
         display: 'flex',
@@ -169,7 +172,7 @@ function Index(props) {
       }
     }, /*#__PURE__*/React.createElement("label", {
       className: "".concat((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require) && 'ant-form-item-required')
-    }, extraInfo.label || id)), formContext.isFoldForm && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
+    }, extraInfo.label || fieldRule && ((_fieldRule$ = fieldRule[0]) === null || _fieldRule$ === void 0 ? void 0 : (_fieldRule$$value = _fieldRule$.value) === null || _fieldRule$$value === void 0 ? void 0 : _fieldRule$$value.label) || fieldRule && ((_fieldRule$2 = fieldRule[0]) === null || _fieldRule$2 === void 0 ? void 0 : (_fieldRule$2$value = _fieldRule$2.value) === null || _fieldRule$2$value === void 0 ? void 0 : _fieldRule$2$value.common.label) || id)), formContext.isFoldForm && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
       type: "link",
       onClick: function onClick() {
         setIsFold(!isFold);

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

@@ -1,19 +1,22 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 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';
 import { MetadataService } from '../../../../framework/metadata/MetadataService';
 import { JsonMetadataProvider } from '../../../../framework/metadata';
 import Editable from '../../../../comps/Editable';
+import useObservable from '../../../../framework/rxjs-hooks/useObservable';
+import { MetadataFormContext } from '../../interface';
 
 var TableArray = function TableArray(props) {
   var initValue = props.initValue,
       name = props.name,
       form = props.form,
       refId = props.refId;
+  var formContext = React.useContext(MetadataFormContext) || {};
 
   var _React$useState = React.useState([]),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -38,6 +41,11 @@ var TableArray = function TableArray(props) {
       list = _React$useState8[0],
       setList = _React$useState8[1];
 
+  useObservable(function (p) {
+    if ((p === null || p === void 0 ? void 0 : p.type) === 'setFieldsValue') {
+      setList(_toConsumableArray(p.payload[name]));
+    }
+  }, [formContext.stream$]);
   React.useEffect(function () {
     if (refId) {
       var server = new MetadataService();

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: 2022-05-11 16:07:30
+ * @LastEditTime: 2022-05-17 15:28:24
  * @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
@@ -28,6 +28,10 @@ export var useGetExtraInfo = function useGetExtraInfo(fields, id, form, type) {
     if (fields) {
       var extraInfo = fields.get(id);
 
+      if (id === 'kafkaSource') {
+        debugger;
+      }
+
       if (extraInfo) {
         // 将map转化为对象
         var _extraInfo = {};

package/es/comps/MetadataForm/index.js

@@ -45,13 +45,12 @@ var MetadataForm = function MetadataForm(props) {
       setFields = _React$useState4[1];
 
   var firstLoadRef = React.useRef(true);
+  var firstLoadForm = React.useRef(true);
   var stream$ = useMemoSubject();
   useObservable(function (p) {
     if ((p === null || p === void 0 ? void 0 : p.type) === 'onSelectChange') {
       onSelectChange && onSelectChange(p.payload);
     }
-
-    if ((p === null || p === void 0 ? void 0 : p.type) === 'onRenderAfter') {}
   }, [stream$]);
   var options = React.useMemo(function () {
     return {
@@ -66,10 +65,23 @@ var MetadataForm = function MetadataForm(props) {
    */
 
   React.useEffect(function () {
-    if (form) {
+    if (form && stream$ && firstLoadForm.current) {
+      // 改写setFiedldsValue;
+      var e = form.setFieldsValue;
+
+      var setFieldsValue = function setFieldsValue(vals) {
+        e(vals);
+        stream$.next({
+          type: 'setFieldsValue',
+          payload: vals
+        });
+      };
+
+      form.setFieldsValue = setFieldsValue;
       getFormInstance && getFormInstance(form);
+      firstLoadForm.current = false;
     }
-  }, [form, getFormInstance]);
+  }, [form, stream$, getFormInstance]);
   React.useEffect(function () {
     if (schema && schema.length > 0) {
       setMySchema(_toConsumableArray(schema));

package/package.json

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