@lemon-fe/kits 1.0.0-80 → 1.0.0-82

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

@@ -61,6 +61,7 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
     private getPagination;
     componentDidUpdate(prevProps: DataGridProps<TData>): void;
     componentWillUnmount(): void;
+    componentDidMount(): void;
     private syncColRender;
     private syncSelection;
     private syncRowData;

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);
@@ -438,6 +444,12 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       this.isReady = false;
+      window.removeEventListener('blur', this.handleFocus);
+    }
+  }, {
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      window.addEventListener('blur', this.handleFocus);
     }
   }, {
     key: "syncColRender",
@@ -830,6 +842,12 @@ var DataGrid = /*#__PURE__*/function (_Component) {
 
         _this4.api.forEachNode(function (node) {
           if (node.id && _this4.selected.has(node.id)) {
+            var rowData = _this4.selected.get(node.id);
+
+            if (node.data !== undefined && rowData !== node.data) {
+              _this4.selected.set(node.id, node.data);
+            }
+
             node.setSelected(true, false, true);
           }
         });
@@ -908,7 +926,9 @@ var DataGrid = /*#__PURE__*/function (_Component) {
 
           _this5.api.setPinnedBottomRowData(pinned);
 
-          _this5.api.ensureIndexVisible(0);
+          if (res.data.length > 0) {
+            _this5.api.ensureIndexVisible(0);
+          }
 
           if (onLoad) {
             onLoad(res.extra);
@@ -945,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;
     }

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/DataGrid/utils.js

@@ -251,10 +251,10 @@ export var Selection = /*#__PURE__*/function () {
 }();
 export var columnTypes = {
   datetime: {
-    initialWidth: 150
+    initialWidth: 159
   },
   date: {
-    initialWidth: 120,
+    initialWidth: 129,
     valueFormatter: function valueFormatter(_ref) {
       var value = _ref.value;
 

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

@@ -16,7 +16,13 @@ export interface BasePopupProps {
      * 当作为modal使用，请不要传入onOk方法，通过open以及onCancel来控制Modal是否显示
      */
     modal?: boolean;
+    open?: boolean;
     readOnly?: boolean;
+    /**
+     *
+     * @description 非modal模式，打开Modal之前
+     */
+    beforeOpen?: () => boolean;
 }
 export interface PopupProps<ValueType> extends BasePopupProps, Omit<ModalProps, 'children' | 'onCancel'> {
     value?: ValueType;
@@ -38,11 +44,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,7 +54,6 @@ export interface PopupProps<ValueType> extends BasePopupProps, Omit<ModalProps,
      * @description 清空后的值
      */
     emptyValue?: ValueType;
-    open?: boolean;
     autoFocus?: boolean;
     onCancel?: () => void;
     renderFooter?: (params: {

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-80",
+  "version": "1.0.0-82",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",