dtable-ui-component 5.3.11 → 5.3.12

package/lib/RowExpandDialog/body/index.js

@@ -62,7 +62,8 @@ class Body extends _react.default.Component {
     this.onHotKey = event => {
       const {
         columns,
-        onKeyDown
+        onKeyDown,
+        onToggle
       } = this.props;
       const readonly = Array.isArray(columns) && columns.length > 0 ? !columns.some(c => c.editable) : true;
       const keyCode = event.keyCode;
@@ -71,7 +72,7 @@ class Body extends _react.default.Component {
         return;
       }
       if (keyCode === _constants.KeyCodes.Esc) {
-        this.props.onRowExpandCancel();
+        onToggle && onToggle();
         return;
       }
       onKeyDown && onKeyDown(event);

package/lib/RowExpandDialog/index.js

@@ -224,7 +224,8 @@ const RowExpandDialog = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     columns: columns,
     valueKey: valueKey,
     onChange: onChange,
-    uploadFile: uploadFile
+    uploadFile: uploadFile,
+    onToggle: onToggle
   }), children[1]), (!saveImmediately || isInsertingRow) && /*#__PURE__*/_react.default.createElement(_reactstrap.ModalFooter, null, /*#__PURE__*/_react.default.createElement(_reactstrap.Button, {
     onClick: toggle,
     color: "secondary"

package/lib/RowExpandEditor/RowExpandDepartmentEditor/index.js

@@ -36,7 +36,7 @@ function RowExpandDepartmentEditor(props) {
       document.removeEventListener('keydown', onKeyDown);
     };
     // eslint-disable-next-line
-  }, [isEditorFocus]);
+  }, [isEditorFocus, showEditor]);
   (0, _react.useEffect)(() => {
     setValue(row[column[valueKey]] || '');
     setShowEditor(false);
@@ -49,7 +49,7 @@ function RowExpandDepartmentEditor(props) {
   function onKeyDown(e) {
     if (e.keyCode === _constants.KeyCodes.Enter && props.isEditorFocus && !showEditor) {
       setShowEditor(true);
-    } else if (e.keyCode === _constants.KeyCodes.Escape) {
+    } else if (e.keyCode === _constants.KeyCodes.Escape && showEditor) {
       e.stopPropagation();
       setShowEditor(false);
       departmentSelectContent.current.focus();

package/lib/RowExpandEditor/RowExpandEmailEditor/index.js

@@ -45,19 +45,19 @@ class RowExpandEmailEditor extends _react.default.Component {
     this.onPaste = e => {
       e.stopPropagation();
     };
-    this.onKeyDown = e => {
-      if (e.keyCode === _constants.KeyCodes.Esc) {
-        e.stopPropagation();
+    this.onKeyDown = event => {
+      if (event.keyCode === _constants.KeyCodes.Esc) {
+        event.stopPropagation();
         this.blurInput();
         return;
       }
-      let {
+      const {
         selectionStart,
         selectionEnd,
         value
-      } = e.currentTarget;
-      if (e.keyCode === _constants.KeyCodes.ChineseInputMethod || e.keyCode === _constants.KeyCodes.LeftArrow && selectionStart === 0 || e.keyCode === _constants.KeyCodes.RightArrow && selectionEnd === value.length) {
-        e.stopPropagation();
+      } = event.currentTarget;
+      if (event.keyCode === _constants.KeyCodes.ChineseInputMethod || event.keyCode === _constants.KeyCodes.LeftArrow && selectionStart === 0 || event.keyCode === _constants.KeyCodes.RightArrow && selectionEnd === value.length) {
+        event.stopPropagation();
       }
     };
     this.onOpenEmailLink = () => {

package/lib/RowExpandEditor/RowExpandTextEditor/index.js

@@ -58,8 +58,17 @@ class RowExpandSimpleText extends _react.default.Component {
     };
     this.onKeyDown = event => {
       if (event.keyCode === _constants.KeyCodes.Esc) {
-        event.preventDefault();
+        event.stopPropagation();
         this.blurInput();
+        return;
+      }
+      const {
+        selectionStart,
+        selectionEnd,
+        value
+      } = event.currentTarget;
+      if (event.keyCode === _constants.KeyCodes.ChineseInputMethod || event.keyCode === _constants.KeyCodes.LeftArrow && selectionStart === 0 || event.keyCode === _constants.KeyCodes.RightArrow && selectionEnd === value.length) {
+        event.stopPropagation();
       }
     };
     this.isChecked = () => {

package/lib/RowExpandEditor/RowExpandUrlEditor/index.js

@@ -47,19 +47,19 @@ class RowExpandUrlEditor extends _react.default.Component {
     this.onPaste = e => {
       e.stopPropagation();
     };
-    this.onKeyDown = e => {
-      if (e.keyCode === _constants.KeyCodes.Esc) {
-        e.stopPropagation();
+    this.onKeyDown = event => {
+      if (event.keyCode === _constants.KeyCodes.Esc) {
+        event.preventDefault();
         this.blurInput();
         return;
       }
-      let {
+      const {
         selectionStart,
         selectionEnd,
         value
-      } = e.currentTarget;
-      if (e.keyCode === _constants.KeyCodes.ChineseInputMethod || e.keyCode === _constants.KeyCodes.LeftArrow && selectionStart === 0 || e.keyCode === _constants.KeyCodes.RightArrow && selectionEnd === value.length) {
-        e.stopPropagation();
+      } = event.currentTarget;
+      if (event.keyCode === _constants.KeyCodes.ChineseInputMethod || event.keyCode === _constants.KeyCodes.LeftArrow && selectionStart === 0 || event.keyCode === _constants.KeyCodes.RightArrow && selectionEnd === value.length) {
+        event.stopPropagation();
       }
     };
     this.onOpenUrlLink = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "5.3.11",
+  "version": "5.3.12",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "3.0.1",