@lemon-fe/kits 1.0.0-81 → 1.0.0-83

package/es/components/DataGrid/index.js

@@ -219,6 +219,12 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       });
     });
 
+    _defineProperty(_assertThisInitialized(_this), "NoRowsOverlay", function () {
+      return /*#__PURE__*/React.createElement(Empty, {
+        description: _this.props.emptyText
+      });
+    });
+
     _defineProperty(_assertThisInitialized(_this), "getRowId", function (params) {
       var rowKey = _this.props.rowKey;
       var result = typeof rowKey === 'function' ? rowKey(params.data) : get(params.data, rowKey);
@@ -959,11 +965,6 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     value: function LoadingOverlay() {
       return /*#__PURE__*/React.createElement(Spin, null);
     }
-  }, {
-    key: "NoRowsOverlay",
-    value: function NoRowsOverlay() {
-      return /*#__PURE__*/React.createElement(Empty, null);
-    }
   }, {
     key: "getMainMenuItems",
     value: function getMainMenuItems(params) {

package/es/components/DataGrid/index.less

@@ -151,12 +151,13 @@
       padding: 2px;
     }
 
-    .ag-row-inline-editing & {
+    .ag-row-focus &,
+    .ag-row-hover & {
       background-color: #fff;
       box-shadow: 0 0 0 2px var(--ag-border-color) inset;
     }
 
-    .ag-cell-inline-editing & {
+    .ag-cell-focus & {
       padding: 0;
       box-shadow: 0 0 0 2px ~'var(--@{ant-prefix}-primary-5)' inset;
     }
@@ -298,6 +299,10 @@
       content: '';
       pointer-events: none;
     }
+
+    .@{prefixCls}-grid-editor {
+      box-shadow: none;
+    }
   }
 
   .ag-menu {

package/es/components/DataGrid/typings.d.ts

@@ -159,4 +159,8 @@ export interface DataGridProps<TData> extends Omit<AgGridReactProps<TData>, 'row
      * @description 封装后的master-detail使用方式，传了这个参数默认开启master-detai，仅当context和data改变才会重新渲染
      */
     detailCell?: DetailCell<TData, any>;
+    /**
+     * @description 没有行数据时显示的文本
+     */
+    emptyText?: string;
 }

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

@@ -16,7 +16,14 @@ export interface BasePopupProps {
      * 当作为modal使用，请不要传入onOk方法，通过open以及onCancel来控制Modal是否显示
      */
     modal?: boolean;
+    open?: boolean;
     readOnly?: boolean;
+    /**
+     *
+     * @description 非modal模式，打开Modal之前
+     */
+    beforeOpen?: () => boolean;
+    autoFocus?: boolean;
 }
 export interface PopupProps<ValueType> extends BasePopupProps, Omit<ModalProps, 'children' | 'onCancel'> {
     value?: ValueType;
@@ -38,11 +45,6 @@ export interface PopupProps<ValueType> extends BasePopupProps, Omit<ModalProps,
      * @description 确认事件之前校验
      */
     beforeOkCheck?: (value?: ValueType) => boolean | PromiseLike<boolean>;
-    /**
-     *
-     * @description 非modal模式，打开Modal之前
-     */
-    beforeOpen?: () => boolean;
     children?: ReactElement | null | ((props: {
         value?: ValueType;
         disabled?: boolean;
@@ -53,8 +55,6 @@ export interface PopupProps<ValueType> extends BasePopupProps, Omit<ModalProps,
      * @description 清空后的值
      */
     emptyValue?: ValueType;
-    open?: boolean;
-    autoFocus?: boolean;
     onCancel?: () => void;
     renderFooter?: (params: {
         onOk: () => void;

package/es/index.d.ts

@@ -21,7 +21,7 @@ export { default as DurationPicker } from './components/DurationPicker';
 export type { DurationPickerValue } from './components/DurationPicker';
 export { default as ColorPicker } from './components/ColorPicker';
 export { default as Popup } from './components/Popup';
-export type { BasePopupProps } from './components/Popup';
+export type { BasePopupProps, PopupProps } from './components/Popup';
 export { default as SiderTree } from './components/SiderTree';
 export type { TreeData } from './components/SiderTree/typings';
 export { default as Icons } from './components/Icons';

package/package.json

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