ronds-metadata 1.0.55 → 1.0.58

package/es/comps/Editable/comps/EditableAction.js

@@ -5,8 +5,11 @@ import _Button from "antd/es/button";
 import { EditOutlined, CloseOutlined, CheckOutlined, DeleteOutlined } from '@ant-design/icons';
 import React from 'react';
 import { EditableContext } from '../interface';
+import { isFreeEditRow } from '../utils';
 
 var EditableAction = function EditableAction(props) {
+  var _editConfig$editCellK;
+
   var type = props.type,
       record = props.record;
 
@@ -35,6 +38,13 @@ var EditableAction = function EditableAction(props) {
       type: 'onSingleSave',
       payload: record
     });
+    editableStream.next({
+      type: 'editCellKey',
+      payload: {
+        dataIndex: undefined,
+        rowIndex: undefined
+      }
+    });
   };
 
   var onDelete = function onDelete() {
@@ -69,7 +79,15 @@ var EditableAction = function EditableAction(props) {
     title: '取消'
   }), /*#__PURE__*/React.createElement(_Divider, {
     type: "vertical"
-  })))), /*#__PURE__*/React.createElement(_Button, {
+  })))), type === 'freedom' && /*#__PURE__*/React.createElement(React.Fragment, null, (record._rowKey_ === (editConfig === null || editConfig === void 0 ? void 0 : (_editConfig$editCellK = editConfig.editCellKey) === null || _editConfig$editCellK === void 0 ? void 0 : _editConfig$editCellK.rowIndex) || isFreeEditRow(editConfig.curRow, record._rowKey_)) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
+    type: "link",
+    size: "small",
+    icon: /*#__PURE__*/React.createElement(CheckOutlined, null),
+    onClick: onSave,
+    title: '确定'
+  }), /*#__PURE__*/React.createElement(_Divider, {
+    type: "vertical"
+  }))), /*#__PURE__*/React.createElement(_Button, {
     type: "link",
     size: "small",
     icon: /*#__PURE__*/React.createElement(DeleteOutlined, null),

package/es/comps/Editable/comps/EditableCell.js

@@ -24,6 +24,8 @@ var EditableCell = function EditableCell(props) {
 
 
   var onCellDoubleClick = function onCellDoubleClick() {
+    var _editConfig$editCellK, _editConfig$editCellK2;
+
     if ((editConfig === null || editConfig === void 0 ? void 0 : editConfig.curRow) && (editConfig === null || editConfig === void 0 ? void 0 : editConfig.curRow) !== 'undefined') {
       if (isFreeEditRow(editConfig.curRow, rowIndex)) return;
 
@@ -32,6 +34,12 @@ var EditableCell = function EditableCell(props) {
       return;
     }
 
+    if (((editConfig === null || editConfig === void 0 ? void 0 : (_editConfig$editCellK = editConfig.editCellKey) === null || _editConfig$editCellK === void 0 ? void 0 : _editConfig$editCellK.rowIndex) || (editConfig === null || editConfig === void 0 ? void 0 : (_editConfig$editCellK2 = editConfig.editCellKey) === null || _editConfig$editCellK2 === void 0 ? void 0 : _editConfig$editCellK2.rowIndex) === 0) && rowIndex !== editConfig.editCellKey.rowIndex) {
+      _message.warning('请先保存正在编辑的行');
+
+      return;
+    }
+
     editableStream.next({
       type: 'editCellKey',
       payload: {
@@ -42,16 +50,9 @@ var EditableCell = function EditableCell(props) {
   };
 
   var onCellClick = function onCellClick() {
-    if (!isFreeEditCell(editConfig.editCellKey, dataIndex, rowIndex)) {
-      editableStream.next({
-        type: 'editCellKey',
-        payload: {
-          dataIndex: undefined,
-          rowIndex: undefined
-        }
-      });
-    }
-
+    // if (!isFreeEditCell(editConfig.editCellKey, dataIndex, rowIndex)) {
+    //   editableStream.next({ type: 'editCellKey', payload: { dataIndex: undefined, rowIndex: undefined } });
+    // }
     if (isAddColumn) {
       editableStream.next({
         type: 'editHeardCellKey',

package/es/comps/Editable/comps/EditableRow.js

@@ -17,13 +17,7 @@ var EditableRow = function EditableRow(props) {
   React.useEffect(function () {
     if (!form) return;
     form.setFieldsValue(record);
-  }, [record]); // 编辑的时候初始化值
-  // React.useEffect(() => {
-  //   const subscription = editableStream.pipe(filter((p: any) => p?.type === 'editRowKey')).subscribe((p: IEditableStream) => {
-  //     form.setFieldsValue(p.payload);
-  //   });
-  //   return () => subscription.unsubscribe();
-  // }, [editableStream]);
+  }, [record]);
 
   var onValuesChange = function onValuesChange(values, allValues) {
     if (editableStream) {

package/es/comps/Editable/index.js

@@ -270,10 +270,10 @@ var Editable = function Editable(props) {
       var _aciton_ = {
         dataKey: '_aciton_',
         title: '操作',
-        width: 60,
-        maxWidth: 60,
+        width: 50,
+        maxWidth: 50,
         export: false,
-        minWidth: 60,
+        minWidth: 50,
         frozen: 'right',
         render: function render(val, record) {
           return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EditableAction, {
@@ -311,6 +311,12 @@ var Editable = function Editable(props) {
 
   var onAddRow = function onAddRow() {
     if (defaultValue) {
+      if (type === 'freedom' && editRowKey) {
+        _message.warn('请先保存正在编辑的行');
+
+        return;
+      }
+
       var _records = recordsRef.current;
 
       if (addPosition === 'top') {

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

@@ -11,9 +11,12 @@ import { useGetExtraInfo } from '../hooks';
 import { getDataCell } from '../utils';
 
 function Index(props) {
+  var _fields$0$value;
+
   var id = props.id,
       items = props.items,
       isRefForm = props.isRefForm,
+      fields = props.fields,
       initEnumValue = props.initEnumValue,
       disabled = props.disabled;
   var formContext = React.useContext(MetadataFormContext) || {};
@@ -30,6 +33,7 @@ function Index(props) {
       setHelp(arr[arr.length - 1]);
     }
   }, [items]);
+  debugger;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: {
       position: 'relative',
@@ -39,7 +43,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 || id)), formContext.isShowTypeInfo && /*#__PURE__*/React.createElement("div", {
+  }, extraInfo.label || ((_fields$0$value = fields[0].value) === null || _fields$0$value === void 0 ? void 0 : _fields$0$value.label) || id)), formContext.isShowTypeInfo && /*#__PURE__*/React.createElement("div", {
     style: {
       padding: '0 6px',
       position: 'absolute',
@@ -55,7 +59,8 @@ function Index(props) {
       borderRadius: '4px'
     }
   }, /*#__PURE__*/React.createElement(_Form.List, {
-    name: id
+    name: id,
+    key: id
   }, function (fields, _ref) {
     var add = _ref.add,
         remove = _ref.remove;

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

@@ -10,6 +10,12 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+
+/*
+ * @Author: wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2022-04-02 17:18:27
+ */
 import React from 'react';
 import { BgColorsOutlined } from '@ant-design/icons';
 import { SketchPicker } from 'react-color';

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

@@ -1,20 +1,19 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
+import "antd/es/select/style";
+import _Select from "antd/es/select";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import "antd/es/select/style";
-import _Select from "antd/es/select";
 import React from 'react';
 import { MetadataService } from '../../../framework/metadata/MetadataService';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
 import { renderForm } from '../utils';
 import { JsonMetadataProvider } from '../../../framework/metadata';
-var Option = _Select.Option;
 
 function Index(props) {
   var _extraInfo$disabled, _extraInfo$disabled2;
@@ -94,10 +93,10 @@ function Index(props) {
     }, _callee);
   })), []);
   React.useEffect(function () {
-    if (refId) {
+    if (refId && isRefForm) {
       onSearch();
     }
-  }, [refId, onSearch]);
+  }, [refId, isRefForm, onSearch]);
   var formOptions = React.useMemo(function () {
     return {
       disabled: disabled,

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: 2021-12-03 16:00:13
+ * @LastEditTime: 2022-04-02 16:44:45
  * @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

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

@@ -30,6 +30,7 @@ export interface IMetaFormProps {
     isRefForm?: boolean;
     initEnumValue?: any;
     field?: any;
+    fields?: any[];
     name?: string[];
     isObj?: boolean;
     refId?: string;

package/es/comps/MetadataForm/interface.js

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

package/es/comps/MetadataForm/utils.js

@@ -5,7 +5,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-04-02 15:10:04
+ * @LastEditTime: 2022-04-02 17:19:55
  */
 import React from 'react';
 import Input from './DataCell/Input';

package/package.json

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