@lemon-fe/kits 1.0.0-89 → 1.0.0-90

package/es/components/DataGrid/index.less

@@ -374,4 +374,8 @@
     color: var(--ag-foreground-color);
     opacity: 0.75;
   }
+
+  .ag-row-selected::before {
+    z-index: -1;
+  }
 }

package/es/components/Popup/index.d.ts

@@ -16,6 +16,9 @@ export interface BasePopupProps {
      * 当作为modal使用，请不要传入onOk方法，通过open以及onCancel来控制Modal是否显示
      */
     modal?: boolean;
+    /**
+     * @description 受控open
+     */
     open?: boolean;
     readOnly?: boolean;
     /**
@@ -24,6 +27,9 @@ export interface BasePopupProps {
      */
     beforeOpen?: () => boolean;
     autoFocus?: boolean;
+    onCancel?: () => void;
+    onOpenChange?: (visible: boolean) => void;
+    onClick?: () => void;
 }
 export interface PopupProps<ValueType> extends BasePopupProps, Omit<ModalProps, 'children' | 'onCancel'> {
     value?: ValueType;
@@ -50,12 +56,10 @@ export interface PopupProps<ValueType> extends BasePopupProps, Omit<ModalProps,
         disabled?: boolean;
         readOnly?: boolean;
     }) => ReactElement | null);
-    onClick?: () => void;
     /**
      * @description 清空后的值
      */
     emptyValue?: ValueType;
-    onCancel?: () => void;
     renderFooter?: (params: {
         onOk: () => void;
         onCancel: () => void;

package/es/components/Popup/index.js

@@ -1,6 +1,6 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
-var _excluded = ["value", "onChange", "component", "children", "formatLabel", "disabled", "allowClear", "autoFocus", "showLabel", "beforeOk", "beforeOkCheck", "placeholder", "onClick", "disabledTip", "bordered", "emptyValue", "onCancel", "modal", "open", "readOnly", "beforeOpen", "renderFooter"];
+var _excluded = ["value", "onChange", "component", "children", "formatLabel", "disabled", "allowClear", "autoFocus", "showLabel", "beforeOk", "beforeOkCheck", "placeholder", "onClick", "disabledTip", "bordered", "emptyValue", "onCancel", "modal", "open", "readOnly", "beforeOpen", "renderFooter", "onOpenChange"];
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -60,6 +60,7 @@ function Popup(props) {
       readOnly = props.readOnly,
       beforeOpen = props.beforeOpen,
       renderFooter = props.renderFooter,
+      onOpenChange = props.onOpenChange,
       restProps = _objectWithoutProperties(props, _excluded);
 
   var _useState = useState(valueProp),
@@ -88,16 +89,12 @@ function Popup(props) {
 
   var handleCancel = function handleCancel() {
     setOpen(false);
-
-    if (onCancel !== undefined) {
-      onCancel();
-    }
+    onOpenChange === null || onOpenChange === void 0 ? void 0 : onOpenChange(false);
+    onCancel === null || onCancel === void 0 ? void 0 : onCancel();
   };
 
   var handleOpen = function handleOpen() {
-    if (onClick) {
-      onClick();
-    }
+    onClick === null || onClick === void 0 ? void 0 : onClick();
 
     if (disabled) {
       if (disabledTip) {
@@ -113,6 +110,7 @@ function Popup(props) {
       }
     }
 
+    onOpenChange === null || onOpenChange === void 0 ? void 0 : onOpenChange(true);
     setOpen(true);
   };
 
@@ -144,40 +142,36 @@ function Popup(props) {
               return _context.abrupt("return");
 
             case 7:
-              setOpen(false);
-
-              if (onCancel !== undefined) {
-                onCancel();
-              }
+              handleCancel();
 
               if (!(onChange !== undefined)) {
-                _context.next = 18;
+                _context.next = 17;
                 break;
               }
 
               if (!(beforeOk && result)) {
-                _context.next = 17;
+                _context.next = 16;
                 break;
               }
 
-              _context.next = 13;
+              _context.next = 12;
               return beforeOk(result);
 
-            case 13:
+            case 12:
               res = _context.sent;
               onChange(res);
-              _context.next = 18;
+              _context.next = 17;
               break;
 
-            case 17:
+            case 16:
               onChange(result);
 
-            case 18:
+            case 17:
               if (inputRef.current !== null) {
                 inputRef.current.focus();
               }
 
-            case 19:
+            case 18:
             case "end":
               return _context.stop();
           }

package/package.json

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