ronds-metadata 1.0.97 → 1.1.0

package/es/comps/Editable/index.js

@@ -127,25 +127,24 @@ var Editable = function Editable(props) {
       case 'editHeardCellKey':
         setEditHeardCellkey(data.payload);
         break;
-
-      case 'onAddColumn':
-        processAddColumnsData(data.payload);
-        break;
-
-      case 'onDeleteColumn':
-        processDeleteColumnsData(data.payload);
-        break;
+      // case 'onAddColumn':
+      //   processAddColumnsData(data.payload);
+      //   break;
+      // case 'onDeleteColumn':
+      //   processDeleteColumnsData(data.payload);
+      //   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(tr('当前值无修改'));
         }
 
         break;
@@ -201,52 +200,36 @@ var Editable = function Editable(props) {
     }
   }, [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 });
-  };
-
-  var processDeleteColumnsData = function processDeleteColumnsData(data) {
-    var _columns = addColumnsRef.current.length > 0 ? addColumnsRef.current : columns;
-
-    if (whiteColumn.findIndex(function (v) {
-      return v === data.dataIndex;
-    }) > -1) {
-      // message.warning(`${data.dataIndex}无法删除`);
-      return;
-    }
-
-    _columns = _columns.filter(function (v) {
-      return v.dataIndex != data.dataIndex;
-    });
-    setAddColumns(_toConsumableArray(_columns));
-    addColumnsRef.current = _columns; // editableStream.next({ type: 'editHeardCellKey', payload: undefined });
-  }; // 返回stream的实例
-
+  useObservable(processStreamFactory, [editableStream]); // const processAddColumnsData = (data: any) => {
+  //   const _columns = addColumnsRef.current.length > 0 ? addColumnsRef.current : columns;
+  //   // 判断key是否重复
+  //   if (_columns.findIndex((v) => v.key === data.key) > -1) {
+  //     // message.warning('表格的key不可以重复');
+  //     return;
+  //   }
+  //   const idx = _columns.findIndex((v: any) => v.dataIndex === data.dataIndex);
+  //   const obj = {
+  //     title: data.title,
+  //     key: data.key,
+  //     dataIndex: data.key,
+  //   };
+  //   _columns.splice(idx + 1, 0, { ..._columns[0], ...obj });
+  //   setAddColumns([..._columns]);
+  //   addColumnsRef.current = _columns;
+  //   // editableStream.next({ type: 'editHeardCellKey', payload: undefined });
+  // };
+  // const processDeleteColumnsData = (data: any) => {
+  //   let _columns = addColumnsRef.current.length > 0 ? addColumnsRef.current : columns;
+  //   if (whiteColumn.findIndex((v) => v === data.dataIndex) > -1) {
+  //     // message.warning(`${data.dataIndex}无法删除`);
+  //     return;
+  //   }
+  //   _columns = _columns.filter((v: any) => v.dataIndex != data.dataIndex);
+  //   setAddColumns([..._columns]);
+  //   addColumnsRef.current = _columns;
+  //   // editableStream.next({ type: 'editHeardCellKey', payload: undefined });
+  // };
+  // 返回stream的实例
 
   React.useEffect(function () {
     if (firstLoadRef && editableStream) {

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

@@ -1,3 +1,4 @@
+import { FormInstance } from 'antd';
 import './index.less';
 interface IMetadataEditProps {
     /**
@@ -20,6 +21,10 @@ interface IMetadataEditProps {
      *  添加新的引用类型点击事件
      */
     onNewRefClick?: () => void;
+    /**
+     * 获取表单的实例
+     */
+    getFormInstance?: (form: FormInstance) => void;
 }
 declare const MetadataEdit: (props: IMetadataEditProps) => JSX.Element;
 export default MetadataEdit;

package/es/comps/MetadataEdit/index.js

@@ -23,7 +23,8 @@ var MetadataEdit = function MetadataEdit(props) {
       isNameDisabled = props.isNameDisabled,
       metadataTag = props.metadataTag,
       onFinish = props.onFinish,
-      onNewRefClick = props.onNewRefClick;
+      onNewRefClick = props.onNewRefClick,
+      getFormInstance = props.getFormInstance;
 
   var _Form$useForm = _Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -62,7 +63,16 @@ var MetadataEdit = function MetadataEdit(props) {
       _React$useState10 = _slicedToArray(_React$useState9, 2),
       curFields = _React$useState10[0],
       setCurFields = _React$useState10[1];
+  /**
+   * 获取form的实例
+   */
 
+
+  React.useEffect(function () {
+    if (form) {
+      getFormInstance && getFormInstance(form);
+    }
+  }, [form]);
   React.useEffect(function () {
     form.setFieldsValue({
       id: 'Test'

package/es/comps/locales/en-US.d.ts

@@ -11,5 +11,6 @@ declare const _default: {
     请输入key: string;
     请输入title: string;
     确认会删除该列: string;
+    当前值无修改: string;
 };
 export default _default;

package/es/comps/locales/en-US.js

@@ -10,5 +10,6 @@ export default {
   请先保存正在编辑的行: 'Please save the line being edited first',
   请输入key: 'Please enter key',
   请输入title: 'Please enter title',
-  确认会删除该列: 'Confirm will delete the column?'
+  确认会删除该列: 'Confirm will delete the column?',
+  当前值无修改: 'No change to current value'
 };

package/es/comps/locales/zh-CN.d.ts

@@ -11,5 +11,6 @@ declare const _default: {
     请输入key: string;
     请输入title: string;
     确认会删除该列: string;
+    当前值无修改: string;
 };
 export default _default;

package/es/comps/locales/zh-CN.js

@@ -10,5 +10,6 @@ export default {
   请先保存正在编辑的行: '请先保存正在编辑的行',
   请输入key: '请输入key',
   请输入title: '请输入title',
-  确认会删除该列: '确认会删除该列?'
+  确认会删除该列: '确认会删除该列?',
+  当前值无修改: '当前值无修改'
 };

package/package.json

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