@lemon-fe/kits 1.0.0-183 → 1.0.0-185

package/es/components/DataGrid/renderer/DetailCellRenderer.js

@@ -64,6 +64,7 @@ var DetailCellRenderer = /*#__PURE__*/forwardRef(function (params, ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(prefix('cell-detail'), _defineProperty({}, prefix('cell-detail-auto-height'), autoHeight))
   }, render(_objectSpread(_objectSpread({}, params), {}, {
+    data: data,
     context: context
   })));
 });

package/es/components/DurationPicker/index.js

@@ -167,9 +167,10 @@ function DurationPicker(props) {
   var handleChangeDates = function handleChangeDates(dates) {
     var newDurationPickerValue = _objectSpread({}, value);
 
+    newDurationPickerValue.option = defaultOptions[0].label;
+
     if (dates === null) {
       newDurationPickerValue.dates = emptyValue;
-      newDurationPickerValue.option = defaultOptions[0].label;
     } else {
       if (restProps.showTime) {
         newDurationPickerValue.dates = [moment(dates[0]).format(dateFormat), moment(dates[1]).format(dateFormat)];

package/es/components/GreyPanel/index.less

@@ -3,4 +3,9 @@
   background-color: fade(#f7f8fa, 60);
   border: 1px dashed #e5e5e5;
   border-radius: @border-radius-base;
+
+  //  去除表单最后一个的下边距 保持上下间距统一
+  .@{ant-prefix}-form-item:last-child {
+    margin-bottom: 0;
+  }
 }

package/es/components/Popup/index.js

@@ -98,59 +98,91 @@ function Popup(props) {
     (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
   };
 
-  var handleOpen = function handleOpen() {
-    onClick === null || onClick === void 0 ? void 0 : onClick();
+  var handleOpen = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              onClick === null || onClick === void 0 ? void 0 : onClick();
 
-    if (disabled) {
-      if (disabledTip) {
-        message.warning(disabledTip);
-      }
+              if (!disabled) {
+                _context.next = 4;
+                break;
+              }
 
-      return;
-    }
+              if (disabledTip) {
+                message.warning(disabledTip);
+              }
 
-    if (beforeOpen !== undefined) {
-      if (!beforeOpen()) {
-        return;
-      }
-    }
+              return _context.abrupt("return");
 
-    onOpenChange === null || onOpenChange === void 0 ? void 0 : onOpenChange(true);
-    setOpen(true);
-  };
+            case 4:
+              if (!(beforeOpen !== undefined)) {
+                _context.next = 9;
+                break;
+              }
+
+              _context.next = 7;
+              return beforeOpen();
+
+            case 7:
+              if (_context.sent) {
+                _context.next = 9;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 9:
+              onOpenChange === null || onOpenChange === void 0 ? void 0 : onOpenChange(true);
+              setOpen(true);
+
+            case 11:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function handleOpen() {
+      return _ref.apply(this, arguments);
+    };
+  }();
 
   var handleOk = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(payload) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(payload) {
       var result, checkResult, change, res;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               result = payload === undefined ? value : payload;
 
               if (!beforeOkCheck) {
-                _context.next = 7;
+                _context2.next = 7;
                 break;
               }
 
-              _context.next = 4;
+              _context2.next = 4;
               return beforeOkCheck(result);
 
             case 4:
-              checkResult = _context.sent;
+              checkResult = _context2.sent;
 
               if (checkResult) {
-                _context.next = 7;
+                _context2.next = 7;
                 break;
               }
 
-              return _context.abrupt("return");
+              return _context2.abrupt("return");
 
             case 7:
               handleCancel();
 
               if (!(onChange !== undefined)) {
-                _context.next = 18;
+                _context2.next = 18;
                 break;
               }
 
@@ -165,17 +197,17 @@ function Popup(props) {
               };
 
               if (!(beforeOk && result)) {
-                _context.next = 17;
+                _context2.next = 17;
                 break;
               }
 
-              _context.next = 13;
+              _context2.next = 13;
               return beforeOk(result);
 
             case 13:
-              res = _context.sent;
+              res = _context2.sent;
               change(res);
-              _context.next = 18;
+              _context2.next = 18;
               break;
 
             case 17:
@@ -183,14 +215,14 @@ function Popup(props) {
 
             case 18:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee);
+      }, _callee2);
     }));
 
     return function handleOk(_x) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 

package/es/hooks/useBatchOperator/index.js

@@ -298,7 +298,9 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
                             if (mode === 'warning') {
                               return /*#__PURE__*/React.createElement(Row, {
                                 justify: 'space-between'
-                              }, /*#__PURE__*/React.createElement("span", null, error.message), /*#__PURE__*/React.createElement("a", {
+                              }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Icons.Tip, {
+                                type: "warning"
+                              }), /*#__PURE__*/React.createElement("span", null, " ", error.message, " ")), /*#__PURE__*/React.createElement("a", {
                                 onClick: function onClick() {
                                   _this2.processNode(id, stepIdx + 1);
                                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-183",
+  "version": "1.0.0-185",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",