ronds-metadata 1.0.41 → 1.0.42

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

@@ -6,18 +6,26 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:53:50
- * @LastEditTime: 2022-03-04 15:56:22
+ * @LastEditTime: 2022-03-08 14:16:12
  */
 import React from 'react';
+import { EditableContext } from '../interface';
 
 function Index(props) {
-  var dataIndex = props.dataIndex;
+  var dataIndex = props.dataIndex,
+      disabled = props.disabled;
+
+  var _ref = React.useContext(EditableContext) || undefined,
+      editConfig = _ref.editConfig;
+
   return /*#__PURE__*/React.createElement(_Form.Item, {
     name: dataIndex,
     style: {
       margin: 0
     }
-  }, /*#__PURE__*/React.createElement(_Input, null));
+  }, /*#__PURE__*/React.createElement(_Input, {
+    disabled: editConfig.type === 'edit' ? disabled : false
+  }));
 }
 
 export default /*#__PURE__*/React.memo(Index);

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

@@ -6,18 +6,26 @@ import _InputNumber from "antd/es/input-number";
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:53:50
- * @LastEditTime: 2022-03-04 14:57:57
+ * @LastEditTime: 2022-03-08 14:16:01
  */
 import React from 'react';
+import { EditableContext } from '../interface';
 
 function Index(props) {
-  var dataIndex = props.dataIndex;
+  var dataIndex = props.dataIndex,
+      disabled = props.disabled;
+
+  var _ref = React.useContext(EditableContext) || undefined,
+      editConfig = _ref.editConfig;
+
   return /*#__PURE__*/React.createElement(_Form.Item, {
     name: dataIndex,
     style: {
       margin: 0
     }
-  }, /*#__PURE__*/React.createElement(_InputNumber, null));
+  }, /*#__PURE__*/React.createElement(_InputNumber, {
+    disabled: editConfig.type === 'edit' ? disabled : false
+  }));
 }
 
 export default /*#__PURE__*/React.memo(Index);

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

@@ -3,25 +3,31 @@ import _Form from "antd/es/form";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["dataIndex"];
+var _excluded = ["dataIndex", "disabled"];
 
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:53:50
- * @LastEditTime: 2022-03-05 08:27:55
+ * @LastEditTime: 2022-03-08 14:14:18
  */
 import React from 'react';
+import { EditableContext } from '../interface';
 
 function Index(props) {
   var dataIndex = props.dataIndex,
+      disabled = props.disabled,
       restProps = _objectWithoutProperties(props, _excluded);
 
+  var _ref = React.useContext(EditableContext) || undefined,
+      editConfig = _ref.editConfig;
+
   return /*#__PURE__*/React.createElement(_Form.Item, {
     name: dataIndex,
     style: {
       margin: 0
     }
   }, /*#__PURE__*/React.createElement(_Select, {
+    disabled: editConfig.type === 'edit' ? disabled : false,
     style: {
       width: '100%'
     },

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

@@ -6,19 +6,27 @@ import _Switch from "antd/es/switch";
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:53:50
- * @LastEditTime: 2022-03-05 08:53:21
+ * @LastEditTime: 2022-03-08 14:14:22
  */
 import React from 'react';
+import { EditableContext } from '../interface';
 
 function Index(props) {
-  var dataIndex = props.dataIndex;
+  var dataIndex = props.dataIndex,
+      disabled = props.disabled;
+
+  var _ref = React.useContext(EditableContext) || undefined,
+      editConfig = _ref.editConfig;
+
   return /*#__PURE__*/React.createElement(_Form.Item, {
     name: dataIndex,
     valuePropName: "checked",
     style: {
       margin: 0
     }
-  }, /*#__PURE__*/React.createElement(_Switch, null));
+  }, /*#__PURE__*/React.createElement(_Switch, {
+    disabled: editConfig.type === 'edit' ? disabled : false
+  }));
 }
 
 export default /*#__PURE__*/React.memo(Index);

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

@@ -12,7 +12,7 @@ var EditableAction = function EditableAction(props) {
 
   var _ref = React.useContext(EditableContext) || undefined,
       editableStream = _ref.editableStream,
-      editRowKey = _ref.editRowKey;
+      editConfig = _ref.editConfig;
 
   var onEdit = function onEdit() {
     editableStream.next({
@@ -44,16 +44,16 @@ var EditableAction = function EditableAction(props) {
     });
   };
 
-  return /*#__PURE__*/React.createElement(React.Fragment, null, type === 'single' && /*#__PURE__*/React.createElement(React.Fragment, null, editRowKey !== record._rowKey_ && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, type === 'single' && /*#__PURE__*/React.createElement(React.Fragment, null, editConfig.curRow !== record._rowKey_ && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
     type: "link",
-    disabled: (editRowKey || editRowKey === 0) && editRowKey !== record._rowKey_,
+    disabled: (editConfig.curRow || editConfig.curRow === 0) && editConfig.curRow !== record._rowKey_,
     size: "small",
     icon: /*#__PURE__*/React.createElement(EditOutlined, null),
     onClick: onEdit,
     title: '编辑'
   }), /*#__PURE__*/React.createElement(_Divider, {
     type: "vertical"
-  })), editRowKey === record._rowKey_ && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
+  })), editConfig.curRow === record._rowKey_ && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
     type: "link",
     size: "small",
     icon: /*#__PURE__*/React.createElement(CheckOutlined, null),

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

@@ -4,7 +4,7 @@ var _excluded = ["editable", "editableType", "dataIndex", "rowIndex", "children"
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 10:01:10
- * @LastEditTime: 2022-03-07 13:40:57
+ * @LastEditTime: 2022-03-08 14:06:58
  */
 import React from 'react';
 import { EditableContext } from '../interface';
@@ -19,10 +19,10 @@ var EditableCell = function EditableCell(props) {
       restProps = _objectWithoutProperties(props, _excluded);
 
   var _ref = React.useContext(EditableContext) || undefined,
-      editRowKey = _ref.editRowKey;
+      editConfig = _ref.editConfig;
 
   if (editableType === 'single') {
-    return /*#__PURE__*/React.createElement("td", restProps, editable && editRowKey === rowIndex ? getDataCell(props) : children);
+    return /*#__PURE__*/React.createElement("td", restProps, editable && editConfig.curRow === rowIndex ? getDataCell(props) : children);
   }
 
   return /*#__PURE__*/React.createElement("td", restProps, editable ? getDataCell(props) : children);

package/es/comps/Editable/index.js

@@ -3,10 +3,10 @@ import _Button from "antd/es/button";
 import "antd/es/table/style";
 import _Table from "antd/es/table";
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/message/style";
 import _message from "antd/es/message";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
 import { BehaviorSubject } from 'rxjs';
@@ -47,6 +47,11 @@ var Editable = function Editable(props) {
       editRowKey = _React$useState4[0],
       setEditRowkey = _React$useState4[1];
 
+  var _React$useState5 = React.useState('add'),
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      editType = _React$useState6[0],
+      setEditType = _React$useState6[1];
+
   var editRowKeyRef = React.useRef(); // 记录上一次发生改变的行值
 
   var lastValueRef = React.useRef(); // 记录上一次的datasource
@@ -71,13 +76,23 @@ var Editable = function Editable(props) {
         break;
 
       case 'editRowKey':
+        if (Object.keys(data.payload).length > 1) {
+          setEditType('edit');
+        } else {
+          setEditType('add');
+        }
+
         setEditRowkey(data.payload._rowKey_);
         editRowKeyRef.current = data.payload._rowKey_;
         break;
 
       case 'onSingleSave':
         if (lastValueRef.current && lastValueRef.current.rowIdx === data.payload._rowKey_) {
-          onRowConfirm && onRowConfirm(lastValueRef.current);
+          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 {
@@ -111,8 +126,9 @@ var Editable = function Editable(props) {
   }, [type]); // 返回stream的实例
 
   React.useEffect(function () {
-    if (editableStream) {
+    if (firstLoadRef && editableStream) {
       getStreamInstance && getStreamInstance(editableStream);
+      firstLoadRef.current = false;
     }
   }, [editableStream]); // 定义内部的record
 
@@ -141,7 +157,7 @@ var Editable = function Editable(props) {
         return _objectSpread(_objectSpread({
           record: record,
           editableType: type
-        }, pick(column, ['editable', 'title', 'dataIndex', 'type', 'enum'])), {}, {
+        }, pick(column, ['editable', 'title', 'dataIndex', 'type', 'enum', 'disabled'])), {}, {
           rowIndex: rowIndex
         });
       };
@@ -209,7 +225,10 @@ var Editable = function Editable(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EditableContext.Provider, {
     value: {
       editableStream: editableStream,
-      editRowKey: editRowKey
+      editConfig: {
+        curRow: editRowKey,
+        type: editType
+      }
     }
   }, /*#__PURE__*/React.createElement(_Table, _extends({
     bordered: true

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

@@ -4,6 +4,7 @@ import { BehaviorSubject } from 'rxjs';
 export interface EditableCellProps extends React.HTMLAttributes<HTMLElement> {
     title: any;
     editable: boolean;
+    disabled?: boolean;
     dataIndex: number;
     rowIndex: number;
     record: any;
@@ -33,7 +34,16 @@ export interface IEditableStream {
 }
 export interface IEditableContextProps {
     editableStream: BehaviorSubject<IEditableStream | undefined>;
-    editRowKey: number;
+    editConfig: {
+        /**
+         * 当前编辑的行
+         */
+        curRow: number;
+        /**
+         * 当前行是编辑还是新增
+         */
+        type: 'edit' | 'add';
+    };
 }
 export declare const EditableContext: React.Context<IEditableContextProps>;
 export interface IMultipleProps {

package/es/comps/Editable/interface.js

@@ -1,7 +1,7 @@
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 15:07:57
- * @LastEditTime: 2022-03-07 15:13:45
+ * @LastEditTime: 2022-03-08 13:59:06
  */
 import React from 'react';
 export var EditableContext = /*#__PURE__*/React.createContext(null);

package/package.json

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