@lemon-fe/components 0.1.116 → 0.1.119

package/es/EditableTable/EditableCell.d.ts

@@ -7,5 +7,6 @@ export default function EditableCell(props: {
     disableUpDown?: boolean;
     disableLeftRight?: boolean;
     errors?: string[];
+    noStyle?: boolean;
     onFocus: () => void;
 }): JSX.Element;

package/es/EditableTable/EditableCell.js

@@ -1,3 +1,9 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 import React from 'react';
 import { message } from 'antd';
 import classNames from 'classnames';
@@ -12,18 +18,21 @@ export default function EditableCell(props) {
       disableLeftRight = props.disableLeftRight,
       errors = props.errors,
       _props$bordered = props.bordered,
-      bordered = _props$bordered === void 0 ? true : _props$bordered;
+      bordered = _props$bordered === void 0 ? true : _props$bordered,
+      _props$noStyle = props.noStyle,
+      noStyle = _props$noStyle === void 0 ? false : _props$noStyle;
   var disabled = get(children, 'props.disabled');
-  return /*#__PURE__*/React.createElement("div", {
+  var mainProps = {
     onFocus: onFocus,
-    "data-up-down": disableUpDown ? '0' : '1',
-    "data-left-right": disableLeftRight ? '0' : '1',
-    className: classNames("".concat(PREFIX_CLS, "-form-item"), {
+    'data-up-down': disableUpDown ? '0' : '1',
+    'data-left-right': disableLeftRight ? '0' : '1',
+    className: noStyle ? "".concat(PREFIX_CLS, "-form-item-no-style") : classNames("".concat(PREFIX_CLS, "-form-item"), {
       'ant-input': focused >= 1 && bordered,
       'ant-input-focused': focused >= 2 && bordered,
       'ant-input-disabled': disabled
     })
-  }, children, errors !== undefined ? /*#__PURE__*/React.createElement("div", {
+  };
+  return /*#__PURE__*/React.createElement("div", _objectSpread({}, mainProps), children, errors !== undefined ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(PREFIX_CLS, "-form-item-error"),
     onClick: function onClick() {
       return message.warning(errors.join('\n'));

package/es/EditableTable/index.less

@@ -20,4 +20,10 @@
     border: 1px solid #c0c0c0;
     border-radius: 4px;
   }
+
+  &-no-style {
+    display: flex;
+    align-items: center;
+    justify-content: start;
+  }
 }

package/es/Popup/index.d.ts

@@ -12,6 +12,8 @@ export interface PopupProps<ValueType> extends ModalProps {
     }) => ReactElement | null;
     formatLabel?: (value: ValueType) => string;
     beforeOk?: (value: ValueType) => ValueType | PromiseLike<ValueType>;
+    /** 确认事件之前校验 */
+    beforeOkCheck?: (value?: ValueType) => boolean | PromiseLike<boolean>;
     children?: JSX.Element | ((props: {
         value?: ValueType;
     }) => JSX.Element);

package/es/Popup/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["value", "onChange", "component", "children", "formatLabel", "disabled", "allowClear", "autoFocus", "showLabel", "beforeOk", "placeholder", "onClick", "disabledTip", "bordered", "emptyValue"];
+var _excluded = ["value", "onChange", "component", "children", "formatLabel", "disabled", "allowClear", "autoFocus", "showLabel", "beforeOk", "beforeOkCheck", "placeholder", "onClick", "disabledTip", "bordered", "emptyValue"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -46,6 +46,7 @@ function Popup(props) {
       _props$showLabel = props.showLabel,
       showLabel = _props$showLabel === void 0 ? true : _props$showLabel,
       beforeOk = props.beforeOk,
+      beforeOkCheck = props.beforeOkCheck,
       placeholder = props.placeholder,
       onClick = props.onClick,
       disabledTip = props.disabledTip,
@@ -94,41 +95,60 @@ function Popup(props) {
 
   var handleOk = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var res;
+      var checkResult, res;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              if (!beforeOkCheck) {
+                _context.next = 6;
+                break;
+              }
+
+              _context.next = 3;
+              return beforeOkCheck(value);
+
+            case 3:
+              checkResult = _context.sent;
+
+              if (checkResult) {
+                _context.next = 6;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 6:
               setVisible(false);
 
               if (!onChange) {
-                _context.next = 10;
+                _context.next = 16;
                 break;
               }
 
               if (!(beforeOk && value)) {
-                _context.next = 9;
+                _context.next = 15;
                 break;
               }
 
-              _context.next = 5;
+              _context.next = 11;
               return beforeOk(value);
 
-            case 5:
+            case 11:
               res = _context.sent;
               onChange(res);
-              _context.next = 10;
+              _context.next = 16;
               break;
 
-            case 9:
+            case 15:
               onChange(value);
 
-            case 10:
+            case 16:
               if (inputRef.current) {
                 inputRef.current.focus();
               }
 
-            case 11:
+            case 17:
             case "end":
               return _context.stop();
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.116",
+  "version": "0.1.119",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -39,5 +39,5 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "194c33e19585ca81634ccf44e6c8efa3beca743c"
+  "gitHead": "1e168ecae5f933292d902e0463f08272fbd98821"
 }